Skip to content

Commit 3978327

Browse files
authored
refactor(ui5-datepicker): convert less to css (#338)
1 parent 0776e01 commit 3978327

File tree

9 files changed

+58
-11
lines changed

9 files changed

+58
-11
lines changed

packages/main/src/DatePicker.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ import KeyCodes from "@ui5/webcomponents-core/dist/sap/ui/events/KeyCodes";
77
import { getCalendarType } from "@ui5/webcomponents-base/src/Configuration";
88
import { getLocale } from "@ui5/webcomponents-base/src/LocaleProvider";
99
import { getIconURI } from "@ui5/webcomponents-base/src/IconPool";
10+
import { addCustomCSS } from "@ui5/webcomponents-base/src/theming/CustomStyle";
1011
import LocaleData from "@ui5/webcomponents-core/dist/sap/ui/core/LocaleData";
1112
import DateFormat from "@ui5/webcomponents-core/dist/sap/ui/core/format/DateFormat";
1213
import CalendarType from "@ui5/webcomponents-base/src/dates/CalendarType";
1314
import CalendarDate from "@ui5/webcomponents-base/src/dates/CalendarDate";
1415
import ValueState from "@ui5/webcomponents-base/src/types/ValueState";
15-
import ShadowDOM from "@ui5/webcomponents-base/src/compatibility/ShadowDOM";
1616
import DatePickerTemplateContext from "./DatePickerTemplateContext";
1717
import Icon from "./Icon";
1818
import Popover from "./Popover";
@@ -23,17 +23,15 @@ import Input from "./Input";
2323
import InputType from "./types/InputType";
2424
import DatePickerRenderer from "./build/compiled/DatePickerRenderer.lit";
2525

26-
// Styles
27-
import belize from "./themes/sap_belize/DatePicker.less";
28-
import belizeHcb from "./themes/sap_belize_hcb/DatePicker.less";
29-
import fiori3 from "./themes/sap_fiori_3/DatePicker.less";
30-
3126
// default calendar for bundling
3227
import "@ui5/webcomponents-core/dist/sap/ui/core/date/Gregorian";
3328

34-
ShadowDOM.registerStyle("sap_belize", "DatePicker.css", belize);
35-
ShadowDOM.registerStyle("sap_belize_hcb", "DatePicker.css", belizeHcb);
36-
ShadowDOM.registerStyle("sap_fiori_3", "DatePicker.css", fiori3);
29+
// Styles
30+
import datePickerCss from "./themes-next/DatePicker.css";
31+
32+
addCustomCSS("ui5-datepicker", "sap_fiori_3", datePickerCss);
33+
addCustomCSS("ui5-datepicker", "sap_belize", datePickerCss);
34+
addCustomCSS("ui5-datepicker", "sap_belize_hcb", datePickerCss);
3735

3836
/**
3937
* @public
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
:host(ui5-datepicker) {
2+
display: inline-block;
3+
width: 100%;
4+
}
5+
6+
ui5-datepicker {
7+
display: inline-block;
8+
width: 100%;
9+
}
10+
11+
.sapWCDPIcon {
12+
color: var(--sapUiContentIconColor);
13+
cursor: pointer;
14+
outline: none;
15+
border: var(--_ui5_datepicker_icon_border);
16+
box-sizing: border-box;
17+
}
18+
19+
.sapWCDPIcon:hover,
20+
.sapWCDPIcon.sapWCDPIconPressed {
21+
border-left-color: white;
22+
}
23+
24+
.sapWCDPIcon:active {
25+
background-color: var(--sapUiButtonLiteActiveBackground);
26+
color: var(--sapUiButtonActiveTextColor);
27+
}
28+
29+
.sapWCDPIcon.sapWCDPIconPressed {
30+
background: var(--sapUiToggleButtonPressedBackground);
31+
color: var(--sapUiButtonActiveTextColor);
32+
}
33+
34+
.sapWCDPIcon:not(.sapWCDPIconPressed):not(:active):hover {
35+
background: var(--sapUiButtonLiteHoverBackground);
36+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
:root {
2+
--_ui5_datepicker_icon_border: none;
3+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import "../base/DatePicker-parameters.css";

packages/main/src/themes-next/sap_belize/parameters-bundle.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
@import "./Button-parameters.css";
55
@import "./Popover-parameters.css";
6+
@import "./DatePicker-parameters.css";
67
@import "./DayPicker-parameters.css";
78
@import "./CalendarHeader-parameters.css";
89
@import "./Card-parameters.css";
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@import "../base/DatePicker-parameters.css";
2+
3+
:root {
4+
--_ui5_datepicker_icon_border: 1px solid transparent;
5+
}

packages/main/src/themes-next/sap_belize_hcb/parameters-bundle.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
@import "./CalendarHeader-parameters.css";
66
@import "./Card-parameters.css";
77
@import "./CheckBox-parameters.css";
8+
@import "./DatePicker-parameters.css";
9+
@import "./DayPicker-parameters.css";
810
@import "./Input-parameters.css";
911
@import "./Link-parameters.css";
1012
@import "./ListItemBase-parameters.css";
@@ -13,7 +15,6 @@
1315
@import "./Panel-parameters.css";
1416
@import "./Popover-parameters.css";
1517
@import "./RadioButton-parameters.css";
16-
@import "./DayPicker-parameters.css";
1718
@import "./Select-parameters.css";
1819
@import "./Switch-parameters.css";
1920
@import "./TabContainer-parameters.css";
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import "../base/DatePicker-parameters.css";

packages/main/src/themes-next/sap_fiori_3/parameters-bundle.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
@import "./Button-parameters.css";
55
@import "./Card-parameters.css";
66
@import "./CheckBox-parameters.css";
7+
@import "./DatePicker-parameters.css";
8+
@import "./DayPicker-parameters.css";
79
@import "./Input-parameters.css";
810
@import "./Link-parameters.css";
911
@import "./ListItemBase-parameters.css";
@@ -12,7 +14,6 @@
1214
@import "./Panel-parameters.css";
1315
@import "./Popover-parameters.css";
1416
@import "./RadioButton-parameters.css";
15-
@import "./DayPicker-parameters.css";
1617
@import "./Select-parameters.css";
1718
@import "./Switch-parameters.css";
1819
@import "./TabContainer-parameters.css";

0 commit comments

Comments
 (0)