Skip to content

Commit 4780640

Browse files
authored
fix: Tabs popup can not trigger click at first time (#245)
* fix: Tabs popup can not trigger click at first time * update snapshot * fix test
1 parent af39039 commit 4780640

File tree

5 files changed

+30
-26
lines changed

5 files changed

+30
-26
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
"dependencies": {
6767
"@babel/runtime": "^7.10.1",
6868
"classnames": "2.x",
69-
"rc-select": "^11.0.0",
70-
"rc-tree": "^3.1.0",
69+
"rc-select": "^11.0.4",
70+
"rc-tree": "^3.6.0",
7171
"rc-util": "^5.0.1"
7272
}
7373
}

src/OptionList.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ export interface OptionListProps<OptionsType extends object[]> {
4848
/** Tell Select that some value is now active to make accessibility work */
4949
onActiveValue: (value: RawValueType, index: number) => void;
5050
onScroll: React.UIEventHandler<HTMLDivElement>;
51+
52+
onMouseEnter: () => void;
5153
}
5254

5355
const OptionList: React.RefForwardingComponent<RefOptionListProps, OptionListProps<DataNode[]>> = (
@@ -67,6 +69,7 @@ const OptionList: React.RefForwardingComponent<RefOptionListProps, OptionListPro
6769
onToggleOpen,
6870
open,
6971
notFoundContent,
72+
onMouseEnter,
7073
} = props;
7174
const {
7275
checkable,
@@ -236,7 +239,7 @@ const OptionList: React.RefForwardingComponent<RefOptionListProps, OptionListPro
236239
}
237240

