fix: dont close layers if they disabled (#33)

voiceflow · Dec 12, 2023 · ebb27fb · ebb27fb
1 parent 5c34a94
commit ebb27fb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/DismissableLayerContext.tsx b/src/DismissableLayerContext.tsx
@@ -2,8 +2,8 @@ import React, { createContext, PropsWithChildren, ReactElement, useCallback, use
 
 import GlobalLayersContext from './GlobalLayersContext.js';
 import { useContextApi } from './hooks.js';
-import Subscriber, { DismissEventHandler } from './Subscriber.js';
 import type { DismissEventType } from './Subscriber.js';
+import Subscriber, { DismissEventHandler } from './Subscriber.js';
 
 interface DismissableLayerValue<T extends HTMLElement | Document = Document> {
   /**

diff --git a/src/useDismissable.ts b/src/useDismissable.ts
@@ -58,12 +58,15 @@ const useDismissable = (
   const dismissableLayer = useContext(DismissableLayerContext);
 
   const [isOpened, setOpen, setClosed] = useEnableDisable(defaultValue);
-  const cache = useCache({ isOpened, onClose, skipDefaultPrevented });
+  const cache = useCache({ isOpened, onClose, disableLayers, skipDefaultPrevented });
 
   const handleOpen = useCallback(() => {
     if (cache.current.isOpened) return;
 
-    dismissableLayer.dismiss();
+    if (!cache.current.disableLayers) {
+      dismissableLayer.dismiss();
+    }
+
     setOpen();
   }, [cache, setOpen, dismissableLayer]);