Skip to content

feat(framework): Maintain a common z-index for all UI5 Web Components instances and OpenUI5 #2980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 22, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions packages/main/src/popup-utils/PopupUtils.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import getSharedResource from "@ui5/webcomponents-base/dist/getSharedResource.js";
import getActiveElement from "@ui5/webcomponents-base/dist/util/getActiveElement.js";

let currentZIndex = 100;
const PopupUtilsData = getSharedResource("PopupUtilsData", {});
PopupUtilsData.currentZIndex = PopupUtilsData.currentZIndex || 100;

const getFocusedElement = () => {
const element = getActiveElement();
Expand Down Expand Up @@ -67,8 +69,8 @@ const getClosedPopupParent = el => {
};

const getNextZIndex = () => {
currentZIndex += 2;
return currentZIndex;
PopupUtilsData.currentZIndex += 2;
return PopupUtilsData.currentZIndex;
};

export {
Expand Down