238241
return (
239-
<div onMouseDown={onListMouseDown}>
242+
<div onMouseDown={onListMouseDown} onMouseEnter={onMouseEnter}>
240243
{activeEntity && open && (
241244
<span style={HIDDEN_STYLE} aria-live="assertive">
242245
{activeEntity.data.value}

tests/Select.props.spec.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,12 @@ describe('TreeSelect.props', () => {
158158
it('set illegal value', () => {
159159
const wrapper = mount(
160160
createSelect({
161+
placeholder: 'showMe',
161162
labelInValue: true,
162163
value: [null],
163164
}),
164165
);
165-
expect(wrapper.getSelection(0).text()).toBe('');
166+
expect(wrapper.find('.rc-tree-select-selection-placeholder').text()).toBe('showMe');
166167
});
167168
});
168169

tests/__snapshots__/Select.checkable.spec.js.snap

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 1
125125
style="display: flex; flex-direction: column;"
126126
>
127127
<div
128-
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked"
128+
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"
129129
>
130130
<span
131131
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
@@ -148,7 +148,7 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 1
148148
</span>
149149
</div>
150150
<div
151-
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked"
151+
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"
152152
>
153153
<span
154154
aria-hidden="true"
@@ -179,7 +179,7 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 1
179179
</span>
180180
</div>
181181
<div
182-
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked"
182+
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"
183183
>
184184
<span
185185
aria-hidden="true"
@@ -289,7 +289,7 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 2
289289
style="display: flex; flex-direction: column;"
290290
>
291291
<div
292-
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
292+
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
293293
>
294294
<span
295295
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
@@ -312,7 +312,7 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 2
312312
</span>
313313
</div>
314314
<div
315-
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
315+
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
316316
>
317317
<span
318318
aria-hidden="true"
@@ -343,7 +343,7 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 2
343343
</span>
344344
</div>
345345
<div
346-
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
346+
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
347347
>
348348
<span
349349
aria-hidden="true"
@@ -513,7 +513,7 @@ exports[`TreeSelect.checkable uncheck remove by tree check 1`] = `
513513
style="display: flex; flex-direction: column;"
514514
>
515515
<div
516-
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked filter-node"
516+
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"
517517
>
518518
<span
519519
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
@@ -536,7 +536,7 @@ exports[`TreeSelect.checkable uncheck remove by tree check 1`] = `
536536
</span>
537537
</div>
538538
<div
539-
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked filter-node"
539+
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"
540540
>
541541
<span
542542
aria-hidden="true"
@@ -567,7 +567,7 @@ exports[`TreeSelect.checkable uncheck remove by tree check 1`] = `
567567
</span>
568568
</div>
569569
<div
570-
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked filter-node"
570+
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"
571571
>
572572
<span
573573
aria-hidden="true"
@@ -674,7 +674,7 @@ exports[`TreeSelect.checkable uncheck remove by tree check 2`] = `
674674
style="display: flex; flex-direction: column;"
675675
>
676676
<div
677-
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open filter-node"
677+
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last filter-node"
678678
>
679679
<span
680680
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
@@ -697,7 +697,7 @@ exports[`TreeSelect.checkable uncheck remove by tree check 2`] = `
697697
</span>
698698
</div>
699699
<div
700-
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open filter-node"
700+
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last filter-node"
701701
>
702702
<span
703703
aria-hidden="true"
@@ -728,7 +728,7 @@ exports[`TreeSelect.checkable uncheck remove by tree check 2`] = `
728728
</span>
729729
</div>
730730
<div
731-
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open filter-node"
731+
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last filter-node"
732732
>
733733
<span
734734
aria-hidden="true"

tests/__snapshots__/Select.spec.js.snap

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ exports[`TreeSelect.basic render renders TreeNode correctly 1`] = `
8080
</span>
8181
</div>
8282
<div
83-
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
83+
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
8484
>
8585
<span
8686
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
@@ -128,7 +128,7 @@ exports[`TreeSelect.basic render renders TreeNode correctly 1`] = `
128128
</span>
129129
</div>
130130
<div
131-
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
131+
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
132132
>
133133
<span
134134
aria-hidden="true"
@@ -256,7 +256,7 @@ exports[`TreeSelect.basic render renders TreeNode correctly with falsy child 1`]
256256
</span>
257257
</div>
258258
<div
259-
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
259+
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
260260
>
261261
<span
262262
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
@@ -304,7 +304,7 @@ exports[`TreeSelect.basic render renders TreeNode correctly with falsy child 1`]
304304
</span>
305305
</div>
306306
<div
307-
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
307+
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
308308
>
309309
<span
310310
aria-hidden="true"
@@ -539,7 +539,7 @@ exports[`TreeSelect.basic render renders treeDataSimpleMode correctly 1`] = `
539539
style="display: flex; flex-direction: column;"
540540
>
541541
<div
542-
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
542+
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
543543
>
544544
<span
545545
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
@@ -559,7 +559,7 @@ exports[`TreeSelect.basic render renders treeDataSimpleMode correctly 1`] = `
559559
</span>
560560
</div>
561561
<div
562-
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
562+
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
563563
>
564564
<span
565565
aria-hidden="true"
@@ -663,7 +663,7 @@ exports[`TreeSelect.basic search nodes check tree changed by filter 1`] = `
663663
style="display: flex; flex-direction: column;"
664664
>
665665
<div
666-
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open filter-node"
666+
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last filter-node"
667667
>
668668
<span
669669
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher-noop"
@@ -782,7 +782,7 @@ exports[`TreeSelect.basic search nodes check tree changed by filter 2`] = `
782782
</span>
783783
</div>
784784
<div
785-
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-close"
785+
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-close rc-tree-select-tree-treenode-leaf-last"
786786
>
787787
<span
788788
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher-noop"
@@ -898,7 +898,7 @@ exports[`TreeSelect.basic search nodes filter node but not remove then 1`] = `
898898
</span>
899899
</div>
900900
<div
901-
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
901+
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
902902
>
903903
<span
904904
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher-noop"
@@ -1016,7 +1016,7 @@ exports[`TreeSelect.basic search nodes renders search input 1`] = `
10161016
</span>
10171017
</div>
10181018
<div
1019-
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-close"
1019+
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-close rc-tree-select-tree-treenode-leaf-last"
10201020
>
10211021
<span
10221022
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher-noop"

0 commit comments

Comments
 (0)