Skip to content

Commit a285745

Browse files
authored
fix: add root element for SingleSelector to make layout easier (#1076)
1 parent e08455c commit a285745

8 files changed

+806
-733
lines changed

assets/index.less

+5
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@
7070
display: flex;
7171
position: relative;
7272

73+
.@{select-prefix}-selection-wrap {
74+
width: 100%;
75+
position: relative;
76+
}
77+
7378
.@{select-prefix}-selection-search {
7479
width: 100%;
7580
position: relative;

src/Selector/MultipleSelector.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -242,12 +242,12 @@ const SelectSelector: React.FC<SelectorProps> = (props) => {
242242
);
243243

244244
return (
245-
<>
245+
<span className={`${selectionPrefixCls}-wrap`}>
246246
{selectionNode}
247247
{!values.length && !inputValue && (
248248
<span className={`${selectionPrefixCls}-placeholder`}>{placeholder}</span>
249249
)}
250-
</>
250+
</span>
251251
);
252252
};
253253

src/Selector/SingleSelector.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const SingleSelector: React.FC<SelectorProps> = (props) => {
7777
}, [item, hasTextInput, placeholder, prefixCls]);
7878

7979
return (
80-
<>
80+
<span className={`${prefixCls}-selection-wrap`}>
8181
<span className={`${prefixCls}-selection-search`}>
8282
<Input
8383
ref={inputRef}
@@ -121,7 +121,7 @@ const SingleSelector: React.FC<SelectorProps> = (props) => {
121121
{item.label}
122122
</span>
123123
) : null}
124-
</>
124+
</span>
125125
);
126126
};
127127

tests/__snapshots__/Combobox.test.tsx.snap

+40-32
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,29 @@ exports[`Select.Combobox renders controlled correctly 1`] = `
88
class="rc-select-selector"
99
>
1010
<span
11-
class="rc-select-selection-search"
11+
class="rc-select-selection-wrap"
1212
>
13-
<input
14-
aria-autocomplete="list"
15-
aria-controls="rc_select_TEST_OR_SSR_list"
16-
aria-expanded="false"
17-
aria-haspopup="listbox"
18-
aria-owns="rc_select_TEST_OR_SSR_list"
19-
autocomplete="off"
20-
class="rc-select-selection-search-input"
21-
id="rc_select_TEST_OR_SSR"
22-
role="combobox"
23-
type="search"
24-
value=""
25-
/>
2613
<span
27-
class="rc-select-selection-placeholder"
14+
class="rc-select-selection-search"
2815
>
29-
Search
16+
<input
17+
aria-autocomplete="list"
18+
aria-controls="rc_select_TEST_OR_SSR_list"
19+
aria-expanded="false"
20+
aria-haspopup="listbox"
21+
aria-owns="rc_select_TEST_OR_SSR_list"
22+
autocomplete="off"
23+
class="rc-select-selection-search-input"
24+
id="rc_select_TEST_OR_SSR"
25+
role="combobox"
26+
type="search"
27+
value=""
28+
/>
29+
<span
30+
class="rc-select-selection-placeholder"
31+
>
32+
Search
33+
</span>
3034
</span>
3135
</span>
3236
</div>
@@ -41,25 +45,29 @@ exports[`Select.Combobox renders correctly 1`] = `
4145
class="rc-select-selector"
4246
>
4347
<span
44-
class="rc-select-selection-search"
48+
class="rc-select-selection-wrap"
4549
>
46-
<input
47-
aria-autocomplete="list"
48-
aria-controls="rc_select_TEST_OR_SSR_list"
49-
aria-expanded="false"
50-
aria-haspopup="listbox"
51-
aria-owns="rc_select_TEST_OR_SSR_list"
52-
autocomplete="off"
53-
class="rc-select-selection-search-input"
54-
id="rc_select_TEST_OR_SSR"
55-
role="combobox"
56-
type="search"
57-
value=""
58-
/>
5950
<span
60-
class="rc-select-selection-placeholder"
51+
class="rc-select-selection-search"
6152
>
62-
Search
53+
<input
54+
aria-autocomplete="list"
55+
aria-controls="rc_select_TEST_OR_SSR_list"
56+
aria-expanded="false"
57+
aria-haspopup="listbox"
58+
aria-owns="rc_select_TEST_OR_SSR_list"
59+
autocomplete="off"
60+
class="rc-select-selection-search-input"
61+
id="rc_select_TEST_OR_SSR"
62+
role="combobox"
63+
type="search"
64+
value=""
65+
/>
66+
<span
67+
class="rc-select-selection-placeholder"
68+
>
69+
Search
70+
</span>
6371
</span>
6472
</span>
6573
</div>

0 commit comments

Comments
 (0)