-
-
Notifications
You must be signed in to change notification settings - Fork 620
feat: scrollTo add align support #1469
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
EmilyyyLiu
wants to merge
7
commits into
react-component:master
Choose a base branch
from
EmilyyyLiu:liuh-scroll
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
b4bc3f7
feat: scrollTo add align
65f7b76
Update README.md
EmilyyyLiu 74f51a1
Update src/Table.tsx
EmilyyyLiu 1027f17
Update src/interface.ts
EmilyyyLiu 833f5ce
fix: virtual table scrollTo align support
c71b494
fix: implement real nearest behavior with offset in Table scrollTo
ec47eb8
fix: improve virtual table align handling
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,12 @@ import VirtualList, { type ListProps, type ListRef } from '@rc-component/virtual | |
| import * as React from 'react'; | ||
| import TableContext, { responseImmutable } from '../context/TableContext'; | ||
| import useFlattenRecords, { type FlattenData } from '../hooks/useFlattenRecords'; | ||
| import type { ColumnType, OnCustomizeScroll, ScrollConfig } from '../interface'; | ||
| import type { | ||
| ColumnType, | ||
| OnCustomizeScroll, | ||
| ScrollConfig, | ||
| VirtualScrollConfig, | ||
| } from '../interface'; | ||
| import BodyLine from './BodyLine'; | ||
| import { GridContext, StaticContext } from './context'; | ||
|
|
||
|
|
@@ -79,15 +84,22 @@ const Grid = React.forwardRef<GridRef, GridProps>((props, ref) => { | |
| // =========================== Ref ============================ | ||
| React.useImperativeHandle(ref, () => { | ||
| const obj = { | ||
| scrollTo: (config: ScrollConfig) => { | ||
| const { offset, ...restConfig } = config; | ||
|
|
||
| // If offset is provided, force align to 'top' for consistent behavior | ||
| if (offset) { | ||
| listRef.current?.scrollTo({ ...restConfig, offset, align: 'top' }); | ||
| } else { | ||
| listRef.current?.scrollTo(config); | ||
| } | ||
| scrollTo: (config: VirtualScrollConfig) => { | ||
| const { align, offset, ...restConfig } = config; | ||
|
|
||
| const alignMap: Record<string, 'top' | 'bottom' | 'auto'> = { | ||
| start: 'top', | ||
| end: 'bottom', | ||
| nearest: 'auto', | ||
| }; | ||
|
Comment on lines
+90
to
+94
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
|
|
||
| const virtualAlign = alignMap[align] ?? (offset ? 'top' : 'auto'); | ||
|
|
||
coderabbitai[bot] marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| listRef.current?.scrollTo({ | ||
| ...restConfig, | ||
| offset, | ||
| align: virtualAlign, | ||
| }); | ||
| }, | ||
| nativeElement: listRef.current?.nativeElement, | ||
| } as unknown as GridRef; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
alignMapobject is recreated on every call toscrollTo. For better performance, consider moving this mapping outside the function or using a constant.