@adsgency_npm/adsgency-ads-ui 0.1.0-alpha.17 → 0.1.0-alpha.18

package/dist/index.cjs

@@ -1862,6 +1862,7 @@ var import_jsx_runtime21 = require("react/jsx-runtime");
 var NestedDismissableLayerContext = React19.createContext(null);
 function useNestedDismissableLayerCoordinator() {
   const activeLayersRef = React19.useRef(/* @__PURE__ */ new Map());
+  const pointerInteractionHadNestedLayerRef = React19.useRef(false);
   const registerNestedLayer = React19.useCallback(
     (id, dismiss) => {
       const activeLayers = activeLayersRef.current;
@@ -1879,17 +1880,50 @@ function useNestedDismissableLayerCoordinator() {
     () => activeLayersRef.current.size > 0,
     []
   );
+  const hadActiveNestedLayerAtPointerDown = React19.useCallback(
+    () => pointerInteractionHadNestedLayerRef.current,
+    []
+  );
   const dismissTopNestedLayer = React19.useCallback(() => {
     const activeLayers = [...activeLayersRef.current.values()];
     activeLayers.at(-1)?.();
   }, []);
+  React19.useEffect(() => {
+    const ownerDocument = globalThis.document;
+    if (!ownerDocument) return;
+    const handlePointerDown = () => {
+      pointerInteractionHadNestedLayerRef.current = activeLayersRef.current.size > 0;
+    };
+    const handleClick = () => {
+      queueMicrotask(() => {
+        pointerInteractionHadNestedLayerRef.current = false;
+      });
+    };
+    const handlePointerCancel = () => {
+      pointerInteractionHadNestedLayerRef.current = false;
+    };
+    ownerDocument.addEventListener("pointerdown", handlePointerDown, true);
+    ownerDocument.addEventListener("click", handleClick);
+    ownerDocument.addEventListener("pointercancel", handlePointerCancel);
+    return () => {
+      ownerDocument.removeEventListener("pointerdown", handlePointerDown, true);
+      ownerDocument.removeEventListener("click", handleClick);
+      ownerDocument.removeEventListener("pointercancel", handlePointerCancel);
+    };
+  }, []);
   return React19.useMemo(
     () => ({
       dismissTopNestedLayer,
       hasActiveNestedLayer,
+      hadActiveNestedLayerAtPointerDown,
       registerNestedLayer
     }),
-    [dismissTopNestedLayer, hasActiveNestedLayer, registerNestedLayer]
+    [
+      dismissTopNestedLayer,
+      hadActiveNestedLayerAtPointerDown,
+      hasActiveNestedLayer,
+      registerNestedLayer
+    ]
   );
 }
 function NestedDismissableLayerProvider({
@@ -1927,12 +1961,16 @@ var PopoverContentImpl = React20.forwardRef(
       (event) => {
         onPointerDownOutside?.(event);
         if (event.defaultPrevented) return;
-        if (!coordinator.hasActiveNestedLayer()) {
+        const hasActiveNestedLayer = coordinator.hasActiveNestedLayer();
+        const shouldShieldParent = hasActiveNestedLayer || coordinator.hadActiveNestedLayerAtPointerDown();
+        if (!shouldShieldParent) {
           shieldNextFocusOutsideRef.current = false;
           return;
         }
         shieldNextFocusOutsideRef.current = true;
-        coordinator.dismissTopNestedLayer();
+        if (hasActiveNestedLayer) {
+          coordinator.dismissTopNestedLayer();
+        }
         event.preventDefault();
       },
       [coordinator, onPointerDownOutside]
@@ -1947,8 +1985,12 @@ var PopoverContentImpl = React20.forwardRef(
           event.preventDefault();
           return;
         }
-        if (!coordinator.hasActiveNestedLayer()) return;
-        coordinator.dismissTopNestedLayer();
+        const hasActiveNestedLayer = coordinator.hasActiveNestedLayer();
+        const shouldShieldParent = hasActiveNestedLayer || coordinator.hadActiveNestedLayerAtPointerDown();
+        if (!shouldShieldParent) return;
+        if (hasActiveNestedLayer) {
+          coordinator.dismissTopNestedLayer();
+        }
         event.preventDefault();
       },
       [coordinator, onFocusOutside]