Skip to content

Commit 7f8cfc3

Browse files
authored
refactor(ui5-input): allow displaying multiple icons (#1162)
1 parent 341c599 commit 7f8cfc3

File tree

8 files changed

+22
-17
lines changed

8 files changed

+22
-17
lines changed

packages/main/src/themes/Input.css

+2-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
}
3939

4040
:host([disabled]) {
41-
opacity: var(--sap_wc_input_disabled_opacity);
41+
opacity: var(--_ui5_input_disabled_opacity);
4242
cursor: default;
4343
pointer-events: none;
4444
background: var(--sapField_ReadOnly_Background);
@@ -174,8 +174,7 @@
174174
/* Input Icon */
175175

176176
.ui5-input-icon-root {
177-
min-width: var(--sap_wc_input_icon_min_width);
178-
width: var(--sap_wc_input_icon_min_width);
177+
min-width: var(--_ui5_input_icon_min_width);
179178
height: 100%;
180179
display: flex;
181180
justify-content: center;

packages/main/src/themes/MultiComboBox.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
}
1616

1717
.ui5-multi-combobox-tokenizer {
18-
max-width: calc(100% - 3rem - var(--sap_wc_input_icon_min_width));
18+
max-width: calc(100% - 3rem - var(--_ui5_input_icon_min_width));
1919
border: none;
2020
width: auto;
2121
min-width: 0px;

packages/main/src/themes/TextArea.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
}
1414

1515
:host([disabled]) {
16-
opacity: var(--sap_wc_input_disabled_opacity);
16+
opacity: var(--_ui5_input_disabled_opacity);
1717
cursor: default;
1818
pointer-events: none;
1919
background: var(--sapField_ReadOnly_Background);

packages/main/src/themes/base/Input-parameters.css

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
--_ui5_input_disabled_border_color: var(--sapField_BorderColor);
1414
--_ui5_input_disabled_background: var(--sapField_Background);
1515
--_ui5_input_icon_padding: 0.625rem .6875rem;
16-
--sap_wc_input_disabled_opacity: 0.5;
17-
--sap_wc_input_icon_min_width: 2.375rem;
18-
--sap_wc_input_compact_min_width: 2rem;
16+
--_ui5_input_disabled_opacity: 0.5;
17+
--_ui5_input_icon_min_width: 2.375rem;
18+
--_ui5_input_compact_min_width: 2rem;
1919
}

packages/main/src/themes/base/sizes-parameters.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
/* Input */
9595
--_ui5_input_height: var(--_ui5_input_compact_height);
9696
--_ui5_input_inner_padding: 0 0.5rem;
97-
--sap_wc_input_icon_min_width: var(--sap_wc_input_compact_min_width);
97+
--_ui5_input_icon_min_width: var(--_ui5_input_compact_min_width);
9898
--_ui5_input_icon_padding: .25rem .5rem;
9999
--_ui5_input_value_state_icon_padding: .1875rem .5rem;
100100

packages/main/src/themes/sap_fiori_3/Input-parameters.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
:root {
44
--_ui5_input_height: 2.25rem;
5-
--sap_wc_input_disabled_opacity: 0.4;
5+
--_ui5_input_disabled_opacity: 0.4;
66
--_ui5_input_wrapper_border_radius: 0.125rem;
77
}

packages/main/src/themes/sap_fiori_3_dark/Input-parameters.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
:root {
44
--_ui5_input_height: 2.25rem;
5-
--sap_wc_input_disabled_opacity: 0.4;
5+
--_ui5_input_disabled_opacity: 0.4;
66
--_ui5_input_wrapper_border_radius: 0.125rem;
77
}

packages/main/test/pages/Input.html

+12-6
Original file line numberDiff line numberDiff line change
@@ -93,32 +93,38 @@ <h3> Input type 'URL'</h3>
9393

9494
<h3> Inputs alignment</h3>
9595
<ui5-button>Press</ui5-button>
96-
<ui5-datepicker style="width: 6rem;" id='dp5'
96+
<ui5-datepicker id='dp5'
9797
placeholder='Delivery Date...'
9898
title='Delivery Date!'>
9999
</ui5-datepicker>
100100

101-
<ui5-datepicker style="width: 6rem;" id='dp5'
101+
<ui5-datepicker id='dp5'
102102
placeholder='Delivery Date...'
103103
value-state="Error"
104104
title='Delivery Date!'>
105105
</ui5-datepicker>
106106

107-
<ui5-select id="mySelect2"style="width: 6rem;">
107+
<ui5-select id="mySelect2">
108108
<ui5-option>Cozy</ui5-option>
109109
<ui5-option selected>Compact</ui5-option>
110110
<ui5-option>Condensed</ui5-option>
111111
</ui5-select>
112112

113-
<ui5-input style="width: 6rem;" value="input" value-state="Error">
113+
<ui5-input value="input" value-state="Error">
114114
<ui5-icon slot="icon" name="message-warning"></ui5-icon>
115115
</ui5-input>
116-
<ui5-select id="mySelect2"style="width: 6rem;" value-state="Error">
116+
<ui5-select id="mySelect2" value-state="Error">
117117
<ui5-option>Cozy</ui5-option>
118118
<ui5-option selected>Compact</ui5-option>
119119
<ui5-option>Condensed</ui5-option>
120120
</ui5-select>
121-
<ui5-multi-combobox value-state="Error" style="width: 6rem;"></ui5-multi-combobox>
121+
<ui5-multi-combobox value-state="Error"></ui5-multi-combobox>
122+
123+
<h3> Input with multiple icons</h3>
124+
<ui5-input id="input3" placeholder="Search ...">
125+
<ui5-icon slot="icon" name="search" style="padding-left: 8px; padding-right: 8px"></ui5-icon>
126+
<ui5-icon slot="icon" name="decline" style="padding-left: 8px; padding-right: 8px"></ui5-icon>
127+
</ui5-input>
122128

123129
<script>
124130
var sap_database_entries = [{ key: "Afg", text: "Afghanistan" }, { key: "Arg", text: "Argentina" }, { key: "Alb", text: "Albania" }, { key: "Arm", text: "Armenia" }, { key: "Alg", text: "Algeria" }, { key: "And", text: "Andorra" }, { key: "Ang", text: "Angola" }, { key: "Ast", text: "Austria" }, { key: "Aus", text: "Australia" }, { key: "Aze", text: "Azerbaijan" }, { key: "Aruba", text: "Aruba" }, { key: "Antigua", text: "Antigua and Barbuda" }, { key: "Bel", text: "Belarus" }, { key: "Bel", text: "Belgium" }, { key: "Bg", text: "Bulgaria" }, { key: "Bra", text: "Brazil" }, { key: "Ch", text: "China" }, { key: "Cub", text: "Cuba" }, { key: "Chil", text: "Chili" }, { key: "Lat", text: "Latvia" }, { key: "Lit", text: "Litva" }, { key: "Prt", text: "Portugal" }, { key: "Sen", text: "Senegal" }, { key: "Ser", text: "Serbia" }, { key: "Afg", text: "Seychelles" }, { key: "Sierra", text: "Sierra Leone" }, { key: "Sgp", text: "Singapore" }, { key: "Sint", text: "Sint Maarten" }, { key: "Slv", text: "Slovakia" }, { key: "Slo", text: "Slovenia" }];

0 commit comments

Comments
 (0)