diff --git a/api/js/etemplate/Et2Tree/Et2TreeDropdown.ts b/api/js/etemplate/Et2Tree/Et2TreeDropdown.ts index 70892c0ede..8c9257ed18 100644 --- a/api/js/etemplate/Et2Tree/Et2TreeDropdown.ts +++ b/api/js/etemplate/Et2Tree/Et2TreeDropdown.ts @@ -15,6 +15,7 @@ import {SearchMixin, SearchResult, SearchResultElement, SearchResultsInterface} import {Et2InputWidgetInterface} from "../Et2InputWidget/Et2InputWidget"; import {Required} from "../Validators/Required"; import {SelectOption} from "../Et2Select/FindSelectOptions"; +import {EgwMenuShoelace} from "../../egw_action/EgwMenuShoelace"; interface TreeSearchResults extends SearchResultsInterface @@ -612,7 +613,7 @@ export class Et2TreeDropdown extends SearchMixin & Et2InputWidg let o = event.relatedTarget; while(o) { - if(o == this.shadowRoot) + if(o == this.shadowRoot || o instanceof EgwMenuShoelace) { return; } diff --git a/pixelegg/css/fancy.css b/pixelegg/css/fancy.css index 7fcfe27808..8d0bad987d 100644 --- a/pixelegg/css/fancy.css +++ b/pixelegg/css/fancy.css @@ -7108,6 +7108,9 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl div.complex_arrow { background-image: url('../../api/templates/default/images/dhxmenu_subar.svg'); } +body > .egw_menu::part(popup) { + z-index: var(--sl-z-index-dropdown); +} body > .egw_menu egw-menu-shoelace { --sl-shadow-x-large: 0 4px 16px hsla(240, 3.8%, 46.1%, 0.6); } diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css index 2105209d10..c9396e214a 100644 --- a/pixelegg/css/mobile.css +++ b/pixelegg/css/mobile.css @@ -7111,6 +7111,9 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl div.complex_arrow { background-image: url('../../api/templates/default/images/dhxmenu_subar.svg'); } +body > .egw_menu::part(popup) { + z-index: var(--sl-z-index-dropdown); +} body > .egw_menu egw-menu-shoelace { --sl-shadow-x-large: 0 4px 16px hsla(240, 3.8%, 46.1%, 0.6); } diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index 3c8e0e031d..7027cc553b 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -7101,6 +7101,9 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl div.complex_arrow { background-image: url('../../api/templates/default/images/dhxmenu_subar.svg'); } +body > .egw_menu::part(popup) { + z-index: var(--sl-z-index-dropdown); +} body > .egw_menu egw-menu-shoelace { --sl-shadow-x-large: 0 4px 16px hsla(240, 3.8%, 46.1%, 0.6); } diff --git a/pixelegg/css/pixelegg.less b/pixelegg/css/pixelegg.less index f2f033c201..d42efe7e2a 100644 --- a/pixelegg/css/pixelegg.less +++ b/pixelegg/css/pixelegg.less @@ -384,6 +384,9 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl div.complex_arrow { background-image: url('../../api/templates/default/images/dhxmenu_subar.svg'); } +body > .egw_menu::part(popup) { + z-index: var(--sl-z-index-dropdown); +} body > .egw_menu egw-menu-shoelace { --sl-shadow-x-large: 0 4px 16px hsl(240 3.8% 46.1% / 60%); } diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css index 0f759eed69..91eb1c6bfe 100644 --- a/pixelegg/mobile/fw_mobile.css +++ b/pixelegg/mobile/fw_mobile.css @@ -6918,6 +6918,9 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl div.complex_arrow { background-image: url('../../api/templates/default/images/dhxmenu_subar.svg'); } +body > .egw_menu::part(popup) { + z-index: var(--sl-z-index-dropdown); +} body > .egw_menu egw-menu-shoelace { --sl-shadow-x-large: 0 4px 16px hsla(240, 3.8%, 46.1%, 0.6); }