Skip to content

fix(cascader): fix default no go top #428

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.

Sign up for GitHub

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
wants to merge 5 commits into
base: master
Choose a base branch
from
+9 −2
Open

fix(cascader): fix default no go top #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c75120
fix(cascader): 🐞 default no go top
blockmood Aug 24, 2023
18fe05d
🐞 fix(cascader): fix test Use Cases
blockmood Aug 24, 2023
0fb084f
fix(cascader): del console
blockmood Aug 24, 2023
baa61ac
fix: test vercel
blockmood Aug 25, 2023
095dc59
fix: recovery code
blockmood Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/OptionList/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ const RefOptionList = React.forwardRef<RefOptionListProps>((props, ref) => {
`li[data-path-key="${cellKeyPath.replace(/\\{0,2}"/g, '\\"')}"]`, // matches unescaped double quotes
);
if (ele) {
scrollIntoParentView(ele);
scrollIntoParentView(ele, activeValueCells);
}
}
}, [activeValueCells]);
Expand Down
9 changes: 8 additions & 1 deletion src/utils/commonUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export function isLeaf(option: DefaultOptionType, fieldNames: FieldNames) {
return option.isLeaf ?? !option[fieldNames.children]?.length;
}

export function scrollIntoParentView(element: HTMLElement) {
export function scrollIntoParentView(element: HTMLElement, activeValueCells: React.Key[]) {
const parent = element.parentElement;
if (!parent) {
return;
Expand All @@ -54,6 +54,13 @@ export function scrollIntoParentView(element: HTMLElement) {
parent.scrollTo({ top: elementToParent });
} else if (elementToParent + element.offsetHeight - parent.scrollTop > parent.offsetHeight) {
parent.scrollTo({ top: elementToParent + element.offsetHeight - parent.offsetHeight });
} else {
const parentToContainer = parent.parentElement.children;
if(!activeValueCells.length || activeValueCells.length === parentToContainer.length) return
const container = parentToContainer[activeValueCells.length];
if (container && typeof container.scrollTo === 'function') {
container.scrollTo({top: 0});
}
}
}

Expand Down