Skip to content

Commit a804e30

Browse files
authoredFeb 26, 2020
fix(ui5-textarea): apply border and bg-color to native textarea (#1250)
1 parent 55a2e4b commit a804e30

File tree

2 files changed

+39
-16
lines changed

2 files changed

+39
-16
lines changed
 

‎packages/main/src/themes/TextArea.css

+37-14
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
:host {
66
width: 100%;
77
color: var(--sapField_TextColor);
8-
background-color: var(--sapField_Background);
98
font-size: var(--sapFontMediumSize);
109
font-family: var(--sapFontFamily);
11-
border: 1px solid var(--sapField_BorderColor);
10+
border-color: var(--sapField_BorderColor);
1211
border-radius: var(--_ui5_input_wrapper_border_radius);
1312
box-sizing: border-box;
1413
}
@@ -17,12 +16,15 @@
1716
opacity: var(--_ui5_input_disabled_opacity);
1817
cursor: default;
1918
pointer-events: none;
20-
background: var(--sapField_ReadOnly_Background);
2119
border-color: var(--sapField_ReadOnly_BorderColor);
2220
-webkit-text-fill-color: var(--sapContent_DisabledTextColor);
2321
color: var(--sapContent_DisabledTextColor);
2422
}
2523

24+
:host([disabled]) .ui5-textarea-inner {
25+
background: var(--sapField_ReadOnly_Background);
26+
}
27+
2628
:host([focused]) .ui5-textarea-inner {
2729
outline: var(--_ui5_textarea_focus_after_width) dotted var(--sapContent_FocusColor);
2830
outline-offset: -3px;
@@ -42,6 +44,7 @@
4244
overflow: hidden;
4345
box-sizing: border-box;
4446
border-radius: inherit;
47+
border-color: inherit;
4548
}
4649

4750
.ui5-textarea-inner {
@@ -58,9 +61,11 @@
5861
-moz-appearance: textfield;
5962
overflow: auto;
6063
resize: none;
61-
border: inherit;
64+
border-color: inherit;
6265
border-radius: inherit;
63-
background: transparent;
66+
background-color: var(--sapField_Background);
67+
border-width: 1px;
68+
border-style: solid;
6469
}
6570

6671
:host([growing]) .ui5-textarea-root {
@@ -87,9 +92,13 @@
8792

8893
:host([readonly]) {
8994
border-color: var(--sapField_ReadOnly_BorderColor);
95+
}
96+
97+
:host([readonly]) .ui5-textarea-inner {
9098
background: var(--sapField_ReadOnly_Background);
9199
}
92100

101+
93102
:host([show-exceeded-text]) .ui5-textarea-root {
94103
flex-direction: column;
95104
}
@@ -115,12 +124,15 @@
115124
}
116125

117126
:host(:not([value-state]):not([exceeding]):not([readonly]):hover) {
118-
background-color: var(--sapField_Hover_Background);
119127
border-color: var(--sapField_Hover_BorderColor);
120128
}
121129

122-
:host([value-state]:not([value-state="None"])),
123-
:host([exceeding]) {
130+
:host(:not([value-state]):not([exceeding]):not([readonly]):hover) .ui5-textarea-inner {
131+
background-color: var(--sapField_Hover_Background);
132+
}
133+
134+
:host([value-state]:not([value-state="None"])) .ui5-textarea-inner,
135+
:host([exceeding]) .ui5-textarea-inner {
124136
border-width: var(--_ui5_input_state_border_width);
125137
}
126138

@@ -134,31 +146,42 @@
134146
}
135147

136148
:host([value-state="Error"]:not([readonly])) {
137-
background-color: var(--sapField_InvalidBackground);
138149
border-color: var(--sapField_InvalidColor);
139150
}
140151

141-
:host([value-state="Error"]:not([readonly]):not([disabled])),
142-
:host([value-state="Warning"]:not([readonly]):not([disabled])) {
152+
:host([value-state="Error"]:not([readonly])) .ui5-textarea-inner {
153+
background-color: var(--sapField_InvalidBackground);
154+
}
155+
156+
:host([value-state="Error"]:not([readonly]):not([disabled])) .ui5-textarea-inner,
157+
:host([value-state="Warning"]:not([readonly]):not([disabled])) .ui5-textarea-inner {
143158
border-style: var(--_ui5_input_error_warning_border_style);
144159
}
145160

146161
:host([value-state="Warning"]:not([readonly])),
147162
:host([exceeding]) {
148-
background-color: var(--sapField_WarningBackground);
149163
border-color: var(--sapField_WarningColor);
150164
}
151165

166+
:host([value-state="Warning"]:not([readonly])) .ui5-textarea-inner,
167+
:host([exceeding]) .ui5-textarea-inner {
168+
background-color: var(--sapField_WarningBackground);
169+
}
170+
152171
:host([value-state="Success"]:not([readonly])) {
153-
background-color: var(--sapField_SuccessBackground);
154172
border-color: var(--sapField_SuccessColor);
155173
}
156174

175+
:host([value-state="Success"]:not([readonly])) .ui5-textarea-inner {
176+
background-color: var(--sapField_SuccessBackground);
177+
border-width: 1px;
178+
}
179+
157180
.ui5-textarea-exceeded-text {
158181
overflow: hidden;
159182
align-self: flex-end;
160183
padding: 0.125rem 0.125rem 0.5rem;
161184
color: var(--sapContent_LabelColor);
162185
font-family: var(--sapFontFamily);
163186
font-size: var(--sapFontSmallSize);
164-
}
187+
}

‎packages/main/test/pages/TextArea.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
</script>
1818

1919
<script>
20-
delete Document.prototype.adoptedStyleSheets
21-
</script>
20+
delete Document.prototype.adoptedStyleSheets
21+
</script>
2222

2323
<script src="../../webcomponentsjs/webcomponents-loader.js"></script>
2424
<script src="../../resources/bundle.esm.js" type="module"></script>

0 commit comments

Comments
 (0)
Please sign in to comment.