@sdata/web-vue 3.0.1 → 3.0.2

package/es/_hooks/use-popup-manager.js

@@ -1,4 +1,4 @@
-import "../style/theme/z-index.js";
+import { MESSAGE_STACK_BASE_Z_INDEX } from "../style/theme/z-index.js";
 import { onBeforeUnmount, onMounted, readonly, ref, watch } from "vue";
 //#region components/_hooks/use-popup-manager.ts
 var PopupManager = class {
@@ -9,17 +9,18 @@ var PopupManager = class {
 			message: /* @__PURE__ */ new Set()
 		};
 		this.getNextZIndex = (type) => {
-			return (type === "message" ? Array.from(this.popupStack.message).pop() || 1002 : Array.from(this.popupStack.popup).pop() || 1e3) + 1;
+			const popupZIndex = Array.from(this.popupStack.popup).pop() || 1e3;
+			return (type === "message" ? Math.max(popupZIndex, MESSAGE_STACK_BASE_Z_INDEX) : popupZIndex) + 1;
 		};
 		this.add = (type) => {
 			const zIndex = this.getNextZIndex(type);
 			this.popupStack[type].add(zIndex);
-			if (type === "dialog") this.popupStack.popup.add(zIndex);
+			if (type !== "popup") this.popupStack.popup.add(zIndex);
 			return zIndex;
 		};
 		this.delete = (zIndex, type) => {
 			this.popupStack[type].delete(zIndex);
-			if (type === "dialog") this.popupStack.popup.delete(zIndex);
+			if (type !== "popup") this.popupStack.popup.delete(zIndex);
 		};
 		this.isLastDialog = (zIndex) => {
 			if (this.popupStack.dialog.size > 1) return zIndex === Array.from(this.popupStack.dialog).pop();

package/es/trigger/trigger.js

@@ -366,6 +366,14 @@ var trigger_default = /* @__PURE__ */ defineComponent({
 			documentContainer: true
 		});
 		const { zIndex } = usePopupManager("popup", { visible: computedVisible });
+		const syncThemePopupContainerZIndex = () => {
+			if (computedVisible.value && zIndex.value > 0 && (themePopupContainer === null || themePopupContainer === void 0 ? void 0 : themePopupContainer.value) && mergedPopupContainer.value === themePopupContainer.value) themePopupContainer.value.style.zIndex = String(zIndex.value);
+		};
+		watch([
+			computedVisible,
+			zIndex,
+			mergedPopupContainer
+		], syncThemePopupContainerZIndex, { immediate: true });
 		let delayTimer = 0;
 		let outsideListener = false;
 		let windowListener = false;

package/json/web-types.json

@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/JetBrains/web-types/master/schema/web-types.json",
   "framework": "vue",
   "name": "@sdata/web-vue",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "contributions": {
     "html": {
       "types-syntax": "typescript",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sdata/web-vue",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "SD Design Vue: A Vue.js 3 UI Library",
   "keywords": [
     "sd",