From 2746460ebd0d6517e8eedadde30b74e424c17a85 Mon Sep 17 00:00:00 2001
From: Georgieva
Date: Tue, 12 Sep 2023 16:56:41 +0300
Subject: [PATCH 001/141] fix(ui5-dialog): fix background and shadow of slotted
ui5-bar (#7421)
* fix(ui5-dialog): fixed background and shadow when ui5-bar is used inside ui5-dalog
fixes: #7418
---------
Co-authored-by: Siyana Todorova
---
packages/fiori/src/themes/Bar.css | 2 +-
packages/fiori/test/pages/DialogWithBar.html | 35 +++++++++++++++++-
packages/main/src/Dialog.ts | 5 +--
packages/main/src/themes/Dialog.css | 36 +++++++++++++------
packages/main/src/themes/PopupsCommon.css | 1 -
.../src/themes/base/Dialog-parameters.css | 5 +--
.../sap_fiori_3_hcb/Dialog-parameters.css | 5 +--
.../PopupsCommon-parameters.css | 5 +++
.../sap_fiori_3_hcb/parameters-bundle.css | 2 +-
.../sap_fiori_3_hcw/Dialog-parameters.css | 5 +--
.../PopupsCommon-parameters.css | 5 +++
.../sap_fiori_3_hcw/parameters-bundle.css | 2 +-
.../sap_horizon_hcb/Dialog-parameters.css | 5 +--
.../PopupsCommon-parameters.css | 1 +
.../sap_horizon_hcb_exp/Dialog-parameters.css | 4 ---
.../sap_horizon_hcw/Dialog-parameters.css | 5 +--
.../PopupsCommon-parameters.css | 1 +
.../sap_horizon_hcw_exp/Dialog-parameters.css | 4 ---
18 files changed, 81 insertions(+), 47 deletions(-)
create mode 100644 packages/main/src/themes/sap_fiori_3_hcb/PopupsCommon-parameters.css
create mode 100644 packages/main/src/themes/sap_fiori_3_hcw/PopupsCommon-parameters.css
diff --git a/packages/fiori/src/themes/Bar.css b/packages/fiori/src/themes/Bar.css
index d52d70d12385..f564da8ab065 100644
--- a/packages/fiori/src/themes/Bar.css
+++ b/packages/fiori/src/themes/Bar.css
@@ -71,4 +71,4 @@
::slotted(*) {
margin: 0 0.25rem;
-}
+}
\ No newline at end of file
diff --git a/packages/fiori/test/pages/DialogWithBar.html b/packages/fiori/test/pages/DialogWithBar.html
index d5d0b5db9022..04adf90a4066 100644
--- a/packages/fiori/test/pages/DialogWithBar.html
+++ b/packages/fiori/test/pages/DialogWithBar.html
@@ -20,7 +20,7 @@
Dialog with Bar in Footer
-
+
Sample Dialog with Bar
+ Error Dialog with Bar in Header
+
+
+
+ Bar used in Header
+
+
+
+
+ Content
+
+
+ Close
+
+
+
diff --git a/packages/main/src/Dialog.ts b/packages/main/src/Dialog.ts
index dc65878e40a2..b8c734bfe255 100644
--- a/packages/main/src/Dialog.ts
+++ b/packages/main/src/Dialog.ts
@@ -184,10 +184,7 @@ class Dialog extends Popup {
/**
* Defines the state of the Dialog
.
- *
- * Available options are: "None"
(by default), "Success"
, "Warning"
, "Information"
and "Error"
.
- *
- * Note: If "Error"
and "Warning"
state is set, it will change the
+ * Note: If "Error"
and "Warning"
state is set, it will change the
* accessibility role to "alertdialog", if the accessibleRole property is set to "Dialog"
.
* @type {sap.ui.webc.base.types.ValueState}
* @name sap.ui.webc.main.Dialog.prototype.state
diff --git a/packages/main/src/themes/Dialog.css b/packages/main/src/themes/Dialog.css
index 50a2d8246dbc..64c92939a998 100644
--- a/packages/main/src/themes/Dialog.css
+++ b/packages/main/src/themes/Dialog.css
@@ -46,19 +46,31 @@
position: relative;
}
-:host([state="Error"]) .ui5-popup-header-root {
- box-shadow: var(--_ui5_dialog_header_error_state_box_shadow);
+.ui5-popup-header-root::before {
+ content: "";
+ position: absolute;
+ inset-block-start: auto;
+ inset-block-end: 0;
+ inset-inline-start: 0;
+ inset-inline-end: 0;
+ height: var(--_ui5_dialog_header_state_line_height);
+ background: var(--sapObjectHeader_BorderColor);
+}
+
+:host([state="Error"]) .ui5-popup-header-root::before {
+ background: var(--sapErrorBorderColor);
}
-:host([state="Information"]) .ui5-popup-header-root {
- box-shadow: var(--_ui5_dialog_header_information_state_box_shadow);
+:host([state="Information"]) .ui5-popup-header-root::before {
+ background: var(--sapInformationBorderColor);
}
-:host([state="Success"]) .ui5-popup-header-root {
- box-shadow: var(--_ui5_dialog_header_success_state_box_shadow);
+
+:host([state="Success"]) .ui5-popup-header-root::before {
+ background: var(--sapSuccessBorderColor);
}
-:host([state="Warning"]) .ui5-popup-header-root {
- box-shadow: var(--_ui5_dialog_header_warning_state_box_shadow);
+:host([state="Warning"]) .ui5-popup-header-root::before {
+ background: var(--sapWarningBorderColor);
}
.ui5-dialog-value-state-icon {
@@ -114,10 +126,14 @@
color: var(--_ui5_dialog_resize_handle_color);
}
-:host ::slotted([slot="footer"]) {
+::slotted([slot="footer"]) {
height: var(--_ui5_dialog_footer_height);
}
-:host ::slotted([slot="footer"][ui5-bar][design="Footer"]) {
+::slotted([slot="footer"][ui5-bar][design="Footer"]) {
border-top: none;
+}
+
+::slotted([slot="header"][ui5-bar]) {
+ box-shadow: none;
}
\ No newline at end of file
diff --git a/packages/main/src/themes/PopupsCommon.css b/packages/main/src/themes/PopupsCommon.css
index ae25baaa570c..714c291d9b55 100644
--- a/packages/main/src/themes/PopupsCommon.css
+++ b/packages/main/src/themes/PopupsCommon.css
@@ -23,7 +23,6 @@
color: var(--sapPageHeader_TextColor);
box-shadow: var(--_ui5_popup_header_shadow);
border-bottom: var(--_ui5_popup_header_border);
- margin-bottom: 0.125rem;
}
.ui5-popup-content {
diff --git a/packages/main/src/themes/base/Dialog-parameters.css b/packages/main/src/themes/base/Dialog-parameters.css
index 72df93515535..db18dff49ea0 100644
--- a/packages/main/src/themes/base/Dialog-parameters.css
+++ b/packages/main/src/themes/base/Dialog-parameters.css
@@ -7,12 +7,9 @@
--_ui5_dialog_header_focus_left_offset: 2px;
--_ui5_dialog_header_focus_right_offset: 2px;
--_ui5_dialog_header_border_radius: 0px;
- --_ui5_dialog_header_error_state_box_shadow: inset 0 -0.0625rem var(--sapErrorBorderColor), var(--sapContent_HeaderShadow);
- --_ui5_dialog_header_information_state_box_shadow: inset 0 -0.0625rem var(--sapInformationBorderColor), var(--sapContent_HeaderShadow);
- --_ui5_dialog_header_success_state_box_shadow: inset 0 -0.0625rem var(--sapSuccessBorderColor), var(--sapContent_HeaderShadow);
- --_ui5_dialog_header_warning_state_box_shadow: inset 0 -0.0625rem var(--sapWarningBorderColor), var(--sapContent_HeaderShadow);
--_ui5_dialog_header_error_state_icon_color: var(--sapNegativeElementColor);
--_ui5_dialog_header_information_state_icon_color: var(--sapInformativeElementColor);
--_ui5_dialog_header_success_state_icon_color: var(--sapPositiveElementColor);
--_ui5_dialog_header_warning_state_icon_color: var(--sapCriticalElementColor);
+ --_ui5_dialog_header_state_line_height: 0.0625rem;
}
diff --git a/packages/main/src/themes/sap_fiori_3_hcb/Dialog-parameters.css b/packages/main/src/themes/sap_fiori_3_hcb/Dialog-parameters.css
index 144fb8a12c01..dfb0ce7d1d67 100644
--- a/packages/main/src/themes/sap_fiori_3_hcb/Dialog-parameters.css
+++ b/packages/main/src/themes/sap_fiori_3_hcb/Dialog-parameters.css
@@ -1,8 +1,5 @@
@import "../base/Dialog-parameters.css";
:root {
- --_ui5_dialog_header_error_state_box_shadow: inset 0 -0.125rem var(--sapErrorBorderColor);
- --_ui5_dialog_header_information_state_box_shadow: inset 0 -0.125rem var(--sapInformationBorderColor);
- --_ui5_dialog_header_success_state_box_shadow: inset 0 -0.125rem var(--sapSuccessBorderColor);
- --_ui5_dialog_header_warning_state_box_shadow: inset 0 -0.125rem var(--sapWarningBorderColor);
+ --_ui5_dialog_header_state_line_height: 0.125rem;
}
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_fiori_3_hcb/PopupsCommon-parameters.css b/packages/main/src/themes/sap_fiori_3_hcb/PopupsCommon-parameters.css
new file mode 100644
index 000000000000..19dd3fe44df2
--- /dev/null
+++ b/packages/main/src/themes/sap_fiori_3_hcb/PopupsCommon-parameters.css
@@ -0,0 +1,5 @@
+@import "../base/PopupsCommon-parameters.css";
+
+:root {
+ --_ui5_popup_header_shadow: none;
+}
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_fiori_3_hcb/parameters-bundle.css b/packages/main/src/themes/sap_fiori_3_hcb/parameters-bundle.css
index 2dc914ffd49b..d8c85e407ebb 100644
--- a/packages/main/src/themes/sap_fiori_3_hcb/parameters-bundle.css
+++ b/packages/main/src/themes/sap_fiori_3_hcb/parameters-bundle.css
@@ -26,7 +26,7 @@
@import "./MessageStrip-parameters.css";
@import "./Panel-parameters.css";
@import "../base/Popover-parameters.css";
-@import "../base/PopupsCommon-parameters.css";
+@import "./PopupsCommon-parameters.css";
@import "./ProgressIndicator-parameters.css";
@import "./RadioButton-parameters.css";
@import "../base/RatingIndicator-parameters.css";
diff --git a/packages/main/src/themes/sap_fiori_3_hcw/Dialog-parameters.css b/packages/main/src/themes/sap_fiori_3_hcw/Dialog-parameters.css
index 144fb8a12c01..dfb0ce7d1d67 100644
--- a/packages/main/src/themes/sap_fiori_3_hcw/Dialog-parameters.css
+++ b/packages/main/src/themes/sap_fiori_3_hcw/Dialog-parameters.css
@@ -1,8 +1,5 @@
@import "../base/Dialog-parameters.css";
:root {
- --_ui5_dialog_header_error_state_box_shadow: inset 0 -0.125rem var(--sapErrorBorderColor);
- --_ui5_dialog_header_information_state_box_shadow: inset 0 -0.125rem var(--sapInformationBorderColor);
- --_ui5_dialog_header_success_state_box_shadow: inset 0 -0.125rem var(--sapSuccessBorderColor);
- --_ui5_dialog_header_warning_state_box_shadow: inset 0 -0.125rem var(--sapWarningBorderColor);
+ --_ui5_dialog_header_state_line_height: 0.125rem;
}
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_fiori_3_hcw/PopupsCommon-parameters.css b/packages/main/src/themes/sap_fiori_3_hcw/PopupsCommon-parameters.css
new file mode 100644
index 000000000000..19dd3fe44df2
--- /dev/null
+++ b/packages/main/src/themes/sap_fiori_3_hcw/PopupsCommon-parameters.css
@@ -0,0 +1,5 @@
+@import "../base/PopupsCommon-parameters.css";
+
+:root {
+ --_ui5_popup_header_shadow: none;
+}
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_fiori_3_hcw/parameters-bundle.css b/packages/main/src/themes/sap_fiori_3_hcw/parameters-bundle.css
index 2dc914ffd49b..d8c85e407ebb 100644
--- a/packages/main/src/themes/sap_fiori_3_hcw/parameters-bundle.css
+++ b/packages/main/src/themes/sap_fiori_3_hcw/parameters-bundle.css
@@ -26,7 +26,7 @@
@import "./MessageStrip-parameters.css";
@import "./Panel-parameters.css";
@import "../base/Popover-parameters.css";
-@import "../base/PopupsCommon-parameters.css";
+@import "./PopupsCommon-parameters.css";
@import "./ProgressIndicator-parameters.css";
@import "./RadioButton-parameters.css";
@import "../base/RatingIndicator-parameters.css";
diff --git a/packages/main/src/themes/sap_horizon_hcb/Dialog-parameters.css b/packages/main/src/themes/sap_horizon_hcb/Dialog-parameters.css
index d5e638ce1eab..6d05d9d20bb7 100644
--- a/packages/main/src/themes/sap_horizon_hcb/Dialog-parameters.css
+++ b/packages/main/src/themes/sap_horizon_hcb/Dialog-parameters.css
@@ -3,8 +3,5 @@
:root {
--_ui5_dialog_resize_handle_right: 0;
--_ui5_dialog_resize_handle_bottom: 3px;
- --_ui5_dialog_header_error_state_box_shadow: inset 0 -0.125rem var(--sapErrorBorderColor);
- --_ui5_dialog_header_information_state_box_shadow: inset 0 -0.125rem var(--sapInformationBorderColor);
- --_ui5_dialog_header_success_state_box_shadow: inset 0 -0.125rem var(--sapSuccessBorderColor);
- --_ui5_dialog_header_warning_state_box_shadow: inset 0 -0.125rem var(--sapWarningBorderColor);
+ --_ui5_dialog_header_state_line_height: 0.125rem;
}
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_horizon_hcb/PopupsCommon-parameters.css b/packages/main/src/themes/sap_horizon_hcb/PopupsCommon-parameters.css
index 538539ccc4ca..be3754497b89 100644
--- a/packages/main/src/themes/sap_horizon_hcb/PopupsCommon-parameters.css
+++ b/packages/main/src/themes/sap_horizon_hcb/PopupsCommon-parameters.css
@@ -3,4 +3,5 @@
:root {
--_ui5_popup_header_font_family: var(--sapFontHeaderFamily);
--_ui5_popup_border_radius: 0.5rem;
+ --_ui5_popup_header_shadow: none;
}
diff --git a/packages/main/src/themes/sap_horizon_hcb_exp/Dialog-parameters.css b/packages/main/src/themes/sap_horizon_hcb_exp/Dialog-parameters.css
index d5e638ce1eab..e46e4a8771f9 100644
--- a/packages/main/src/themes/sap_horizon_hcb_exp/Dialog-parameters.css
+++ b/packages/main/src/themes/sap_horizon_hcb_exp/Dialog-parameters.css
@@ -3,8 +3,4 @@
:root {
--_ui5_dialog_resize_handle_right: 0;
--_ui5_dialog_resize_handle_bottom: 3px;
- --_ui5_dialog_header_error_state_box_shadow: inset 0 -0.125rem var(--sapErrorBorderColor);
- --_ui5_dialog_header_information_state_box_shadow: inset 0 -0.125rem var(--sapInformationBorderColor);
- --_ui5_dialog_header_success_state_box_shadow: inset 0 -0.125rem var(--sapSuccessBorderColor);
- --_ui5_dialog_header_warning_state_box_shadow: inset 0 -0.125rem var(--sapWarningBorderColor);
}
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_horizon_hcw/Dialog-parameters.css b/packages/main/src/themes/sap_horizon_hcw/Dialog-parameters.css
index d5e638ce1eab..6d05d9d20bb7 100644
--- a/packages/main/src/themes/sap_horizon_hcw/Dialog-parameters.css
+++ b/packages/main/src/themes/sap_horizon_hcw/Dialog-parameters.css
@@ -3,8 +3,5 @@
:root {
--_ui5_dialog_resize_handle_right: 0;
--_ui5_dialog_resize_handle_bottom: 3px;
- --_ui5_dialog_header_error_state_box_shadow: inset 0 -0.125rem var(--sapErrorBorderColor);
- --_ui5_dialog_header_information_state_box_shadow: inset 0 -0.125rem var(--sapInformationBorderColor);
- --_ui5_dialog_header_success_state_box_shadow: inset 0 -0.125rem var(--sapSuccessBorderColor);
- --_ui5_dialog_header_warning_state_box_shadow: inset 0 -0.125rem var(--sapWarningBorderColor);
+ --_ui5_dialog_header_state_line_height: 0.125rem;
}
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_horizon_hcw/PopupsCommon-parameters.css b/packages/main/src/themes/sap_horizon_hcw/PopupsCommon-parameters.css
index 538539ccc4ca..be3754497b89 100644
--- a/packages/main/src/themes/sap_horizon_hcw/PopupsCommon-parameters.css
+++ b/packages/main/src/themes/sap_horizon_hcw/PopupsCommon-parameters.css
@@ -3,4 +3,5 @@
:root {
--_ui5_popup_header_font_family: var(--sapFontHeaderFamily);
--_ui5_popup_border_radius: 0.5rem;
+ --_ui5_popup_header_shadow: none;
}
diff --git a/packages/main/src/themes/sap_horizon_hcw_exp/Dialog-parameters.css b/packages/main/src/themes/sap_horizon_hcw_exp/Dialog-parameters.css
index d5e638ce1eab..e46e4a8771f9 100644
--- a/packages/main/src/themes/sap_horizon_hcw_exp/Dialog-parameters.css
+++ b/packages/main/src/themes/sap_horizon_hcw_exp/Dialog-parameters.css
@@ -3,8 +3,4 @@
:root {
--_ui5_dialog_resize_handle_right: 0;
--_ui5_dialog_resize_handle_bottom: 3px;
- --_ui5_dialog_header_error_state_box_shadow: inset 0 -0.125rem var(--sapErrorBorderColor);
- --_ui5_dialog_header_information_state_box_shadow: inset 0 -0.125rem var(--sapInformationBorderColor);
- --_ui5_dialog_header_success_state_box_shadow: inset 0 -0.125rem var(--sapSuccessBorderColor);
- --_ui5_dialog_header_warning_state_box_shadow: inset 0 -0.125rem var(--sapWarningBorderColor);
}
\ No newline at end of file
From 0690e5142d10832584a4b485114280f0edd76424 Mon Sep 17 00:00:00 2001
From: Georgieva
Date: Wed, 13 Sep 2023 11:10:41 +0300
Subject: [PATCH 002/141] fix(ui5-card): adjust samples for last list item's
square corners (#7539)
JIRA: 3114
---
packages/main/src/themes/Card.css | 2 +-
packages/main/src/themes/ListItemBase.css | 4 +--
packages/main/test/pages/styles/Card.css | 4 +++
packages/main/test/pages/styles/Carousel.css | 4 +++
.../_stories/main/Card/Card.stories.ts | 10 +++---
.../main/Carousel/Carousel.stories.ts | 35 ++++++++-----------
6 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/packages/main/src/themes/Card.css b/packages/main/src/themes/Card.css
index 0ea7ed7a0476..38d1dc0f5f07 100644
--- a/packages/main/src/themes/Card.css
+++ b/packages/main/src/themes/Card.css
@@ -33,7 +33,7 @@
}
.ui5-card-root.ui5-card--nocontent .ui5-card-header-root {
- border-bottom: none;
+ border-bottom: none;
}
.ui5-card--nocontent ::slotted([ui5-card-header]) {
diff --git a/packages/main/src/themes/ListItemBase.css b/packages/main/src/themes/ListItemBase.css
index ef0c7d35ede9..81c83fd4e803 100644
--- a/packages/main/src/themes/ListItemBase.css
+++ b/packages/main/src/themes/ListItemBase.css
@@ -74,8 +74,8 @@
}
:host([disabled]) {
- opacity: var(--_ui5-listitembase_disabled_opacity);
- pointer-events: none;
+ opacity: var(--_ui5-listitembase_disabled_opacity);
+ pointer-events: none;
}
.ui5-li-content {
diff --git a/packages/main/test/pages/styles/Card.css b/packages/main/test/pages/styles/Card.css
index fc4af941bb3d..cc7647644a94 100644
--- a/packages/main/test/pages/styles/Card.css
+++ b/packages/main/test/pages/styles/Card.css
@@ -25,3 +25,7 @@
.myCardHeader--ar-he-ch::part(title) {
font-weight: 700;
}
+
+[ui5-card] [ui5-list]:last-child {
+ margin-block-end: 0.75rem;
+}
\ No newline at end of file
diff --git a/packages/main/test/pages/styles/Carousel.css b/packages/main/test/pages/styles/Carousel.css
index 99d021d72e4c..125a5faefe30 100644
--- a/packages/main/test/pages/styles/Carousel.css
+++ b/packages/main/test/pages/styles/Carousel.css
@@ -7,6 +7,10 @@ ui5-carousel {
height: 100%;
}
+[ui5-card] [ui5-list]:last-child {
+ margin-block-end: 0.75rem;
+}
+
.carousel1auto {
background-color: var(--sapBackgroundColor);
padding: 1rem;
diff --git a/packages/playground/_stories/main/Card/Card.stories.ts b/packages/playground/_stories/main/Card/Card.stories.ts
index 87a9135d3bf6..96ed1569a9bf 100644
--- a/packages/playground/_stories/main/Card/Card.stories.ts
+++ b/packages/playground/_stories/main/Card/Card.stories.ts
@@ -47,7 +47,7 @@ const header = (titleText: string, subtitleText: string, status?: string, action
${interactive ? "interactive" : ""}
>
${avatar ? avatar : ""}
- ${actions?.map(a => `${a} `)}
+ ${actions ? actions.map(a => `${a} `) : ""}
`;
};
@@ -67,7 +67,7 @@ const setWidth = (width: string) => {
export const InteractiveHeader = Template.bind({});
InteractiveHeader.args = {
header: header("This header is interactive", "Click, press Enter or Space", "3 of 6", [], ` `, true),
- default: `
+ default: `
Richard Wilson
Elena Petrova
John Miller
@@ -95,7 +95,7 @@ WithTable.args = {
.status-success { color: #107e3e; }
-
+
Sales Order
@@ -182,14 +182,14 @@ WithTimeline.decorators = [setWidth("22rem")];
export const More = Template.bind({});
const MoreCards = [{
header: header("David Williams", "Sales Manager"),
- default: `
+ default: `
Personal Development
Finance
Communications Skills
`
}, {
header: header("Project Cloud Transformation", "Revenue per Product | EUR", "3 of 3"),
- default: `
+ default: `
Avantel
Telecomunicaciones Star
Talpa
diff --git a/packages/playground/_stories/main/Carousel/Carousel.stories.ts b/packages/playground/_stories/main/Carousel/Carousel.stories.ts
index 36d43e636e5e..80bdce50ea11 100644
--- a/packages/playground/_stories/main/Carousel/Carousel.stories.ts
+++ b/packages/playground/_stories/main/Carousel/Carousel.stories.ts
@@ -86,25 +86,21 @@ MultipleItemsPerPage.args = {
-
-
- Alain Chevalier
- Monique Legrand
- Michael Adams
-
-
+
+ Alain Chevalier
+ Monique Legrand
+ Michael Adams
+
-
-
- Richard Wilson
- Elena Petrova
- John Miller
-
-
+
+ Richard Wilson
+ Elena Petrova
+ John Miller
+
`
};
MultipleItemsPerPage.decorators = [
@@ -117,15 +113,12 @@ MultipleItemsPerPage.decorators = [
min-width: 18rem;
}
- ui5-li::part(icon) {
- padding-inline-end: 0;
+ ui5-card ui5-list:last-child {
+ margin-block-end: 0.75rem;
}
- .card-content {
- display: flex;
- justify-content: space-around;
- flex-wrap: wrap;
- width: 100%;
+ ui5-li::part(icon) {
+ padding-inline-end: 0;
}
${story()}`
From 1051c4706fbc4433459f66984a8fe2349535b91e Mon Sep 17 00:00:00 2001
From: Lukas Harbarth
Date: Wed, 13 Sep 2023 12:19:19 +0200
Subject: [PATCH 003/141] docs(ui5-toolbar): add note about allowed components
in default slot (#7577)
---
packages/main/src/Toolbar.ts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/packages/main/src/Toolbar.ts b/packages/main/src/Toolbar.ts
index 17eca059464c..13c2cbaae904 100644
--- a/packages/main/src/Toolbar.ts
+++ b/packages/main/src/Toolbar.ts
@@ -154,6 +154,8 @@ class Toolbar extends UI5Element {
/**
* Defines the items of the component.
+ *
+ * Note: Currently only ui5-toolbar-button
, ui5-toolbar-select
, ui5-toolbar-separator
and ui5-toolbar-spacer
are allowed here.
*
* @type {sap.ui.webc.main.IToolbarItem[]}
* @name sap.ui.webc.main.Toolbar.prototype.default
From 0e4b7c97b280431415e088c9fcaad4fe5a249de8 Mon Sep 17 00:00:00 2001
From: gmkv
Date: Wed, 13 Sep 2023 13:32:21 +0300
Subject: [PATCH 004/141] chore: bump theming-base-content version to 11.6.8
(#7571)
This update includes the updated theme parameters.
See https://github.com/SAP/theming-base-content/releases/tag/11.6.8
---
packages/theming/package.json | 2 +-
yarn.lock | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/packages/theming/package.json b/packages/theming/package.json
index 6e87b219f4c9..a73c4bf35bb7 100644
--- a/packages/theming/package.json
+++ b/packages/theming/package.json
@@ -29,7 +29,7 @@
"directory": "packages/theming"
},
"dependencies": {
- "@sap-theming/theming-base-content": "11.6.4",
+ "@sap-theming/theming-base-content": "11.6.8",
"@ui5/webcomponents-base": "1.18.0-rc.0"
},
"devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 02e4ec63c1fc..ad5ec5546756 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2484,10 +2484,10 @@
resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
-"@sap-theming/theming-base-content@11.6.4":
- version "11.6.4"
- resolved "https://registry.yarnpkg.com/@sap-theming/theming-base-content/-/theming-base-content-11.6.4.tgz#828b314c5036b054d4bae20243b382e1eb57c7cf"
- integrity sha512-ub3W9qRO4Kt1nrXJBvTqUbQjpAhcQNGcIh1CTopVStpGGhEP1a2VPeXxJQPL37FCzIFeN898OBiQgCgQNpVqYQ==
+"@sap-theming/theming-base-content@11.6.8":
+ version "11.6.8"
+ resolved "https://registry.yarnpkg.com/@sap-theming/theming-base-content/-/theming-base-content-11.6.8.tgz#3e70ddfe415f4492b3e37df2c642fbbf7cb8296d"
+ integrity sha512-LRYvqVeqFYCqhB4EMbFslQpgRLrYyOOsacWI0JZbWlnvRkbF4/pzKpr4ULyVPFp26CrwXhUZJeSSAa3/8KS6iw==
"@sigstore/protobuf-specs@^0.1.0":
version "0.1.0"
From 6594cd5df91f31f31efc740846670df4a1c1933d Mon Sep 17 00:00:00 2001
From: Petar Dimov <32839090+dimovpetar@users.noreply.github.com>
Date: Wed, 13 Sep 2023 13:51:40 +0300
Subject: [PATCH 005/141] =?UTF-8?q?fix(ui5-upload-coll=D0=B5ction):=20alig?=
=?UTF-8?q?n=20buttons=20to=20avoid=20extra=20space=20when=20size=20is=20s?=
=?UTF-8?q?mall=20(#7491)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/fiori/src/UploadCollectionItem.hbs | 120 +++++++++---------
.../fiori/src/themes/UploadCollectionItem.css | 67 +++++-----
.../base/UploadCollection-parameters.css | 5 +-
.../UploadCollection-parameters.css | 5 +
.../themes/sap_belize/parameters-bundle.css | 4 +-
.../UploadCollection-parameters.css | 1 +
.../UploadCollection-parameters.css | 1 +
.../UploadCollection-parameters.css | 2 -
.../UploadCollection-parameters.css | 2 -
.../UploadCollection-parameters.css | 2 -
.../UploadCollection-parameters.css | 2 -
.../UploadCollection-parameters.css | 2 -
.../UploadCollection-parameters.css | 2 -
.../UploadCollection-parameters.css | 2 -
.../UploadCollection-parameters.css | 2 -
.../fiori/test/specs/UploadCollection.spec.js | 2 +-
16 files changed, 104 insertions(+), 117 deletions(-)
create mode 100644 packages/fiori/src/themes/sap_belize/UploadCollection-parameters.css
diff --git a/packages/fiori/src/UploadCollectionItem.hbs b/packages/fiori/src/UploadCollectionItem.hbs
index ac05109cef36..df025c3b8a92 100644
--- a/packages/fiori/src/UploadCollectionItem.hbs
+++ b/packages/fiori/src/UploadCollectionItem.hbs
@@ -1,11 +1,10 @@
{{>include "../../main/src/ListItem.hbs"}}
{{#*inline "listItemContent"}}
-
-
-
-
-
+
+
+
+
{{#if _editing}}
@@ -46,65 +45,66 @@
{{/if}}
-
- {{#if _editing}}
+
+
+
+ {{#if _editing}}
+ {{_renameBtnText}}
+ {{_cancelRenameBtnText}}
+ {{else}}
+ {{#if _showRetry}}
{{_renameBtnText}}
+ icon="refresh"
+ design="Transparent"
+ tooltip="{{_retryButtonTooltip}}"
+ @click="{{_onRetry}}"
+ @keyup="{{_onRetryKeyup}}"
+ >
+ {{/if}}
+ {{#if _showTerminate}}
{{_cancelRenameBtnText}}
- {{else}}
- {{#if _showRetry}}
-
- {{/if}}
- {{#if _showTerminate}}
-
-
- {{/if}}
+ icon="stop"
+ design="Transparent"
+ tooltip="{{_terminateButtonTooltip}}"
+ @click="{{_onTerminate}}"
+ @keyup="{{_onTerminateKeyup}}">
+
+ {{/if}}
- {{#if showEditButton}}
-
-
- {{/if}}
+ {{#if showEditButton}}
+
+
+ {{/if}}
- {{#if renderUploadCollectionDeleteButton}}
-
- {{/if}}
+ {{#if renderUploadCollectionDeleteButton}}
+
{{/if}}
-
+ {{/if}}
{{/inline}}
\ No newline at end of file
diff --git a/packages/fiori/src/themes/UploadCollectionItem.css b/packages/fiori/src/themes/UploadCollectionItem.css
index 25d97dcf646a..2f60ba24f080 100644
--- a/packages/fiori/src/themes/UploadCollectionItem.css
+++ b/packages/fiori/src/themes/UploadCollectionItem.css
@@ -1,35 +1,43 @@
:host {
height: auto;
+ container-type: inline-size;
}
:host(:not([hidden])) {
display: block;
}
+:host::part(content) {
+ overflow: visible; /* prevents buttons hover shadow clipping */
+}
+
.ui5-li-root.ui5-uci-root {
padding: 1rem;
}
-.ui5-uci-edit-buttons {
+.ui5-uci-buttons {
display: flex;
+ pointer-events: all;
+ margin-inline-start: 1rem;
+ gap: 0.5rem;
}
/* Thumbnail */
.ui5-uci-thumbnail {
- width: 3rem;
- height: 3rem;
- margin-right: 0.75rem;
+ width: var(--ui5_upload_collection_thumbnail_size);
+ height: var(--ui5_upload_collection_thumbnail_size);
+ margin-inline-end: var(--ui5_upload_collection_thumbnail_margin_inline_end);
}
::slotted([ui5-icon][slot="thumbnail"]) {
- width: 3rem;
- height: 3rem;
+ width: var(--ui5_upload_collection_thumbnail_size);
+ height: var(--ui5_upload_collection_thumbnail_size);
font-size: 2.5rem;
}
::slotted(img[slot="thumbnail"]) {
- width: 3rem;
- height: 3rem;
+ width: var(--ui5_upload_collection_thumbnail_size);
+ height: var(--ui5_upload_collection_thumbnail_size);
}
:host([actionable]) ::slotted([ui5-icon][slot="thumbnail"]) {
@@ -37,7 +45,7 @@
}
/* Content */
-.ui5-uci-content-and-edit-container {
+.ui5-uci-thumbnail-and-content-container {
flex: 1 1 auto;
min-width: 0; /* fixes chrome overflow issue */
display: flex;
@@ -53,11 +61,14 @@
.ui5-uci-content {
flex: 1 1 auto;
- margin-right: .5rem;
width: 100%;
min-width: 0; /* fixes chrome overflow issue */
}
+.ui5-uci-progress-box {
+ margin-inline-start: 0.5rem;
+}
+
.ui5-uci-file-name {
display: block;
font-family: "72override", var(--sapFontFamily);
@@ -123,18 +134,17 @@
display: none;
}
-.ui5-uci-edit-buttons {
- pointer-events: all;
- margin-inline-start: 1rem;
-}
-
.ui5-uci-edit-rename-btn {
margin-right: 0.125rem;
}
-@media(max-width: 30rem) {
- .ui5-uci-content-and-edit-container {
- display: block;
+@container (max-width: 30rem) {
+ :host::part(content) {
+ flex-wrap: wrap;
+ }
+
+ .ui5-uci-thumbnail-and-content-container {
+ width: 100%;
}
.ui5-uci-content-and-progress {
@@ -144,20 +154,17 @@
.ui5-uci-progress-box {
width: 100%;
margin-top: .5rem;
+ margin-inline-start: 0;
}
.ui5-uci-content {
width: 100%;
}
- .ui5-uci-edit-buttons {
- margin-inline-start: 0;
+ .ui5-uci-buttons {
+ margin-inline-start: var(--ui5_upload_collection_small_size_buttons_margin_inline_start);
margin-block-start: var(--ui5_upload_collection_small_size_buttons_margin_block_start);
}
-
- .ui5-uci-edit-buttons [ui5-button] {
- margin-block-end: var(--ui5_upload_collection_button_margin_block_end);
- }
}
.ui5-uci-progress-indicator {
@@ -172,18 +179,6 @@
justify-content: space-between;
}
-[ui5-button] {
- margin-inline: 0.5rem;
-}
-
-[ui5-button]:first-of-type {
- margin-inline-start: 0;
-}
-
-[ui5-button]:last-of-type {
- margin-inline-end: var(--ui5_upload_collection_last_button_inline_end);
-}
-
:host([active][actionable]) ::slotted([ui5-icon][slot="thumbnail"]),
:host([active][actionable]) .ui5-uci-file-name,
:host([active][actionable]) .ui5-uci-description {
diff --git a/packages/fiori/src/themes/base/UploadCollection-parameters.css b/packages/fiori/src/themes/base/UploadCollection-parameters.css
index 9686026a484f..ac00bf83c58a 100644
--- a/packages/fiori/src/themes/base/UploadCollection-parameters.css
+++ b/packages/fiori/src/themes/base/UploadCollection-parameters.css
@@ -2,7 +2,8 @@
--ui5_upload_collection_drag_overlay_border: 0.125rem dashed var(--sapContent_ForegroundBorderColor);
--ui5_upload_collection_drop_overlay_border: 0.125rem solid var(--sapContent_DragAndDropActiveColor);
--ui5_upload_collection_drop_overlay_background: transparent;
- --ui5_upload_collection_button_margin_block_end: 0;
- --ui5_upload_collection_last_button_inline_end: 0;
+ --ui5_upload_collection_thumbnail_size: 3rem;
+ --ui5_upload_collection_thumbnail_margin_inline_end: 0.75rem;
--ui5_upload_collection_small_size_buttons_margin_block_start: 0.75rem;
+ --ui5_upload_collection_small_size_buttons_margin_inline_start: 0;
}
\ No newline at end of file
diff --git a/packages/fiori/src/themes/sap_belize/UploadCollection-parameters.css b/packages/fiori/src/themes/sap_belize/UploadCollection-parameters.css
new file mode 100644
index 000000000000..74225a5e87cd
--- /dev/null
+++ b/packages/fiori/src/themes/sap_belize/UploadCollection-parameters.css
@@ -0,0 +1,5 @@
+@import "../base/UploadCollection-parameters.css";
+
+:root {
+ --ui5_upload_collection_small_size_buttons_margin_inline_start: calc(var(--ui5_upload_collection_thumbnail_size) + var(--ui5_upload_collection_thumbnail_margin_inline_end));
+}
\ No newline at end of file
diff --git a/packages/fiori/src/themes/sap_belize/parameters-bundle.css b/packages/fiori/src/themes/sap_belize/parameters-bundle.css
index 24902e4ae4f0..d7ddadee3a99 100644
--- a/packages/fiori/src/themes/sap_belize/parameters-bundle.css
+++ b/packages/fiori/src/themes/sap_belize/parameters-bundle.css
@@ -9,7 +9,7 @@
@import "../base/ShellBar-parameters.css";
@import "../base/SideNavigation-parameters.css";
@import "../base/TimelineItem-parameters.css";
-@import "../base/UploadCollection-parameters.css";
@import "../base/ViewSettingsDialog-parameters.css";
@import "../base/Wizard-parameters.css";
-@import "../base/WizardTab-parameters.css";
\ No newline at end of file
+@import "../base/WizardTab-parameters.css";
+@import "./UploadCollection-parameters.css";
\ No newline at end of file
diff --git a/packages/fiori/src/themes/sap_belize_hcb/UploadCollection-parameters.css b/packages/fiori/src/themes/sap_belize_hcb/UploadCollection-parameters.css
index e635bd9a99d1..ba8072b27698 100644
--- a/packages/fiori/src/themes/sap_belize_hcb/UploadCollection-parameters.css
+++ b/packages/fiori/src/themes/sap_belize_hcb/UploadCollection-parameters.css
@@ -4,4 +4,5 @@
--ui5_upload_collection_drag_overlay_border: 0.1875rem dashed var(--sapContent_ForegroundBorderColor);
--ui5_upload_collection_drop_overlay_border: 0.1875rem solid var(--sapContent_HelpColor);
--ui5_upload_collection_drop_overlay_background: transparent;
+ --ui5_upload_collection_small_size_buttons_margin_inline_start: calc(var(--ui5_upload_collection_thumbnail_size) + var(--ui5_upload_collection_thumbnail_margin_inline_end));
}
\ No newline at end of file
diff --git a/packages/fiori/src/themes/sap_belize_hcw/UploadCollection-parameters.css b/packages/fiori/src/themes/sap_belize_hcw/UploadCollection-parameters.css
index 24c88b60f303..fad99a722f32 100644
--- a/packages/fiori/src/themes/sap_belize_hcw/UploadCollection-parameters.css
+++ b/packages/fiori/src/themes/sap_belize_hcw/UploadCollection-parameters.css
@@ -3,4 +3,5 @@
:root {
--ui5_upload_collection_drag_overlay_border: 0.1875rem dashed var(--sapContent_ForegroundBorderColor);
--ui5_upload_collection_drop_overlay_border: 0.1875rem solid var(--sapContent_HelpColor);
+ --ui5_upload_collection_small_size_buttons_margin_inline_start: calc(var(--ui5_upload_collection_thumbnail_size) + var(--ui5_upload_collection_thumbnail_margin_inline_end));
}
\ No newline at end of file
diff --git a/packages/fiori/src/themes/sap_horizon/UploadCollection-parameters.css b/packages/fiori/src/themes/sap_horizon/UploadCollection-parameters.css
index f504586df9e2..23cb9e77ee23 100644
--- a/packages/fiori/src/themes/sap_horizon/UploadCollection-parameters.css
+++ b/packages/fiori/src/themes/sap_horizon/UploadCollection-parameters.css
@@ -1,7 +1,5 @@
@import "../base/UploadCollection-parameters.css";
:root {
- --ui5_upload_collection_button_margin_block_end: 2px;
- --ui5_upload_collection_last_button_inline_end: 2px;
--ui5_upload_collection_small_size_buttons_margin_block_start: 0.5rem;
}
\ No newline at end of file
diff --git a/packages/fiori/src/themes/sap_horizon_dark/UploadCollection-parameters.css b/packages/fiori/src/themes/sap_horizon_dark/UploadCollection-parameters.css
index f504586df9e2..23cb9e77ee23 100644
--- a/packages/fiori/src/themes/sap_horizon_dark/UploadCollection-parameters.css
+++ b/packages/fiori/src/themes/sap_horizon_dark/UploadCollection-parameters.css
@@ -1,7 +1,5 @@
@import "../base/UploadCollection-parameters.css";
:root {
- --ui5_upload_collection_button_margin_block_end: 2px;
- --ui5_upload_collection_last_button_inline_end: 2px;
--ui5_upload_collection_small_size_buttons_margin_block_start: 0.5rem;
}
\ No newline at end of file
diff --git a/packages/fiori/src/themes/sap_horizon_dark_exp/UploadCollection-parameters.css b/packages/fiori/src/themes/sap_horizon_dark_exp/UploadCollection-parameters.css
index f504586df9e2..23cb9e77ee23 100644
--- a/packages/fiori/src/themes/sap_horizon_dark_exp/UploadCollection-parameters.css
+++ b/packages/fiori/src/themes/sap_horizon_dark_exp/UploadCollection-parameters.css
@@ -1,7 +1,5 @@
@import "../base/UploadCollection-parameters.css";
:root {
- --ui5_upload_collection_button_margin_block_end: 2px;
- --ui5_upload_collection_last_button_inline_end: 2px;
--ui5_upload_collection_small_size_buttons_margin_block_start: 0.5rem;
}
\ No newline at end of file
diff --git a/packages/fiori/src/themes/sap_horizon_exp/UploadCollection-parameters.css b/packages/fiori/src/themes/sap_horizon_exp/UploadCollection-parameters.css
index f504586df9e2..23cb9e77ee23 100644
--- a/packages/fiori/src/themes/sap_horizon_exp/UploadCollection-parameters.css
+++ b/packages/fiori/src/themes/sap_horizon_exp/UploadCollection-parameters.css
@@ -1,7 +1,5 @@
@import "../base/UploadCollection-parameters.css";
:root {
- --ui5_upload_collection_button_margin_block_end: 2px;
- --ui5_upload_collection_last_button_inline_end: 2px;
--ui5_upload_collection_small_size_buttons_margin_block_start: 0.5rem;
}
\ No newline at end of file
diff --git a/packages/fiori/src/themes/sap_horizon_hcb/UploadCollection-parameters.css b/packages/fiori/src/themes/sap_horizon_hcb/UploadCollection-parameters.css
index 743a58be3118..69913c713307 100644
--- a/packages/fiori/src/themes/sap_horizon_hcb/UploadCollection-parameters.css
+++ b/packages/fiori/src/themes/sap_horizon_hcb/UploadCollection-parameters.css
@@ -4,7 +4,5 @@
--ui5_upload_collection_drag_overlay_border: 0.1875rem dashed var(--sapContent_ForegroundBorderColor);
--ui5_upload_collection_drop_overlay_border: 0.1875rem solid var(--sapContent_HelpColor);
--ui5_upload_collection_drop_overlay_background: transparent;
- --ui5_upload_collection_button_margin_block_end: 2px;
- --ui5_upload_collection_last_button_inline_end: 2px;
--ui5_upload_collection_small_size_buttons_margin_block_start: 0.5rem;
}
\ No newline at end of file
diff --git a/packages/fiori/src/themes/sap_horizon_hcb_exp/UploadCollection-parameters.css b/packages/fiori/src/themes/sap_horizon_hcb_exp/UploadCollection-parameters.css
index 743a58be3118..69913c713307 100644
--- a/packages/fiori/src/themes/sap_horizon_hcb_exp/UploadCollection-parameters.css
+++ b/packages/fiori/src/themes/sap_horizon_hcb_exp/UploadCollection-parameters.css
@@ -4,7 +4,5 @@
--ui5_upload_collection_drag_overlay_border: 0.1875rem dashed var(--sapContent_ForegroundBorderColor);
--ui5_upload_collection_drop_overlay_border: 0.1875rem solid var(--sapContent_HelpColor);
--ui5_upload_collection_drop_overlay_background: transparent;
- --ui5_upload_collection_button_margin_block_end: 2px;
- --ui5_upload_collection_last_button_inline_end: 2px;
--ui5_upload_collection_small_size_buttons_margin_block_start: 0.5rem;
}
\ No newline at end of file
diff --git a/packages/fiori/src/themes/sap_horizon_hcw/UploadCollection-parameters.css b/packages/fiori/src/themes/sap_horizon_hcw/UploadCollection-parameters.css
index 7c3f439e2931..18eefa6d36d9 100644
--- a/packages/fiori/src/themes/sap_horizon_hcw/UploadCollection-parameters.css
+++ b/packages/fiori/src/themes/sap_horizon_hcw/UploadCollection-parameters.css
@@ -3,7 +3,5 @@
:root {
--ui5_upload_collection_drag_overlay_border: 0.1875rem dashed var(--sapContent_ForegroundBorderColor);
--ui5_upload_collection_drop_overlay_border: 0.1875rem solid var(--sapContent_HelpColor);
- --ui5_upload_collection_button_margin_block_end: 2px;
- --ui5_upload_collection_last_button_inline_end: 2px;
--ui5_upload_collection_small_size_buttons_margin_block_start: 0.5rem;
}
\ No newline at end of file
diff --git a/packages/fiori/src/themes/sap_horizon_hcw_exp/UploadCollection-parameters.css b/packages/fiori/src/themes/sap_horizon_hcw_exp/UploadCollection-parameters.css
index 7c3f439e2931..18eefa6d36d9 100644
--- a/packages/fiori/src/themes/sap_horizon_hcw_exp/UploadCollection-parameters.css
+++ b/packages/fiori/src/themes/sap_horizon_hcw_exp/UploadCollection-parameters.css
@@ -3,7 +3,5 @@
:root {
--ui5_upload_collection_drag_overlay_border: 0.1875rem dashed var(--sapContent_ForegroundBorderColor);
--ui5_upload_collection_drop_overlay_border: 0.1875rem solid var(--sapContent_HelpColor);
- --ui5_upload_collection_button_margin_block_end: 2px;
- --ui5_upload_collection_last_button_inline_end: 2px;
--ui5_upload_collection_small_size_buttons_margin_block_start: 0.5rem;
}
\ No newline at end of file
diff --git a/packages/fiori/test/specs/UploadCollection.spec.js b/packages/fiori/test/specs/UploadCollection.spec.js
index acad191ff271..63a3c155e428 100644
--- a/packages/fiori/test/specs/UploadCollection.spec.js
+++ b/packages/fiori/test/specs/UploadCollection.spec.js
@@ -22,7 +22,7 @@ describe("UploadCollection", () => {
await editButton.click();
assert.ok(await secondItem.shadow$(".ui5-uci-edit-container").isDisplayed(), "edit container should be rendered");
- assert.ok(await secondItem.shadow$(".ui5-uci-edit-buttons").isDisplayed(), "edit buttons should be rendered");
+ assert.ok(await secondItem.shadow$(".ui5-uci-buttons").isDisplayed(), "buttons should be rendered");
assert.notOk(await secondItem.shadow$(".ui5-li-detailbtn").isDisplayed(), "detail button should be hidden");
// reset the item
From d459fc217bf6c63c1070743ea7d4447b08bdf2bc Mon Sep 17 00:00:00 2001
From: Nayden Naydenov <31909318+nnaydenow@users.noreply.github.com>
Date: Wed, 13 Sep 2023 14:10:24 +0300
Subject: [PATCH 006/141] fix(ui5-segmented-button): visual misalignments
(#7528)
* chore: simplify css
* chore: finish css changes
* fix(ui5-segmented-button): add rtl parameters
* fix(ui5-segmented-button): change rtl parameters
---------
Co-authored-by: Nayden Naydenov
Co-authored-by: ilhan007
Co-authored-by: hinzzx
Co-authored-by: Stoyan <88034608+hinzzx@users.noreply.github.com>
---
packages/main/src/themes/SegmentedButton.css | 44 ++++++--------
.../base/SegmentedButtton-parameters.css | 5 +-
.../main/src/themes/base/rtl-parameters.css | 2 +
.../main/src/themes/base/sizes-parameters.css | 3 -
.../SegmentedButtton-parameters.css | 9 ++-
.../themes/sap_horizon/parameters-bundle.css | 2 +-
.../src/themes/sap_horizon/rtl-parameters.css | 6 ++
.../SegmentedButtton-parameters.css | 9 ++-
.../sap_horizon_dark/parameters-bundle.css | 2 +-
.../sap_horizon_dark/rtl-parameters.css | 6 ++
.../SegmentedButtton-parameters.css | 9 ++-
.../parameters-bundle.css | 2 +-
.../sap_horizon_dark_exp/rtl-parameters.css | 6 ++
.../SegmentedButtton-parameters.css | 9 ++-
.../sap_horizon_exp/parameters-bundle.css | 2 +-
.../themes/sap_horizon_exp/rtl-parameters.css | 6 ++
.../SegmentedButtton-parameters.css | 1 -
.../SegmentedButtton-parameters.css | 1 -
.../SegmentedButtton-parameters.css | 1 -
.../SegmentedButtton-parameters.css | 1 -
packages/main/test/pages/SegmentedButton.html | 57 +++++++++++++++++++
21 files changed, 129 insertions(+), 54 deletions(-)
create mode 100644 packages/main/src/themes/sap_horizon/rtl-parameters.css
create mode 100644 packages/main/src/themes/sap_horizon_dark/rtl-parameters.css
create mode 100644 packages/main/src/themes/sap_horizon_dark_exp/rtl-parameters.css
create mode 100644 packages/main/src/themes/sap_horizon_exp/rtl-parameters.css
diff --git a/packages/main/src/themes/SegmentedButton.css b/packages/main/src/themes/SegmentedButton.css
index dad64d57a650..d640c6427e01 100644
--- a/packages/main/src/themes/SegmentedButton.css
+++ b/packages/main/src/themes/SegmentedButton.css
@@ -13,11 +13,14 @@
margin: 0;
padding: 0;
background-color: var(--sapButton_Background);
- border-radius: var(--_ui5_segmented_btn_outer_border_radius);
+ border-radius: var(--sapButton_BorderCornerRadius);
+ box-shadow: inset 0 0 0 var(--sapButton_BorderWidth) var(--sapButton_BorderColor);
}
::slotted([ui5-segmented-button-item]) {
border-radius: var(--_ui5_segmented_btn_inner_border_radius);
+ border-color: var(--_ui5_segmented_btn_border_color);
+ background-color: var(--_ui5_segmented_btn_background_color);
height: var(--_ui5_button_base_height);
min-width: 2.5rem;
white-space: nowrap;
@@ -28,52 +31,37 @@
::slotted([ui5-segmented-button-item]:hover) {
z-index: 2;
+ box-shadow: var(--_ui5_segmented_btn_hover_box_shadow);
+ border-color: var(--sapButton_Hover_BorderColor);
+ background-color: var(--sapButton_Hover_Background);
}
::slotted([ui5-segmented-button-item][pressed]),
::slotted([ui5-segmented-button-item][active]) {
- border: 0.0625rem solid var(--sapButton_Selected_BorderColor);
+ border-color: var(--sapButton_Selected_BorderColor);
background-color: var(--sapButton_Selected_Background);
color: var(--sapButton_Selected_TextColor);
}
::slotted([ui5-segmented-button-item][pressed]:hover) {
- border: 0.0625rem solid var(--sapButton_Selected_Hover_BorderColor);
+ border-color: var(--sapButton_Selected_Hover_BorderColor);
background-color: var(--sapButton_Selected_Hover_Background);
color: var(--sapButton_Selected_TextColor);
}
-::slotted([ui5-segmented-button-item]:nth-child(odd)) {
- border-inline-end: var(--_ui5_segmented_btn_inner_border_odd_child);
- border-inline-start: var(--_ui5_segmented_btn_inner_border_odd_child);
-}
-
-::slotted([ui5-segmented-button-item][pressed]:nth-child(odd)),
-::slotted([ui5-segmented-button-item][active]:nth-child(odd)) {
- border-inline-end: var(--_ui5_segmented_btn_inner_pressed_border_odd_child);
- border-inline-start: var(--_ui5_segmented_btn_inner_pressed_border_odd_child);
-}
-
::slotted([ui5-segmented-button-item]:last-child) {
- border-start-end-radius: var(--_ui5_segmented_btn_border_radius);
- border-end-end-radius: var(--_ui5_segmented_btn_border_radius);
- border-inline-end: var(--_ui5_segmented_btn_inner_border);
-}
-
-::slotted([ui5-segmented-button-item][pressed]:last-child),
-::slotted([ui5-segmented-button-item][active]:last-child) {
- border-inline-end: 0.0625rem solid var(--sapButton_Selected_BorderColor);
+ border-start-end-radius: var(--sapButton_BorderCornerRadius);
+ border-end-end-radius: var(--sapButton_BorderCornerRadius);
}
::slotted([ui5-segmented-button-item]:first-child) {
- border-start-start-radius: var(--_ui5_segmented_btn_border_radius);
- border-end-start-radius: var(--_ui5_segmented_btn_border_radius);
- border-inline-start: var(--_ui5_segmented_btn_inner_border);
+ border-start-start-radius: var(--sapButton_BorderCornerRadius);
+ border-end-start-radius: var(--sapButton_BorderCornerRadius);
}
-::slotted([ui5-segmented-button-item][pressed]:first-child),
-::slotted([ui5-segmented-button-item][active]:first-child) {
- border-inline-start: 0.0625rem solid var(--sapButton_Selected_BorderColor);
+::slotted([ui5-segmented-button-item]:not(:first-child)) {
+ border-left-width: var(--_ui5_segmented_btn_item_border_left);
+ border-right-width: var(--_ui5_segmented_btn_item_border_right);
}
::slotted([ui5-segmented-button-item][active]:not([active]):hover) {
diff --git a/packages/main/src/themes/base/SegmentedButtton-parameters.css b/packages/main/src/themes/base/SegmentedButtton-parameters.css
index 6eddd2ffc525..d5bea9caa14f 100644
--- a/packages/main/src/themes/base/SegmentedButtton-parameters.css
+++ b/packages/main/src/themes/base/SegmentedButtton-parameters.css
@@ -2,8 +2,7 @@
--_ui5_segmented_btn_inner_border: 0.0625rem solid var(--sapButton_BorderColor);
--_ui5_segmented_btn_inner_border_odd_child: 0;
--_ui5_segmented_btn_inner_pressed_border_odd_child: 0;
- --_ui5_segmented_btn_border_radius: 0.375rem;
--_ui5_segmented_btn_inner_border_radius: 0;
- --_ui5_segmented_btn_outer_border_radius: 0.375rem;
- --_ui5_segmented_btn_background_color: transparent;
+ --_ui5_segmented_btn_item_border_left: 0px;
+ --_ui5_segmented_btn_item_border_right: 0.0625rem;
}
\ No newline at end of file
diff --git a/packages/main/src/themes/base/rtl-parameters.css b/packages/main/src/themes/base/rtl-parameters.css
index 9f4799745e86..00a8636e237d 100644
--- a/packages/main/src/themes/base/rtl-parameters.css
+++ b/packages/main/src/themes/base/rtl-parameters.css
@@ -41,5 +41,7 @@
--_ui5_menu_submenu_placement_type_left_margin_offset: 0 0.25rem;
--_ui5-menu_item_icon_float: left;
+ --_ui5_segmented_btn_item_border_left: 0.0625rem;
+ --_ui5_segmented_btn_item_border_right: 0px;
--_ui5-shellbar-notification-btn-count-offset: auto;
}
\ No newline at end of file
diff --git a/packages/main/src/themes/base/sizes-parameters.css b/packages/main/src/themes/base/sizes-parameters.css
index 1fe422e02e73..49dcd040f218 100644
--- a/packages/main/src/themes/base/sizes-parameters.css
+++ b/packages/main/src/themes/base/sizes-parameters.css
@@ -135,9 +135,6 @@
--_ui5_timeline_tli_indicator_before_without_icon_bottom: -1.875rem;
--_ui5_timeline_tli_indicator_before_without_icon_right: -1.9375rem;
- /* SegmentedButton */
- --_ui5_segmented_btn_border_radius: 0.375rem;
-
/* SplitButton */
--_ui5_split_button_middle_separator_top: 0;
--_ui5_split_button_middle_separator_height: 2.25rem;
diff --git a/packages/main/src/themes/sap_horizon/SegmentedButtton-parameters.css b/packages/main/src/themes/sap_horizon/SegmentedButtton-parameters.css
index 011d6ce31a86..43753fcc6893 100644
--- a/packages/main/src/themes/sap_horizon/SegmentedButtton-parameters.css
+++ b/packages/main/src/themes/sap_horizon/SegmentedButtton-parameters.css
@@ -4,7 +4,10 @@
--_ui5_segmented_btn_inner_border: 0.0625rem solid transparent;
--_ui5_segmented_btn_inner_border_odd_child: 0.0625rem solid transparent;
--_ui5_segmented_btn_inner_pressed_border_odd_child: 0.0625rem solid var(--sapButton_Selected_BorderColor);
- --_ui5_segmented_btn_border_radius: 0.5rem;
- --_ui5_segmented_btn_inner_border_radius: 0.5rem;
- --_ui5_segmented_btn_outer_border_radius: 0.5rem;
+ --_ui5_segmented_btn_inner_border_radius: var(--sapButton_BorderCornerRadius);
+ --_ui5_segmented_btn_background_color: var(--sapButton_Lite_Background);
+ --_ui5_segmented_btn_border_color: var(--sapButton_Lite_BorderColor);
+ --_ui5_segmented_btn_hover_box_shadow: none;
+ --_ui5_segmented_btn_item_border_left: 0.0625rem;
+ --_ui5_segmented_btn_item_border_right: 0.0625rem;
}
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_horizon/parameters-bundle.css b/packages/main/src/themes/sap_horizon/parameters-bundle.css
index 6e45e94d1d12..c277f0ca9dc1 100644
--- a/packages/main/src/themes/sap_horizon/parameters-bundle.css
+++ b/packages/main/src/themes/sap_horizon/parameters-bundle.css
@@ -62,4 +62,4 @@
@import "./StepInput-parameters.css";
@import "./GrowingButton-parameters.css";
@import "./sizes-parameters.css";
-@import "../base/rtl-parameters.css";
\ No newline at end of file
+@import "./rtl-parameters.css";
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_horizon/rtl-parameters.css b/packages/main/src/themes/sap_horizon/rtl-parameters.css
new file mode 100644
index 000000000000..c61f63a0b675
--- /dev/null
+++ b/packages/main/src/themes/sap_horizon/rtl-parameters.css
@@ -0,0 +1,6 @@
+@import "../base/rtl-parameters.css";
+
+[dir="rtl"] {
+ --_ui5_segmented_btn_item_border_left: 0.0625rem;
+ --_ui5_segmented_btn_item_border_right: 0.0625rem;
+}
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_horizon_dark/SegmentedButtton-parameters.css b/packages/main/src/themes/sap_horizon_dark/SegmentedButtton-parameters.css
index 011d6ce31a86..43753fcc6893 100644
--- a/packages/main/src/themes/sap_horizon_dark/SegmentedButtton-parameters.css
+++ b/packages/main/src/themes/sap_horizon_dark/SegmentedButtton-parameters.css
@@ -4,7 +4,10 @@
--_ui5_segmented_btn_inner_border: 0.0625rem solid transparent;
--_ui5_segmented_btn_inner_border_odd_child: 0.0625rem solid transparent;
--_ui5_segmented_btn_inner_pressed_border_odd_child: 0.0625rem solid var(--sapButton_Selected_BorderColor);
- --_ui5_segmented_btn_border_radius: 0.5rem;
- --_ui5_segmented_btn_inner_border_radius: 0.5rem;
- --_ui5_segmented_btn_outer_border_radius: 0.5rem;
+ --_ui5_segmented_btn_inner_border_radius: var(--sapButton_BorderCornerRadius);
+ --_ui5_segmented_btn_background_color: var(--sapButton_Lite_Background);
+ --_ui5_segmented_btn_border_color: var(--sapButton_Lite_BorderColor);
+ --_ui5_segmented_btn_hover_box_shadow: none;
+ --_ui5_segmented_btn_item_border_left: 0.0625rem;
+ --_ui5_segmented_btn_item_border_right: 0.0625rem;
}
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_horizon_dark/parameters-bundle.css b/packages/main/src/themes/sap_horizon_dark/parameters-bundle.css
index 8897a981a59d..0f76992aab21 100644
--- a/packages/main/src/themes/sap_horizon_dark/parameters-bundle.css
+++ b/packages/main/src/themes/sap_horizon_dark/parameters-bundle.css
@@ -61,4 +61,4 @@
@import "./StepInput-parameters.css";
@import "./GrowingButton-parameters.css";
@import "./sizes-parameters.css";
-@import "../base/rtl-parameters.css";
\ No newline at end of file
+@import "./rtl-parameters.css";
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_horizon_dark/rtl-parameters.css b/packages/main/src/themes/sap_horizon_dark/rtl-parameters.css
new file mode 100644
index 000000000000..c61f63a0b675
--- /dev/null
+++ b/packages/main/src/themes/sap_horizon_dark/rtl-parameters.css
@@ -0,0 +1,6 @@
+@import "../base/rtl-parameters.css";
+
+[dir="rtl"] {
+ --_ui5_segmented_btn_item_border_left: 0.0625rem;
+ --_ui5_segmented_btn_item_border_right: 0.0625rem;
+}
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_horizon_dark_exp/SegmentedButtton-parameters.css b/packages/main/src/themes/sap_horizon_dark_exp/SegmentedButtton-parameters.css
index 011d6ce31a86..43753fcc6893 100644
--- a/packages/main/src/themes/sap_horizon_dark_exp/SegmentedButtton-parameters.css
+++ b/packages/main/src/themes/sap_horizon_dark_exp/SegmentedButtton-parameters.css
@@ -4,7 +4,10 @@
--_ui5_segmented_btn_inner_border: 0.0625rem solid transparent;
--_ui5_segmented_btn_inner_border_odd_child: 0.0625rem solid transparent;
--_ui5_segmented_btn_inner_pressed_border_odd_child: 0.0625rem solid var(--sapButton_Selected_BorderColor);
- --_ui5_segmented_btn_border_radius: 0.5rem;
- --_ui5_segmented_btn_inner_border_radius: 0.5rem;
- --_ui5_segmented_btn_outer_border_radius: 0.5rem;
+ --_ui5_segmented_btn_inner_border_radius: var(--sapButton_BorderCornerRadius);
+ --_ui5_segmented_btn_background_color: var(--sapButton_Lite_Background);
+ --_ui5_segmented_btn_border_color: var(--sapButton_Lite_BorderColor);
+ --_ui5_segmented_btn_hover_box_shadow: none;
+ --_ui5_segmented_btn_item_border_left: 0.0625rem;
+ --_ui5_segmented_btn_item_border_right: 0.0625rem;
}
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_horizon_dark_exp/parameters-bundle.css b/packages/main/src/themes/sap_horizon_dark_exp/parameters-bundle.css
index 8897a981a59d..0f76992aab21 100644
--- a/packages/main/src/themes/sap_horizon_dark_exp/parameters-bundle.css
+++ b/packages/main/src/themes/sap_horizon_dark_exp/parameters-bundle.css
@@ -61,4 +61,4 @@
@import "./StepInput-parameters.css";
@import "./GrowingButton-parameters.css";
@import "./sizes-parameters.css";
-@import "../base/rtl-parameters.css";
\ No newline at end of file
+@import "./rtl-parameters.css";
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_horizon_dark_exp/rtl-parameters.css b/packages/main/src/themes/sap_horizon_dark_exp/rtl-parameters.css
new file mode 100644
index 000000000000..c61f63a0b675
--- /dev/null
+++ b/packages/main/src/themes/sap_horizon_dark_exp/rtl-parameters.css
@@ -0,0 +1,6 @@
+@import "../base/rtl-parameters.css";
+
+[dir="rtl"] {
+ --_ui5_segmented_btn_item_border_left: 0.0625rem;
+ --_ui5_segmented_btn_item_border_right: 0.0625rem;
+}
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_horizon_exp/SegmentedButtton-parameters.css b/packages/main/src/themes/sap_horizon_exp/SegmentedButtton-parameters.css
index 011d6ce31a86..43753fcc6893 100644
--- a/packages/main/src/themes/sap_horizon_exp/SegmentedButtton-parameters.css
+++ b/packages/main/src/themes/sap_horizon_exp/SegmentedButtton-parameters.css
@@ -4,7 +4,10 @@
--_ui5_segmented_btn_inner_border: 0.0625rem solid transparent;
--_ui5_segmented_btn_inner_border_odd_child: 0.0625rem solid transparent;
--_ui5_segmented_btn_inner_pressed_border_odd_child: 0.0625rem solid var(--sapButton_Selected_BorderColor);
- --_ui5_segmented_btn_border_radius: 0.5rem;
- --_ui5_segmented_btn_inner_border_radius: 0.5rem;
- --_ui5_segmented_btn_outer_border_radius: 0.5rem;
+ --_ui5_segmented_btn_inner_border_radius: var(--sapButton_BorderCornerRadius);
+ --_ui5_segmented_btn_background_color: var(--sapButton_Lite_Background);
+ --_ui5_segmented_btn_border_color: var(--sapButton_Lite_BorderColor);
+ --_ui5_segmented_btn_hover_box_shadow: none;
+ --_ui5_segmented_btn_item_border_left: 0.0625rem;
+ --_ui5_segmented_btn_item_border_right: 0.0625rem;
}
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_horizon_exp/parameters-bundle.css b/packages/main/src/themes/sap_horizon_exp/parameters-bundle.css
index 71dd171eedae..ba5306f98e0f 100644
--- a/packages/main/src/themes/sap_horizon_exp/parameters-bundle.css
+++ b/packages/main/src/themes/sap_horizon_exp/parameters-bundle.css
@@ -61,4 +61,4 @@
@import "./StepInput-parameters.css";
@import "./GrowingButton-parameters.css";
@import "./sizes-parameters.css";
-@import "../base/rtl-parameters.css";
\ No newline at end of file
+@import "./rtl-parameters.css";
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_horizon_exp/rtl-parameters.css b/packages/main/src/themes/sap_horizon_exp/rtl-parameters.css
new file mode 100644
index 000000000000..c61f63a0b675
--- /dev/null
+++ b/packages/main/src/themes/sap_horizon_exp/rtl-parameters.css
@@ -0,0 +1,6 @@
+@import "../base/rtl-parameters.css";
+
+[dir="rtl"] {
+ --_ui5_segmented_btn_item_border_left: 0.0625rem;
+ --_ui5_segmented_btn_item_border_right: 0.0625rem;
+}
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_horizon_hcb/SegmentedButtton-parameters.css b/packages/main/src/themes/sap_horizon_hcb/SegmentedButtton-parameters.css
index ab5c3a8e4251..ed8b3b9cc25f 100644
--- a/packages/main/src/themes/sap_horizon_hcb/SegmentedButtton-parameters.css
+++ b/packages/main/src/themes/sap_horizon_hcb/SegmentedButtton-parameters.css
@@ -4,6 +4,5 @@
--_ui5_segmented_btn_inner_border: 0.0625rem solid var(--sapButton_Selected_BorderColor);
--_ui5_segmented_btn_inner_border_odd_child: 0.0625rem solid transparent;
--_ui5_segmented_btn_inner_pressed_border_odd_child: 0.0625rem solid var(--sapButton_Selected_BorderColor);
- --_ui5_segmented_btn_border_radius: 0.375rem;
--_ui5_segmented_btn_inner_border_radius: 0;
}
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_horizon_hcb_exp/SegmentedButtton-parameters.css b/packages/main/src/themes/sap_horizon_hcb_exp/SegmentedButtton-parameters.css
index ab5c3a8e4251..ed8b3b9cc25f 100644
--- a/packages/main/src/themes/sap_horizon_hcb_exp/SegmentedButtton-parameters.css
+++ b/packages/main/src/themes/sap_horizon_hcb_exp/SegmentedButtton-parameters.css
@@ -4,6 +4,5 @@
--_ui5_segmented_btn_inner_border: 0.0625rem solid var(--sapButton_Selected_BorderColor);
--_ui5_segmented_btn_inner_border_odd_child: 0.0625rem solid transparent;
--_ui5_segmented_btn_inner_pressed_border_odd_child: 0.0625rem solid var(--sapButton_Selected_BorderColor);
- --_ui5_segmented_btn_border_radius: 0.375rem;
--_ui5_segmented_btn_inner_border_radius: 0;
}
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_horizon_hcw/SegmentedButtton-parameters.css b/packages/main/src/themes/sap_horizon_hcw/SegmentedButtton-parameters.css
index ab5c3a8e4251..ed8b3b9cc25f 100644
--- a/packages/main/src/themes/sap_horizon_hcw/SegmentedButtton-parameters.css
+++ b/packages/main/src/themes/sap_horizon_hcw/SegmentedButtton-parameters.css
@@ -4,6 +4,5 @@
--_ui5_segmented_btn_inner_border: 0.0625rem solid var(--sapButton_Selected_BorderColor);
--_ui5_segmented_btn_inner_border_odd_child: 0.0625rem solid transparent;
--_ui5_segmented_btn_inner_pressed_border_odd_child: 0.0625rem solid var(--sapButton_Selected_BorderColor);
- --_ui5_segmented_btn_border_radius: 0.375rem;
--_ui5_segmented_btn_inner_border_radius: 0;
}
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_horizon_hcw_exp/SegmentedButtton-parameters.css b/packages/main/src/themes/sap_horizon_hcw_exp/SegmentedButtton-parameters.css
index ab5c3a8e4251..ed8b3b9cc25f 100644
--- a/packages/main/src/themes/sap_horizon_hcw_exp/SegmentedButtton-parameters.css
+++ b/packages/main/src/themes/sap_horizon_hcw_exp/SegmentedButtton-parameters.css
@@ -4,6 +4,5 @@
--_ui5_segmented_btn_inner_border: 0.0625rem solid var(--sapButton_Selected_BorderColor);
--_ui5_segmented_btn_inner_border_odd_child: 0.0625rem solid transparent;
--_ui5_segmented_btn_inner_pressed_border_odd_child: 0.0625rem solid var(--sapButton_Selected_BorderColor);
- --_ui5_segmented_btn_border_radius: 0.375rem;
--_ui5_segmented_btn_inner_border_radius: 0;
}
\ No newline at end of file
diff --git a/packages/main/test/pages/SegmentedButton.html b/packages/main/test/pages/SegmentedButton.html
index 826f6f06d38f..76233622464d 100644
--- a/packages/main/test/pages/SegmentedButton.html
+++ b/packages/main/test/pages/SegmentedButton.html
@@ -24,6 +24,63 @@
Segmentedbutton example
+
Default button
+
+
+
+ First
+ Second
+
+
+
+
+ First
+ Second
+ Third
+
+
+
+
+ First
+ Second
+ Third
+ Fourth
+
+
+
+
+ First
+ Second
+ Third
+ Fourth
+ Fifth
+
+
+
+
+ First
+ Second
+ Third
+ Fourth
+ Fifth
+ Sixth
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Item
From 21528a0ae5f3cec84d30362eba79bb6fa08a75d4 Mon Sep 17 00:00:00 2001
From: Evdokia Yordanova
Date: Wed, 13 Sep 2023 16:30:49 +0300
Subject: [PATCH 007/141] feat(ui5-combobox, ui5-multi-combo-box, ui5-input,
ui5-multi-input): add wrapping in suggestions and n-more (#7509)
* feat(ui5-combobox): poc add wrapping in suggestions and n-more
* feat(ui5-combo-box,ui5-multi-combo-box,ui5-input,ui5-multi-input): poc add wrapping suggest/n-more
* feat(ui5-combobox, ui5-multi-combo-box, ui5-input, ui5-multi-input): update testing examples
* feat(ui5-combobox, ui5-multi-combo-box, ui5-input, ui5-multi-input): add storybook samples
* feat(ui5-combobox, ui5-multi-combo-box, ui5-input, ui5-multi-input): update
* feat(ui5-combobox, ui5-multi-combo-box, ui5-input, ui5-multi-input): update
* feat(ui5-combobox, ui5-multi-combo-box, ui5-input, ui5-multi-input): update comments
---
packages/main/src/ComboBoxPopover.hbs | 1 +
packages/main/src/InputPopover.hbs | 1 +
packages/main/src/MultiComboBoxPopover.hbs | 1 +
packages/main/src/TokenizerPopover.hbs | 5 ++++-
packages/main/src/themes/Suggestions.css | 5 -----
packages/main/test/pages/ComboBox.html | 9 +++++++++
packages/main/test/pages/Input.html | 6 ++++++
packages/main/test/pages/MultiComboBox.html | 8 +++++++-
packages/main/test/pages/MultiInput.html | 16 ++++++++++++++++
.../_stories/main/ComboBox/ComboBox.stories.ts | 10 ++++++++++
.../_stories/main/Input/Input.stories.ts | 10 ++++++++++
.../main/MultiComboBox/MultiComboBox.stories.ts | 11 ++++++++++-
.../main/MultiInput/MultiInput.stories.ts | 14 +++++++++++++-
13 files changed, 88 insertions(+), 9 deletions(-)
diff --git a/packages/main/src/ComboBoxPopover.hbs b/packages/main/src/ComboBoxPopover.hbs
index b36fe5422d00..239ad2f725e7 100644
--- a/packages/main/src/ComboBoxPopover.hbs
+++ b/packages/main/src/ComboBoxPopover.hbs
@@ -122,6 +122,7 @@
{{#*inline "listItem"}}
{{{ this.text }}}
{{else}}
{{#each _tokens}}
-
+
{{this.text}}
{{/each}}
diff --git a/packages/main/src/themes/Suggestions.css b/packages/main/src/themes/Suggestions.css
index d4c2c4150f20..75b013a31310 100644
--- a/packages/main/src/themes/Suggestions.css
+++ b/packages/main/src/themes/Suggestions.css
@@ -11,11 +11,6 @@
padding: 0 1rem;
}
-.ui5-suggestions-popover [ui5-li],
-.ui5-suggestions-popover [ui5-li-suggestion-item] {
- height: var(--_ui5_list_item_dropdown_base_height);
-}
-
.ui5-suggestions-popover [ui5-li]::part(icon),
.ui5-suggestions-popover [ui5-li-suggestion-item]::part(icon) {
color: var(--sapList_TextColor);
diff --git a/packages/main/test/pages/ComboBox.html b/packages/main/test/pages/ComboBox.html
index 7d8644f1de9b..56d7ebeeb41c 100644
--- a/packages/main/test/pages/ComboBox.html
+++ b/packages/main/test/pages/ComboBox.html
@@ -262,6 +262,15 @@ ComboBox in Compact
+
+ ComboBox - suggestions and show wrapping
+
+
+
+
+
+
+
`;
}
-]
\ No newline at end of file
+]
+
+
+export const SuggestionsWrapping = Template.bind({});
+SuggestionsWrapping.args = {
+ placeholder: "Enter product",
+ showSuggestions: true,
+ default: `
+
+
+
`,
+ valueStateMessage: '
Token is already in the list
',
+};
\ No newline at end of file
From edeab49e3f7b63b3aee358983ea1fb9ff586ea3c Mon Sep 17 00:00:00 2001
From: Petar Dimov <32839090+dimovpetar@users.noreply.github.com>
Date: Wed, 13 Sep 2023 16:41:15 +0300
Subject: [PATCH 008/141] fix(ui5-upload-collection-item): align thumbnail to
top (#7582)
Fixes #7551
---
packages/fiori/src/themes/UploadCollectionItem.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/fiori/src/themes/UploadCollectionItem.css b/packages/fiori/src/themes/UploadCollectionItem.css
index 2f60ba24f080..8bc45cd82a7f 100644
--- a/packages/fiori/src/themes/UploadCollectionItem.css
+++ b/packages/fiori/src/themes/UploadCollectionItem.css
@@ -49,7 +49,7 @@
flex: 1 1 auto;
min-width: 0; /* fixes chrome overflow issue */
display: flex;
- align-items: center;
+ align-items: flex-start;
}
.ui5-uci-content-and-progress {
From 16111210e746381b1a79c39ea656363b3b734fd5 Mon Sep 17 00:00:00 2001
From: Nayden Naydenov <31909318+nnaydenow@users.noreply.github.com>
Date: Thu, 14 Sep 2023 11:05:24 +0300
Subject: [PATCH 009/141] chore: remove preview themes (#7580)
Co-authored-by: Nayden Naydenov
---
packages/playground/.storybook/decorators/useOptions.ts | 4 ----
1 file changed, 4 deletions(-)
diff --git a/packages/playground/.storybook/decorators/useOptions.ts b/packages/playground/.storybook/decorators/useOptions.ts
index 7084ba9ca25f..2da3c9eb2128 100644
--- a/packages/playground/.storybook/decorators/useOptions.ts
+++ b/packages/playground/.storybook/decorators/useOptions.ts
@@ -10,10 +10,6 @@ export const themes: Themes = {
"Evening Horizon": "sap_horizon_dark",
"Horizon High Contrast Black": "sap_horizon_hcb",
"Horizon High Contrast White": "sap_horizon_hcw",
- "Morning Horizon Preview": "sap_horizon_exp",
- "Evening Horizon Preview": "sap_horizon_dark_exp",
- "Horizon High Contrast Black Preview": "sap_horizon_hcb_exp",
- "Horizon High Contrast White Preview": "sap_horizon_hcw_exp",
"Quartz Light": "sap_fiori_3",
"Quartz Dark": "sap_fiori_3_dark",
"Quartz High Contrast Black": "sap_fiori_3_hcb",
From 4d144dd76001cd2eed284629b12de9d99b64f383 Mon Sep 17 00:00:00 2001
From: Konstantin Gogov <68374332+kgogov@users.noreply.github.com>
Date: Thu, 14 Sep 2023 11:31:33 +0300
Subject: [PATCH 010/141] feat(ui5-checkbox): update horizon theme paramaters
(#7576)
---
packages/main/src/themes/sap_horizon/CheckBox-parameters.css | 3 +--
.../main/src/themes/sap_horizon_dark/CheckBox-parameters.css | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/packages/main/src/themes/sap_horizon/CheckBox-parameters.css b/packages/main/src/themes/sap_horizon/CheckBox-parameters.css
index 4a86dba60bd7..f16fbe99648e 100644
--- a/packages/main/src/themes/sap_horizon/CheckBox-parameters.css
+++ b/packages/main/src/themes/sap_horizon/CheckBox-parameters.css
@@ -14,10 +14,9 @@
--_ui5_checkbox_hover_background: var(--sapContent_Selected_Hover_Background);
--_ui5_checkbox_inner_hover_border_color: var(--sapField_Hover_BorderColor);
--_ui5_checkbox_inner_hover_checked_border_color: var(--sapField_Hover_BorderColor);
- --_ui5_checkbox_inner_selected_border_color: var(--sapField_Hover_BorderColor);
+ --_ui5_checkbox_inner_selected_border_color: var(--sapField_BorderColor);
--_ui5_checkbox_inner_active_border_color: var(--sapField_Hover_BorderColor);
--_ui5_checkbox_active_background: var(--sapContent_Selected_Hover_Background);
- --_ui5_checkbox_inner_selected_border_color: var(--sapField_Hover_BorderColor);
/* readonly */
--_ui5_checkbox_inner_readonly_border: var(--sapElement_BorderWidth) var(--sapField_ReadOnly_BorderColor) dashed;
/* error state */
diff --git a/packages/main/src/themes/sap_horizon_dark/CheckBox-parameters.css b/packages/main/src/themes/sap_horizon_dark/CheckBox-parameters.css
index 755aca223bb6..f55e190b54ea 100644
--- a/packages/main/src/themes/sap_horizon_dark/CheckBox-parameters.css
+++ b/packages/main/src/themes/sap_horizon_dark/CheckBox-parameters.css
@@ -14,10 +14,9 @@
--_ui5_checkbox_hover_background: var(--sapContent_Selected_Hover_Background);
--_ui5_checkbox_inner_hover_border_color: var(--sapField_Hover_BorderColor);
--_ui5_checkbox_inner_hover_checked_border_color: var(--sapField_Hover_BorderColor);
- --_ui5_checkbox_inner_selected_border_color: var(--sapField_Hover_BorderColor);
+ --_ui5_checkbox_inner_selected_border_color: var(--sapField_BorderColor);
--_ui5_checkbox_inner_active_border_color: var(--sapField_Hover_BorderColor);
--_ui5_checkbox_active_background: var(--sapContent_Selected_Hover_Background);
- --_ui5_checkbox_inner_selected_border_color: var(--sapField_Hover_BorderColor);
/* readonly */
--_ui5_checkbox_inner_readonly_border: var(--sapElement_BorderWidth) var(--sapField_ReadOnly_BorderColor) dashed;
/* error state */
From 3835032336d4e7366bd70639b59dc0bfca6c5b0b Mon Sep 17 00:00:00 2001
From: SAP LX Lab Service Account
Date: Thu, 14 Sep 2023 03:56:51 -0700
Subject: [PATCH 011/141] Translation Delivery (#7587)
chore: translation delivery
Change-Id: I8bae3c3918dc0a092e5bae721540300dfec3d940
---
packages/main/src/i18n/messagebundle_de.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/packages/main/src/i18n/messagebundle_de.properties b/packages/main/src/i18n/messagebundle_de.properties
index 1f45ce92f764..09a001870683 100644
--- a/packages/main/src/i18n/messagebundle_de.properties
+++ b/packages/main/src/i18n/messagebundle_de.properties
@@ -139,7 +139,7 @@ MESSAGE_STRIP_INFORMATION=Informationsleiste
MULTICOMBOBOX_DIALOG_OK_BUTTON=OK
-RADIO_BUTTON_GROUP_REQUIRED=Select one of the available options.
+RADIO_BUTTON_GROUP_REQUIRED=Wählen Sie eine der verfügbaren Optionen aus.
VALUE_STATE_ERROR_ALREADY_SELECTED=Wert ist bereits ausgewählt.
@@ -302,4 +302,4 @@ DIALOG_HEADER_ARIA_DESCRIBEDBY_DRAGGABLE=Zum Verschieben verwenden Sie die Pfeil
DIALOG_HEADER_ARIA_DESCRIBEDBY_DRAGGABLE_RESIZABLE=Zum Verschieben verwenden Sie die Pfeiltasten; zum Ändern der Größe verwenden Sie die Umschalttaste + Pfeiltasten
LABEL_COLON=:
-TOOLBAR_OVERFLOW_BUTTON_ARIA_LABEL=Additional Options
+TOOLBAR_OVERFLOW_BUTTON_ARIA_LABEL=Zusätzliche Optionen
From b4dea675f5793c28ee9f0123d0e8bf6bd38c0b83 Mon Sep 17 00:00:00 2001
From: Stoyan <88034608+hinzzx@users.noreply.github.com>
Date: Thu, 14 Sep 2023 14:02:53 +0300
Subject: [PATCH 012/141] fix(ui5-switch): fix text alignment in all themes
(#7416)
In order to fix the visual design in all themes, we had to introduce an alternate CSS variable. This was added because in Horizon themes for example, for the Text and Graphical Switch, the variable --_ui5_switch_text_inactive_left needs to have a different value for each of the styles in order to be properly aligned.
---
packages/main/src/themes/Switch.css | 3 +++
packages/main/src/themes/base/Switch-parameters.css | 3 +++
packages/main/src/themes/sap_horizon/Switch-parameters.css | 3 +++
.../main/src/themes/sap_horizon_dark/Switch-parameters.css | 4 ++++
.../main/src/themes/sap_horizon_hcb/Switch-parameters.css | 2 ++
.../main/src/themes/sap_horizon_hcw/Switch-parameters.css | 3 +++
6 files changed, 18 insertions(+)
diff --git a/packages/main/src/themes/Switch.css b/packages/main/src/themes/Switch.css
index 986542778813..08ab32472658 100644
--- a/packages/main/src/themes/Switch.css
+++ b/packages/main/src/themes/Switch.css
@@ -337,11 +337,14 @@
color: var(--_ui5_switch_text_active_color);
overflow: var(--_ui5_switch_text_overflow);
text-overflow: ellipsis;
+ left: var(--_ui5_switch_text_active_left_alternate);
}
.ui5-switch-root .ui5-switch-text--off {
color: var(--_ui5_switch_text_inactive_color);
overflow: var(--_ui5_switch_text_overflow);
text-overflow: ellipsis;
+ left: var(--_ui5_switch_text_inactive_left_alternate);
+ right: var(--_ui5_switch_text_inactive_right_alternate);
}
.ui5-switch-root .ui5-switch-no-label-icon-on,
diff --git a/packages/main/src/themes/base/Switch-parameters.css b/packages/main/src/themes/base/Switch-parameters.css
index 5d5c815fa8de..30c9cd874c7a 100644
--- a/packages/main/src/themes/base/Switch-parameters.css
+++ b/packages/main/src/themes/base/Switch-parameters.css
@@ -116,8 +116,11 @@
--_ui5_switch_text_width: none;
--_ui5_switch_text_inactive_left: auto;
+ --_ui5_switch_text_inactive_left_alternate: auto;
--_ui5_switch_text_inactive_right: 0.125rem;
+ --_ui5_switch_text_inactive_right_alternate: 0.125rem;
--_ui5_switch_text_active_left: calc(-100% + 2rem);
+ --_ui5_switch_text_active_left_alternate: calc(-100% + 2rem);
--_ui5_switch_text_active_right: auto;
--_ui5_switch_text_active_color: var(--sapButton_Track_Selected_TextColor);
diff --git a/packages/main/src/themes/sap_horizon/Switch-parameters.css b/packages/main/src/themes/sap_horizon/Switch-parameters.css
index f9364cc20203..21c7fda0d64c 100644
--- a/packages/main/src/themes/sap_horizon/Switch-parameters.css
+++ b/packages/main/src/themes/sap_horizon/Switch-parameters.css
@@ -104,8 +104,11 @@
--_ui5_switch_text_with_label_width: 1.75rem;
--_ui5_switch_text_inactive_left: 0.1875rem;
+ --_ui5_switch_text_inactive_left_alternate: 0.0625rem;
--_ui5_switch_text_inactive_right: auto;
+ --_ui5_switch_text_inactive_right_alternate: 0;
--_ui5_switch_text_active_left: 0.1875rem;
+ --_ui5_switch_text_active_left_alternate: 0.0625rem;
--_ui5_switch_text_active_right: auto;
--_ui5_switch_text_active_color: var(--sapButton_Handle_Selected_TextColor);
diff --git a/packages/main/src/themes/sap_horizon_dark/Switch-parameters.css b/packages/main/src/themes/sap_horizon_dark/Switch-parameters.css
index 900e5c76509e..9e1d2e2287eb 100644
--- a/packages/main/src/themes/sap_horizon_dark/Switch-parameters.css
+++ b/packages/main/src/themes/sap_horizon_dark/Switch-parameters.css
@@ -103,8 +103,11 @@
--_ui5_switch_text_with_label_width: 1.75rem;
--_ui5_switch_text_inactive_left: 0.1875rem;
+ --_ui5_switch_text_inactive_left_alternate: 0;
--_ui5_switch_text_inactive_right: auto;
+ --_ui5_switch_text_inactive_right_alternate: 0;
--_ui5_switch_text_active_left: 0.1875rem;
+ --_ui5_switch_text_active_left_alternate: 0.0625rem;
--_ui5_switch_text_active_right: auto;
--_ui5_switch_text_active_color: var(--sapButton_Handle_Selected_TextColor);
@@ -145,4 +148,5 @@
--_ui5_switch_text_font_size: var(--sapFontSize);
--_ui5_switch_text_width: 1rem;
--_ui5_switch_text_active_left: 0.1875rem;
+ --_ui5_switch_text_active_left_alternate: 0.0625rem;
}
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_horizon_hcb/Switch-parameters.css b/packages/main/src/themes/sap_horizon_hcb/Switch-parameters.css
index 17955ea429bf..65ec9d460d15 100644
--- a/packages/main/src/themes/sap_horizon_hcb/Switch-parameters.css
+++ b/packages/main/src/themes/sap_horizon_hcb/Switch-parameters.css
@@ -123,8 +123,10 @@
--_ui5_switch_text_with_label_width: 1.75rem;
--_ui5_switch_text_inactive_left: 0.1875rem;
+ --_ui5_switch_text_inactive_left_alternate: 0.0625rem;
--_ui5_switch_text_inactive_right: auto;
--_ui5_switch_text_active_left: 0.1875rem;
+ --_ui5_switch_text_active_left_alternate: 0.0625rem;
--_ui5_switch_text_compact_active_left: 0.1875rem;
--_ui5_switch_text_active_right: auto;
diff --git a/packages/main/src/themes/sap_horizon_hcw/Switch-parameters.css b/packages/main/src/themes/sap_horizon_hcw/Switch-parameters.css
index c724cf6383c1..75997d7e0d93 100644
--- a/packages/main/src/themes/sap_horizon_hcw/Switch-parameters.css
+++ b/packages/main/src/themes/sap_horizon_hcw/Switch-parameters.css
@@ -104,8 +104,10 @@
--_ui5_switch_text_with_label_width: 1.75rem;
--_ui5_switch_text_inactive_left: 0.1875rem;
+ --_ui5_switch_text_inactive_left_alternate: 0.0625rem;
--_ui5_switch_text_inactive_right: auto;
--_ui5_switch_text_active_left: 0.1875rem;
+ --_ui5_switch_text_active_left_alternate: 0.0625rem;
--_ui5_switch_text_active_right: auto;
--_ui5_switch_text_active_color: var(--sapButton_Handle_Selected_TextColor);
@@ -146,4 +148,5 @@
--_ui5_switch_text_font_size: var(--sapFontSize);
--_ui5_switch_text_width: 1rem;
--_ui5_switch_text_active_left: 0.1875rem;
+ --_ui5_switch_text_active_left_alternate: 0.0625rem;
}
\ No newline at end of file
From acf5c6683b828e6dec0094eba6a73c14d7566ada Mon Sep 17 00:00:00 2001
From: Stoyan <88034608+hinzzx@users.noreply.github.com>
Date: Thu, 14 Sep 2023 22:53:37 +0300
Subject: [PATCH 013/141] docs: enhance storybook samples (#7454)
*Bar
Cleared the JSDoc enums;
Changed the story name to -> Basic
*Button
Cleared JSDoc enums;
Remove redunant Storybook samples;
*DatePicker
Cleared JSDoc enums;
*DynamicSideContent
Added custom styling to the native HTML tags as changing the themes wasn't updating the content. For example on Dark themes like Evening Horizon, both the background and the text would appear dark, which led to poor user experience;
*FileUploader
Cleared JSDoc enums
Moved the Custom FileUploader sample to lower position, because we do not encourage using non-focusable elements;
*Menu
Fixed wrong property name headerText -> header-text because it wasnt showing on Mobile Devices;
Changed sample name -> Basic with Header Text -> Basic
*SplitButton
Cleared JSDoc enums;
Remove redunant Storybook samples;
*StepInput
Cleared JSDoc enums;
Wrapped the main story component in the Storybook in a div with max-width: 13rem, due to component being stretched to the whole page, causing poor user experience;
Simplified and removed redunant Storybook samples;
*Switch
Remove redunant Storybook samples;
Reduced the Textual Switch samples because we do not encourage using Text in our switch component;
*ToggleButton
Enhance samples;
---
packages/fiori/src/Bar.ts | 16 +---
packages/main/src/Button.ts | 21 ------
packages/main/src/DatePicker.ts | 9 ---
packages/main/src/FileUploader.ts | 10 ---
packages/main/src/SplitButton.ts | 12 ---
packages/main/src/StepInput.ts | 9 ---
.../_stories/fiori/Bar/Bar.stories.ts | 2 +-
.../DynamicSideContent.stories.ts | 38 +++++-----
.../_stories/main/Button/Button.stories.ts | 52 +++++--------
.../main/Calendar/Calendar.stories.ts | 2 +-
.../main/DatePicker/DatePicker.stories.ts | 2 +-
.../DateRangePicker.stories.ts | 4 +-
.../DateTimePicker/DateTimePicker.stories.ts | 2 +-
.../main/FileUploader/FileUploader.stories.ts | 9 +--
.../_stories/main/Menu/Menu.stories.ts | 4 +-
.../main/SplitButton/SplitButton.stories.ts | 45 ++++-------
.../main/StepInput/StepInput.stories.ts | 74 ++++++++-----------
.../_stories/main/Switch/Switch.stories.ts | 30 +-------
.../main/ToggleButton/ToggleButton.stories.ts | 42 ++++-------
19 files changed, 115 insertions(+), 268 deletions(-)
diff --git a/packages/fiori/src/Bar.ts b/packages/fiori/src/Bar.ts
index 2bad152b0816..70b4d323b01e 100644
--- a/packages/fiori/src/Bar.ts
+++ b/packages/fiori/src/Bar.ts
@@ -71,16 +71,6 @@ class Bar extends UI5Element {
/**
* Defines the component's design.
*
- *
- * Note:
- * Available options are:
- *
- * Header
- * Subheader
- * Footer
- * FloatingFooter
- *
- *
* @type {sap.ui.webc.fiori.types.BarDesign}
* @name sap.ui.webc.fiori.Bar.prototype.design
* @defaultvalue "Header"
@@ -90,7 +80,7 @@ class Bar extends UI5Element {
design!: `${BarDesign}`
/**
- * Defines the content at the start of the bar
+ * Defines the content at the start of the bar.
* @type {HTMLElement[]}
* @name sap.ui.webc.fiori.Bar.prototype.startContent
* @slot
@@ -100,7 +90,7 @@ class Bar extends UI5Element {
startContent!: Array;
/**
- * Defines the content in the middle of the bar
+ * Defines the content in the middle of the bar.
* @type {HTMLElement[]}
* @name sap.ui.webc.fiori.Bar.prototype.default
* @slot middleContent
@@ -110,7 +100,7 @@ class Bar extends UI5Element {
middleContent!: Array
/**
- * Defines the content at the end of the bar
+ * Defines the content at the end of the bar.
* @type {HTMLElement[]}
* @name sap.ui.webc.fiori.Bar.prototype.endContent
* @slot
diff --git a/packages/main/src/Button.ts b/packages/main/src/Button.ts
index 4885e558a350..0af5c780cf14 100644
--- a/packages/main/src/Button.ts
+++ b/packages/main/src/Button.ts
@@ -105,18 +105,6 @@ class Button extends UI5Element implements IFormElement {
/**
* Defines the component design.
*
- *
- * The available values are:
- *
- *
- * Default
- * Emphasized
- * Positive
- * Negative
- * Transparent
- * Attention
- *
- *
* @type {sap.ui.webc.main.types.ButtonDesign}
* @name sap.ui.webc.main.Button.prototype.design
* @defaultvalue "Default"
@@ -254,15 +242,6 @@ class Button extends UI5Element implements IFormElement {
* Defines whether the button has special form-related functionality.
*
*
- * The available values are:
- *
- *
- * Button
- * Submit
- * Reset
- *
- *
- *
* Note: For the type
property to have effect, you must add the following import to your project:
* import "@ui5/webcomponents/dist/features/InputElementsFormSupport.js";
*
diff --git a/packages/main/src/DatePicker.ts b/packages/main/src/DatePicker.ts
index ecbc692885e6..49ef0fbd65fc 100644
--- a/packages/main/src/DatePicker.ts
+++ b/packages/main/src/DatePicker.ts
@@ -226,15 +226,6 @@ class DatePicker extends DateComponentBase implements IFormElement {
/**
* Defines the value state of the component.
- *
- * Available options are:
- *
- * None
- * Error
- * Warning
- * Success
- * Information
- *
*
* @type {sap.ui.webc.base.types.ValueState}
* @name sap.ui.webc.main.DatePicker.prototype.valueState
diff --git a/packages/main/src/FileUploader.ts b/packages/main/src/FileUploader.ts
index e730e95548ca..f9eb5050801b 100644
--- a/packages/main/src/FileUploader.ts
+++ b/packages/main/src/FileUploader.ts
@@ -183,16 +183,6 @@ class FileUploader extends UI5Element implements IFormElement {
/**
* Defines the value state of the component.
- *
- * Available options are:
- *
- * None
- * Error
- * Warning
- * Success
- * Information
- *
- *
* @type {sap.ui.webc.base.types.ValueState}
* @name sap.ui.webc.main.FileUploader.prototype.valueState
* @defaultvalue "None"
diff --git a/packages/main/src/SplitButton.ts b/packages/main/src/SplitButton.ts
index ce24c642575e..4d2e89622258 100644
--- a/packages/main/src/SplitButton.ts
+++ b/packages/main/src/SplitButton.ts
@@ -135,18 +135,6 @@ class SplitButton extends UI5Element {
/**
* Defines the component design.
*
- *
- * The available values are:
- *
- *
- * Default
- * Emphasized
- * Positive
- * Negative
- * Transparent
- * Attention
- *
- *
* @type {sap.ui.webc.main.types.ButtonDesign}
* @name sap.ui.webc.main.SplitButton.prototype.design
* @defaultvalue "Default"
diff --git a/packages/main/src/StepInput.ts b/packages/main/src/StepInput.ts
index 258645f5fa08..1e378eceba49 100644
--- a/packages/main/src/StepInput.ts
+++ b/packages/main/src/StepInput.ts
@@ -155,15 +155,6 @@ class StepInput extends UI5Element implements IFormElement {
/**
* Defines the value state of the component.
- *
- * Available options are:
- *
- * None
- * Error
- * Warning
- * Success
- * Information
- *
*
* @name sap.ui.webc.main.StepInput.prototype.valueState
* @type {sap.ui.webc.base.types.ValueState}
diff --git a/packages/playground/_stories/fiori/Bar/Bar.stories.ts b/packages/playground/_stories/fiori/Bar/Bar.stories.ts
index b27b14c5f164..14abd8382a0f 100644
--- a/packages/playground/_stories/fiori/Bar/Bar.stories.ts
+++ b/packages/playground/_stories/fiori/Bar/Bar.stories.ts
@@ -34,7 +34,7 @@ const Template: UI5StoryArgs = (args) => html``;
export const Basic = Template.bind({});
-Basic.storyName = "With Content and Design";
+Basic.storyName = "Basic";
Basic.args = {
design: BarDesign.Header,
startContent: ` `,
diff --git a/packages/playground/_stories/fiori/DynamicSideContent/DynamicSideContent.stories.ts b/packages/playground/_stories/fiori/DynamicSideContent/DynamicSideContent.stories.ts
index 2a34c00dcf78..69806c662672 100644
--- a/packages/playground/_stories/fiori/DynamicSideContent/DynamicSideContent.stories.ts
+++ b/packages/playground/_stories/fiori/DynamicSideContent/DynamicSideContent.stories.ts
@@ -27,7 +27,20 @@ export default {
argTypes,
} as Meta;
-const Template: UI5StoryArgs = (args) => html` = (args) => html`
+
+ = (args) => htm
export const Basic = Template.bind({});
Basic.args = {
default: `
-
Main Content
-
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc ex mi, elementum et ante commodo, semper sollicitudin magna. Sed dapibus ut tortor quis varius. Sed luctus sem at nunc porta vulputate. Suspendisse lobortis arcu est, quis ultrices ipsum fermentum a. Vestibulum a ipsum placerat ligula gravida fringilla at id ex. Etiam pellentesque lorem sed sagittis aliquam. Quisque semper orci risus, vel efficitur dui euismod aliquet. Morbi sapien sapien, rhoncus et rutrum nec, rhoncus id nisl. Cras non tincidunt enim, id eleifend neque.
+
Main Content
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc ex mi, elementum et ante commodo, semper sollicitudin magna. Sed dapibus ut tortor quis varius. Sed luctus sem at nunc porta vulputate. Suspendisse lobortis arcu est, quis ultrices ipsum fermentum a. Vestibulum a ipsum placerat ligula gravida fringilla at id ex. Etiam pellentesque lorem sed sagittis aliquam. Quisque semper orci risus, vel efficitur dui euismod aliquet. Morbi sapien sapien, rhoncus et rutrum nec, rhoncus id nisl. Cras non tincidunt enim, id eleifend neque.
`,
sideContent: `
-
Side Content
-
Morbi lorem libero, imperdiet id condimentum ac, tempor ut velit. Integer a laoreet sem. Nunc at sagittis nisi. Sed placerat diam eu porttitor dignissim. Maecenas nec fringilla tortor. Pellentesque ut elit est. Curabitur quis elit at mauris ullamcorper fringilla. Nullam diam mi, porttitor dictum orci nec, molestie luctus metus. Nunc ut ex blandit, elementum erat eget, pulvinar sapien. Donec nec lorem eu nunc eleifend tempor at non tortor. In quam velit, ornare at rutrum ac, porta ac augue. Suspendisse venenatis semper lacus at venenatis. Praesent vestibulum ligula nulla, at tempus lorem consequat suscipit. Aenean consequat dapibus dui, at bibendum mauris porta a.
+
Side Content
+
Morbi lorem libero, imperdiet id condimentum ac, tempor ut velit. Integer a laoreet sem. Nunc at sagittis nisi. Sed placerat diam eu porttitor dignissim. Maecenas nec fringilla tortor. Pellentesque ut elit est. Curabitur quis elit at mauris ullamcorper fringilla. Nullam diam mi, porttitor dictum orci nec, molestie luctus metus. Nunc ut ex blandit, elementum erat eget, pulvinar sapien. Donec nec lorem eu nunc eleifend tempor at non tortor. In quam velit, ornare at rutrum ac, porta ac augue. Suspendisse venenatis semper lacus at venenatis. Praesent vestibulum ligula nulla, at tempus lorem consequat suscipit. Aenean consequat dapibus dui, at bibendum mauris porta a.
`,
+ sideContentVisibility: SideContentVisibility.AlwaysShow,
};
-
-export const Position = Template.bind({});
-Position.storyName = "Side Content Position";
-Position.args = {
- sideContentPosition: SideContentPosition.Start,
- default: `
-
Main Content
-
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc ex mi, elementum et ante commodo, semper sollicitudin magna. Sed dapibus ut tortor quis varius. Sed luctus sem at nunc porta vulputate. Suspendisse lobortis arcu est, quis ultrices ipsum fermentum a. Vestibulum a ipsum placerat ligula gravida fringilla at id ex. Etiam pellentesque lorem sed sagittis aliquam. Quisque semper orci risus, vel efficitur dui euismod aliquet. Morbi sapien sapien, rhoncus et rutrum nec, rhoncus id nisl. Cras non tincidunt enim, id eleifend neque.
-
`,
- sideContent: `
-
Side Content
-
Morbi lorem libero, imperdiet id condimentum ac, tempor ut velit. Integer a laoreet sem. Nunc at sagittis nisi. Sed placerat diam eu porttitor dignissim. Maecenas nec fringilla tortor. Pellentesque ut elit est. Curabitur quis elit at mauris ullamcorper fringilla. Nullam diam mi, porttitor dictum orci nec, molestie luctus metus. Nunc ut ex blandit, elementum erat eget, pulvinar sapien. Donec nec lorem eu nunc eleifend tempor at non tortor. In quam velit, ornare at rutrum ac, porta ac augue. Suspendisse venenatis semper lacus at venenatis. Praesent vestibulum ligula nulla, at tempus lorem consequat suscipit. Aenean consequat dapibus dui, at bibendum mauris porta a.
-
`,
-};
\ No newline at end of file
diff --git a/packages/playground/_stories/main/Button/Button.stories.ts b/packages/playground/_stories/main/Button/Button.stories.ts
index e12b0d54e051..f6f33296eeb9 100644
--- a/packages/playground/_stories/main/Button/Button.stories.ts
+++ b/packages/playground/_stories/main/Button/Button.stories.ts
@@ -40,39 +40,23 @@ const Template: UI5StoryArgs = (args) => html` html`Cancel
- ${story()}`,
-];
\ No newline at end of file
+export const DifferentDesigns: StoryFn = () => html`
+ Emphasized
+ Attention
+ Positive
+ Negative
+ Transparent
+`;
+
+export const IconOnlyButtons: StoryFn = () => html`
+
+
+
+
+
+`;
+IconOnlyButtons.storyName = "Icon-Only Buttons";
\ No newline at end of file
diff --git a/packages/playground/_stories/main/Calendar/Calendar.stories.ts b/packages/playground/_stories/main/Calendar/Calendar.stories.ts
index 7c64d2c3c8f5..f96a64699764 100644
--- a/packages/playground/_stories/main/Calendar/Calendar.stories.ts
+++ b/packages/playground/_stories/main/Calendar/Calendar.stories.ts
@@ -43,7 +43,7 @@ const Template: UI5StoryArgs = (args) => html` = (args) => html`<
export const Basic = Template.bind({});
export const MinMax = Template.bind({});
-MinMax.storyName = "Min/Max Dates and Format Pattern";
+MinMax.storyName = "Formatted Date Range";
MinMax.args = {
minDate: "1/1/2020",
maxDate: "4/5/2020",
@@ -54,7 +54,7 @@ MinMax.args = {
};
export const LongFormat = Template.bind({});
-LongFormat.storyName = "Value, Format Pattern, and Delimiter";
+LongFormat.storyName = "Formatted Value and Delimiter";
LongFormat.args = {
value: "March 31, 2023 ~ April 9, 2023",
delimiter: "~",
diff --git a/packages/playground/_stories/main/DateTimePicker/DateTimePicker.stories.ts b/packages/playground/_stories/main/DateTimePicker/DateTimePicker.stories.ts
index b0ddd87c178f..53160d98cf48 100644
--- a/packages/playground/_stories/main/DateTimePicker/DateTimePicker.stories.ts
+++ b/packages/playground/_stories/main/DateTimePicker/DateTimePicker.stories.ts
@@ -50,7 +50,7 @@ FormatPattern.args = {
};
export const MinMax = Template.bind({});
-MinMax.storyName = "Min/Max Dates and Format Pattern";
+MinMax.storyName = "Formatted Date Range";
MinMax.args = {
value: "Jan 11, 2020, 11:11:11 AM",
minDate: "Jan 11, 2020, 00:00:00 AM",
diff --git a/packages/playground/_stories/main/FileUploader/FileUploader.stories.ts b/packages/playground/_stories/main/FileUploader/FileUploader.stories.ts
index bfeaeb6b6b62..ac894d0880e8 100644
--- a/packages/playground/_stories/main/FileUploader/FileUploader.stories.ts
+++ b/packages/playground/_stories/main/FileUploader/FileUploader.stories.ts
@@ -48,13 +48,6 @@ Basic.decorators = [
${story()}`,
];
-export const Custom = Template.bind({});
-Custom.storyName = "With Custom Design ";
-Custom.args = {
- hideInput: true,
- default: `Upload File `,
-};
-
export const Advanced = Template.bind({});
Advanced.storyName = "Image Uploader";
Advanced.args = {
@@ -69,7 +62,7 @@ Advanced.decorators = [
`;}
];
-export const Disabled = Template.bind({});
-Disabled.storyName = "Disabled SplitButton";
-Disabled.args = {
- default: "Disabled",
- disabled: true,
-};
-
-export const Design = Template.bind({});
-Design.args = {
- default: "Attention",
- design: ButtonDesign.Attention,
-};
-
-export const WithIcon = Template.bind({});
-WithIcon.args = {
- default: "Icon",
- icon: "add",
-};
-
-export const WithActiveIcon = Template.bind({});
-WithActiveIcon.args = {
- default: "Press Me",
- icon: "add",
- activeIcon: "accept",
-};
\ No newline at end of file
+export const DifferentDesigns: StoryFn = () => html`
+ Emphasized
+ Attention
+ Positive
+ Negative
+ Transparent
+`;
\ No newline at end of file
diff --git a/packages/playground/_stories/main/StepInput/StepInput.stories.ts b/packages/playground/_stories/main/StepInput/StepInput.stories.ts
index c59189e03a37..72260c008946 100644
--- a/packages/playground/_stories/main/StepInput/StepInput.stories.ts
+++ b/packages/playground/_stories/main/StepInput/StepInput.stories.ts
@@ -10,7 +10,6 @@ import type { UI5StoryArgs } from "../../../types.js";
import { DocsPage } from "../../../.storybook/docs";
import type StepInput from "@ui5/webcomponents/dist/StepInput.js";
-import ValueState from "@ui5/webcomponents-base/dist/types/ValueState";
const component = "ui5-step-input";
@@ -25,56 +24,47 @@ export default {
argTypes,
} as Meta;
-const Template: UI5StoryArgs = (args) => html`
- ${unsafeHTML(args.valueStateMessage)}
- `;
+const Template: UI5StoryArgs = (args) => html`
+
+
+ ${unsafeHTML(args.valueStateMessage)}
+
+
`;
export const Basic = Template.bind({});
Basic.args = {
value: 5,
};
-export const Readonly = Template.bind({});
-Readonly.args = {
- value: 5,
- readonly: true,
-};
-
-export const Disabled = Template.bind({});
-Disabled.args = {
- value: 5,
- disabled: true,
-};
-
-export const Design = Template.bind({});
-Design.storyName = "Value State";
-Design.args = {
- value: 5,
- valueState: ValueState.Success,
-};
+export const DifferentValueStates: StoryFn = () => html`
+
+
+
+
+`;
export const MinMax = Template.bind({});
MinMax.storyName = "Min/Max and Step Values";
MinMax.args = {
value: 0,
- min: -100,
- max: 100,
+ min: -50,
+ max: 50,
step: 10,
};
@@ -88,7 +78,7 @@ ValuePrecision.args = {
};
export const Label = Template.bind({});
-Label.storyName = "With Label and Alignment";
+Label.storyName = "With Text Alignment";
Label.args = {
id: "myStepInput",
style: "text-align: left",
@@ -96,6 +86,6 @@ Label.args = {
required: true,
};
Label.decorators = [
- (story) => html`Number
+ (story) => html`Number is left-aligned
${story()}`,
]
\ No newline at end of file
diff --git a/packages/playground/_stories/main/Switch/Switch.stories.ts b/packages/playground/_stories/main/Switch/Switch.stories.ts
index f1c73a8b0890..f5bd859e8371 100644
--- a/packages/playground/_stories/main/Switch/Switch.stories.ts
+++ b/packages/playground/_stories/main/Switch/Switch.stories.ts
@@ -38,30 +38,8 @@ const Template: UI5StoryArgs = (args) => html``;
export const Basic = Template.bind({});
-
-export const WithText = Template.bind({});
-WithText.args = {
- textOn: "On",
- textOff: "Off",
-};
-
-export const Checked = Template.bind({});
-Checked.args = {
- textOn: "Yes",
- textOff: "No",
- checked: true,
-};
-
-export const Disabled = Template.bind({});
-Disabled.args = {
- disabled: true,
- checked: true,
-};
-
-export const Design = Template.bind({});
-Design.args = {
- design: SwitchDesign.Graphical,
- accessibleName: "graphical",
+Basic.args = {
+ accessibleName: "Switch with Accessible Name",
};
export const RequiredInForm = Template.bind({});
@@ -85,13 +63,13 @@ RequiredInForm.decorators = [
}
@@ -191,12 +181,13 @@ DatePicker with format `yyyy` should open picker on years
labelLiveChangePrevent.innerHTML = 'input: ' + JSON.stringify(e.detail);
});
- $('#ui5-datepicker--startDate').on('ui5-input change', (function(e) {
- var dp = $('#ui5-datepicker--startDate')[0];
+ function datePickerInputChangeHandler(e) {
+ var dp = e.currentTarget;
dp.setAttribute('value-state', e.detail.valid ? 'None' : 'Error');
- $('#startDate').val($('#ui5-datepicker--startDate').val());
- $('#startDate').trigger('change');
- }));
+ }
+
+ document.getElementById('ui5-datepicker--startDate').addEventListener('ui5-input change', datePickerInputChangeHandler);
+ document.getElementById('ui5-datepicker--startDate').addEventListener('change', datePickerInputChangeHandler);
var dp11 = document.getElementById('dp11');
diff --git a/packages/main/test/pages/DayPicker.html b/packages/main/test/pages/DayPicker.html
index 03198b255d59..2c56498a3969 100644
--- a/packages/main/test/pages/DayPicker.html
+++ b/packages/main/test/pages/DayPicker.html
@@ -4,19 +4,8 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/packages/main/test/pages/WheelSlider_Test_Page.html b/packages/main/test/pages/WheelSlider_Test_Page.html
index 4228f70cbf38..a03b888947e0 100644
--- a/packages/main/test/pages/WheelSlider_Test_Page.html
+++ b/packages/main/test/pages/WheelSlider_Test_Page.html
@@ -1,24 +1,15 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
+
-
-
+
+
+
\ No newline at end of file
From 7ac1ffd96b109fe7b3ee28d76beebfdac06c2fad Mon Sep 17 00:00:00 2001
From: SAP LX Lab Service Account
Date: Thu, 5 Oct 2023 02:00:30 -0700
Subject: [PATCH 045/141] Translation Delivery (#7663)
* chore: translation delivery
Change-Id: Ib9d66d306332c7cd339631ffeb1a6dbdf8185b25
* chore: translation delivery
Change-Id: Idd575d800d7d2eae6e519d01f3fc146fb7b0f92c
* chore: translation delivery
Change-Id: I010a2013d9bbb35014e12da8f0cbc688fccd5d85
---
packages/main/src/i18n/messagebundle_ar.properties | 6 ++++++
packages/main/src/i18n/messagebundle_bg.properties | 6 ++++++
packages/main/src/i18n/messagebundle_ca.properties | 6 ++++++
packages/main/src/i18n/messagebundle_cs.properties | 6 ++++++
packages/main/src/i18n/messagebundle_cy.properties | 6 ++++++
packages/main/src/i18n/messagebundle_da.properties | 6 ++++++
packages/main/src/i18n/messagebundle_de.properties | 6 ++++++
packages/main/src/i18n/messagebundle_el.properties | 6 ++++++
packages/main/src/i18n/messagebundle_en.properties | 6 ++++++
packages/main/src/i18n/messagebundle_en_GB.properties | 6 ++++++
.../main/src/i18n/messagebundle_en_US_sappsd.properties | 6 ++++++
.../main/src/i18n/messagebundle_en_US_saptrc.properties | 6 ++++++
packages/main/src/i18n/messagebundle_es.properties | 6 ++++++
packages/main/src/i18n/messagebundle_es_MX.properties | 6 ++++++
packages/main/src/i18n/messagebundle_et.properties | 6 ++++++
packages/main/src/i18n/messagebundle_fi.properties | 6 ++++++
packages/main/src/i18n/messagebundle_fr.properties | 6 ++++++
packages/main/src/i18n/messagebundle_fr_CA.properties | 6 ++++++
packages/main/src/i18n/messagebundle_hi.properties | 6 ++++++
packages/main/src/i18n/messagebundle_hr.properties | 6 ++++++
packages/main/src/i18n/messagebundle_hu.properties | 6 ++++++
packages/main/src/i18n/messagebundle_id.properties | 6 ++++++
packages/main/src/i18n/messagebundle_it.properties | 6 ++++++
packages/main/src/i18n/messagebundle_iw.properties | 6 ++++++
packages/main/src/i18n/messagebundle_ja.properties | 6 ++++++
packages/main/src/i18n/messagebundle_kk.properties | 6 ++++++
packages/main/src/i18n/messagebundle_ko.properties | 6 ++++++
packages/main/src/i18n/messagebundle_lt.properties | 6 ++++++
packages/main/src/i18n/messagebundle_lv.properties | 6 ++++++
packages/main/src/i18n/messagebundle_ms.properties | 6 ++++++
packages/main/src/i18n/messagebundle_nl.properties | 6 ++++++
packages/main/src/i18n/messagebundle_no.properties | 6 ++++++
packages/main/src/i18n/messagebundle_pl.properties | 6 ++++++
packages/main/src/i18n/messagebundle_pt.properties | 6 ++++++
packages/main/src/i18n/messagebundle_pt_PT.properties | 6 ++++++
packages/main/src/i18n/messagebundle_ro.properties | 6 ++++++
packages/main/src/i18n/messagebundle_ru.properties | 6 ++++++
packages/main/src/i18n/messagebundle_sh.properties | 6 ++++++
packages/main/src/i18n/messagebundle_sk.properties | 6 ++++++
packages/main/src/i18n/messagebundle_sl.properties | 6 ++++++
packages/main/src/i18n/messagebundle_sv.properties | 6 ++++++
packages/main/src/i18n/messagebundle_th.properties | 6 ++++++
packages/main/src/i18n/messagebundle_tr.properties | 6 ++++++
packages/main/src/i18n/messagebundle_uk.properties | 6 ++++++
packages/main/src/i18n/messagebundle_vi.properties | 6 ++++++
packages/main/src/i18n/messagebundle_zh_CN.properties | 6 ++++++
packages/main/src/i18n/messagebundle_zh_TW.properties | 6 ++++++
47 files changed, 282 insertions(+)
diff --git a/packages/main/src/i18n/messagebundle_ar.properties b/packages/main/src/i18n/messagebundle_ar.properties
index 07476b8eff58..c5be2d9d14b5 100644
--- a/packages/main/src/i18n/messagebundle_ar.properties
+++ b/packages/main/src/i18n/messagebundle_ar.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=إدخال الوقت
TIMEPICKER_CLOCK_DIAL_LABEL=طلب الساعة
+TIMEPICKER_INPUTS_ENTER_HOURS=يُرجى إدخال الساعات
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=يُرجى إدخال الدقائق
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=يُرجى إدخال الثواني
+
DURATION_INPUT_DESCRIPTION=إدخال المدة
DATETIME_PICKER_DATE_BUTTON=التاريخ
diff --git a/packages/main/src/i18n/messagebundle_bg.properties b/packages/main/src/i18n/messagebundle_bg.properties
index ff34f66571bf..4cd6b772b820 100644
--- a/packages/main/src/i18n/messagebundle_bg.properties
+++ b/packages/main/src/i18n/messagebundle_bg.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Въвеждане на час
TIMEPICKER_CLOCK_DIAL_LABEL=Циферблат на часовник
+TIMEPICKER_INPUTS_ENTER_HOURS=Моля, въведете час
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Моля, въведете минути
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Моля, въведете секунди
+
DURATION_INPUT_DESCRIPTION=Въвеждане на времетраене
DATETIME_PICKER_DATE_BUTTON=Дата
diff --git a/packages/main/src/i18n/messagebundle_ca.properties b/packages/main/src/i18n/messagebundle_ca.properties
index 2e262e0420f9..908bab330d2a 100644
--- a/packages/main/src/i18n/messagebundle_ca.properties
+++ b/packages/main/src/i18n/messagebundle_ca.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Entrada d'hora
TIMEPICKER_CLOCK_DIAL_LABEL=Esfera de rellotge
+TIMEPICKER_INPUTS_ENTER_HOURS=Introduïu les hores
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Introduïu els minuts
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Introduïu els segons
+
DURATION_INPUT_DESCRIPTION=Entrada de durada
DATETIME_PICKER_DATE_BUTTON=Data
diff --git a/packages/main/src/i18n/messagebundle_cs.properties b/packages/main/src/i18n/messagebundle_cs.properties
index d58af5933db9..848ca12b8f49 100644
--- a/packages/main/src/i18n/messagebundle_cs.properties
+++ b/packages/main/src/i18n/messagebundle_cs.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Zadání času
TIMEPICKER_CLOCK_DIAL_LABEL=Ciferník hodin
+TIMEPICKER_INPUTS_ENTER_HOURS=Zadejte hodiny
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Zadejte minuty
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Zadejte sekundy
+
DURATION_INPUT_DESCRIPTION=Zadání trvání
DATETIME_PICKER_DATE_BUTTON=Datum
diff --git a/packages/main/src/i18n/messagebundle_cy.properties b/packages/main/src/i18n/messagebundle_cy.properties
index 89f9a0964431..0cdc9d97d63a 100644
--- a/packages/main/src/i18n/messagebundle_cy.properties
+++ b/packages/main/src/i18n/messagebundle_cy.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Mewnbwn Amser
TIMEPICKER_CLOCK_DIAL_LABEL=Deial Cloc
+TIMEPICKER_INPUTS_ENTER_HOURS=Rhowch oriau
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Rhowch funudau
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Rhowch eiliadau
+
DURATION_INPUT_DESCRIPTION=Mewnbwn Hyd
DATETIME_PICKER_DATE_BUTTON=Dyddiad
diff --git a/packages/main/src/i18n/messagebundle_da.properties b/packages/main/src/i18n/messagebundle_da.properties
index 79e620cfa2f7..54b07d6364ea 100644
--- a/packages/main/src/i18n/messagebundle_da.properties
+++ b/packages/main/src/i18n/messagebundle_da.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Tidsinput
TIMEPICKER_CLOCK_DIAL_LABEL=Urskive
+TIMEPICKER_INPUTS_ENTER_HOURS=Indtast timer
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Indtast minutter
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Indtast sekunder
+
DURATION_INPUT_DESCRIPTION=Varighedsinput
DATETIME_PICKER_DATE_BUTTON=Dato
diff --git a/packages/main/src/i18n/messagebundle_de.properties b/packages/main/src/i18n/messagebundle_de.properties
index 09a001870683..35cef980cd12 100644
--- a/packages/main/src/i18n/messagebundle_de.properties
+++ b/packages/main/src/i18n/messagebundle_de.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Zeiteingabe
TIMEPICKER_CLOCK_DIAL_LABEL=Zifferblatt
+TIMEPICKER_INPUTS_ENTER_HOURS=Stunde eingeben
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Minute eingeben
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Sekunde eingeben
+
DURATION_INPUT_DESCRIPTION=Eingabe der Dauer
DATETIME_PICKER_DATE_BUTTON=Datum
diff --git a/packages/main/src/i18n/messagebundle_el.properties b/packages/main/src/i18n/messagebundle_el.properties
index 1499569b8841..5fadbb9c2fd6 100644
--- a/packages/main/src/i18n/messagebundle_el.properties
+++ b/packages/main/src/i18n/messagebundle_el.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Εισαγωγή Ώρας
TIMEPICKER_CLOCK_DIAL_LABEL=Πληκτρολόγηση Ώρας
+TIMEPICKER_INPUTS_ENTER_HOURS=Εισαγάγετε ώρες
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Εισαγάγετε λεπτά
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Εισαγάγετε δευτερόλεπτα
+
DURATION_INPUT_DESCRIPTION=Εισαγωγή Διάρκειας
DATETIME_PICKER_DATE_BUTTON=Ημερομηνία
diff --git a/packages/main/src/i18n/messagebundle_en.properties b/packages/main/src/i18n/messagebundle_en.properties
index 05ecb2ac10b0..aed010edd0bd 100644
--- a/packages/main/src/i18n/messagebundle_en.properties
+++ b/packages/main/src/i18n/messagebundle_en.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Time Input
TIMEPICKER_CLOCK_DIAL_LABEL=Clock Dial
+TIMEPICKER_INPUTS_ENTER_HOURS=Please enter hours
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Please enter minutes
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Please enter seconds
+
DURATION_INPUT_DESCRIPTION=Duration Input
DATETIME_PICKER_DATE_BUTTON=Date
diff --git a/packages/main/src/i18n/messagebundle_en_GB.properties b/packages/main/src/i18n/messagebundle_en_GB.properties
index b3c90f0b0a92..477ecbf1e6dc 100644
--- a/packages/main/src/i18n/messagebundle_en_GB.properties
+++ b/packages/main/src/i18n/messagebundle_en_GB.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Time Input
TIMEPICKER_CLOCK_DIAL_LABEL=Clock Dial
+TIMEPICKER_INPUTS_ENTER_HOURS=Please enter hours
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Please enter minutes
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Please enter seconds
+
DURATION_INPUT_DESCRIPTION=Duration Input
DATETIME_PICKER_DATE_BUTTON=Date
diff --git a/packages/main/src/i18n/messagebundle_en_US_sappsd.properties b/packages/main/src/i18n/messagebundle_en_US_sappsd.properties
index 4293aa952876..9878a22c5d84 100644
--- a/packages/main/src/i18n/messagebundle_en_US_sappsd.properties
+++ b/packages/main/src/i18n/messagebundle_en_US_sappsd.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=[[[Ţįɱē Ĭŋρűţ∙∙∙∙]]]
TIMEPICKER_CLOCK_DIAL_LABEL=[[[Ĉĺŏċķ Ďįąĺ∙∙∙∙]]]
+TIMEPICKER_INPUTS_ENTER_HOURS=[[[Ƥĺēąşē ēŋţēŗ ĥŏűŗş∙∙∙∙∙∙]]]
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=[[[Ƥĺēąşē ēŋţēŗ ɱįŋűţēş∙∙∙∙]]]
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=[[[Ƥĺēąşē ēŋţēŗ şēċŏŋƌş∙∙∙∙]]]
+
DURATION_INPUT_DESCRIPTION=[[[Ďűŗąţįŏŋ Ĭŋρűţ∙∙∙∙∙]]]
DATETIME_PICKER_DATE_BUTTON=[[[Ďąţē]]]
diff --git a/packages/main/src/i18n/messagebundle_en_US_saptrc.properties b/packages/main/src/i18n/messagebundle_en_US_saptrc.properties
index 5eb06d809ffa..2a33b6a5f395 100644
--- a/packages/main/src/i18n/messagebundle_en_US_saptrc.properties
+++ b/packages/main/src/i18n/messagebundle_en_US_saptrc.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=5W4XgHn2RMpCgiWpkl9+Mw_Time Input
TIMEPICKER_CLOCK_DIAL_LABEL=3lW27/s9KRCchbQWqvbpSA_Clock Dial
+TIMEPICKER_INPUTS_ENTER_HOURS=lytu6KNiQJf+Pnh1NITTlg_Please enter hours
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=QOX3PgnJlZu5vF7uJSD+Bg_Please enter minutes
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=eFXFsAUwdVRuFFGNqfQ8zw_Please enter seconds
+
DURATION_INPUT_DESCRIPTION=K8i+jptpLJGMAFLNWV5O5A_Duration Input
DATETIME_PICKER_DATE_BUTTON=WMB6EthjmUNV8kYnBWYsPA_Date
diff --git a/packages/main/src/i18n/messagebundle_es.properties b/packages/main/src/i18n/messagebundle_es.properties
index 0b96acf63407..b7529c55793a 100644
--- a/packages/main/src/i18n/messagebundle_es.properties
+++ b/packages/main/src/i18n/messagebundle_es.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Entrada de hora
TIMEPICKER_CLOCK_DIAL_LABEL=Esfera de reloj
+TIMEPICKER_INPUTS_ENTER_HOURS=Introduzca las horas
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Introduzca los minutos
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Introduzca los segundos
+
DURATION_INPUT_DESCRIPTION=Entrada de duración
DATETIME_PICKER_DATE_BUTTON=Fecha
diff --git a/packages/main/src/i18n/messagebundle_es_MX.properties b/packages/main/src/i18n/messagebundle_es_MX.properties
index e326543356ef..159e3f58ad12 100644
--- a/packages/main/src/i18n/messagebundle_es_MX.properties
+++ b/packages/main/src/i18n/messagebundle_es_MX.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Entrada de hora
TIMEPICKER_CLOCK_DIAL_LABEL=Esfera de reloj
+TIMEPICKER_INPUTS_ENTER_HOURS=Ingrese las horas
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Ingrese los minutos
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Ingrese los segundos
+
DURATION_INPUT_DESCRIPTION=Entrada de duración
DATETIME_PICKER_DATE_BUTTON=Fecha
diff --git a/packages/main/src/i18n/messagebundle_et.properties b/packages/main/src/i18n/messagebundle_et.properties
index 916d9af6d99a..06a5f1e83041 100644
--- a/packages/main/src/i18n/messagebundle_et.properties
+++ b/packages/main/src/i18n/messagebundle_et.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Kellaajasisend
TIMEPICKER_CLOCK_DIAL_LABEL=Kella numbrilaud
+TIMEPICKER_INPUTS_ENTER_HOURS=Sisestage tunnid
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Sisestage minutid
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Sisestage sekundid
+
DURATION_INPUT_DESCRIPTION=Kestusesisend
DATETIME_PICKER_DATE_BUTTON=Kuupäev
diff --git a/packages/main/src/i18n/messagebundle_fi.properties b/packages/main/src/i18n/messagebundle_fi.properties
index 692935e741b3..800da47bea94 100644
--- a/packages/main/src/i18n/messagebundle_fi.properties
+++ b/packages/main/src/i18n/messagebundle_fi.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Ajan syöttö
TIMEPICKER_CLOCK_DIAL_LABEL=Kellotaulu
+TIMEPICKER_INPUTS_ENTER_HOURS=Syötä tunnit
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Syötä minuutit
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Syötä sekunnit
+
DURATION_INPUT_DESCRIPTION=Keston syöttö
DATETIME_PICKER_DATE_BUTTON=Päivämäärä
diff --git a/packages/main/src/i18n/messagebundle_fr.properties b/packages/main/src/i18n/messagebundle_fr.properties
index 35a0202bc1d6..68162210347b 100644
--- a/packages/main/src/i18n/messagebundle_fr.properties
+++ b/packages/main/src/i18n/messagebundle_fr.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Saisie de l'heure
TIMEPICKER_CLOCK_DIAL_LABEL=Cadran horloge
+TIMEPICKER_INPUTS_ENTER_HOURS=Entrez les heures.
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Entrez les minutes.
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Entrez les secondes.
+
DURATION_INPUT_DESCRIPTION=Saisie de la durée
DATETIME_PICKER_DATE_BUTTON=Date
diff --git a/packages/main/src/i18n/messagebundle_fr_CA.properties b/packages/main/src/i18n/messagebundle_fr_CA.properties
index ccb7f45a56a9..907826c6dd85 100644
--- a/packages/main/src/i18n/messagebundle_fr_CA.properties
+++ b/packages/main/src/i18n/messagebundle_fr_CA.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Saisie de l'heure
TIMEPICKER_CLOCK_DIAL_LABEL=Cadran horloge
+TIMEPICKER_INPUTS_ENTER_HOURS=Saisissez les heures.
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Saisissez les minutes.
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Saisissez les secondes.
+
DURATION_INPUT_DESCRIPTION=Saisie de la durée
DATETIME_PICKER_DATE_BUTTON=Date
diff --git a/packages/main/src/i18n/messagebundle_hi.properties b/packages/main/src/i18n/messagebundle_hi.properties
index 2587829c66d0..74abf2fbf7ac 100644
--- a/packages/main/src/i18n/messagebundle_hi.properties
+++ b/packages/main/src/i18n/messagebundle_hi.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=समय इनपुट
TIMEPICKER_CLOCK_DIAL_LABEL=क्लॉक डायल
+TIMEPICKER_INPUTS_ENTER_HOURS=कृपया घंटे दर्ज करें
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=कृपया मिनट दर्ज करें
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=कृपया सेकंड दर्ज करें
+
DURATION_INPUT_DESCRIPTION=अवधि इनपुट
DATETIME_PICKER_DATE_BUTTON=दिनांक
diff --git a/packages/main/src/i18n/messagebundle_hr.properties b/packages/main/src/i18n/messagebundle_hr.properties
index 85de2a211d10..d46ee90ea38a 100644
--- a/packages/main/src/i18n/messagebundle_hr.properties
+++ b/packages/main/src/i18n/messagebundle_hr.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Unos vremena
TIMEPICKER_CLOCK_DIAL_LABEL=Brojčanik sata
+TIMEPICKER_INPUTS_ENTER_HOURS=Unesite sate
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Unesite minute
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Unesite sekunde
+
DURATION_INPUT_DESCRIPTION=Unos trajanja
DATETIME_PICKER_DATE_BUTTON=Datum
diff --git a/packages/main/src/i18n/messagebundle_hu.properties b/packages/main/src/i18n/messagebundle_hu.properties
index c461671a6794..c8e1ffcb6315 100644
--- a/packages/main/src/i18n/messagebundle_hu.properties
+++ b/packages/main/src/i18n/messagebundle_hu.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Idő bevitele
TIMEPICKER_CLOCK_DIAL_LABEL=Óraszámlap
+TIMEPICKER_INPUTS_ENTER_HOURS=Adja meg az órákat
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Adja meg a perceket
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Adja meg a másodperceket
+
DURATION_INPUT_DESCRIPTION=Időtartam bevitele
DATETIME_PICKER_DATE_BUTTON=Dátum
diff --git a/packages/main/src/i18n/messagebundle_id.properties b/packages/main/src/i18n/messagebundle_id.properties
index 107e9e892f59..5b754396e810 100644
--- a/packages/main/src/i18n/messagebundle_id.properties
+++ b/packages/main/src/i18n/messagebundle_id.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Input Waktu
TIMEPICKER_CLOCK_DIAL_LABEL=Tampilan Jam
+TIMEPICKER_INPUTS_ENTER_HOURS=Harap masukkan jam
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Harap masukkan menit
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Harap masukkan detik
+
DURATION_INPUT_DESCRIPTION=Input Durasi
DATETIME_PICKER_DATE_BUTTON=Tanggal
diff --git a/packages/main/src/i18n/messagebundle_it.properties b/packages/main/src/i18n/messagebundle_it.properties
index 6f0a310059b7..13afa91768f0 100644
--- a/packages/main/src/i18n/messagebundle_it.properties
+++ b/packages/main/src/i18n/messagebundle_it.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Inserimento ora
TIMEPICKER_CLOCK_DIAL_LABEL=Quadrante dell’orologio
+TIMEPICKER_INPUTS_ENTER_HOURS=Inserisci ore
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Inserisci minuti
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Inserisci secondi
+
DURATION_INPUT_DESCRIPTION=Inserimento durata
DATETIME_PICKER_DATE_BUTTON=Data
diff --git a/packages/main/src/i18n/messagebundle_iw.properties b/packages/main/src/i18n/messagebundle_iw.properties
index 5e118640dff0..ffbe6a8f7254 100644
--- a/packages/main/src/i18n/messagebundle_iw.properties
+++ b/packages/main/src/i18n/messagebundle_iw.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=קלט של שעה
TIMEPICKER_CLOCK_DIAL_LABEL=מחוגה של שעון
+TIMEPICKER_INPUTS_ENTER_HOURS=הזן שעות
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=הזן דקות
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=הזן שניות
+
DURATION_INPUT_DESCRIPTION=קלט של משך זמן
DATETIME_PICKER_DATE_BUTTON=תאריך
diff --git a/packages/main/src/i18n/messagebundle_ja.properties b/packages/main/src/i18n/messagebundle_ja.properties
index 8ba1bff4f150..71bd73d5a070 100644
--- a/packages/main/src/i18n/messagebundle_ja.properties
+++ b/packages/main/src/i18n/messagebundle_ja.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=時刻入力
TIMEPICKER_CLOCK_DIAL_LABEL=時計ダイアル
+TIMEPICKER_INPUTS_ENTER_HOURS=時間数を入力してください
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=分数を入力してください
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=秒数を入力してください
+
DURATION_INPUT_DESCRIPTION=期間入力
DATETIME_PICKER_DATE_BUTTON=日付
diff --git a/packages/main/src/i18n/messagebundle_kk.properties b/packages/main/src/i18n/messagebundle_kk.properties
index 7b62e06fa1ca..2f229455ac6f 100644
--- a/packages/main/src/i18n/messagebundle_kk.properties
+++ b/packages/main/src/i18n/messagebundle_kk.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Уақыт енгізу
TIMEPICKER_CLOCK_DIAL_LABEL=Циферблат
+TIMEPICKER_INPUTS_ENTER_HOURS=Сағаттар енгізіңіз
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Минуттар енгізіңіз
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Секундтар енгізіңіз
+
DURATION_INPUT_DESCRIPTION=Ұзақтық енгізу
DATETIME_PICKER_DATE_BUTTON=Күні
diff --git a/packages/main/src/i18n/messagebundle_ko.properties b/packages/main/src/i18n/messagebundle_ko.properties
index abe5631e5d96..709ae258527b 100644
--- a/packages/main/src/i18n/messagebundle_ko.properties
+++ b/packages/main/src/i18n/messagebundle_ko.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=시간 입력
TIMEPICKER_CLOCK_DIAL_LABEL=시계 다이얼
+TIMEPICKER_INPUTS_ENTER_HOURS=시간을 입력하십시오.
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=분을 입력하십시오.
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=초를 입력하십시오.
+
DURATION_INPUT_DESCRIPTION=기간 입력
DATETIME_PICKER_DATE_BUTTON=일자
diff --git a/packages/main/src/i18n/messagebundle_lt.properties b/packages/main/src/i18n/messagebundle_lt.properties
index b83c4328d965..6cc3a572d26a 100644
--- a/packages/main/src/i18n/messagebundle_lt.properties
+++ b/packages/main/src/i18n/messagebundle_lt.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Laiko įvestis
TIMEPICKER_CLOCK_DIAL_LABEL=Laikrodžio ciferblatas
+TIMEPICKER_INPUTS_ENTER_HOURS=Įveskite valandas
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Įveskite minutes
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Įveskite sekundes
+
DURATION_INPUT_DESCRIPTION=Trukmės įvestis
DATETIME_PICKER_DATE_BUTTON=Data
diff --git a/packages/main/src/i18n/messagebundle_lv.properties b/packages/main/src/i18n/messagebundle_lv.properties
index 6e3fcdcc76d3..1df916bb67d7 100644
--- a/packages/main/src/i18n/messagebundle_lv.properties
+++ b/packages/main/src/i18n/messagebundle_lv.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Laika ievade
TIMEPICKER_CLOCK_DIAL_LABEL=Pulksteņiezvane
+TIMEPICKER_INPUTS_ENTER_HOURS=Lūdzu, ievadīt stundas
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Lūdzu, ievadīt minūtes
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Lūdzu, ievadīt sekundes
+
DURATION_INPUT_DESCRIPTION=Ilguma ievade
DATETIME_PICKER_DATE_BUTTON=Datums
diff --git a/packages/main/src/i18n/messagebundle_ms.properties b/packages/main/src/i18n/messagebundle_ms.properties
index a082cbe2b68f..6463732cbe8d 100644
--- a/packages/main/src/i18n/messagebundle_ms.properties
+++ b/packages/main/src/i18n/messagebundle_ms.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Input Masa
TIMEPICKER_CLOCK_DIAL_LABEL=Dail Jam
+TIMEPICKER_INPUTS_ENTER_HOURS=Sila masukkan jam
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Sila masukkan minit
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Sila masukkan saat
+
DURATION_INPUT_DESCRIPTION=Input Jangka Masa
DATETIME_PICKER_DATE_BUTTON=Tarikh
diff --git a/packages/main/src/i18n/messagebundle_nl.properties b/packages/main/src/i18n/messagebundle_nl.properties
index 689f473778c0..21bb269dcc92 100644
--- a/packages/main/src/i18n/messagebundle_nl.properties
+++ b/packages/main/src/i18n/messagebundle_nl.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Tijdinvoer
TIMEPICKER_CLOCK_DIAL_LABEL=Wijzerplaat van klok
+TIMEPICKER_INPUTS_ENTER_HOURS=Uren invoeren
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Minuten invoeren
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Seconden invoeren
+
DURATION_INPUT_DESCRIPTION=Duurinvoer
DATETIME_PICKER_DATE_BUTTON=Datum
diff --git a/packages/main/src/i18n/messagebundle_no.properties b/packages/main/src/i18n/messagebundle_no.properties
index b8e143a6b099..d78e9d36fcf2 100644
--- a/packages/main/src/i18n/messagebundle_no.properties
+++ b/packages/main/src/i18n/messagebundle_no.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Inntasting av tidspunkt
TIMEPICKER_CLOCK_DIAL_LABEL=Urskive
+TIMEPICKER_INPUTS_ENTER_HOURS=Oppgi timer
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Oppgi minutter
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Oppgi sekunder
+
DURATION_INPUT_DESCRIPTION=Inntasting av varighet
DATETIME_PICKER_DATE_BUTTON=Dato
diff --git a/packages/main/src/i18n/messagebundle_pl.properties b/packages/main/src/i18n/messagebundle_pl.properties
index 451d20215f07..6bd7cff8ab77 100644
--- a/packages/main/src/i18n/messagebundle_pl.properties
+++ b/packages/main/src/i18n/messagebundle_pl.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Wpis czasu
TIMEPICKER_CLOCK_DIAL_LABEL=Tarcza zegara
+TIMEPICKER_INPUTS_ENTER_HOURS=Wprowadź godziny
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Wprowadź minuty
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Wprowadź sekundy
+
DURATION_INPUT_DESCRIPTION=Wpis czasu trwania
DATETIME_PICKER_DATE_BUTTON=Data
diff --git a/packages/main/src/i18n/messagebundle_pt.properties b/packages/main/src/i18n/messagebundle_pt.properties
index f41e5f826e91..d7c2080277c3 100644
--- a/packages/main/src/i18n/messagebundle_pt.properties
+++ b/packages/main/src/i18n/messagebundle_pt.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Entrada de hora
TIMEPICKER_CLOCK_DIAL_LABEL=Relógio
+TIMEPICKER_INPUTS_ENTER_HOURS=Insira horas
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Insira minutos
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Insira segundos
+
DURATION_INPUT_DESCRIPTION=Entrada de duração
DATETIME_PICKER_DATE_BUTTON=Data
diff --git a/packages/main/src/i18n/messagebundle_pt_PT.properties b/packages/main/src/i18n/messagebundle_pt_PT.properties
index a2ceb135bf57..b6585d625e3a 100644
--- a/packages/main/src/i18n/messagebundle_pt_PT.properties
+++ b/packages/main/src/i18n/messagebundle_pt_PT.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Introdução de hora
TIMEPICKER_CLOCK_DIAL_LABEL=Mostrador de relógio
+TIMEPICKER_INPUTS_ENTER_HOURS=Introduza horas
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Introduza minutos
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Introduza segundos
+
DURATION_INPUT_DESCRIPTION=Introdução de duração
DATETIME_PICKER_DATE_BUTTON=Data
diff --git a/packages/main/src/i18n/messagebundle_ro.properties b/packages/main/src/i18n/messagebundle_ro.properties
index d3ae62238005..6a7379ebbdce 100644
--- a/packages/main/src/i18n/messagebundle_ro.properties
+++ b/packages/main/src/i18n/messagebundle_ro.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Intrare oră
TIMEPICKER_CLOCK_DIAL_LABEL=Cadran orar
+TIMEPICKER_INPUTS_ENTER_HOURS=Introduceți ore
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Introduceți minute
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Introduceți secunde
+
DURATION_INPUT_DESCRIPTION=Intrare durată
DATETIME_PICKER_DATE_BUTTON=Dată
diff --git a/packages/main/src/i18n/messagebundle_ru.properties b/packages/main/src/i18n/messagebundle_ru.properties
index c75690204acb..a18e9c68ff65 100644
--- a/packages/main/src/i18n/messagebundle_ru.properties
+++ b/packages/main/src/i18n/messagebundle_ru.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Ввод времени
TIMEPICKER_CLOCK_DIAL_LABEL=Циферблат
+TIMEPICKER_INPUTS_ENTER_HOURS=Введите часы
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Введите минуты
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Введите секунды
+
DURATION_INPUT_DESCRIPTION=Ввод продолжительности
DATETIME_PICKER_DATE_BUTTON=Дата
diff --git a/packages/main/src/i18n/messagebundle_sh.properties b/packages/main/src/i18n/messagebundle_sh.properties
index bdbc298ff246..e56a23c33851 100644
--- a/packages/main/src/i18n/messagebundle_sh.properties
+++ b/packages/main/src/i18n/messagebundle_sh.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Unos vremena
TIMEPICKER_CLOCK_DIAL_LABEL=Brojčanik sata
+TIMEPICKER_INPUTS_ENTER_HOURS=Unesite sate
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Unesite minute
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Unesite sekunde
+
DURATION_INPUT_DESCRIPTION=Unos trajanja
DATETIME_PICKER_DATE_BUTTON=Datum
diff --git a/packages/main/src/i18n/messagebundle_sk.properties b/packages/main/src/i18n/messagebundle_sk.properties
index 627a7bfc2697..64cc5b126fd8 100644
--- a/packages/main/src/i18n/messagebundle_sk.properties
+++ b/packages/main/src/i18n/messagebundle_sk.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Zadanie času
TIMEPICKER_CLOCK_DIAL_LABEL=Ciferník hodín
+TIMEPICKER_INPUTS_ENTER_HOURS=Zadajte hodiny
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Zadajte minúty
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Zadajte sekundy
+
DURATION_INPUT_DESCRIPTION=Zadanie trvania
DATETIME_PICKER_DATE_BUTTON=Dátum
diff --git a/packages/main/src/i18n/messagebundle_sl.properties b/packages/main/src/i18n/messagebundle_sl.properties
index aba53b26137b..ac130f1433c4 100644
--- a/packages/main/src/i18n/messagebundle_sl.properties
+++ b/packages/main/src/i18n/messagebundle_sl.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Vnos časa
TIMEPICKER_CLOCK_DIAL_LABEL=Številčnica ure
+TIMEPICKER_INPUTS_ENTER_HOURS=Vnesite ure
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Vnesite minute
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Vnesite sekunde
+
DURATION_INPUT_DESCRIPTION=Vnos trajanja
DATETIME_PICKER_DATE_BUTTON=Datum
diff --git a/packages/main/src/i18n/messagebundle_sv.properties b/packages/main/src/i18n/messagebundle_sv.properties
index 6f50eaada025..fb45687411ba 100644
--- a/packages/main/src/i18n/messagebundle_sv.properties
+++ b/packages/main/src/i18n/messagebundle_sv.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Tidsinmatning
TIMEPICKER_CLOCK_DIAL_LABEL=Urtavla
+TIMEPICKER_INPUTS_ENTER_HOURS=Ange timmar
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Ange minuter
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Ange sekunder
+
DURATION_INPUT_DESCRIPTION=Tidslängdsinmatning
DATETIME_PICKER_DATE_BUTTON=Datum
diff --git a/packages/main/src/i18n/messagebundle_th.properties b/packages/main/src/i18n/messagebundle_th.properties
index f279c79aacd0..c864e7241b85 100644
--- a/packages/main/src/i18n/messagebundle_th.properties
+++ b/packages/main/src/i18n/messagebundle_th.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=การป้อนข้อมูลเวลา
TIMEPICKER_CLOCK_DIAL_LABEL=หน้าปัดนาฬิกา
+TIMEPICKER_INPUTS_ENTER_HOURS=กรุณาป้อนชั่วโมง
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=กรุณาป้อนนาที
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=กรุณาป้อนวินาที
+
DURATION_INPUT_DESCRIPTION=การป้อนข้อมูลระยะเวลา
DATETIME_PICKER_DATE_BUTTON=วันที่
diff --git a/packages/main/src/i18n/messagebundle_tr.properties b/packages/main/src/i18n/messagebundle_tr.properties
index 18e48a3e0fe0..edf5b32396c0 100644
--- a/packages/main/src/i18n/messagebundle_tr.properties
+++ b/packages/main/src/i18n/messagebundle_tr.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Zaman girişi
TIMEPICKER_CLOCK_DIAL_LABEL=Saat kadranı
+TIMEPICKER_INPUTS_ENTER_HOURS=Saat girin
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Dakika girin
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Saniye girin
+
DURATION_INPUT_DESCRIPTION=Süre girişi
DATETIME_PICKER_DATE_BUTTON=Tarih
diff --git a/packages/main/src/i18n/messagebundle_uk.properties b/packages/main/src/i18n/messagebundle_uk.properties
index 2e8d0ff19394..64f4e1f27889 100644
--- a/packages/main/src/i18n/messagebundle_uk.properties
+++ b/packages/main/src/i18n/messagebundle_uk.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Введення часу
TIMEPICKER_CLOCK_DIAL_LABEL=Циферблат
+TIMEPICKER_INPUTS_ENTER_HOURS=Введіть години
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Введіть хвилини
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Введіть секунди
+
DURATION_INPUT_DESCRIPTION=Введення тривалості
DATETIME_PICKER_DATE_BUTTON=Дата
diff --git a/packages/main/src/i18n/messagebundle_vi.properties b/packages/main/src/i18n/messagebundle_vi.properties
index 06fcc0e24d94..93daa84cba0e 100644
--- a/packages/main/src/i18n/messagebundle_vi.properties
+++ b/packages/main/src/i18n/messagebundle_vi.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=Nhập thời gian
TIMEPICKER_CLOCK_DIAL_LABEL=Quay số đồng hồ
+TIMEPICKER_INPUTS_ENTER_HOURS=Vui lòng nhập giờ
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=Vui lòng nhập phút
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=Vui lòng nhập giây
+
DURATION_INPUT_DESCRIPTION=Nhập khoảng thời gian
DATETIME_PICKER_DATE_BUTTON=Ngày
diff --git a/packages/main/src/i18n/messagebundle_zh_CN.properties b/packages/main/src/i18n/messagebundle_zh_CN.properties
index 15fd781bf37a..b84bebbd81f1 100644
--- a/packages/main/src/i18n/messagebundle_zh_CN.properties
+++ b/packages/main/src/i18n/messagebundle_zh_CN.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=时间输入
TIMEPICKER_CLOCK_DIAL_LABEL=钟表盘
+TIMEPICKER_INPUTS_ENTER_HOURS=请输入小时
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=请输入分钟
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=请输入秒
+
DURATION_INPUT_DESCRIPTION=持续时间输入
DATETIME_PICKER_DATE_BUTTON=日期
diff --git a/packages/main/src/i18n/messagebundle_zh_TW.properties b/packages/main/src/i18n/messagebundle_zh_TW.properties
index 85ca21485511..40bca29281cb 100644
--- a/packages/main/src/i18n/messagebundle_zh_TW.properties
+++ b/packages/main/src/i18n/messagebundle_zh_TW.properties
@@ -225,6 +225,12 @@ TIMEPICKER_INPUT_DESCRIPTION=時間輸入
TIMEPICKER_CLOCK_DIAL_LABEL=鐘面
+TIMEPICKER_INPUTS_ENTER_HOURS=請輸入小時
+
+TIMEPICKER_INPUTS_ENTER_MINUTES=請輸入分鐘
+
+TIMEPICKER_INPUTS_ENTER_SECONDS=請輸入秒數
+
DURATION_INPUT_DESCRIPTION=持續期輸入
DATETIME_PICKER_DATE_BUTTON=日期
From ff04434c9c00b29367faff22d187edb55186eccd Mon Sep 17 00:00:00 2001
From: Konstantin Gogov <68374332+kgogov@users.noreply.github.com>
Date: Thu, 5 Oct 2023 16:10:04 +0300
Subject: [PATCH 046/141] fix(ui5-shellbar): horizon theme update (#7623)
---
packages/fiori/src/themes/ShellBar.css | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/packages/fiori/src/themes/ShellBar.css b/packages/fiori/src/themes/ShellBar.css
index 11e53b6edef0..7934422ffc9a 100644
--- a/packages/fiori/src/themes/ShellBar.css
+++ b/packages/fiori/src/themes/ShellBar.css
@@ -32,8 +32,8 @@
height: 2.25rem;
padding: 0;
margin-inline-start: 0.5rem;
- border: none;
- background: transparent;
+ border: 0.0625rem solid var(--sapButton_Lite_BorderColor);
+ background: var(--sapButton_Lite_Background);
outline-color: var(--_ui5_shellbar_logo_outline_color);
color: var(--sapShell_TextColor);
box-sizing: border-box;
@@ -59,13 +59,8 @@
.ui5-shellbar-button:hover,
.ui5-shellbar-image-button:hover {
background: var(--sapShell_Hover_Background);
-}
-
-
-::slotted([ui5-button][slot="startButton"]:hover),
-.ui5-shellbar-button:hover,
-.ui5-shellbar-menu-button.ui5-shellbar-menu-button--interactive:hover {
- box-shadow: var(--_ui5_shellbar_button_box_shadow);
+ border-color: var(--sapButton_Lite_Hover_BorderColor);
+ color: var(--sapShell_TextColor);
}
::slotted([ui5-button][slot="startButton"][active]),
@@ -73,6 +68,7 @@
.ui5-shellbar-button[active],
.ui5-shellbar-image-button:active {
background: var(--sapShell_Active_Background);
+ border-color: var(--sapButton_Lite_Active_BorderColor);
color: var(--_ui5_shellbar_button_active_color);
}
From a14d57c2c25c714983ee3cb0899c8ec72a677b55 Mon Sep 17 00:00:00 2001
From: Konstantin Gogov <68374332+kgogov@users.noreply.github.com>
Date: Mon, 9 Oct 2023 13:48:43 +0300
Subject: [PATCH 047/141] fix(ui5-shellbar): often failing unit test (#7677)
Fixes: #7673
---
packages/fiori/test/specs/ShellBar.spec.js | 34 ++++++++++------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/packages/fiori/test/specs/ShellBar.spec.js b/packages/fiori/test/specs/ShellBar.spec.js
index c99bf665944e..5646c218867e 100644
--- a/packages/fiori/test/specs/ShellBar.spec.js
+++ b/packages/fiori/test/specs/ShellBar.spec.js
@@ -21,7 +21,7 @@ const getCustomActionProp = async (id, pos, prop) => {
}
describe("Component Behavior", () => {
- before(async () => {
+ beforeEach(async () => {
await browser.url(`test/pages/ShellBar.html`);
});
@@ -38,8 +38,7 @@ describe("Component Behavior", () => {
});
it("tests acc default roles", async () => {
- let sb = await browser.$("#sbAcc");
-
+ const sb = await browser.$("#sbAcc");
const logoDOM = await sb.shadow$(".ui5-shellbar-logo");
// assert
@@ -48,8 +47,7 @@ describe("Component Behavior", () => {
});
it("tests acc custom roles", async () => {
- let sb = await browser.$("#sbAccRoles");
-
+ const sb = await browser.$("#sbAccRoles");
const logoDOM = await sb.shadow$(".ui5-shellbar-logo");
// assertHANDLE_RESIZE_DEBOUNCE_RATE_WAIT
@@ -69,7 +67,7 @@ describe("Component Behavior", () => {
describe("ui5-shellbar menu", () => {
it("tests close on content click", async () => {
const primaryTitle = await browser.$("#shellbar").shadow$(".ui5-shellbar-menu-button");
- const staticAreaItemClassName = await browser.getStaticAreaItemClassName("#shellbar")
+ const staticAreaItemClassName = await browser.getStaticAreaItemClassName("#shellbar");
const menuPopover = await browser.$(`.${staticAreaItemClassName}`).shadow$(".ui5-shellbar-menu-popover");
const firstMenuItem = await menuPopover.$("ui5-list > ui5-li");
@@ -80,7 +78,6 @@ describe("Component Behavior", () => {
});
});
-
describe("ui5-shellbar-item", async () => {
it("tests the stable-dom-ref attribute", async () => {
const shellbar = await browser.$("#shellbarwithitems");
@@ -321,13 +318,13 @@ describe("Component Behavior", () => {
describe("Events", () => {
describe("Big screen", () => {
- before(async () => {
+ beforeEach(async () => {
await browser.setWindowSize(1920, 1080);
});
it("tests opening of menu", async () => {
const primaryTitle = await browser.$("#shellbar").shadow$(".ui5-shellbar-menu-button");
- const staticAreaItemClassName = await browser.getStaticAreaItemClassName("#shellbar")
+ const staticAreaItemClassName = await browser.getStaticAreaItemClassName("#shellbar");
const menuPopover = await browser.$(`.${staticAreaItemClassName}`).shadow$(".ui5-shellbar-menu-popover");
await primaryTitle.click();
@@ -339,8 +336,6 @@ describe("Component Behavior", () => {
const input = await browser.$("#press-input");
await notificationsIcon.click();
-
-
assert.strictEqual(await input.getValue(), "Notifications", "Input value is set by click event of Notifications icon");
});
@@ -378,7 +373,7 @@ describe("Component Behavior", () => {
it("tests menuItemClick event", async () => {
const primaryTitle = await browser.$("#shellbar").shadow$(".ui5-shellbar-menu-button");
- const staticAreaItemClassName = await browser.getStaticAreaItemClassName("#shellbar")
+ const staticAreaItemClassName = await browser.getStaticAreaItemClassName("#shellbar");
const menuPopover = await browser.$(`.${staticAreaItemClassName}`).shadow$(".ui5-shellbar-menu-popover");
const firstMenuItem = await menuPopover.$("ui5-list > ui5-li");
const secondMenuItem = await menuPopover.$("ui5-list > ui5-li:nth-child(2)");
@@ -391,6 +386,9 @@ describe("Component Behavior", () => {
assert.strictEqual(await input.getValue(), "Application 1", "Input value is set by click event of the first menu item");
assert.strictEqual(await inputData.getValue(), "key1", "The user defined attributes are available.");
+ await input.setProperty("value", "");
+ await inputData.setProperty("value", "");
+
await primaryTitle.click();
await secondMenuItem.click();
@@ -424,7 +422,7 @@ describe("Component Behavior", () => {
});
describe("Small screen", () => {
- before(async () => {
+ beforeEach(async () => {
await browser.setWindowSize(510, 1080);
});
@@ -439,7 +437,7 @@ describe("Component Behavior", () => {
it("tests opening of menu", async () => {
const primaryTitle = await browser.$("#shellbar").shadow$(".ui5-shellbar-menu-button");
- const staticAreaItemClassName = await browser.getStaticAreaItemClassName("#shellbar")
+ const staticAreaItemClassName = await browser.getStaticAreaItemClassName("#shellbar");
const menuPopover = await browser.$(`.${staticAreaItemClassName}`).shadow$(".ui5-shellbar-menu-popover");
await primaryTitle.click();
@@ -448,7 +446,7 @@ describe("Component Behavior", () => {
it("tests notificationsClick event", async () => {
const overflowButton = await browser.$("#shellbar").shadow$(".ui5-shellbar-overflow-button");
- const staticAreaItemClassName = await browser.getStaticAreaItemClassName("#shellbar")
+ const staticAreaItemClassName = await browser.getStaticAreaItemClassName("#shellbar");
const overflowPopover = await browser.$(`.${staticAreaItemClassName}`).shadow$(".ui5-shellbar-overflow-popover");
const notificationListItem = await overflowPopover.$("ui5-list ui5-li:nth-child(4)");
const input = await browser.$("#press-input");
@@ -470,7 +468,7 @@ describe("Component Behavior", () => {
it("tests productSwitchClick event", async () => {
const overflowButton = await browser.$("#shellbar").shadow$(".ui5-shellbar-overflow-button");
- const staticAreaItemClassName = await browser.getStaticAreaItemClassName("#shellbar")
+ const staticAreaItemClassName = await browser.getStaticAreaItemClassName("#shellbar");
const overflowPopover = await browser.$(`.${staticAreaItemClassName}`).shadow$(".ui5-shellbar-overflow-popover");
const productSwitchIcon = await overflowPopover.$("ui5-list ui5-li:nth-child(5)");
const input = await browser.$("#press-input");
@@ -483,7 +481,7 @@ describe("Component Behavior", () => {
it("tests preventDefault of productSwitchClick event", async () => {
const overflowButton = await browser.$("#shellbar").shadow$(".ui5-shellbar-overflow-button");
- const staticAreaItemClassName = await browser.getStaticAreaItemClassName("#shellbar")
+ const staticAreaItemClassName = await browser.getStaticAreaItemClassName("#shellbar");
const overflowPopover = await browser.$(`.${staticAreaItemClassName}`).shadow$(".ui5-shellbar-overflow-popover");
const productSwitchIcon = await overflowPopover.$("ui5-list ui5-li:nth-child(5)");
@@ -497,7 +495,7 @@ describe("Component Behavior", () => {
const overflowButton = await browser.$("#shellbar").shadow$(".ui5-shellbar-overflow-button");
const searchField = await browser.$("#shellbar").shadow$(".ui5-shellbar-search-full-width-wrapper");
const cancelButton = await browser.$("#shellbar").shadow$(".ui5-shellbar-search-full-width-wrapper .ui5-shellbar-button");
- const staticAreaItemClassName = await browser.getStaticAreaItemClassName("#shellbar")
+ const staticAreaItemClassName = await browser.getStaticAreaItemClassName("#shellbar");
const overflowPopover = await browser.$(`.${staticAreaItemClassName}`).shadow$(".ui5-shellbar-overflow-popover");
const searchListItem = await overflowPopover.$("ui5-list ui5-li:nth-child(1)");
From 6983f71acdaf3f94215d0fb86d9558db5b0b2887 Mon Sep 17 00:00:00 2001
From: Stoyan <88034608+hinzzx@users.noreply.github.com>
Date: Mon, 9 Oct 2023 14:08:43 +0300
Subject: [PATCH 048/141] feat(ui5-color-palette-item): add selected state
(#7598)
We are introducing a *selected* property to the **.
This enhancement allows users to explicitly set a *selected state* to any **.
For example, previously the first item was always on focus when opening the **.
Additionally, when one item is *selected*, any previously selected item will be deselected, ensuring that only one item can be selected within a ** at any given time.
The selected state could be set either by:
- Setting it explicitly by using the *selected* property;
- By right-clicking on a with the mouse;
- By pressing Enter or Space upon focused ;
---
packages/main/src/ColorPalette.ts | 59 +++++++++++--
packages/main/src/ColorPaletteItem.hbs | 2 +-
packages/main/src/ColorPaletteItem.ts | 24 ++++++
packages/main/src/themes/ColorPaletteItem.css | 83 ++++++++++++++++++-
.../themes/base/ColorPalette-parameters.css | 4 +
.../sap_horizon/ColorPalette-parameters.css | 4 +
.../ColorPalette-parameters.css | 4 +
packages/main/test/pages/ColorPalette.html | 15 ++--
packages/main/test/specs/ColorPalette.spec.js | 29 ++++++-
9 files changed, 201 insertions(+), 23 deletions(-)
diff --git a/packages/main/src/ColorPalette.ts b/packages/main/src/ColorPalette.ts
index 44dc5987541e..97d743dd5e36 100644
--- a/packages/main/src/ColorPalette.ts
+++ b/packages/main/src/ColorPalette.ts
@@ -168,6 +168,7 @@ class ColorPalette extends UI5Element {
_itemNavigationRecentColors: ItemNavigation;
_recentColors: Array;
moreColorsFeature?: ColorPaletteMoreColors;
+ _currentlySelected?: ColorPaletteItem;
static i18nBundle: I18nBundle;
@@ -198,6 +199,8 @@ class ColorPalette extends UI5Element {
}
onBeforeRendering() {
+ this._ensureSingleSelectionOrDeselectAll();
+
this.displayedColors.forEach((item, index) => {
item.index = index + 1;
});
@@ -228,6 +231,7 @@ class ColorPalette extends UI5Element {
_setColor(color: string) {
this._selectedColor = color;
+
if (this._recentColors[0] !== this._selectedColor) {
if (this._recentColors.includes(this._selectedColor)) {
this._recentColors.unshift(this._recentColors.splice(this._recentColors.indexOf(this._selectedColor), 1)[0]);
@@ -241,25 +245,59 @@ class ColorPalette extends UI5Element {
});
}
+ /**
+ * Ensures that only one item is selected or only the last selected item remains active if more than one are explicitly set as 'selected'.
+ *
+ * @private
+ * @returns {void}
+ */
+ _ensureSingleSelectionOrDeselectAll() {
+ const selectedItems = [...this.colors, ...this.recentColorsElements].filter(item => item.selected);
+ selectedItems.pop();
+ selectedItems.forEach(item => { item.selected = false; });
+ }
+
_onclick(e: MouseEvent) {
- const target = e.target as ColorPaletteItem;
- if (target.hasAttribute("ui5-color-palette-item")) {
- this.selectColor(target);
- }
+ this.handleSelection(e.target as ColorPaletteItem);
}
_onkeyup(e: KeyboardEvent) {
const target = e.target as ColorPaletteItem;
- if (isSpace(e) && target.hasAttribute("ui5-color-palette-item")) {
+ if (isSpace(e)) {
e.preventDefault();
- this.selectColor(target);
+ this.handleSelection(target);
}
}
_onkeydown(e: KeyboardEvent) {
const target = e.target as ColorPaletteItem;
- if (isEnter(e) && target.hasAttribute("ui5-color-palette-item")) {
- this.selectColor(target);
+ if (isEnter(e)) {
+ this.handleSelection(target);
+ }
+ }
+
+ handleSelection(target: ColorPaletteItem) {
+ if (!target.hasAttribute("ui5-color-palette-item") || !target.value) {
+ return;
+ }
+
+ if (this._currentlySelected === target) {
+ target.selected = !target.selected;
+ return;
+ }
+
+ this.selectColor(target);
+
+ // Handle selection for items within the 'recentColorsElements'
+ if (this.recentColorsElements.includes(target)) {
+ this.recentColorsElements[0].selected = true;
+ this.recentColorsElements[0].focus();
+ this._currentlySelected = this.recentColorsElements[0];
+ } else {
+ [...this.colors, ...this.recentColorsElements].forEach(item => {
+ item.selected = item === target;
+ });
+ this._currentlySelected = target;
}
}
@@ -269,6 +307,11 @@ class ColorPalette extends UI5Element {
this._onDefaultColorClick();
}
+ if (isSpace(e) || isEnter(e)) {
+ e.preventDefault();
+ this._onDefaultColorClick();
+ }
+
if (isDown(e)) {
e.stopPropagation();
diff --git a/packages/main/src/ColorPaletteItem.hbs b/packages/main/src/ColorPaletteItem.hbs
index f53050f0609a..576935748692 100644
--- a/packages/main/src/ColorPaletteItem.hbs
+++ b/packages/main/src/ColorPaletteItem.hbs
@@ -1,5 +1,5 @@
+ * Note: Only one item must be selected per ui5-color-palette
.
+ * If more than one item is defined as selected, the last one would be considered as the selected one.
+ *
+ * @public
+ * @type {boolean}
+ * @name sap.ui.webc.main.ColorPaletteItem.prototype.selected
+ * @defaultvalue false
+ * @since 1.19.0
+ */
+ @property({ type: Boolean })
+ selected!: boolean;
+
/**
* Defines the tab-index of the element, helper information for the ItemNavigation.
* @private
@@ -109,6 +124,15 @@ class ColorPaletteItem extends UI5Element implements ITabbable {
},
};
}
+
+ get classes() {
+ return {
+ root: {
+ "ui5-cp-item": true,
+ "ui5-cp-selected": this.selected,
+ },
+ };
+ }
}
ColorPaletteItem.define();
diff --git a/packages/main/src/themes/ColorPaletteItem.css b/packages/main/src/themes/ColorPaletteItem.css
index 70761bae5887..b3c04bff2274 100644
--- a/packages/main/src/themes/ColorPaletteItem.css
+++ b/packages/main/src/themes/ColorPaletteItem.css
@@ -8,7 +8,8 @@
box-sizing: border-box;
}
-:host(:not([_disabled]):hover) {
+:host(:not([_disabled]):hover),
+:host([selected]) {
height: var(--_ui5_color-palette-item-hover-height);
width: var(--_ui5_color-palette-item-hover-height);
margin: var(--_ui5_color-palette-item-hover-margin);
@@ -40,16 +41,28 @@
border-radius: 0.1875rem;
}
-.ui5-cp-item:hover:not(:focus) {
- border: 1px solid var(--sapGroup_ContentBackground);
+.ui5-cp-item:hover:not(:focus),
+.ui5-cp-item.ui5-cp-selected {
+ border: 0.0625rem solid var(--sapGroup_ContentBackground);
border-radius: var(--_ui5_color-palette-item-hover-inner-border-radius);
box-sizing: border-box;
}
-:host(:not([_disabled]):not([phone])) .ui5-cp-item:focus{
+.ui5-cp-item.ui5-cp-selected:focus,
+:host(:not([_disabled]):not([phone])) .ui5-cp-item:focus,
+:host(:not([_disabled])[phone]) .ui5-cp-item:focus {
outline: none;
}
+:host(:not([_disabled])[phone]) .ui5-cp-item:focus {
+ width: 2.875rem;
+ height: 2.875rem;
+ right: 0.125rem;
+ bottom: 0.125rem;
+ box-shadow: 0 0 0 0.0625rem #FFF, 0 0 0 0.125rem var(--sapContent_ForegroundBorderColor);
+ border: var(--_ui5_color-palette-item-phone-selected-focus);
+}
+
:host(:not([_disabled]):not([phone]):focus) .ui5-cp-item {
pointer-events: none;
}
@@ -105,3 +118,65 @@
border-radius: var(--_ui5_color-palette-item-after-focus-border-radius);
pointer-events: none;
}
+
+
+/* Specific styling for the selected state */
+
+:host([selected]:not([_disabled]):not([phone])) .ui5-cp-item.ui5-cp-selected:focus:not(:hover)::after,
+:host([selected]:not([_disabled]):not([phone])) .ui5-cp-item.ui5-cp-selected:focus:hover::after {
+ border: var(--_ui5_color-palette-item-selected-focused-border-after);
+}
+
+:host([selected]:not([_disabled]):not([phone])) .ui5-cp-item.ui5-cp-selected:focus:not(:hover)::before,
+:host([selected]:not([_disabled]):not([phone])) .ui5-cp-item.ui5-cp-selected:focus:hover::before {
+ content: "";
+ box-sizing: border-box;
+ position: absolute;
+ left: var(--_ui5_color-palette-item-selected-focused-border-before);
+ top: var(--_ui5_color-palette-item-selected-focused-border-before);
+ right: var(--_ui5_color-palette-item-selected-focused-border-before);
+ bottom: var(--_ui5_color-palette-item-selected-focused-border-before);
+ border: var(--_ui5_color-palette-item-before-focus-color);
+ border-radius: var(--_ui5_color-palette-item-before-focus-border-radius);
+ pointer-events: none;
+}
+
+/* Phone specific styles for the selected state */
+
+:host([selected]:not([_disabled])[phone]) .ui5-cp-item.ui5-cp-selected:focus:not(:hover)::after,
+:host([selected]:not([_disabled])[phone]) .ui5-cp-item.ui5-cp-selected:focus:hover::after {
+ content: "";
+ box-sizing: border-box;
+ position: absolute;
+ left: var(--_ui5_color-palette-item-after-focus-offset);
+ top: var(--_ui5_color-palette-item-after-focus-offset);
+ right: var(--_ui5_color-palette-item-after-focus-offset);
+ bottom: var(--_ui5_color-palette-item-after-focus-offset);
+ border: var(--_ui5_color-palette-item-after-focus-color-phone);
+ border-radius: var(--_ui5_color-palette-item-after-focus-border-radius);
+ pointer-events: none;
+}
+
+:host([selected]:not([_disabled])[phone]) .ui5-cp-item.ui5-cp-selected:focus:not(:hover)::before,
+:host([selected]:not([_disabled])[phone]) .ui5-cp-item.ui5-cp-selected:focus:hover::before {
+ content: "";
+ box-sizing: border-box;
+ position: absolute;
+ left: var(--_ui5_color-palette-item-selected-focused-border-before);
+ top: var(--_ui5_color-palette-item-selected-focused-border-before);
+ right: var(--_ui5_color-palette-item-selected-focused-border-before);
+ bottom: var(--_ui5_color-palette-item-selected-focused-border-before);
+ border: var(--_ui5_color-palette-item-before-focus-color);
+ border-radius: .1875rem;
+ pointer-events: none;
+}
+
+:host([selected]:not([_disabled])[phone]) .ui5-cp-item.ui5-cp-selected:not(:focus),
+:host([selected]:not([_disabled])[phone]) .ui5-cp-item.ui5-cp-selected:not(:focus):not(:hover) {
+ width: 2.875rem;
+ height: 2.875rem;
+ right: 0.125rem;
+ bottom: 0.125rem;
+ border: 0.0625rem solid var(--sapGroup_ContentBackground);
+ box-shadow: 0 0 0 0.0625rem var(--sapContent_ForegroundBorderColor); /* gap */
+}
\ No newline at end of file
diff --git a/packages/main/src/themes/base/ColorPalette-parameters.css b/packages/main/src/themes/base/ColorPalette-parameters.css
index 6297660e25ce..ec627519ba27 100644
--- a/packages/main/src/themes/base/ColorPalette-parameters.css
+++ b/packages/main/src/themes/base/ColorPalette-parameters.css
@@ -10,6 +10,7 @@
--_ui5_color-palette-item-before-focus-offset: 0.0625rem;
--_ui5_color-palette-item-before-focus-hover-offset: 0.0625rem;
--_ui5_color-palette-item-after-focus-color: 0.0625rem dotted black;
+ --_ui5_color-palette-item-selected-focused-border-after: var(--_ui5_color-palette-item-after-focus-color);
--_ui5_color-palette-item-after-focus-offset: 0.0625rem;
--_ui5_color-palette-item-after-focus-hover-offset: 0.0625rem;
--_ui5_color-palette-item-before-focus-border-radius: 0;
@@ -18,4 +19,7 @@
--_ui5_color-palette-item-inner-border-radius: 0.1875rem;
--_ui5_color-palette-item-hover-outer-border-radius: 0.25rem;
--_ui5_color-palette-item-hover-inner-border-radius: 0.1875rem;
+ --_ui5_color-palette-item-selected-focused-border-before: var(--_ui5_color-palette-item-before-focus-hover-offset);
+ --_ui5_color-palette-item-after-focus-color-phone: var(--_ui5_color-palette-item-after-focus-color);
+ --_ui5_color-palette-item-phone-selected-focus: none;
}
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_horizon/ColorPalette-parameters.css b/packages/main/src/themes/sap_horizon/ColorPalette-parameters.css
index e7313180b6bf..9d5d2430da67 100644
--- a/packages/main/src/themes/sap_horizon/ColorPalette-parameters.css
+++ b/packages/main/src/themes/sap_horizon/ColorPalette-parameters.css
@@ -12,10 +12,14 @@
--_ui5_color-palette-item-before-focus-offset: -0.3125rem;
--_ui5_color-palette-item-before-focus-hover-offset: -0.0625rem;
--_ui5_color-palette-item-after-focus-color: 0.0625rem solid var(--sapContent_ContrastFocusColor);
+ --_ui5_color-palette-item-selected-focused-border-after: none;
--_ui5_color-palette-item-after-focus-offset: -0.1875rem;
--_ui5_color-palette-item-after-focus-hover-offset: 0.0625rem;
--_ui5_color-palette-item-before-focus-border-radius: 0.4375rem;
--_ui5_color-palette-item-after-focus-border-radius: 0.3125rem;
--_ui5_color-palette-item-hover-outer-border-radius: 0.4375rem;
--_ui5_color-palette-item-hover-inner-border-radius: 0.375rem;
+ --_ui5_color-palette-item-selected-focused-border-before: -0.1875rem;
+ --_ui5_color-palette-item-after-focus-color-phone: none;
+ --_ui5_color-palette-item-phone-selected-focus: 1px solid var(--sapGroup_ContentBackground);
}
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_horizon_dark/ColorPalette-parameters.css b/packages/main/src/themes/sap_horizon_dark/ColorPalette-parameters.css
index e7313180b6bf..9d5d2430da67 100644
--- a/packages/main/src/themes/sap_horizon_dark/ColorPalette-parameters.css
+++ b/packages/main/src/themes/sap_horizon_dark/ColorPalette-parameters.css
@@ -12,10 +12,14 @@
--_ui5_color-palette-item-before-focus-offset: -0.3125rem;
--_ui5_color-palette-item-before-focus-hover-offset: -0.0625rem;
--_ui5_color-palette-item-after-focus-color: 0.0625rem solid var(--sapContent_ContrastFocusColor);
+ --_ui5_color-palette-item-selected-focused-border-after: none;
--_ui5_color-palette-item-after-focus-offset: -0.1875rem;
--_ui5_color-palette-item-after-focus-hover-offset: 0.0625rem;
--_ui5_color-palette-item-before-focus-border-radius: 0.4375rem;
--_ui5_color-palette-item-after-focus-border-radius: 0.3125rem;
--_ui5_color-palette-item-hover-outer-border-radius: 0.4375rem;
--_ui5_color-palette-item-hover-inner-border-radius: 0.375rem;
+ --_ui5_color-palette-item-selected-focused-border-before: -0.1875rem;
+ --_ui5_color-palette-item-after-focus-color-phone: none;
+ --_ui5_color-palette-item-phone-selected-focus: 1px solid var(--sapGroup_ContentBackground);
}
\ No newline at end of file
diff --git a/packages/main/test/pages/ColorPalette.html b/packages/main/test/pages/ColorPalette.html
index dc5a67ff10bc..e547b9392b1e 100644
--- a/packages/main/test/pages/ColorPalette.html
+++ b/packages/main/test/pages/ColorPalette.html
@@ -19,15 +19,13 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -107,6 +105,7 @@
+