Skip to content

Activate item on select/check to do keyboard navigation onwards #695

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 4 commits into
base: master
Choose a base branch
from
Open

Activate item on select/check to do keyboard navigation onwards #695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb102b3
ímprove, do not reset active item on mouse move
benroe89 Dec 30, 2022
631e9e8
change, explicitly set focus if focused changed
benroe89 Dec 30, 2022
bdceff9
ensure focused on select or check
benroe89 Dec 30, 2022
7399b83
update active item to selected/checked on
benroe89 Dec 30, 2022
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
11 changes: 8 additions & 3 deletions src/NodeList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ const NodeList = React.forwardRef<NodeListRef, NodeListProps<any>>((props, ref)
// =============================== Ref ================================
const listRef = React.useRef<ListRef>(null);
const indentMeasurerRef = React.useRef<HTMLDivElement>(null);
const inputRef = React.useRef<HTMLInputElement>(null);
React.useImperativeHandle(ref, () => ({
scrollTo: scroll => {
listRef.current.scrollTo(scroll);
Expand Down Expand Up @@ -252,6 +253,12 @@ const NodeList = React.forwardRef<NodeListRef, NodeListProps<any>>((props, ref)
}
}, [dragging]);

React.useEffect(() => {
if (focused && inputRef.current) {
inputRef.current.focus();
}
}, [focused]);

const mergedData = motion ? transitionData : data;

const treeNodeRequiredProps = {
Expand Down Expand Up @@ -281,6 +288,7 @@ const NodeList = React.forwardRef<NodeListRef, NodeListProps<any>>((props, ref)
tabIndex={focusable !== false ? tabIndex : null}
onKeyDown={onKeyDown}
onFocus={onFocus}
ref={inputRef}
onBlur={onBlur}
value=""
onChange={noop}
Expand Down Expand Up @@ -357,9 +365,6 @@ const NodeList = React.forwardRef<NodeListRef, NodeListProps<any>>((props, ref)
onMotionStart={onListChangeStart}
onMotionEnd={onMotionEnd}
treeNodeRequiredProps={treeNodeRequiredProps}
onMouseMove={() => {
onActiveChange(null);
}}
/>
);
}}
Expand Down
5 changes: 4 additions & 1 deletion src/Tree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,8 @@ class Tree<TreeDataType extends DataNode | BasicDataNode = DataNode> extends Rea
})
.filter(node => node);

this.setUncontrolledState({ selectedKeys });
this.setUncontrolledState({ selectedKeys, focused: true });
this.onActiveChange(key)

onSelect?.(selectedKeys, {
event: 'select',
Expand Down Expand Up @@ -940,12 +941,14 @@ class Tree<TreeDataType extends DataNode | BasicDataNode = DataNode> extends Rea
this.setUncontrolledState(
{
checkedKeys,
focused: true,
},
false,
{
halfCheckedKeys,
},
);
this.onActiveChange(key)
}

onCheck?.(checkedObj, eventObj as CheckInfo<TreeDataType>);
Expand Down