reshaped 3.8.0-canary.3 → 3.8.0-canary.4

package/dist/components/Modal/tests/Modal.stories.js

@@ -166,6 +166,7 @@ export const containerRef = () => {
 };
 export const edgeCases = () => {
     const menuModalToggle = useToggle();
+    const menuModalToggleInner = useToggle();
     const scrollModalToggle = useToggle();
     const inputRef = React.useRef(null);
     return (<Example>
@@ -233,7 +234,11 @@ export const edgeCases = () => {
 								<DropdownMenu.Item>Item 2</DropdownMenu.Item>
 							</DropdownMenu.Content>
 						</DropdownMenu>
+						<Button onClick={menuModalToggleInner.activate}>Open dialog</Button>
 						<Button onClick={menuModalToggle.deactivate}>Close</Button>
+						<Modal active={menuModalToggleInner.active} onClose={menuModalToggleInner.deactivate}>
+							<Button onClick={menuModalToggleInner.deactivate}>Close</Button>
+						</Modal>
 					</View>
 				</Modal>
 			</Example.Item>

package/dist/hooks/_private/useIsDismissible.js

@@ -4,7 +4,6 @@
  */
 import React from "react";
 import useElementId from "../useElementId.js";
-import { onNextFrame } from "../../utilities/animation.js";
 let queue = {};
 let latestId = null;
 const removeFromQueue = (id) => {
@@ -28,19 +27,12 @@ const useIsDismissible = (args) => {
     React.useEffect(() => {
         if (!active)
             return;
-        onNextFrame(() => addToQueue(id, contentRef, triggerRef));
+        addToQueue(id, contentRef, triggerRef);
         return () => removeFromQueue(id);
     }, [active, id, contentRef, triggerRef]);
     return React.useCallback(() => {
         if (!active)
             return true;
-        const latest = latestId ? queue[latestId] : undefined;
-        const latestTrigger = latest?.triggerRef?.current;
-        const prev = latest?.parentId ? queue[latest.parentId] : undefined;
-        const prevContent = prev?.contentRef.current;
-        // Don't block independently rendered components that are not nested in each other
-        if (!prevContent || !latestTrigger || !prevContent.contains(latestTrigger))
-            return true;
         return latestId === id;
     }, [id, active]);
 };

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "reshaped",
 	"description": "Professionally crafted design system in React & Figma for building products of any scale and complexity",
-	"version": "3.8.0-canary.3",
+	"version": "3.8.0-canary.4",
 	"license": "MIT",
 	"email": "hello@reshaped.so",
 	"homepage": "https://reshaped.so",