Skip to content

fix: Tabs popup can not trigger click at first time #245

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

Merged
merged 3 commits into from
Jun 28, 2020
Merged

fix: Tabs popup can not trigger click at first time #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b7f4a6
fix: Tabs popup can not trigger click at first time
zombieJ Jun 28, 2020
7b10de3
update snapshot
zombieJ Jun 28, 2020
857e7e7
fix test
zombieJ Jun 28, 2020
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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
"dependencies": {
"@babel/runtime": "^7.10.1",
"classnames": "2.x",
"rc-select": "^11.0.0",
"rc-tree": "^3.1.0",
"rc-select": "^11.0.4",
"rc-tree": "^3.6.0",
"rc-util": "^5.0.1"
}
}
5 changes: 4 additions & 1 deletion src/OptionList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ export interface OptionListProps<OptionsType extends object[]> {
/** Tell Select that some value is now active to make accessibility work */
onActiveValue: (value: RawValueType, index: number) => void;
onScroll: React.UIEventHandler<HTMLDivElement>;

onMouseEnter: () => void;
}

const OptionList: React.RefForwardingComponent<RefOptionListProps, OptionListProps<DataNode[]>> = (
Expand All @@ -67,6 +69,7 @@ const OptionList: React.RefForwardingComponent<RefOptionListProps, OptionListPro
onToggleOpen,
open,
notFoundContent,
onMouseEnter,
} = props;
const {
checkable,
Expand Down Expand Up @@ -236,7 +239,7 @@ const OptionList: React.RefForwardingComponent<RefOptionListProps, OptionListPro
}

return (
<div onMouseDown={onListMouseDown}>
<div onMouseDown={onListMouseDown} onMouseEnter={onMouseEnter}>
{activeEntity && open && (
<span style={HIDDEN_STYLE} aria-live="assertive">
{activeEntity.data.value}
Expand Down
3 changes: 2 additions & 1 deletion tests/Select.props.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,12 @@ describe('TreeSelect.props', () => {
it('set illegal value', () => {
const wrapper = mount(
createSelect({
placeholder: 'showMe',
labelInValue: true,
value: [null],
}),
);
expect(wrapper.getSelection(0).text()).toBe('');
expect(wrapper.find('.rc-tree-select-selection-placeholder').text()).toBe('showMe');
});
});

Expand Down
24 changes: 12 additions & 12 deletions tests/__snapshots__/Select.checkable.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 1
style="display: flex; flex-direction: column;"
>
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked"
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked rc-tree-select-tree-treenode-leaf-last"
>
<span
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
Expand All @@ -148,7 +148,7 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 1
</span>
</div>
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked"
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked rc-tree-select-tree-treenode-leaf-last"
>
<span
aria-hidden="true"
Expand Down Expand Up @@ -179,7 +179,7 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 1
</span>
</div>
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked"
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked rc-tree-select-tree-treenode-leaf-last"
>
<span
aria-hidden="true"
Expand Down Expand Up @@ -289,7 +289,7 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 2
style="display: flex; flex-direction: column;"
>
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
>
<span
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
Expand All @@ -312,7 +312,7 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 2
</span>
</div>
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
>
<span
aria-hidden="true"
Expand Down Expand Up @@ -343,7 +343,7 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 2
</span>
</div>
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
>
<span
aria-hidden="true"
Expand Down Expand Up @@ -513,7 +513,7 @@ exports[`TreeSelect.checkable uncheck remove by tree check 1`] = `
style="display: flex; flex-direction: column;"
>
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked filter-node"
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked rc-tree-select-tree-treenode-leaf-last filter-node"
>
<span
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
Expand All @@ -536,7 +536,7 @@ exports[`TreeSelect.checkable uncheck remove by tree check 1`] = `
</span>
</div>
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked filter-node"
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked rc-tree-select-tree-treenode-leaf-last filter-node"
>
<span
aria-hidden="true"
Expand Down Expand Up @@ -567,7 +567,7 @@ exports[`TreeSelect.checkable uncheck remove by tree check 1`] = `
</span>
</div>
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked filter-node"
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked rc-tree-select-tree-treenode-leaf-last filter-node"
>
<span
aria-hidden="true"
Expand Down Expand Up @@ -674,7 +674,7 @@ exports[`TreeSelect.checkable uncheck remove by tree check 2`] = `
style="display: flex; flex-direction: column;"
>
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open filter-node"
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last filter-node"
>
<span
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
Expand All @@ -697,7 +697,7 @@ exports[`TreeSelect.checkable uncheck remove by tree check 2`] = `
</span>
</div>
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open filter-node"
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last filter-node"
>
<span
aria-hidden="true"
Expand Down Expand Up @@ -728,7 +728,7 @@ exports[`TreeSelect.checkable uncheck remove by tree check 2`] = `
</span>
</div>
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open filter-node"
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last filter-node"
>
<span
aria-hidden="true"
Expand Down
20 changes: 10 additions & 10 deletions tests/__snapshots__/Select.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ exports[`TreeSelect.basic render renders TreeNode correctly 1`] = `
</span>
</div>
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
>
<span
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
Expand Down Expand Up @@ -128,7 +128,7 @@ exports[`TreeSelect.basic render renders TreeNode correctly 1`] = `
</span>
</div>
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
>
<span
aria-hidden="true"
Expand Down Expand Up @@ -256,7 +256,7 @@ exports[`TreeSelect.basic render renders TreeNode correctly with falsy child 1`]
</span>
</div>
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
>
<span
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
Expand Down Expand Up @@ -304,7 +304,7 @@ exports[`TreeSelect.basic render renders TreeNode correctly with falsy child 1`]
</span>
</div>
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
>
<span
aria-hidden="true"
Expand Down Expand Up @@ -539,7 +539,7 @@ exports[`TreeSelect.basic render renders treeDataSimpleMode correctly 1`] = `
style="display: flex; flex-direction: column;"
>
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
>
<span
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
Expand All @@ -559,7 +559,7 @@ exports[`TreeSelect.basic render renders treeDataSimpleMode correctly 1`] = `
</span>
</div>
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
>
<span
aria-hidden="true"
Expand Down Expand Up @@ -663,7 +663,7 @@ exports[`TreeSelect.basic search nodes check tree changed by filter 1`] = `
style="display: flex; flex-direction: column;"
>
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open filter-node"
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last filter-node"
>
<span
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher-noop"
Expand Down Expand Up @@ -782,7 +782,7 @@ exports[`TreeSelect.basic search nodes check tree changed by filter 2`] = `
</span>
</div>
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-close"
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-close rc-tree-select-tree-treenode-leaf-last"
>
<span
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher-noop"
Expand Down Expand Up @@ -898,7 +898,7 @@ exports[`TreeSelect.basic search nodes filter node but not remove then 1`] = `
</span>
</div>
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
>
<span
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher-noop"
Expand Down Expand Up @@ -1016,7 +1016,7 @@ exports[`TreeSelect.basic search nodes renders search input 1`] = `
</span>
</div>
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-close"
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-close rc-tree-select-tree-treenode-leaf-last"
>
<span
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher-noop"
Expand Down