@rainbow-oh/yee-c 0.15.2 → 0.15.3

package/dist/cjs/Dialog/dialog.js

@@ -160,7 +160,7 @@ var Dialog = (baseprops) => {
   });
   (0, import_useLockFocus.default)(contentElement, delayOpen);
   (0, import_useEsc.default)({
-    enabled: keyboard,
+    enabled: keyboard && open,
     onEsc: () => {
       onCancel == null ? void 0 : onCancel();
     }

package/dist/cjs/Drawer/drawer.js

@@ -157,7 +157,7 @@ var Drawer = (baseprops) => {
   const bodyId = `${drawerId}-body`;
   (0, import_useLockFocus.default)(contentRef.current, delayOpen);
   (0, import_useEsc.default)({
-    enabled: keyboard,
+    enabled: keyboard && open,
     onEsc: () => {
       onClose == null ? void 0 : onClose();
     }

package/dist/cjs/ImageViewer/popup.js

@@ -74,7 +74,7 @@ var Popup = (baseprops, ref) => {
   const internalRef = (0, import_react2.useRef)(null);
   const componentRef = ref || internalRef;
   (0, import_useEsc.default)({
-    enabled: keyboard,
+    enabled: keyboard && open,
     onEsc: () => {
       onClose == null ? void 0 : onClose();
     }

package/dist/cjs/hooks/useEsc.d.ts

@@ -10,7 +10,7 @@ export interface UseEscProps {
     enabled?: boolean;
 }
 /**
- * React Hook for listening to ESC key press
+ * Hook for listening to ESC key press
  *
  * @example
  * ```tsx

package/dist/cjs/hooks/useEsc.js

@@ -34,25 +34,30 @@ __export(useEsc_exports, {
 module.exports = __toCommonJS(useEsc_exports);
 var import_react = require("react");
 var import_useEvent = __toESM(require("./useEvent"));
+var escSeq = 0;
+var escLayers = [];
 function useEsc({ onEsc, enabled = true } = {}) {
   const handleEsc = (0, import_useEvent.default)(onEsc || (() => {
   }));
-  const handleKeyDown = (0, import_react.useCallback)(
-    (event) => {
-      if (event.key === "Escape") {
-        event.preventDefault();
-        handleEsc(event);
-      }
-    },
-    [handleEsc]
-  );
+  const [id] = (0, import_react.useState)(() => ++escSeq);
   (0, import_react.useEffect)(() => {
     if (!enabled) {
       return;
     }
+    escLayers.push(id);
+    const handleKeyDown = (event) => {
+      if (event.key === "Escape" && escLayers[escLayers.length - 1] === id) {
+        event.preventDefault();
+        handleEsc(event);
+      }
+    };
     document.addEventListener("keydown", handleKeyDown);
     return () => {
       document.removeEventListener("keydown", handleKeyDown);
+      const index = escLayers.lastIndexOf(id);
+      if (index !== -1) {
+        escLayers.splice(index, 1);
+      }
     };
-  }, [enabled, handleKeyDown]);
+  }, [enabled, handleEsc, id]);
 }

package/dist/cjs/style/themes.css

@@ -1,7 +1,7 @@
 /*!
  * @rainbow-oh/yee-c CSS Variables
  * Auto-generated, do not edit manually
- * Generated on 2026-10-20T02:41:00.650Z
+ * Generated on 2026-10-20T03:27:37.391Z
  */
 
 /* ========== color.blue.css ========== */

package/dist/cjs/style/variables.css

@@ -1,7 +1,7 @@
 /*!
  * @rainbow-oh/yee-c CSS Variables
  * Auto-generated, do not edit manually
- * Generated on 2026-10-20T02:41:00.650Z
+ * Generated on 2026-10-20T03:27:37.391Z
  */
 
 /* ========== color.css ========== */

package/dist/cjs/version.d.ts

@@ -3,4 +3,4 @@ declare global {
         __yee_c_version__: string;
     }
 }
-export declare const version = "0.15.2";
+export declare const version = "0.15.3";

package/dist/cjs/version.js

@@ -22,7 +22,7 @@ __export(version_exports, {
   version: () => version
 });
 module.exports = __toCommonJS(version_exports);
-var version = "0.15.2";
+var version = "0.15.3";
 if (typeof window !== "undefined") {
   window.__yee_c_version__ = version;
 }

package/dist/esm/Dialog/dialog.js

@@ -114,9 +114,10 @@ var Dialog = function Dialog(baseprops) {
   // lock focus in the dialog
   useLockFocus(contentElement, delayOpen);
 
-  // enable esc to close dialog
+  // enable esc to close dialog; gated on open so a mounted-but-closed
+  // dialog does not occupy the esc layer stack and swallow the top layer
   useEsc({
-    enabled: keyboard,
+    enabled: keyboard && open,
     onEsc: function onEsc() {
       onCancel === null || onCancel === void 0 || onCancel();
     }

package/dist/esm/Drawer/drawer.js

@@ -136,8 +136,11 @@ var Drawer = function Drawer(baseprops) {
   var titleId = "".concat(drawerId, "-title");
   var bodyId = "".concat(drawerId, "-body");
   useLockFocus(contentRef.current, delayOpen);
+
+  // gated on open so a mounted-but-closed drawer does not occupy the esc
+  // layer stack and swallow the top layer
   useEsc({
-    enabled: keyboard,
+    enabled: keyboard && open,
     onEsc: function onEsc() {
       onClose === null || onClose === void 0 || onClose();
     }

package/dist/esm/ImageViewer/popup.js

@@ -37,8 +37,11 @@ var Popup = function Popup(baseprops, ref) {
     onClose = props.onClose;
   var internalRef = useRef(null);
   var componentRef = ref || internalRef;
+
+  // gated on open so a mounted-but-closed viewer does not occupy the esc
+  // layer stack and swallow the top layer
   useEsc({
-    enabled: keyboard,
+    enabled: keyboard && open,
     onEsc: function onEsc() {
       onClose === null || onClose === void 0 || onClose();
     }

package/dist/esm/hooks/useEsc.d.ts

@@ -10,7 +10,7 @@ export interface UseEscProps {
     enabled?: boolean;
 }
 /**
- * React Hook for listening to ESC key press
+ * Hook for listening to ESC key press
  *
  * @example
  * ```tsx

package/dist/esm/hooks/useEsc.js

@@ -1,7 +1,19 @@
-import { useCallback, useEffect } from 'react';
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { useEffect, useState } from 'react';
 import useEvent from "./useEvent";
+// 层级栈：所有 useEsc 监听都挂在 document 上，同一 keydown 会触发全部 handler。
+// 按启用顺序压栈，Esc 只响应最后启用（最上层）的那一个 —— 弹层内再开
+// 筛选/下拉/抽屉时，第一次 Esc 只关最上层，再按才逐层关闭。
+var escSeq = 0;
+var escLayers = [];
+
 /**
- * React Hook for listening to ESC key press
+ * Hook for listening to ESC key press
  *
  * @example
  * ```tsx
@@ -19,19 +31,29 @@ export default function useEsc() {
     _ref$enabled = _ref.enabled,
     enabled = _ref$enabled === void 0 ? true : _ref$enabled;
   var handleEsc = useEvent(onEsc || function () {});
-  var handleKeyDown = useCallback(function (event) {
-    if (event.key === 'Escape') {
-      event.preventDefault();
-      handleEsc(event);
-    }
-  }, [handleEsc]);
+  var _useState = useState(function () {
+      return ++escSeq;
+    }),
+    _useState2 = _slicedToArray(_useState, 1),
+    id = _useState2[0];
   useEffect(function () {
     if (!enabled) {
       return;
     }
+    escLayers.push(id);
+    var handleKeyDown = function handleKeyDown(event) {
+      if (event.key === 'Escape' && escLayers[escLayers.length - 1] === id) {
+        event.preventDefault();
+        handleEsc(event);
+      }
+    };
     document.addEventListener('keydown', handleKeyDown);
     return function () {
       document.removeEventListener('keydown', handleKeyDown);
+      var index = escLayers.lastIndexOf(id);
+      if (index !== -1) {
+        escLayers.splice(index, 1);
+      }
     };
-  }, [enabled, handleKeyDown]);
+  }, [enabled, handleEsc, id]);
 }

package/dist/esm/style/themes.css

@@ -1,7 +1,7 @@
 /*!
  * @rainbow-oh/yee-c CSS Variables
  * Auto-generated, do not edit manually
- * Generated on 2026-10-20T02:41:00.650Z
+ * Generated on 2026-10-20T03:27:37.391Z
  */
 
 /* ========== color.blue.css ========== */

package/dist/esm/style/variables.css

@@ -1,7 +1,7 @@
 /*!
  * @rainbow-oh/yee-c CSS Variables
  * Auto-generated, do not edit manually
- * Generated on 2026-10-20T02:41:00.650Z
+ * Generated on 2026-10-20T03:27:37.391Z
  */
 
 /* ========== color.css ========== */

package/dist/esm/version.d.ts

@@ -3,4 +3,4 @@ declare global {
         __yee_c_version__: string;
     }
 }
-export declare const version = "0.15.2";
+export declare const version = "0.15.3";

package/dist/esm/version.js

@@ -1,4 +1,4 @@
-export var version = "0.15.2";
+export var version = "0.15.3";
 if (typeof window !== 'undefined') {
   window.__yee_c_version__ = version;
 }