Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

show checkboxes in multiselect list and color them "primary" when selected

Vincentc07ce9f86ecb
diff --git a/ui/component/or-mwc-components/src/or-mwc-input.ts b/ui/component/or-mwc-components/src/or-mwc-input.ts
index b92e65e82..a5c9f419b 100644
--- a/ui/component/or-mwc-components/src/or-mwc-input.ts
+++ b/ui/component/or-mwc-components/src/or-mwc-input.ts
@@ -550,6 +550,10 @@ const style = css`
#field {
height: 100%;
}
+
+ .mdc-select__menu .mdc-list .mdc-list-item.mdc-list-item--selected or-icon {
+ --or-icon-fill: var(--or-app-color4);
+ }
`;
@customElement("or-mwc-input")
@@ -864,9 +868,16 @@ export class OrMwcInput extends LitElement {
} else {
inputValue.push(value);
}
- const icon = (ev.composedPath()[0] as HTMLElement).getElementsByTagName("or-icon")[0] as OrIcon;
+ const listItemEl = (ev.composedPath()[0] as HTMLElement).closest("li") as HTMLElement,
+ icon = (ev.composedPath()[0] as HTMLElement).getElementsByTagName("or-icon")[0] as OrIcon;
if (icon) {
- icon.icon = index >= 0 ? undefined : "check";
+ if (index >= 0) {
+ icon.icon = "checkbox-blank-outline";
+ listItemEl.classList.remove("mdc-list-item--selected");
+ } else {
+ icon.icon = "checkbox-marked";
+ listItemEl.classList.add("mdc-list-item--selected");
+ }
}
this._tempValue = inputValue;
}
diff --git a/ui/component/or-mwc-components/src/or-mwc-list.ts b/ui/component/or-mwc-components/src/or-mwc-list.ts
index 3b93dc3bb..b38e0d016 100644
--- a/ui/component/or-mwc-components/src/or-mwc-list.ts
+++ b/ui/component/or-mwc-components/src/or-mwc-list.ts
@@ -118,9 +118,9 @@ export function getItemTemplate(item: ListItem | null, index: number, selectedVa
let icon = listItem.icon;
let selectedClassName = "mdc-list-item--selected";
translate = translate || item.translate;
-
+
if (multiSelect && type === ListType.MULTI_TICK) {
- icon = isSelected ? "check" : undefined;
+ icon = isSelected ? "checkbox-marked" : "checkbox-blank-outline";
}
if (type === ListType.MULTI_TICK || icon) {
@@ -177,7 +177,7 @@ export function getItemTemplate(item: ListItem | null, index: number, selectedVa
break;
case ListType.MULTI_TICK:
ariaChecked = isSelected ? "true" : "false";
- selectedClassName = "mdc-menu-item--selected";
+ selectedClassName = "mdc-list-item--selected";
break;
}