Skip to content

Commit 206aeb0

Browse files
zombieJzombieJ
authored
refactor: use rc-util useId (#1155)
1 parent b0b7473 commit 206aeb0

File tree

7 files changed

+68
-100
lines changed

7 files changed

+68
-100
lines changed

‎src/Select.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import SelectContext from './SelectContext';
4949
import type { SelectContextProps } from './SelectContext';
5050
import useCache from './hooks/useCache';
5151
import useFilterOptions from './hooks/useFilterOptions';
52-
import useId from './hooks/useId';
52+
import useId from '@rc-component/util/lib/hooks/useId';
5353
import useOptions from './hooks/useOptions';
5454
import useRefFunc from './hooks/useRefFunc';
5555
import type { FlattenOptionData } from './interface';

‎src/hooks/useId.ts

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎tests/__snapshots__/Combobox.test.tsx.snap

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ exports[`Select.Combobox renders controlled 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="false"
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-select-selection-search-input"
24-
id="rc_select_TEST_OR_SSR"
24+
id="test-id"
2525
role="combobox"
2626
type="search"
2727
value=""
@@ -52,13 +52,13 @@ exports[`Select.Combobox renders correctly 1`] = `
5252
>
5353
<input
5454
aria-autocomplete="list"
55-
aria-controls="rc_select_TEST_OR_SSR_list"
55+
aria-controls="test-id_list"
5656
aria-expanded="false"
5757
aria-haspopup="listbox"
58-
aria-owns="rc_select_TEST_OR_SSR_list"
58+
aria-owns="test-id_list"
5959
autocomplete="off"
6060
class="rc-select-selection-search-input"
61-
id="rc_select_TEST_OR_SSR"
61+
id="test-id"
6262
role="combobox"
6363
type="search"
6464
value=""

‎tests/__snapshots__/Multiple.test.tsx.snap

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ exports[`Select.Multiple max tag render not display maxTagPlaceholder if maxTagC
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-select-selection-search-input"
32-
id="rc_select_TEST_OR_SSR"
32+
id="test-id"
3333
readonly=""
3434
role="combobox"
3535
style="opacity: 0;"
@@ -147,13 +147,13 @@ exports[`Select.Multiple max tag render truncates tags by maxTagCount and show m
147147
>
148148
<input
149149
aria-autocomplete="list"
150-
aria-controls="rc_select_TEST_OR_SSR_list"
150+
aria-controls="test-id_list"
151151
aria-expanded="false"
152152
aria-haspopup="listbox"
153-
aria-owns="rc_select_TEST_OR_SSR_list"
153+
aria-owns="test-id_list"
154154
autocomplete="off"
155155
class="rc-select-selection-search-input"
156-
id="rc_select_TEST_OR_SSR"
156+
id="test-id"
157157
readonly=""
158158
role="combobox"
159159
style="opacity: 0;"
@@ -269,13 +269,13 @@ exports[`Select.Multiple max tag render truncates tags by maxTagCount and show m
269269
>
270270
<input
271271
aria-autocomplete="list"
272-
aria-controls="rc_select_TEST_OR_SSR_list"
272+
aria-controls="test-id_list"
273273
aria-expanded="false"
274274
aria-haspopup="listbox"
275-
aria-owns="rc_select_TEST_OR_SSR_list"
275+
aria-owns="test-id_list"
276276
autocomplete="off"
277277
class="rc-select-selection-search-input"
278-
id="rc_select_TEST_OR_SSR"
278+
id="test-id"
279279
readonly=""
280280
role="combobox"
281281
style="opacity: 0;"
@@ -374,13 +374,13 @@ exports[`Select.Multiple max tag render truncates values by maxTagTextLength 1`]
374374
>
375375
<input
376376
aria-autocomplete="list"
377-
aria-controls="rc_select_TEST_OR_SSR_list"
377+
aria-controls="test-id_list"
378378
aria-expanded="false"
379379
aria-haspopup="listbox"
380-
aria-owns="rc_select_TEST_OR_SSR_list"
380+
aria-owns="test-id_list"
381381
autocomplete="off"
382382
class="rc-select-selection-search-input"
383-
id="rc_select_TEST_OR_SSR"
383+
id="test-id"
384384
readonly=""
385385
role="combobox"
386386
style="opacity: 0;"

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@ exports[`Select.Basic does not filter when filterOption value is false 1`] = `
77
>
88
<div>
99
<div
10-
id="rc_select_TEST_OR_SSR_list"
10+
id="test-id_list"
1111
role="listbox"
1212
style="height: 0px; width: 0px; overflow: hidden;"
1313
>
1414
<div
1515
aria-label="1"
1616
aria-selected="false"
17-
id="rc_select_TEST_OR_SSR_list_0"
17+
id="test-id_list_0"
1818
role="option"
1919
>
2020
1
2121
</div>
2222
<div
2323
aria-label="2"
2424
aria-selected="false"
25-
id="rc_select_TEST_OR_SSR_list_1"
25+
id="test-id_list_1"
2626
role="option"
2727
>
2828
2
@@ -99,7 +99,7 @@ exports[`Select.Basic filterOption could be true as described in default value 1
9999
<div>
100100
<div
101101
class="rc-select-item-empty"
102-
id="rc_select_TEST_OR_SSR_list"
102+
id="test-id_list"
103103
role="listbox"
104104
>
105105
Not Found
@@ -123,13 +123,13 @@ exports[`Select.Basic no search 1`] = `
123123
>
124124
<input
125125
aria-autocomplete="list"
126-
aria-controls="rc_select_TEST_OR_SSR_list"
126+
aria-controls="test-id_list"
127127
aria-expanded="false"
128128
aria-haspopup="listbox"
129-
aria-owns="rc_select_TEST_OR_SSR_list"
129+
aria-owns="test-id_list"
130130
autocomplete="off"
131131
class="rc-select-selection-search-input"
132-
id="rc_select_TEST_OR_SSR"
132+
id="test-id"
133133
readonly=""
134134
role="combobox"
135135
style="opacity: 0;"
@@ -166,15 +166,15 @@ exports[`Select.Basic render renders aria-attributes correctly 1`] = `
166166
>
167167
<input
168168
aria-autocomplete="list"
169-
aria-controls="rc_select_TEST_OR_SSR_list"
169+
aria-controls="test-id_list"
170170
aria-expanded="false"
171171
aria-haspopup="listbox"
172172
aria-label="some-label"
173173
aria-labelledby="test-id"
174-
aria-owns="rc_select_TEST_OR_SSR_list"
174+
aria-owns="test-id_list"
175175
autocomplete="off"
176176
class="antd-selection-search-input"
177-
id="rc_select_TEST_OR_SSR"
177+
id="test-id"
178178
role="combobox"
179179
type="search"
180180
value=""
@@ -218,13 +218,13 @@ exports[`Select.Basic render renders correctly 1`] = `
218218
>
219219
<input
220220
aria-autocomplete="list"
221-
aria-controls="rc_select_TEST_OR_SSR_list"
221+
aria-controls="test-id_list"
222222
aria-expanded="false"
223223
aria-haspopup="listbox"
224-
aria-owns="rc_select_TEST_OR_SSR_list"
224+
aria-owns="test-id_list"
225225
autocomplete="off"
226226
class="antd-selection-search-input"
227-
id="rc_select_TEST_OR_SSR"
227+
id="test-id"
228228
role="combobox"
229229
type="search"
230230
value=""
@@ -270,13 +270,13 @@ exports[`Select.Basic render renders data-attributes correctly 1`] = `
270270
>
271271
<input
272272
aria-autocomplete="list"
273-
aria-controls="rc_select_TEST_OR_SSR_list"
273+
aria-controls="test-id_list"
274274
aria-expanded="false"
275275
aria-haspopup="listbox"
276-
aria-owns="rc_select_TEST_OR_SSR_list"
276+
aria-owns="test-id_list"
277277
autocomplete="off"
278278
class="antd-selection-search-input"
279-
id="rc_select_TEST_OR_SSR"
279+
id="test-id"
280280
role="combobox"
281281
type="search"
282282
value=""
@@ -320,14 +320,14 @@ exports[`Select.Basic render renders disabled select correctly 1`] = `
320320
>
321321
<input
322322
aria-autocomplete="list"
323-
aria-controls="rc_select_TEST_OR_SSR_list"
323+
aria-controls="test-id_list"
324324
aria-expanded="false"
325325
aria-haspopup="listbox"
326-
aria-owns="rc_select_TEST_OR_SSR_list"
326+
aria-owns="test-id_list"
327327
autocomplete="off"
328328
class="antd-selection-search-input"
329329
disabled=""
330-
id="rc_select_TEST_OR_SSR"
330+
id="test-id"
331331
role="combobox"
332332
type="search"
333333
value=""
@@ -362,13 +362,13 @@ exports[`Select.Basic render renders role prop correctly 1`] = `
362362
>
363363
<input
364364
aria-autocomplete="list"
365-
aria-controls="rc_select_TEST_OR_SSR_list"
365+
aria-controls="test-id_list"
366366
aria-expanded="false"
367367
aria-haspopup="listbox"
368-
aria-owns="rc_select_TEST_OR_SSR_list"
368+
aria-owns="test-id_list"
369369
autocomplete="off"
370370
class="antd-selection-search-input"
371-
id="rc_select_TEST_OR_SSR"
371+
id="test-id"
372372
role="button"
373373
type="search"
374374
value=""
@@ -545,22 +545,22 @@ exports[`Select.Basic should contain falsy children 1`] = `
545545
>
546546
<div>
547547
<div
548-
id="rc_select_TEST_OR_SSR_list"
548+
id="test-id_list"
549549
role="listbox"
550550
style="height: 0px; width: 0px; overflow: hidden;"
551551
>
552552
<div
553553
aria-label="1"
554554
aria-selected="true"
555-
id="rc_select_TEST_OR_SSR_list_0"
555+
id="test-id_list_0"
556556
role="option"
557557
>
558558
1
559559
</div>
560560
<div
561561
aria-label="2"
562562
aria-selected="false"
563-
id="rc_select_TEST_OR_SSR_list_1"
563+
id="test-id_list_1"
564564
role="option"
565565
>
566566
2
@@ -644,22 +644,22 @@ exports[`Select.Basic should render custom dropdown correctly 1`] = `
644644
CUSTOM NODE
645645
</div>
646646
<div
647-
id="rc_select_TEST_OR_SSR_list"
647+
id="test-id_list"
648648
role="listbox"
649649
style="height: 0px; width: 0px; overflow: hidden;"
650650
>
651651
<div
652652
aria-label="1"
653653
aria-selected="false"
654-
id="rc_select_TEST_OR_SSR_list_0"
654+
id="test-id_list_0"
655655
role="option"
656656
>
657657
1
658658
</div>
659659
<div
660660
aria-label="2"
661661
aria-selected="false"
662-
id="rc_select_TEST_OR_SSR_list_1"
662+
id="test-id_list_1"
663663
role="option"
664664
>
665665
2

0 commit comments

Comments
 (0)