Skip to content

Commit 921ac5a

Browse files
authored
fix(ui5-label): fix required label in safari (#3182)
1 parent 2621a40 commit 921ac5a

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed

packages/main/src/Label.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@click={{_onclick}}
55
for="{{for}}"
66
>
7-
<span class="ui5-label-text-wrapper">
7+
<span class="{{classes.textWrapper}}">
88
<bdi id="{{_id}}-bdi">
99
<slot></slot>
1010
</bdi>

packages/main/src/Label.js

+10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js";
22
import litRender from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
3+
import { isSafari } from "@ui5/webcomponents-base/dist/Device.js";
34

45
// Template
56
import LabelTemplate from "./generated/templates/LabelTemplate.lit.js";
@@ -124,6 +125,15 @@ class Label extends UI5Element {
124125
return labelCss;
125126
}
126127

128+
get classes() {
129+
return {
130+
textWrapper: {
131+
"ui5-label-text-wrapper": true,
132+
"ui5-label-text-wrapper-safari": isSafari(),
133+
},
134+
};
135+
}
136+
127137
_onclick() {
128138
const elementToFocus = document.getElementById(this.for);
129139
if (elementToFocus) {

packages/main/src/themes/Label.css

+9-4
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,21 @@ bdi {
3636
max-width: 100%;
3737
}
3838

39-
:host(:not([wrap])[required][show-colon]) .ui5-label-text-wrapper {
40-
max-width: calc(100% - .85rem);
39+
:host(:not([wrap])[required][show-colon]) .ui5-label-text-wrapper,
40+
:host(:not([wrap])[required][show-colon]) .ui5-label-text-wrapper.ui5-label-text-wrapper-safari {
41+
max-width: calc(100% - .8rem);
4142
}
4243

4344
:host(:not([wrap])[required]) .ui5-label-text-wrapper {
44-
max-width: calc(100% - 0.475rem);
45+
max-width: calc(100% - .475rem);
46+
}
47+
48+
:host(:not([wrap])[required]) .ui5-label-text-wrapper.ui5-label-text-wrapper-safari {
49+
max-width: calc(100% - .425rem);
4550
}
4651

4752
:host(:not([wrap])[show-colon]) .ui5-label-text-wrapper {
48-
max-width: calc(100% - 0.2rem);
53+
max-width: calc(100% - .2rem);
4954
}
5055

5156
:host([show-colon]) .ui5-label-required-colon:before {

0 commit comments

Comments
 (0)