100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
UI updates: Multi select input support added and cleanup of list based controls
Rich Turner79b3213f5607
diff --git a/ui/component/or-app/src/or-header.ts b/ui/component/or-app/src/or-header.tsindex 69a81005e..98a58d69e 100644--- a/ui/component/or-app/src/or-header.ts+++ b/ui/component/or-app/src/or-header.ts@@ -12,7 +12,8 @@ import manager, {} from "@openremote/core";import "@openremote/or-mwc-components/or-mwc-dialog";import "@openremote/or-icon";-import {getContentWithMenuTemplate, MenuItem} from "@openremote/or-mwc-components/or-mwc-menu";+import {getContentWithMenuTemplate} from "@openremote/or-mwc-components/or-mwc-menu";+import {ListItem} from "@openremote/or-mwc-components/or-mwc-list";import {Tenant} from "@openremote/model";import {router} from "./index";@@ -44,7 +45,7 @@ export const DEFAULT_LANGUAGES: Languages = {es: "spanish"};-function getHeaderMenuItems(items: HeaderItem[]): MenuItem[] {+function getHeaderMenuItems(items: HeaderItem[]): ListItem[] {return items.filter(hasRequiredRole).map((option) => {return {text: option.text,@@ -449,7 +450,7 @@ class OrHeader extends LitElement {return {text: r.displayName!,value: r.realm!- } as MenuItem;+ } as ListItem;});return html`diff --git a/ui/component/or-asset-tree/src/index.ts b/ui/component/or-asset-tree/src/index.tsindex 0125bee4e..901ae0cb7 100644--- a/ui/component/or-asset-tree/src/index.ts+++ b/ui/component/or-asset-tree/src/index.ts@@ -22,7 +22,8 @@ import {InputType, OrInput} from "@openremote/or-mwc-components/or-mwc-input";import Qs from "qs";import {getAssetDescriptorIconTemplate} from "@openremote/or-icon";import "@openremote/or-mwc-components/or-mwc-menu";-import {getContentWithMenuTemplate, MenuItem} from "@openremote/or-mwc-components/or-mwc-menu";+import {getContentWithMenuTemplate} from "@openremote/or-mwc-components/or-mwc-menu";+import {ListItem} from "@openremote/or-mwc-components/or-mwc-list";import "@openremote/or-mwc-components/or-mwc-list";import {i18next} from "@openremote/or-translate";import "@openremote/or-mwc-components/or-mwc-dialog";@@ -313,7 +314,7 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {${getContentWithMenuTemplate(html`<or-mwc-input type="${InputType.BUTTON}" icon="sort-variant" ?hidden="${!this.showSortBtn}"></or-mwc-input>`,- ["name", "type", "createdOn", "status"].map((sort) => { return {value: sort, text: i18next.t(sort)} as MenuItem; }),+ ["name", "type", "createdOn", "status"].map((sort) => { return {value: sort, text: i18next.t(sort)} as ListItem; }),this.sortBy,(v) => this._onSortClicked(v as string))}</div>diff --git a/ui/component/or-asset-viewer/src/or-edit-asset-panel.ts b/ui/component/or-asset-viewer/src/or-edit-asset-panel.tsindex 91c0a4544..215ab045c 100644--- a/ui/component/or-asset-viewer/src/or-edit-asset-panel.ts+++ b/ui/component/or-asset-viewer/src/or-edit-asset-panel.ts@@ -392,7 +392,7 @@ export class OrEditAssetPanel extends LitElement {const dialog = showDialog({content: html`<div id="meta-creator">- <or-mwc-list id="meta-creator-list" .type="${ListType.CHECKBOX}" .listItems="${metaItemList}"></or-mwc-list>+ <or-mwc-list id="meta-creator-list" .type="${ListType.MULTI_CHECKBOX}" .listItems="${metaItemList}"></or-mwc-list></div>`,styles: html`diff --git a/ui/component/or-log-viewer/src/index.ts b/ui/component/or-log-viewer/src/index.tsindex 9c0df9b49..45ed8fe08 100644--- a/ui/component/or-log-viewer/src/index.ts+++ b/ui/component/or-log-viewer/src/index.ts@@ -20,7 +20,8 @@ import {InputType, OrInputChangedEvent} from "@openremote/or-mwc-components/or-mimport {MDCDataTable} from "@material/data-table";import moment from "moment";import "@openremote/or-mwc-components/or-mwc-menu";-import {getContentWithMenuTemplate, MenuItem} from "@openremote/or-mwc-components/or-mwc-menu";+import {getContentWithMenuTemplate} from "@openremote/or-mwc-components/or-mwc-menu";+import {ListItem} from "@openremote/or-mwc-components/or-mwc-list";import { GenericAxiosResponse } from "axios";// TODO: Add webpack/rollup to build so consumers aren't forced to use the same tooling@@ -336,13 +337,13 @@ export class OrLogViewer extends translate(i18next)(LitElement) {return Object.keys((Model as any)["SyslogLevel"]).map((key) => [key, i18next.t(key.toLocaleLowerCase())]);}- protected _getCategoryMenuItems(): MenuItem[] {+ protected _getCategoryMenuItems(): ListItem[] {const categories = this.config && this.config.allowedCategories ? this.config.allowedCategories : Object.keys((Model as any)["SyslogCategory"]) as Model.SyslogCategory[];return categories.map((cat) => {return {text: i18next.t("logCategory." + cat, {defaultValue: Util.capitaliseFirstLetter(cat.toLowerCase().replace(/_/g, " "))}),value: cat- } as MenuItem;+ } as ListItem;});}diff --git a/ui/component/or-mwc-components/package.json b/ui/component/or-mwc-components/package.jsonindex 0e838cf17..15bb44913 100644--- a/ui/component/or-mwc-components/package.json+++ b/ui/component/or-mwc-components/package.json@@ -21,7 +21,7 @@"@material/menu": "^9.0.0","@material/snackbar": "^9.0.0","@openremote/core": "^1.0.3",-+ "@openremote/or-icon": "^1.0.3","@openremote/or-translate": "^1.0.3","lit-element": "^2.4.0"},diff --git a/ui/component/or-mwc-components/src/or-mwc-input.ts b/ui/component/or-mwc-components/src/or-mwc-input.tsindex 80e2f84c3..c7f629704 100644--- a/ui/component/or-mwc-components/src/or-mwc-input.ts+++ b/ui/component/or-mwc-components/src/or-mwc-input.ts@@ -13,8 +13,37 @@ import {MDCList, MDCListActionEvent} from "@material/list";import {MDCFormField, MDCFormFieldInput} from "@material/form-field";import {MDCIconButtonToggle, MDCIconButtonToggleEventDetail} from "@material/icon-button";import {DefaultColor4, DefaultColor8, Util} from "@openremote/core";-import i18next from "i18next";-import { ValueFormat, ValueFormatStyleRepresentation, AssetDescriptor, ValueDescriptorHolder, ValueDescriptor, WellknownValueTypes, MetaHolder, WellknownMetaItems, ValueHolder, NameHolder, Attribute, ValueConstraint, AttributeDescriptor, ValueConstraintSize, ValueConstraintPattern, ValueConstraintMax, ValueConstraintMin, ValueConstraintAllowedValues, ValueConstraintPastOrPresent, ValueConstraintPast, ValueConstraintFuture, ValueConstraintFutureOrPresent, ValueConstraintNotNull, ValueConstraintNotBlank, ValueConstraintNotEmpty, NameValueHolder } from "@openremote/model";+import "@openremote/or-icon";+import {OrIcon} from "@openremote/or-icon";+import {+ AssetDescriptor,+ Attribute,+ AttributeDescriptor,+ MetaHolder,+ NameHolder,+ NameValueHolder,+ ValueConstraint,+ ValueConstraintAllowedValues,+ ValueConstraintFuture,+ ValueConstraintFutureOrPresent,+ ValueConstraintMax,+ ValueConstraintMin,+ ValueConstraintNotBlank,+ ValueConstraintNotEmpty,+ ValueConstraintNotNull,+ ValueConstraintPast,+ ValueConstraintPastOrPresent,+ ValueConstraintPattern,+ ValueConstraintSize,+ ValueDescriptor,+ ValueDescriptorHolder,+ ValueFormat,+ ValueFormatStyleRepresentation,+ ValueHolder,+ WellknownMetaItems,+ WellknownValueTypes+} from "@openremote/model";+import {getItemTemplate, getListTemplate, ListItem, ListType} from "./or-mwc-list";// TODO: Add webpack/rollup to build so consumers aren't forced to use the same toolingconst buttonStyle = require("@material/button/dist/mdc.button.css");@@ -145,6 +174,7 @@ export const getValueHolderInputTemplateProvider: ValueInputProviderGenerator =let pattern: string | undefined;let min: any;let max: any;+ let multiple: any;let required: boolean | undefined;let selectOptions: [string, string][] | undefined;let valueConverter: (v: any) => any | undefined;@@ -310,6 +340,10 @@ export const getValueHolderInputTemplateProvider: ValueInputProviderGenerator =return ["" + v, label || "" + v];});inputType = InputType.SELECT;++ if (valueDescriptor.arrayDimensions && valueDescriptor.arrayDimensions > 0) {+ multiple = true;+ }}if (inputType === InputType.DATETIME) {@@ -346,7 +380,7 @@ export const getValueHolderInputTemplateProvider: ValueInputProviderGenerator =const label = supportsLabel ? options.label : undefined;return html`<or-mwc-input id="input" .type="${inputType}" .label="${label}" .value="${value}" .pattern="${pattern}"- .min="${min}" .max="${max}" .format="${format}" .focused="${focused}" .required="${required}"+ .min="${min}" .max="${max}" .format="${format}" .focused="${focused}" .required="${required}" .multiple="${multiple}".options="${selectOptions}" .readonly="${readonly}" .disabled="${disabled}" .step="${step}".helperText="${helperText}" .helperPersistent="${true}"@or-mwc-input-changed="${(e: OrInputChangedEvent) => {@@ -668,6 +702,7 @@ export class OrInput extends LitElement {protected _mdcComponent?: MDCComponent<any>;protected _mdcComponent2?: MDCComponent<any>;protected _selectedIndex = -1;+ protected _tempValue: any;disconnectedCallback(): void {super.disconnectedCallback();@@ -811,9 +846,47 @@ export class OrInput extends LitElement {};const opts = this.resolveOptions(this.options);- const value = opts && opts.find(([optValue, optDisplay], index) => this.value === optValue);- const valueLabel = value ? value[1] : typeof this.value === "string" ? this.value : "";- this._selectedIndex = -1;++ const itemClickHandler: (ev: MouseEvent, item: ListItem) => void = (ev, item) => {+ const value = item.value;++ if (this.multiple) {+ ev.stopPropagation();+ let inputValue = this._tempValue || this.value;+ if (!Array.isArray(inputValue)) {+ inputValue = inputValue ? [this.value] : [];+ }+ const index = inputValue.findIndex((v: any) => v === value);+ if (index >= 0) {+ inputValue.splice(index, 1);+ } else {+ inputValue.push(value);+ }+ const icon = (ev.composedPath()[0] as HTMLElement).getElementsByTagName("or-icon")[0] as OrIcon;+ if (icon) {+ icon.icon = index >= 0 ? undefined : "check";+ }+ this._tempValue = inputValue;+ }+ };++ const menuCloseHandler = () => {++ const v = (this._tempValue || this.value);+ window.setTimeout(() => {+ if (this._mdcComponent) {+ // Hack to stop label moving down when there is a value set+ (this._mdcComponent as any).foundation.adapter.floatLabel(v && (!Array.isArray(v) || v.length > 0));+ }+ });++ if (!this._tempValue) {+ return;+ }+ const val = [...this._tempValue];+ this._tempValue = undefined;+ this.onValueChange(undefined, val);+ };return html`<div id="component"@@ -826,7 +899,7 @@ export class OrInput extends LitElement {<span class="mdc-select__ripple"></span>${outlined ? this.renderOutlined(labelTemplate) : labelTemplate}<span class="mdc-select__selected-text-container">- <span id="selected-text" class="mdc-select__selected-text">${valueLabel ? i18next.t(valueLabel) : ""}<</span>+ <span id="selected-text" class="mdc-select__selected-text">${this.getSelectedTextValue()}</span></span><span class="mdc-select__dropdown-icon"><svg@@ -848,19 +921,26 @@ export class OrInput extends LitElement {</span>${!outlined ? html`<div class="mdc-line-ripple"></div>` : ``}</div>-- <div class="mdc-select__menu mdc-menu mdc-menu-surface">- <ul class="mdc-list" role="listbox">- ${opts ? opts.map(([optValue, optDisplay], index) => {- if (this.value === optValue) {- this._selectedIndex = index;- }- return html`<li class="mdc-list-item ${this._selectedIndex === index ? "mdc-list-item--selected" : ""}" role="option" aria-selected="${this._selectedIndex === index}" data-value="${optValue}">- <span class="mdc-list-item__ripple"></span>- <span class="mdc-list-item__text">${i18next.t(optDisplay)}</span>- </li>`;- }) : ``}- </ul>++ <div class="mdc-select__menu mdc-menu mdc-menu-surface" @MDCMenuSurface:closed="${menuCloseHandler}">+ ${getListTemplate(+ this.multiple ? ListType.MULTI_TICK : ListType.SELECT,+ opts ? html`${opts.map(([optValue, optDisplay], index) => {+ return getItemTemplate(+ {+ text: optDisplay,+ value: optValue+ },+ index,+ Array.isArray(this.value) ? this.value as string[] : this.value ? [this.value as string] : undefined,+ this.multiple ? ListType.MULTI_TICK : ListType.SELECT,+ false,+ itemClickHandler+ )+ })}` : html``,+ false,+ undefined+ )}</div>${hasHelper ? html`@@ -1137,8 +1217,6 @@ export class OrInput extends LitElement {if (this.format) {return this.format;}--}protected updated(_changedProperties: PropertyValues): void {@@ -1165,7 +1243,22 @@ export class OrInput extends LitElement {case InputType.SELECT:const mdcSelect = new MDCSelect(component);this._mdcComponent = mdcSelect;- mdcSelect.selectedIndex = this._selectedIndex;++ if (!this.value) {+ mdcSelect.selectedIndex = -1; // Without this first option will be shown as selected+ }++ (this._mdcComponent as any).foundation.adapter.floatLabel(this.value && (!Array.isArray(this.value) || this.value.length > 0));++ // This overrides the standard mdc menu body click capture handler as it doesn't work with webcomponents+ (mdcSelect as any).menu.menuSurface_.foundation.handleBodyClick = function (evt: MouseEvent) {+ const el = evt.composedPath()[0]; // Use composed path not evt target to work with webcomponents+ if (this.adapter.isElementInContainer(el)) {+ return;+ }+ (mdcSelect as any).menu.menuSurface_.close();+ };+break;case InputType.RADIO:break;@@ -1216,7 +1309,9 @@ export class OrInput extends LitElement {} else {// some components need to be kept in sync with the DOMif (this.type === InputType.SELECT && this._mdcComponent) {- (this._mdcComponent as MDCSelect).selectedIndex = this._selectedIndex;+ const selectedText = this.getSelectedTextValue();+ (this._mdcComponent as any).foundation.adapter.setSelectedText(selectedText);+ (this._mdcComponent as any).foundation.adapter.floatLabel(!!selectedText);} else if (this.type === InputType.RANGE && this._mdcComponent) {const slider = this._mdcComponent as MDCSlider;slider.setDisabled(this.disabled || this.readonly);@@ -1262,18 +1357,27 @@ export class OrInput extends LitElement {if (this._mdcComponent instanceof MDCTextField) {this._mdcComponent.valid = valid;}- if(!valid && this.type != InputType.CHECKBOX) return+ if (!valid && this.type !== InputType.CHECKBOX) return;}- const previousValue = this.value;- if (newValue === "null") {- newValue = null;+ let previousValue = this.value;++ if (previousValue === undefined) {+ previousValue = null;}if (newValue === "undefined") {newValue = undefined;}+ if (newValue === undefined) {+ newValue = null;+ }++ if (newValue === "null") {+ newValue = null;+ }+if (typeof(newValue) === "string") {switch (this.type) {case InputType.CHECKBOX:@@ -1338,4 +1442,11 @@ export class OrInput extends LitElement {return resolved;}++ protected getSelectedTextValue(): string {+ const opts = this.resolveOptions(this.options);+ const value = this.value;+ const values = Array.isArray(value) ? value as string[] : value ? [value as string] : undefined;+ return !opts || !values ? "" : values.map(v => opts.find(([optValue, optDisplay], index) => v === optValue)).map(opt => opt && opt[1]).join(",");+ }}diff --git a/ui/component/or-mwc-components/src/or-mwc-list.ts b/ui/component/or-mwc-components/src/or-mwc-list.tsindex 1e0b89e7b..3d5ae8d55 100644--- a/ui/component/or-mwc-components/src/or-mwc-list.ts+++ b/ui/component/or-mwc-components/src/or-mwc-list.ts@@ -13,10 +13,12 @@ import {styleMap} from "lit-html/directives/style-map";import {ifDefined} from "lit-html/directives/if-defined";import {MDCList, MDCListActionEvent} from "@material/list";import { DefaultColor8, DefaultColor4, Util } from "@openremote/core";-import i18next from "i18next";+import "@openremote/or-translate";const listStyle = require("@material/list/dist/mdc.list.css");const checkboxStyle = require("@material/checkbox/dist/mdc.checkbox.css");+export {MDCListActionEvent};+export interface ListItem {icon?: string;trailingIcon?: string;@@ -46,33 +48,12 @@ declare global {}}-// language=CSS-const style = css`- :host {- white-space: nowrap;- --internal-or-mwc-input-color: var(--or-mwc-input-color, var(--or-app-color4, ${unsafeCSS(DefaultColor4)}));- --internal-or-mwc-input-text-color: var(--or-mwc-input-text-color, var(--or-app-color1, ${unsafeCSS(DefaultColor8)}));-- --mdc-theme-primary: var(--internal-or-mwc-input-color);- --mdc-theme-on-primary: var(--internal-or-mwc-input-text-color);- --mdc-theme-secondary: var(--internal-or-mwc-input-color);- }-- .mdc-list-item__graphic {- margin-right: 16px;- }-- a {- text-decoration: none;- color: rgba(0, 0, 0, 0.87);- }-`;-export enum ListType {PLAIN = "PLAIN",- SELECTABLE = "SELECTABLE",+ SELECT = "SELECT",RADIO = "RADIO",- CHECKBOX = "CHECKBOX"+ MULTI_CHECKBOX = "MULTI_CHECKBOX",+ MULTI_TICK = "MULTI_TICK"}export type ListGroupItem = {@@ -93,6 +74,161 @@ export function createListGroup(lists: ListGroupItem[]) {`;}+export function getListTemplate(type: ListType, content: TemplateResult, isTwoLine?: boolean, role?: string, actionHandler?: (ev: MDCListActionEvent) => void): TemplateResult {++ role = role || "listbox";++ switch (type) {+ case ListType.RADIO:+ role = "radiogroup";+ break;+ case ListType.MULTI_CHECKBOX:+ role = "group";+ break;+ }++ return html`+ <ul id="list" class="mdc-list${isTwoLine ? " mdc-list--two-line" : ""}" role="${ifDefined(role)}" @MDCList:action="${(ev: MDCListActionEvent) => actionHandler && actionHandler(ev)}" aria-hidden="true" aria-orientation="vertical" tabindex="-1">+ ${content}+ </ul>+ `;+}++export function getItemTemplate(item: ListItem | null, index: number, selectedValues: string | string[] | undefined, type: ListType, translate?: boolean, itemClickCallback?: (e: MouseEvent, item: ListItem) => void): TemplateResult {++ if (item === null) {+ // Divider+ return html`<li role="separator" class="mdc-list-divider"></li>`;+ }++ const listItem = item as ListItem;+ const multiSelect = type === ListType.MULTI_CHECKBOX || type === ListType.MULTI_TICK;+ const value = listItem.value;+ const isSelected = type !== ListType.PLAIN && (selectedValues === value || (Array.isArray(selectedValues) && selectedValues.length > 0 && ((multiSelect && selectedValues.some((v) => v === value)) || (!multiSelect && selectedValues[0] === value))));+ const text = listItem.text !== undefined ? listItem.text : listItem.value;+ const secondaryText = listItem.secondaryText;+ let role: string | undefined = "menuitem";+ let ariaSelected: string | undefined;+ let ariaChecked: string | undefined;+ let tabIndex: string | undefined;+ let textTemplate: TemplateResult | string = ``;+ let leftTemplate: TemplateResult | string = ``;+ let rightTemplate: TemplateResult | string = ``;+ let icon = listItem.icon;+ let selectedClassName = "mdc-list-item--selected";+ translate = translate || item.translate;++ if (multiSelect && type === ListType.MULTI_TICK) {+ icon = isSelected ? "check" : undefined;+ }++ if (type === ListType.MULTI_TICK || icon) {+ leftTemplate = html`+ <span class="mdc-list-item__graphic">+ <or-icon icon="${icon}"></or-icon>+ </span>+ `;+ }++ if (listItem.trailingIcon) {+ rightTemplate = html`+ <span class="mdc-list-item__meta" aria-hidden="true">+ <or-icon icon="${listItem.trailingIcon}"></or-icon>+ </span>+ `;+ }++ switch (type) {+ case ListType.SELECT:+ ariaSelected = isSelected ? "true" : "false";+ tabIndex = isSelected || ((!selectedValues || selectedValues.length === 0) && index === 0) ? "0" : undefined;+ role = "option";+ break;+ case ListType.RADIO:+ ariaChecked = isSelected ? "true" : "false";+ role = "radio";+ leftTemplate = html`+ <span class="mdc-list-item__graphic">+ <div class="mdc-radio">+ <input class="mdc-radio__native-control" id="radio-item-${index+1}" type="radio" value="${value}" />+ <div class="mdc-radio__background">+ <div class="mdc-radio__outer-circle"></div>+ <div class="mdc-radio__inner-circle"></div>+ </div>+ </div>+ </span>+ `;+ break;+ case ListType.MULTI_CHECKBOX:+ ariaChecked = isSelected ? "true" : "false";+ role = "checkbox";+ leftTemplate = html`+ <div class="mdc-checkbox">+ <input type="checkbox" class="mdc-checkbox__native-control" />+ <div class="mdc-checkbox__background">+ <svg class="mdc-checkbox__checkmark" viewBox="0 0 24 24">+ <path class="mdc-checkbox__checkmark-path" fill="none" d="M1.73,12.91 8.1,19.28 22.79,4.59"/>+ </svg>+ <div class="mdc-checkbox__mixedmark"></div>+ </div>+ </div>+ `;+ break;+ case ListType.MULTI_TICK:+ ariaChecked = isSelected ? "true" : "false";+ selectedClassName = "mdc-menu-item--selected";+ break;+ }++ if (text) {+ if (secondaryText !== undefined) {+ textTemplate = html`+ <span class="mdc-list-item__text">+ <span class="mdc-list-item__primary-text">${translate ? html`<or-translate .value="${text}"></or-translate>` : text}</span>+ <span class="mdc-list-item__secondary-text">${translate ? html`<or-translate .value="${secondaryText || ""}"></or-translate>` : secondaryText || ""}</span>+ </span>+ `;+ } else {+ if (type === ListType.RADIO) {+ textTemplate = html`<label class="mdc-list-item__text" for="radio-item-${index+1}">${translate ? html`<or-translate .value="${text}"></or-translate>` : text}</label>`;+ } else {+ textTemplate = html`<span class="mdc-list-item__text">${translate ? html`<or-translate .value="${text}"></or-translate>` : text}</span>`;+ }+ }+ }++ return html`+ <li @click="${(e: MouseEvent) => itemClickCallback && itemClickCallback(e, item)}" style="${listItem.styleMap ? styleMap(listItem.styleMap) : ""}" class="mdc-list-item ${isSelected ? selectedClassName : ""}" role="${ifDefined(role)}" tabindex="${ifDefined(tabIndex)}" aria-checked="${ifDefined(ariaChecked)}" aria-selected="${ifDefined(ariaSelected)}" data-value="${value}">+ <span class="mdc-list-item__ripple"></span>+ ${leftTemplate}+ ${textTemplate}+ ${rightTemplate}+ </li>+ `;+}++// language=CSS+const style = css`+ :host {+ white-space: nowrap;+ --internal-or-mwc-input-color: var(--or-mwc-input-color, var(--or-app-color4, ${unsafeCSS(DefaultColor4)}));+ --internal-or-mwc-input-text-color: var(--or-mwc-input-text-color, var(--or-app-color1, ${unsafeCSS(DefaultColor8)}));++ --mdc-theme-primary: var(--internal-or-mwc-input-color);+ --mdc-theme-on-primary: var(--internal-or-mwc-input-text-color);+ --mdc-theme-secondary: var(--internal-or-mwc-input-color);+ }++ .mdc-list-item__graphic {+ margin-right: 16px;+ }++ a {+ text-decoration: none;+ color: rgba(0, 0, 0, 0.87);+ }+`;+@customElement("or-mwc-list")export class OrMwcList extends LitElement {@@ -111,7 +247,7 @@ export class OrMwcList extends LitElement {public values?: string[] | string;@property({type: String, attribute: true})- public type: ListType = ListType.SELECTABLE;+ public type: ListType = ListType.SELECT;@query("#wrapper")protected _wrapperElem!: HTMLElement;@@ -123,7 +259,6 @@ export class OrMwcList extends LitElement {constructor() {super();-}disconnectedCallback(): void {@@ -135,7 +270,6 @@ export class OrMwcList extends LitElement {}protected shouldUpdate(_changedProperties: PropertyValues): boolean {-if (this._mdcComponent && _changedProperties.has("values")) {if (!Util.objectsEqual(this.values, _changedProperties.get("values"))) {const vals = this.values ? Array.isArray(this.values) ? this.values : [this.values] : [];@@ -147,152 +281,16 @@ export class OrMwcList extends LitElement {}protected render() {-- if (!this.listItems || this.listItems.length === 0) {- return html``;- }-- return this.getItemsTemplate(this.listItems, this.values, this.type);- }-- protected getItemsTemplate(items: (ListItem | null)[], values: string | string[] | undefined, type: ListType): TemplateResult {-- const isTwoLine = items.some((item) => item && !!item.secondaryText);- let role: string | undefined;-- switch (type) {- case ListType.SELECTABLE:- role = "listbox";- break;- case ListType.RADIO:- role = "radiogroup";- break;- case ListType.CHECKBOX:- role = "group";- break;- }-- return html`- <ul id="list" class="mdc-list${isTwoLine ? " mdc-list--two-line" : ""}" role="${ifDefined(role)}" @MDCList:action="${(ev: MDCListActionEvent) => this._onSelected(ev)}">- ${items.map((listItem, index) => this.getItemTemplate(listItem, index, values, type))}- </ul>- `;- }-- protected getItemTemplate(item: ListItem | null, index: number, values: string | string[] | undefined, type: ListType): TemplateResult {-- if (item === null) {- // Divider- return html`<li role="separator" class="mdc-list-divider"></li>`;- }-- const listItem = item as ListItem;- const multiSelect = type === ListType.CHECKBOX;- const value = listItem.value;- const isSelected = type !== ListType.PLAIN && (values === value || (Array.isArray(values) && values.length > 0 && ((multiSelect && values.some((v) => v === value)) || (!multiSelect && values[0] === value))));- let text = listItem.text !== undefined ? listItem.text : listItem.value;- let secondaryText = listItem.secondaryText;-- if (listItem.translate !== false) {- text = i18next.t(text);- if (secondaryText) {- secondaryText = i18next.t(secondaryText);- }- }- let role: string | undefined;- let ariaSelected: string | undefined;- let ariaChecked: string | undefined;- let tabIndex: string | undefined;- let textTemplate: TemplateResult | string = ``;- let leftTemplate: TemplateResult | string = ``;- let rightTemplate: TemplateResult | string = ``;-- if (listItem.icon) {- leftTemplate = html`- <span class="mdc-list-item__graphic">- <or-icon icon="${listItem.icon}"></or-icon>- </span>- `;- }-- if (listItem.trailingIcon) {- rightTemplate = html`- <span class="mdc-list-item__meta" aria-hidden="true">- <or-icon icon="${listItem.trailingIcon}"></or-icon>- </span>- `;- }-- switch (type) {- case ListType.SELECTABLE:- ariaSelected = isSelected ? "true" : "false";- tabIndex = isSelected || ((!values || values.length === 0) && index === 0) ? "0" : undefined;- role = "option";- break;- case ListType.RADIO:- ariaChecked = isSelected ? "true" : "false";- role = "radio";- leftTemplate = html`- <span class="mdc-list-item__graphic">- <div class="mdc-radio">- <input class="mdc-radio__native-control" id="radio-item-${index+1}" type="radio" value="${value}" />- <div class="mdc-radio__background">- <div class="mdc-radio__outer-circle"></div>- <div class="mdc-radio__inner-circle"></div>- </div>- </div>- </span>- `;- break;- case ListType.CHECKBOX:- ariaChecked = isSelected ? "true" : "false";- role = "checkbox";- leftTemplate = html`- <div class="mdc-checkbox">- <input type="checkbox" class="mdc-checkbox__native-control" />- <div class="mdc-checkbox__background">- <svg class="mdc-checkbox__checkmark" viewBox="0 0 24 24">- <path class="mdc-checkbox__checkmark-path" fill="none" d="M1.73,12.91 8.1,19.28 22.79,4.59"/>- </svg>- <div class="mdc-checkbox__mixedmark"></div>- </div>- </div>- `;- break;- }-- if (text) {- if (secondaryText !== undefined) {- textTemplate = html`- <span class="mdc-list-item__text">- <span class="mdc-list-item__primary-text">${text}</span>- <span class="mdc-list-item__secondary-text">${secondaryText || ""}</or-translate></span>- </span>- `;- } else {- if (type === ListType.RADIO) {- textTemplate = html`<label class="mdc-list-item__text" for="radio-item-${index+1}">${text}</label>`;- } else {- textTemplate = html`<span class="mdc-list-item__text">${text}</span>`;- }- }- }-- return html`- <li style="${listItem.styleMap ? styleMap(listItem.styleMap) : ""}" class="mdc-list-item${isSelected ? " mdc-list-item--selected" : ""}" role="${ifDefined(role)}" tabindex="${ifDefined(tabIndex)}" aria-checked="${ifDefined(ariaChecked)}" aria-selected="${ifDefined(ariaSelected)}">- <span class="mdc-list-item__ripple"></span>- ${leftTemplate}- ${textTemplate}- ${rightTemplate}- </li>- `;+ const content = !this.listItems ? html`` : html`${this.listItems.map((listItem, index) => getItemTemplate(listItem, index, this.values, this.type))}`;+ const isTwoLine = this.listItems && this.listItems.some((item) => item && !!item.secondaryText);+ return getListTemplate(this.type, content, isTwoLine, undefined, (ev) => this._onSelected(ev));}protected firstUpdated(_changedProperties: PropertyValues): void {super.firstUpdated(_changedProperties);if (this._mdcElem) {this._mdcComponent = new MDCList(this._mdcElem);- if (this.type === ListType.SELECTABLE || this.type === ListType.RADIO) {+ if (this.type === ListType.SELECT || this.type === ListType.RADIO) {this._mdcComponent.singleSelection = true;}}@@ -327,7 +325,7 @@ export class OrMwcList extends LitElement {return indexes;}, [] as number[]);- this._mdcComponent.selectedIndex = this.type === ListType.CHECKBOX ? indexes : indexes.length >= 1 ? indexes[0] : -1;+ this._mdcComponent.selectedIndex = this.type === ListType.MULTI_CHECKBOX ? indexes : indexes.length >= 1 ? indexes[0] : -1;}protected _onSelected(ev: MDCListActionEvent) {@@ -335,28 +333,4 @@ export class OrMwcList extends LitElement {ev.stopPropagation();this.dispatchEvent(new OrMwcListChangedEvent(this.selectedItems));}-- // private _itemClicked(e: MouseEvent, item: MenuItem) {- // e.stopPropagation();- // const value = item.value;- //- // if (!this.multiSelect) {- // this.values = value;- // if(!this.noSurface){- // this._mdcComponent!.open = false;- // }- // } else {- // if (!Array.isArray(this.values)) {- // this.values = this.values ? [this.values] : [];- // }- // const index = this.values.findIndex((v) => v === value);- // if (index >= 0) {- // this.values.splice(index, 1);- // } else {- // this.values.push(value);- // }- // this.requestUpdate();- // }- // this.dispatchEvent(new OrMwcMenuChangedEvent(this.values));- // }}diff --git a/ui/component/or-mwc-components/src/or-mwc-menu.ts b/ui/component/or-mwc-components/src/or-mwc-menu.tsindex 2f281fb25..365851335 100644--- a/ui/component/or-mwc-components/src/or-mwc-menu.ts+++ b/ui/component/or-mwc-components/src/or-mwc-menu.ts@@ -9,26 +9,17 @@ import {TemplateResult,unsafeCSS} from "lit-element";-import {styleMap} from "lit-html/directives/style-map";import {MDCMenu} from "@material/menu";-import { DefaultColor8, DefaultColor4 } from "@openremote/core";+import {DefaultColor4, DefaultColor8} from "@openremote/core";// @ts-ignoreimport listStyle from "@material/list/dist/mdc.list.css";// @ts-ignoreimport menuSurfaceStyle from "@material/menu-surface/dist/mdc.menu-surface.css";+import {getItemTemplate, getListTemplate, ListItem, ListType, MDCListActionEvent} from "./or-mwc-list";// @ts-ignoreconst menuStyle = require("@material/menu/dist/mdc.menu.css");-export interface MenuItem {- icon?: string;- trailingIcon?: string;- text?: string;- secondaryText?: string;- value: string;- styleMap?: {[style: string]: string};-}-export class OrMwcMenuChangedEvent extends CustomEvent<string | string[]> {public static readonly NAME = "or-mwc-menu-changed";@@ -61,7 +52,7 @@ declare global {}}-export function getContentWithMenuTemplate(content: TemplateResult, menuItems: (MenuItem | MenuItem[] | null)[], selectedValues: string[] | string | undefined, valueChangedCallback: (values: string[] | string) => void, closedCallback?: () => void, multiSelect = false): TemplateResult {+export function getContentWithMenuTemplate(content: TemplateResult, menuItems: (ListItem | ListItem[] | null)[], selectedValues: string[] | string | undefined, valueChangedCallback: (values: string[] | string) => void, closedCallback?: () => void, multiSelect = false, translateValues = true): TemplateResult {const openMenu = (evt: Event) => {if (!menuItems) {@@ -74,7 +65,7 @@ export function getContentWithMenuTemplate(content: TemplateResult, menuItems: (return html`<span><span @click="${openMenu}">${content}</span>- ${menuItems ? html`<or-mwc-menu ?multiselect="${multiSelect}" @or-mwc-menu-closed="${() => {if (closedCallback) { closedCallback(); }} }" @or-mwc-menu-changed="${(evt: OrMwcMenuChangedEvent) => {if (valueChangedCallback) { valueChangedCallback(evt.detail); }} }" .values="${selectedValues}" .menuItems="${menuItems}" id="menu"></or-mwc-menu>` : ``}+ ${menuItems ? html`<or-mwc-menu ?multiselect="${multiSelect}" @or-mwc-menu-closed="${() => {if (closedCallback) { closedCallback(); }} }" @or-mwc-menu-changed="${(evt: OrMwcMenuChangedEvent) => {if (valueChangedCallback) { valueChangedCallback(evt.detail); }} }" .translateValues="${translateValues}" .values="${selectedValues}" .menuItems="${menuItems}" id="menu"></or-mwc-menu>` : ``}</span>`;}@@ -115,7 +106,7 @@ export class OrMwcMenu extends LitElement {}@property({type: Array})- public menuItems?: (MenuItem | MenuItem[] | null)[];+ public menuItems?: (ListItem | ListItem[] | null)[];@property({type: Array})public values?: string[] | string;@@ -127,7 +118,7 @@ export class OrMwcMenu extends LitElement {public visible?: boolean;@property({type: Boolean, attribute: true})- public twoLine?: boolean;+ public translateValues?: boolean;@query("#wrapper")protected _wrapperElem!: HTMLElement;@@ -155,83 +146,37 @@ export class OrMwcMenu extends LitElement {return html``;}+ const content = this.getItemsTemplate(this.menuItems, this.translateValues);+ const isTwoLine = this.menuItems && this.menuItems.some((item) => item && !Array.isArray(item) && !!item.secondaryText);+return html`<div id="wrapper" class="mdc-menu-surface--anchor"><div class="mdc-menu mdc-menu-surface" id="menu" @MDCMenuSurface:closed="${this._onMenuClosed}">- <ul class="mdc-list ${this.twoLine ? "mdc-list--two-line" : ""}" role="menu" aria-hidden="true" aria-orientation="vertical" tabindex="-1">- ${this.getItemsTemplate(this.menuItems)}- </ul>+ ${getListTemplate(ListType.MULTI_TICK, content, isTwoLine, "menu")}</div></div>`;}- protected getItemsTemplate(items: (MenuItem | MenuItem[] | null)[]): TemplateResult {+ protected getItemsTemplate(items: (ListItem | ListItem[] | null)[], translate?: boolean): TemplateResult {- const hasIcon = this.multiSelect || items.find((mi) => mi && !Array.isArray(mi) && mi.icon);+ const type = this.multiSelect ? ListType.MULTI_TICK : ListType.PLAIN;return html`- ${items.map((item) => {- if (item === null) {- return html`<li class="mdc-list-divider" role="separator"></li>`;- }- if (Array.isArray(item)) {- return html`- <li>- <ul class="mdc-menu__selection-group">- ${this.getItemsTemplate(item)}- </ul>- </li>- `;- }+ ${items.map((item, index) => {- const isSelected = this.isValueSelected((item as MenuItem).value);- let icon = item.icon;- const text = item.text !== undefined ? item.text : item.value;- let leftTemplate: TemplateResult | string = ``;- let rightTemplate: TemplateResult | string = ``;-- if (this.multiSelect) {- icon = isSelected ? "check" : undefined;- }-- if (hasIcon) {- leftTemplate = html`<span class="mdc-list-item__graphic mdc-menu__selection-group-icon" aria-hidden="true">- <or-icon icon="${icon}"></or-icon>- </span>`;- }-- if (item.trailingIcon) {- rightTemplate = html`<span class="mdc-list-item__meta" aria-hidden="true">- <or-icon icon="${item.trailingIcon}"></or-icon>- </span>`;- }-+ if (Array.isArray(item)) {return html`- <li @click="${(e: MouseEvent) => {this._itemClicked(e, item)}}" style="${item.styleMap ? styleMap(item.styleMap) : ""}" class="mdc-list-item ${isSelected ? "mdc-menu-item--selected" : ""}" role="menuitem" aria-checked="${isSelected}">- ${leftTemplate}- ${!text ? html`` : html`- <span class="mdc-list-item__text">- <span class="${this.twoLine ? "mdc-list-item__primary-text" : ""}"><or-translate value="${item.text}"></or-translate></span>- ${this.twoLine ? html`<span class="mdc-list-item__secondary-text"><or-translate value="${item.secondaryText}"></or-translate></span>` : ``}- </span>- `}- ${rightTemplate}+ <li>+ <ul class="mdc-menu__selection-group">+ ${this.getItemsTemplate(item, translate)}+ </ul></li>`;- })}- `;- }-- protected isValueSelected(value: string): boolean {-- if (Array.isArray(this.values) && this.values.length > 0) {- if (this.multiSelect) {- return !!this.values.find((v) => v === value);}- return this.values[0] === value;- }- return this.values === value;++ return getItemTemplate(item, index, this.values, type, translate, (e, item) => this._itemClicked(e, item));+ })}`;}protected firstUpdated(_changedProperties: PropertyValues): void {@@ -262,7 +207,7 @@ export class OrMwcMenu extends LitElement {this.dispatchEvent(new OrMwcMenuClosedEvent());}- private _itemClicked(e: MouseEvent, item: MenuItem) {+ private _itemClicked(e: MouseEvent, item: ListItem) {e.stopPropagation();const value = item.value;diff --git a/ui/component/or-mwc-components/tsconfig.json b/ui/component/or-mwc-components/tsconfig.jsonindex b18fb4430..19d452147 100644--- a/ui/component/or-mwc-components/tsconfig.json+++ b/ui/component/or-mwc-components/tsconfig.json@@ -10,6 +10,7 @@],"references": [{ "path": "../core" },- { "path": "../or-translate" }+ { "path": "../or-translate" },+ { "path": "../or-icon" }]}diff --git a/ui/component/or-rules/src/json-viewer/or-rule-condition.ts b/ui/component/or-rules/src/json-viewer/or-rule-condition.tsindex 8fa91abcc..e32673a69 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-condition.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-condition.ts@@ -3,7 +3,8 @@ import {AssetTypeInfo, RuleCondition, WellknownAssets} from "@openremote/model";import {ConditionType, getAssetTypeFromQuery, RulesConfig} from "../index";import "./or-rule-asset-query";import "@openremote/or-mwc-components/or-mwc-menu";-import {getContentWithMenuTemplate, MenuItem} from "@openremote/or-mwc-components/or-mwc-menu";+import {getContentWithMenuTemplate} from "@openremote/or-mwc-components/or-mwc-menu";+import {ListItem} from "@openremote/or-mwc-components/or-mwc-list";import "@openremote/or-icon";import "@openremote/or-translate";import {InputType} from "@openremote/or-mwc-components/or-mwc-input";@@ -15,7 +16,7 @@ import {OrRuleAssetQuery} from "./or-rule-asset-query";const TIMER_COLOR = "4b87ea";const DATE_TIME_COLOR = "6AEAA4";-export function getWhenTypesMenu(config?: RulesConfig, assetInfos?: AssetTypeInfo[]): MenuItem[] {+export function getWhenTypesMenu(config?: RulesConfig, assetInfos?: AssetTypeInfo[]): ListItem[] {let addAssetTypes = true;let addTimer = true;@@ -25,7 +26,7 @@ export function getWhenTypesMenu(config?: RulesConfig, assetInfos?: AssetTypeInfaddTimer = config.controls.allowedConditionTypes.indexOf(ConditionType.TIMER) >= 0;}- const menu: MenuItem[] = [];+ const menu: ListItem[] = [];if (addAssetTypes && assetInfos) {menu.push(...assetInfos.filter((assetInfo) => assetInfo.assetDescriptor!.descriptorType !== "agent").map((assetTypeInfo) => {@@ -39,7 +40,7 @@ export function getWhenTypesMenu(config?: RulesConfig, assetInfos?: AssetTypeInfvalue: assetTypeInfo.assetDescriptor!.name,icon: icon ? icon : AssetModelUtil.getAssetDescriptorIcon(WellknownAssets.THINGASSET),styleMap: styleMap- } as MenuItem;+ } as ListItem;}).sort(Util.sortByString((listItem) => listItem.value!)));}@@ -50,7 +51,7 @@ export function getWhenTypesMenu(config?: RulesConfig, assetInfos?: AssetTypeInficon: "timer",value: ConditionType.TIMER,styleMap: {"--or-icon-fill": "#" + TIMER_COLOR}- } as MenuItem);+ } as ListItem);}return menu;diff --git a/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts b/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.tsindex c2e044490..726379429 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts@@ -13,7 +13,8 @@ import {} from "@openremote/model";import i18next from "i18next";import {InputType} from "@openremote/or-mwc-components/or-mwc-input";-import {getContentWithMenuTemplate, MenuItem} from "@openremote/or-mwc-components/or-mwc-menu";+import {getContentWithMenuTemplate} from "@openremote/or-mwc-components/or-mwc-menu";+import {ListItem} from "@openremote/or-mwc-components/or-mwc-list";import {AssetModelUtil, Util} from "@openremote/core";import "./or-rule-action-attribute";import "./or-rule-action-notification";@@ -22,7 +23,7 @@ import {translate} from "@openremote/or-translate";const NOTIFICATION_COLOR = "4B87EA";const WAIT_COLOR = "EACC54";-function getActionTypesMenu(config?: RulesConfig, assetInfos?: AssetTypeInfo[]): MenuItem[] {+function getActionTypesMenu(config?: RulesConfig, assetInfos?: AssetTypeInfo[]): ListItem[] {let addAssetTypes = true;let addWait = true;@@ -37,7 +38,7 @@ function getActionTypesMenu(config?: RulesConfig, assetInfos?: AssetTypeInfo[]):}- const menu: MenuItem[] = [];+ const menu: ListItem[] = [];if (addAssetTypes && assetInfos) {menu.push(...assetInfos.filter((assetInfo) => assetInfo.assetDescriptor!.descriptorType !== "agent").map((assetTypeInfo) => {@@ -51,7 +52,7 @@ function getActionTypesMenu(config?: RulesConfig, assetInfos?: AssetTypeInfo[]):value: assetTypeInfo.assetDescriptor!.name,icon: icon ? icon : AssetModelUtil.getAssetDescriptorIcon(WellknownAssets.THINGASSET),styleMap: styleMap- } as MenuItem;+ } as ListItem;}));}@@ -61,7 +62,7 @@ function getActionTypesMenu(config?: RulesConfig, assetInfos?: AssetTypeInfo[]):icon: "email",value: ActionType.EMAIL,styleMap: {"--or-icon-fill": "#" + NOTIFICATION_COLOR}- } as MenuItem);+ } as ListItem);}if (addPushNotification) {@@ -70,7 +71,7 @@ function getActionTypesMenu(config?: RulesConfig, assetInfos?: AssetTypeInfo[]):icon: "cellphone-message",value: ActionType.PUSH_NOTIFICATION,styleMap: {"--or-icon-fill": "#" + NOTIFICATION_COLOR}- } as MenuItem);+ } as ListItem);}if (addWait) {@@ -79,7 +80,7 @@ function getActionTypesMenu(config?: RulesConfig, assetInfos?: AssetTypeInfo[]):icon: "timer",value: ActionType.WAIT,styleMap: {"--or-icon-fill": "#" + WAIT_COLOR}- } as MenuItem);+ } as ListItem);}menu.sort(Util.sortByString((listItem) => listItem.value!));@@ -99,7 +100,7 @@ export enum RecurrenceOption {ONCE_PER_WEEK = "oncePerWeek",}-function getRecurrenceMenu(config?: RulesConfig): MenuItem[] {+function getRecurrenceMenu(config?: RulesConfig): ListItem[] {if (config && config.controls && config.controls.allowedRecurrenceOptions) {return config.controls.allowedRecurrenceOptions.map((value) => {diff --git a/ui/component/or-rules/src/or-rule-list.ts b/ui/component/or-rules/src/or-rule-list.tsindex 509f4a081..1bf918613 100644--- a/ui/component/or-rules/src/or-rule-list.ts+++ b/ui/component/or-rules/src/or-rule-list.ts@@ -17,7 +17,8 @@ import {RulesetNode} from "./index";import "@openremote/or-mwc-components/or-mwc-menu";-import {MenuItem, getContentWithMenuTemplate} from "@openremote/or-mwc-components/or-mwc-menu";+import {getContentWithMenuTemplate} from "@openremote/or-mwc-components/or-mwc-menu";+import {ListItem} from "@openremote/or-mwc-components/or-mwc-list";import {translate} from "@openremote/or-translate";import i18next from "i18next";import {showErrorDialog, showOkCancelDialog} from "@openremote/or-mwc-components/or-mwc-dialog";@@ -257,7 +258,7 @@ export class OrRuleList extends translate(i18next)(LitElement) {addTemplate = getContentWithMenuTemplate(html`<or-mwc-input type="${InputType.BUTTON}" icon="plus"></or-mwc-input>`,allowedLanguages.map((l) => {- return {value: l, text: i18next.t(l)} as MenuItem;+ return {value: l, text: i18next.t(l)} as ListItem;}),this.language,(v) => this._onAddClicked(v as RulesetLang));@@ -292,7 +293,7 @@ export class OrRuleList extends translate(i18next)(LitElement) {${getContentWithMenuTemplate(html`<or-mwc-input type="${InputType.BUTTON}" icon="sort-variant"></or-mwc-input>`,- sortOptions.map((sort) => { return { value: sort, text: i18next.t(sort) } as MenuItem; }),+ sortOptions.map((sort) => { return { value: sort, text: i18next.t(sort) } as ListItem; }),this.sortBy,(v) => this._onSortClicked(v as string))}</div>