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
Prevent or-mwc-menu from disrupting KPI attribute card layout (#1842)
Hammad Hassan596841a83e57
diff --git a/ui/component/or-attribute-card/src/index.ts b/ui/component/or-attribute-card/src/index.tsindex d7d63eaf3..749c3becf 100644--- a/ui/component/or-attribute-card/src/index.ts+++ b/ui/component/or-attribute-card/src/index.ts@@ -454,7 +454,14 @@ export class OrAttributeCard extends LitElement {return option;}),this.period,- (value) => this._setPeriodOption(value)+ (value) => this._setPeriodOption(value),+ undefined, // closedCallback+ false, // multiSelect+ true, // translateValues+ false, // midHeight+ false, // fullWidth+ "kpi-menu-id", // Menu Id+ true // fixToHost)}</div>` : html`diff --git a/ui/component/or-mwc-components/src/or-mwc-menu.ts b/ui/component/or-mwc-components/src/or-mwc-menu.tsindex b760806ad..ebdbe4cdf 100644--- a/ui/component/or-mwc-components/src/or-mwc-menu.ts+++ b/ui/component/or-mwc-components/src/or-mwc-menu.ts@@ -16,6 +16,7 @@ import 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";+import { ref } from 'lit/directives/ref.js';// @ts-ignoreconst menuStyle = require("@material/menu/dist/mdc.menu.css");@@ -51,20 +52,52 @@ declare global {}}-export function getContentWithMenuTemplate(content: TemplateResult, menuItems: (ListItem | ListItem[] | null)[], selectedValues: string[] | string | undefined, valueChangedCallback: (values: string[] | string) => void, closedCallback?: () => void, multiSelect = false, translateValues = true, midHeight = false, fullWidth = false): TemplateResult {+export function positionMenuAtElement<T extends OrMwcMenu>(+ menu: T,+ hostElement?: HTMLElement+): T {+ if (!hostElement) {+ hostElement = document.body;+ }+ const rect = hostElement.getBoundingClientRect();++ // Applying a style that is calculated from the runtime coordinates of+ // the host element.+ Object.assign(menu.style, {+ position: 'fixed',+ top: `${rect.bottom}px`,+ left: `${rect.left}px`,+ zIndex: '1000',+ display: 'block'+ });++ return menu;+}++export function getContentWithMenuTemplate(content: TemplateResult, menuItems: (ListItem | ListItem[] | null)[], selectedValues: string[] | string | undefined, valueChangedCallback: (values: string[] | string) => void, closedCallback?: () => void, multiSelect = false, translateValues = true, midHeight = false, fullWidth = false, menuId = "menu", fixedToHost = false): TemplateResult {+ let menuRef: OrMwcMenu | null = null; // Reference to the menuconst openMenu = (evt: Event) => {if (!menuItems) {return;}+ if (fixedToHost && menuRef) {+ const hostElement = evt.currentTarget as HTMLElement;++ // Using run time coordinates to assign a fixed position to the menu+ positionMenuAtElement(+ menuRef,+ hostElement+ );+ }((evt.currentTarget as Element).parentElement!.lastElementChild as OrMwcMenu).open();};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); }} }" .translateValues="${translateValues}" .values="${selectedValues}" .menuItems="${menuItems}" .midHeight="${midHeight}" .fullWidth="${fullWidth}" 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}" .midHeight="${midHeight}" .fullWidth="${fullWidth}" id="${menuId}" ${ref(el => (menuRef = el as OrMwcMenu))}></or-mwc-menu>` : ``}</span>`;}