Skip to content

Commit 1f5043d

Browse files
zombieJzombieJ
authored
refactor: useId instead (#645)
* refactor: useId instead * test: update snapshot
1 parent f3670b0 commit 1f5043d

5 files changed

Lines changed: 47 additions & 47 deletions

File tree

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
},
4646
"dependencies": {
4747
"classnames": "2.x",
48-
"@rc-component/select": "~1.0.2",
48+
"@rc-component/select": "~1.0.7",
4949
"@rc-component/tree": "~1.0.1",
5050
"@rc-component/util": "^1.2.1"
5151
},

‎src/TreeSelect.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { BaseSelectPropsWithoutPrivate, BaseSelectRef } from '@rc-component/select';
22
import { BaseSelect } from '@rc-component/select';
3-
import useId from '@rc-component/select/lib/hooks/useId';
3+
import useId from '@rc-component/util/lib/hooks/useId';
44
import type { IconType } from '@rc-component/tree/lib/interface';
55
import type { ExpandAction } from '@rc-component/tree/lib/Tree';
66
import { conductCheck } from '@rc-component/tree/lib/utils/conductUtil';

‎tests/__snapshots__/Select.checkable.spec.tsx.snap‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,13 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 1
105105
>
106106
<input
107107
aria-autocomplete="list"
108-
aria-controls="rc_select_TEST_OR_SSR_list"
108+
aria-controls="test-id_list"
109109
aria-expanded="true"
110110
aria-haspopup="listbox"
111-
aria-owns="rc_select_TEST_OR_SSR_list"
111+
aria-owns="test-id_list"
112112
autocomplete="off"
113113
class="rc-tree-select-selection-search-input"
114-
id="rc_select_TEST_OR_SSR"
114+
id="test-id"
115115
role="combobox"
116116
style=""
117117
type="search"
@@ -324,13 +324,13 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 2
324324
>
325325
<input
326326
aria-autocomplete="list"
327-
aria-controls="rc_select_TEST_OR_SSR_list"
327+
aria-controls="test-id_list"
328328
aria-expanded="true"
329329
aria-haspopup="listbox"
330-
aria-owns="rc_select_TEST_OR_SSR_list"
330+
aria-owns="test-id_list"
331331
autocomplete="off"
332332
class="rc-tree-select-selection-search-input"
333-
id="rc_select_TEST_OR_SSR"
333+
id="test-id"
334334
role="combobox"
335335
style=""
336336
type="search"
@@ -627,13 +627,13 @@ exports[`TreeSelect.checkable uncheck remove by tree check 1`] = `
627627
>
628628
<input
629629
aria-autocomplete="list"
630-
aria-controls="rc_select_TEST_OR_SSR_list"
630+
aria-controls="test-id_list"
631631
aria-expanded="true"
632632
aria-haspopup="listbox"
633-
aria-owns="rc_select_TEST_OR_SSR_list"
633+
aria-owns="test-id_list"
634634
autocomplete="off"
635635
class="rc-tree-select-selection-search-input"
636-
id="rc_select_TEST_OR_SSR"
636+
id="test-id"
637637
role="combobox"
638638
style=""
639639
type="search"
@@ -846,13 +846,13 @@ exports[`TreeSelect.checkable uncheck remove by tree check 2`] = `
846846
>
847847
<input
848848
aria-autocomplete="list"
849-
aria-controls="rc_select_TEST_OR_SSR_list"
849+
aria-controls="test-id_list"
850850
aria-expanded="true"
851851
aria-haspopup="listbox"
852-
aria-owns="rc_select_TEST_OR_SSR_list"
852+
aria-owns="test-id_list"
853853
autocomplete="off"
854854
class="rc-tree-select-selection-search-input"
855-
id="rc_select_TEST_OR_SSR"
855+
id="test-id"
856856
role="combobox"
857857
style=""
858858
type="search"

