Skip to content

Commit 12cf724

Browse files
chore(ui5-user-settings): resolve comments
1 parent bc19bf6 commit 12cf724

3 files changed

Lines changed: 11 additions & 18 deletions

File tree

packages/fiori/src/UserSettingsAppearanceViewItem.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ import {
77
import jsxRenderer from "@ui5/webcomponents-base/dist/renderer/JsxRenderer.js";
88
import ListItemCustom from "@ui5/webcomponents/dist/ListItemCustom.js";
99

10+
// Import default icon used by appearance view items
11+
import "@ui5/webcomponents-icons/dist/product.js";
12+
1013
@customElement({
1114
tag: "ui5-user-settings-appearance-view-item",
1215
renderer: jsxRenderer,

packages/website/docs/_samples/fiori/UserSettingsDialog/Basic/main.js

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import "@ui5/webcomponents-fiori/dist/UserSettingsAppearanceViewGroup.js";
55
import "@ui5/webcomponents-fiori/dist/UserSettingsView.js";
66
import "@ui5/webcomponents-fiori/dist/UserSettingsItem.js";
77
import "@ui5/webcomponents-fiori/dist/UserSettingsDialog.js";
8+
import { setTheme } from "@ui5/webcomponents-base/dist/config/Theme.js";
89

910
import "@ui5/webcomponents-fiori/dist/ShellBar.js";
1011
import "@ui5/webcomponents-fiori/dist/ShellBarBranding.js";
@@ -30,6 +31,7 @@ import "@ui5/webcomponents-icons/dist/action-settings.js";
3031
import "@ui5/webcomponents-icons/dist/user-settings.js";
3132
import "@ui5/webcomponents-icons/dist/person-placeholder.js";
3233
import "@ui5/webcomponents-icons/dist/palette.js";
34+
import "@ui5/webcomponents-icons/dist/product.js";
3335
import "@ui5/webcomponents-icons/dist/iphone.js";
3436
import "@ui5/webcomponents-icons/dist/qr-code.js";
3537
import "@ui5/webcomponents-icons/dist/bell.js";
@@ -42,7 +44,7 @@ const settingsDialogItems = [...document.getElementsByTagName("ui5-user-settings
4244
const account = document.getElementById("account");
4345
const resetAllButton = document.getElementById("reset-all-button");
4446
// Theme change
45-
const appearanceView = document.getElementById("appearanceView");
47+
const appearanceView = document.querySelector("ui5-user-settings-appearance-view");
4648
//Language and Region
4749
const languageRegion = document.getElementById("language-region-container");
4850
const language = document.getElementById("language");
@@ -56,10 +58,8 @@ const mobile2Button = document.getElementById("mobile2-button");
5658

5759
const resetAll = document.getElementById("resetAll");
5860
const resetPersonalization = document.getElementById("resetPersonalization");
59-
const toast = [...document.getElementsByTagName("ui5-toast")][0];
6061
const toastReset = document.getElementById("toastReset");
6162
const toastResetAll = document.getElementById("toastResetAll");
62-
const themeSave =document.getElementById("themeSave");
6363

6464
shellbar.addEventListener("ui5-profile-click", (event) => {
6565
console.log(" menuShellBar ui5-profile-click")
@@ -104,9 +104,9 @@ appearanceView.addEventListener("selection-change", (e) => {
104104
const selectedItem = e.detail.item;
105105

106106
if (selectedItem?.itemKey) {
107-
window["sap-ui-webcomponents-bundle"].configuration.setTheme(selectedItem.itemKey);
107+
setTheme(selectedItem.itemKey);
108108
}
109-
});
109+
});
110110

111111
dialogClosers.forEach(btn => {
112112
btn.addEventListener("click", () => {
@@ -130,11 +130,6 @@ mobile2Button.addEventListener("click", function () {
130130
mobileSecondPage.text = "Android";
131131
});
132132

133-
134-
themeSave.addEventListener("click", function () {
135-
toast.open = true;
136-
});
137-
138133
resetPersonalization.addEventListener("click", function () {
139134
toastReset.open = true;
140135
});

packages/website/docs/_samples/patterns/UXCIntegration/Basic/main.js

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ import "@ui5/webcomponents-fiori/dist/UserSettingsAppearanceViewGroup.js";
5252
import "@ui5/webcomponents-fiori/dist/UserSettingsView.js";
5353
import "@ui5/webcomponents-fiori/dist/UserSettingsItem.js";
5454
import "@ui5/webcomponents-fiori/dist/UserSettingsDialog.js";
55+
import { setTheme } from "@ui5/webcomponents-base/dist/config/Theme.js";
5556

5657
import "@ui5/webcomponents-icons/dist/globe.js";
5758
import "@ui5/webcomponents-icons/dist/collaborate.js";
@@ -80,6 +81,7 @@ import "@ui5/webcomponents-icons/dist/action-settings.js";
8081
import "@ui5/webcomponents-icons/dist/user-settings.js";
8182
import "@ui5/webcomponents-icons/dist/person-placeholder.js";
8283
import "@ui5/webcomponents-icons/dist/palette.js";
84+
import "@ui5/webcomponents-icons/dist/product.js";
8385
import "@ui5/webcomponents-icons/dist/iphone.js";
8486
import "@ui5/webcomponents-icons/dist/qr-code.js";
8587
import "@ui5/webcomponents-icons/dist/bell.js";
@@ -294,11 +296,8 @@ const mobile2Button = document.getElementById("mobile2-button");
294296
const resetAllButton = document.getElementById("reset-all-button");
295297
const resetAll = document.getElementById("resetAll");
296298
const resetPersonalization = document.getElementById("resetPersonalization");
297-
const toast = document.getElementById("toastThemeSave");
298299
const toastReset = document.getElementById("toastReset");
299300
const toastResetAll = document.getElementById("toastResetAll");
300-
const themeSave =document.getElementById("themeSave");
301-
302301

303302
//Language and Region
304303
language.addEventListener("selection-change", function (event) {
@@ -322,7 +321,7 @@ appearanceView.addEventListener("selection-change", (e) => {
322321
const selectedItem = e.detail.item;
323322

324323
if (selectedItem?.itemKey) {
325-
window["sap-ui-webcomponents-bundle"].configuration.setTheme(selectedItem.itemKey);
324+
setTheme(selectedItem.itemKey);
326325
}
327326
});
328327

@@ -340,10 +339,6 @@ resetAllButton.addEventListener("click", function () {
340339
additionalDialog.open = true;
341340
});
342341

343-
themeSave.addEventListener("click", function () {
344-
toast.open = true;
345-
});
346-
347342
resetPersonalization.addEventListener("click", function () {
348343
toastReset.open = true;
349344
});

0 commit comments

Comments
 (0)