‎tests/__snapshots__/Select.multiple.spec.js.snap‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ exports[`TreeSelect.multiple can hide search box by showSearch = false 1`] = `
2323
>
2424
<input
2525
aria-autocomplete="list"
26-
aria-controls="rc_select_TEST_OR_SSR_list"
26+
aria-controls="test-id_list"
2727
aria-expanded="false"
2828
aria-haspopup="listbox"
29-
aria-owns="rc_select_TEST_OR_SSR_list"
29+
aria-owns="test-id_list"
3030
autocomplete="off"
3131
class="rc-tree-select-selection-search-input"
32-
id="rc_select_TEST_OR_SSR"
32+
id="test-id"
3333
readonly=""
3434
role="combobox"
3535
style="opacity: 0;"

‎tests/__snapshots__/Select.spec.tsx.snap‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ exports[`TreeSelect.basic render renders TreeNode correctly 1`] = `
1515
>
1616
<input
1717
aria-autocomplete="list"
18-
aria-controls="rc_select_TEST_OR_SSR_list"
18+
aria-controls="test-id_list"
1919
aria-expanded="true"
2020
aria-haspopup="listbox"
21-
aria-owns="rc_select_TEST_OR_SSR_list"
21+
aria-owns="test-id_list"
2222
autocomplete="off"
2323
class="rc-tree-select-selection-search-input"
24-
id="rc_select_TEST_OR_SSR"
24+
id="test-id"
2525
readonly=""
2626
role="combobox"
2727
style="opacity: 0;"
@@ -227,13 +227,13 @@ exports[`TreeSelect.basic render renders TreeNode correctly with falsy child 1`]
227227
>
228228
<input
229229
aria-autocomplete="list"
230-
aria-controls="rc_select_TEST_OR_SSR_list"
230+
aria-controls="test-id_list"
231231
aria-expanded="true"
232232
aria-haspopup="listbox"
233-
aria-owns="rc_select_TEST_OR_SSR_list"
233+
aria-owns="test-id_list"
234234
autocomplete="off"
235235
class="rc-tree-select-selection-search-input"
236-
id="rc_select_TEST_OR_SSR"
236+
id="test-id"
237237
readonly=""
238238
role="combobox"
239239
style="opacity: 0;"
@@ -448,13 +448,13 @@ exports[`TreeSelect.basic render renders correctly 1`] = `
448448
>
449449
<input
450450
aria-autocomplete="list"
451-
aria-controls="rc_select_TEST_OR_SSR_list"
451+
aria-controls="test-id_list"
452452
aria-expanded="false"
453453
aria-haspopup="listbox"
454-
aria-owns="rc_select_TEST_OR_SSR_list"
454+
aria-owns="test-id_list"
455455
autocomplete="off"
456456
class="awesome-selection-search-input"
457-
id="rc_select_TEST_OR_SSR"
457+
id="test-id"
458458
readonly=""
459459
role="combobox"
460460
style="opacity: 0;"
@@ -494,14 +494,14 @@ exports[`TreeSelect.basic render renders disabled correctly 1`] = `
494494
>
495495
<input
496496
aria-autocomplete="list"
497-
aria-controls="rc_select_TEST_OR_SSR_list"
497+
aria-controls="test-id_list"
498498
aria-expanded="false"
499499
aria-haspopup="listbox"
500-
aria-owns="rc_select_TEST_OR_SSR_list"
500+
aria-owns="test-id_list"
501501
autocomplete="off"
502502
class="rc-tree-select-selection-search-input"
503503
disabled=""
504-
id="rc_select_TEST_OR_SSR"
504+
id="test-id"
505505
readonly=""
506506
role="combobox"
507507
style="opacity: 0;"
@@ -542,13 +542,13 @@ exports[`TreeSelect.basic render renders tree correctly 1`] = `
542542
>
543543
<input
544544
aria-autocomplete="list"
545-
aria-controls="rc_select_TEST_OR_SSR_list"
545+
aria-controls="test-id_list"
546546
aria-expanded="true"
547547
aria-haspopup="listbox"
548-
aria-owns="rc_select_TEST_OR_SSR_list"
548+
aria-owns="test-id_list"
549549
autocomplete="off"
550550
class="rc-tree-select-selection-search-input"
551-
id="rc_select_TEST_OR_SSR"
551+
id="test-id"
552552
role="combobox"
553553
style=""
554554
type="search"
@@ -787,13 +787,13 @@ exports[`TreeSelect.basic render renders treeDataSimpleMode correctly 1`] = `
787787
>
788788
<input
789789
aria-autocomplete="list"
790-
aria-controls="rc_select_TEST_OR_SSR_list"
790+
aria-controls="test-id_list"
791791
aria-expanded="true"
792792
aria-haspopup="listbox"
793-
aria-owns="rc_select_TEST_OR_SSR_list"
793+
aria-owns="test-id_list"
794794
autocomplete="off"
795795
class="rc-tree-select-selection-search-input"
796-
id="rc_select_TEST_OR_SSR"
796+
id="test-id"
797797
readonly=""
798798
role="combobox"
799799
style="opacity: 0;"
@@ -943,13 +943,13 @@ exports[`TreeSelect.basic search nodes check tree changed by filter 1`] = `
943943
>
944944
<input
945945
aria-autocomplete="list"
946-
aria-controls="rc_select_TEST_OR_SSR_list"
946+
aria-controls="test-id_list"
947947
aria-expanded="true"
948948
aria-haspopup="listbox"
949-
aria-owns="rc_select_TEST_OR_SSR_list"
949+
aria-owns="test-id_list"
950950
autocomplete="off"
951951
class="rc-tree-select-selection-search-input"
952-
id="rc_select_TEST_OR_SSR"
952+
id="test-id"
953953
role="combobox"
954954
type="search"
955955
value="a"
@@ -1066,13 +1066,13 @@ exports[`TreeSelect.basic search nodes check tree changed by filter 2`] = `
10661066
>
10671067
<input
10681068
aria-autocomplete="list"
1069-
aria-controls="rc_select_TEST_OR_SSR_list"
1069+
aria-controls="test-id_list"
10701070
aria-expanded="true"
10711071
aria-haspopup="listbox"
1072-
aria-owns="rc_select_TEST_OR_SSR_list"
1072+
aria-owns="test-id_list"
10731073
autocomplete="off"
10741074
class="rc-tree-select-selection-search-input"
1075-
id="rc_select_TEST_OR_SSR"
1075+
id="test-id"
10761076
role="combobox"
10771077
type="search"
10781078
value=""
@@ -1216,13 +1216,13 @@ exports[`TreeSelect.basic search nodes filter node but not remove then 1`] = `
12161216
>
12171217
<input
12181218
aria-autocomplete="list"
1219-
aria-controls="rc_select_TEST_OR_SSR_list"
1219+
aria-controls="test-id_list"
12201220
aria-expanded="true"
12211221
aria-haspopup="listbox"
1222-
aria-owns="rc_select_TEST_OR_SSR_list"
1222+
aria-owns="test-id_list"
12231223
autocomplete="off"
12241224
class="rc-tree-select-selection-search-input"
1225-
id="rc_select_TEST_OR_SSR"
1225+
id="test-id"
12261226
role="combobox"
12271227
type="search"
12281228
value="a"
@@ -1365,13 +1365,13 @@ exports[`TreeSelect.basic search nodes renders search input 1`] = `
13651365
>
13661366
<input
13671367
aria-autocomplete="list"
1368-
aria-controls="rc_select_TEST_OR_SSR_list"
1368+
aria-controls="test-id_list"
13691369
aria-expanded="true"
13701370
aria-haspopup="listbox"
1371-
aria-owns="rc_select_TEST_OR_SSR_list"
1371+
aria-owns="test-id_list"
13721372
autocomplete="off"
13731373
class="rc-tree-select-selection-search-input"
1374-
id="rc_select_TEST_OR_SSR"
1374+
id="test-id"
13751375
role="combobox"
13761376
type="search"
13771377
value=""

0 commit comments

Comments
 (0)