@samline/drawer 2.0.5 → 2.0.7

package/dist/{svelte/components-client-BnT3P9Or.mjs → components-client-LPOAyYIW.mjs}

@@ -1450,6 +1450,7 @@ function getDragPermission({ targetTagName, hasNoDragAttribute, direction, timeS
     };
 }
 
+const useSafeLayoutEffect = typeof window === 'undefined' ? React__default.useEffect : React__default.useLayoutEffect;
 function Root({ open: openProp, onOpenChange, children, onDrag: onDragProp, onRelease: onReleaseProp, snapPoints, shouldScaleBackground = false, setBackgroundColorOnScale = true, closeThreshold = CLOSE_THRESHOLD, scrollLockTimeout = SCROLL_LOCK_TIMEOUT, dismissible = true, handleOnly = false, fadeFromIndex = snapPoints && snapPoints.length - 1, activeSnapPoint: activeSnapPointProp, setActiveSnapPoint: setActiveSnapPointProp, fixed, modal = true, onClose, nested, noBodyStyles = false, direction = 'bottom', defaultOpen = false, disablePreventScroll = true, snapToSequentialPoint = false, preventScrollRestoration = false, repositionInputs = true, onAnimationEnd, container, autoFocus = false }) {
     var _drawerRef_current, _drawerRef_current1;
     const animationEndTimeoutRef = React__default.useRef(null);
@@ -1507,6 +1508,27 @@ function Root({ open: openProp, onOpenChange, children, onDrag: onDragProp, onRe
     const drawerHeightRef = React__default.useRef(((_drawerRef_current = drawerRef.current) == null ? void 0 : _drawerRef_current.getBoundingClientRect().height) || 0);
     const drawerWidthRef = React__default.useRef(((_drawerRef_current1 = drawerRef.current) == null ? void 0 : _drawerRef_current1.getBoundingClientRect().width) || 0);
     const initialDrawerHeight = React__default.useRef(0);
+    const releaseHiddenFocusBeforeOpen = React__default.useCallback(()=>{
+        var _drawerRef_current;
+        if (!modal || autoFocus || typeof document === 'undefined') {
+            return;
+        }
+        const activeElement = document.activeElement;
+        if (!activeElement || activeElement === document.body) {
+            return;
+        }
+        const activeElementNode = activeElement;
+        if (((_drawerRef_current = drawerRef.current) == null ? void 0 : _drawerRef_current.contains(activeElementNode)) || (activeElementNode.closest == null ? void 0 : activeElementNode.closest.call(activeElementNode, '[data-drawer]'))) {
+            return;
+        }
+        if (typeof activeElementNode.blur !== 'function') {
+            return;
+        }
+        activeElementNode.blur();
+    }, [
+        autoFocus,
+        modal
+    ]);
     const onSnapPointChange = React__default.useCallback((activeSnapPointIndex)=>{
         // Change openTime ref when we reach the last snap point to prevent dragging for 500ms incase it's scrollable.
         if (snapPoints && activeSnapPointIndex === snapPointsOffset.length - 1) openTime.current = new Date();
@@ -1557,23 +1579,14 @@ function Root({ open: openProp, onOpenChange, children, onDrag: onDragProp, onRe
         noBodyStyles,
         autoFocus
     });
-    React__default.useEffect(()=>{
-        var _drawerRef_current;
-        if (!isOpen || !modal || autoFocus || typeof document === 'undefined') {
+    useSafeLayoutEffect(()=>{
+        if (!isOpen) {
             return;
         }
-        const activeElement = document.activeElement;
-        if (!(activeElement instanceof HTMLElement)) {
-            return;
-        }
-        if (((_drawerRef_current = drawerRef.current) == null ? void 0 : _drawerRef_current.contains(activeElement)) || activeElement.closest('[data-drawer]')) {
-            return;
-        }
-        activeElement.blur();
+        releaseHiddenFocusBeforeOpen();
     }, [
-        autoFocus,
         isOpen,
-        modal
+        releaseHiddenFocusBeforeOpen
     ]);
     function getScale() {
         return (window.innerWidth - WINDOW_TOP_OFFSET) / window.innerWidth;
@@ -1982,6 +1995,7 @@ function Root({ open: openProp, onOpenChange, children, onDrag: onDragProp, onRe
         onOpenChange: (open)=>{
             if (!dismissible && !open) return;
             if (open) {
+                releaseHiddenFocusBeforeOpen();
                 setHasBeenOpened(true);
             } else {
                 closeDrawer(true);

package/dist/index.js

@@ -27988,6 +27988,7 @@ function getDragPermission({
 }
 
 // src/react/components.tsx
+var useSafeLayoutEffect = typeof window === "undefined" ? import_react9.default.useEffect : import_react9.default.useLayoutEffect;
 function Root2({
   open: openProp,
   onOpenChange,
@@ -28073,6 +28074,23 @@ function Root2({
   const drawerHeightRef = import_react9.default.useRef(drawerRef.current?.getBoundingClientRect().height || 0);
   const drawerWidthRef = import_react9.default.useRef(drawerRef.current?.getBoundingClientRect().width || 0);
   const initialDrawerHeight = import_react9.default.useRef(0);
+  const releaseHiddenFocusBeforeOpen2 = import_react9.default.useCallback(() => {
+    if (!modal || autoFocus || typeof document === "undefined") {
+      return;
+    }
+    const activeElement = document.activeElement;
+    if (!activeElement || activeElement === document.body) {
+      return;
+    }
+    const activeElementNode = activeElement;
+    if (drawerRef.current?.contains(activeElementNode) || activeElementNode.closest?.("[data-drawer]")) {
+      return;
+    }
+    if (typeof activeElementNode.blur !== "function") {
+      return;
+    }
+    activeElementNode.blur();
+  }, [autoFocus, modal]);
   const onSnapPointChange = import_react9.default.useCallback((activeSnapPointIndex2) => {
     if (snapPoints && activeSnapPointIndex2 === snapPointsOffset.length - 1) openTime.current = /* @__PURE__ */ new Date();
   }, []);
@@ -28131,19 +28149,12 @@ function Root2({
     noBodyStyles,
     autoFocus
   });
-  import_react9.default.useEffect(() => {
-    if (!isOpen || !modal || autoFocus || typeof document === "undefined") {
-      return;
-    }
-    const activeElement = document.activeElement;
-    if (!(activeElement instanceof HTMLElement)) {
-      return;
-    }
-    if (drawerRef.current?.contains(activeElement) || activeElement.closest("[data-drawer]")) {
+  useSafeLayoutEffect(() => {
+    if (!isOpen) {
       return;
     }
-    activeElement.blur();
-  }, [autoFocus, isOpen, modal]);
+    releaseHiddenFocusBeforeOpen2();
+  }, [isOpen, releaseHiddenFocusBeforeOpen2]);
   function getScale() {
     return (window.innerWidth - WINDOW_TOP_OFFSET) / window.innerWidth;
   }
@@ -28527,6 +28538,7 @@ function Root2({
       onOpenChange: (open) => {
         if (!dismissible && !open) return;
         if (open) {
+          releaseHiddenFocusBeforeOpen2();
           setHasBeenOpened(true);
         } else {
           closeDrawer2(true);
@@ -28880,7 +28892,7 @@ var VISUALLY_HIDDEN_STYLE = {
   whiteSpace: "nowrap",
   border: 0
 };
-var useSafeLayoutEffect = typeof window === "undefined" ? import_react10.default.useEffect : import_react10.default.useLayoutEffect;
+var useSafeLayoutEffect2 = typeof window === "undefined" ? import_react10.default.useEffect : import_react10.default.useLayoutEffect;
 function toReactDrawerProps(options, open, onOpenChange, internalOnDragChange, internalOnReleaseChange) {
   const { id: _id, parentId: _parentId, onDragChange, onReleaseChange, ...drawerOptions } = options;
   const baseProps = {
@@ -28914,7 +28926,7 @@ function VanillaNode({
   dataAttribute
 }) {
   const ref = import_react10.default.useRef(null);
-  useSafeLayoutEffect(() => {
+  useSafeLayoutEffect2(() => {
     const element = ref.current;
     if (!element) {
       return;
@@ -29120,6 +29132,7 @@ function openAncestorChain(parentId) {
     openAncestorChain(nextParentId);
   }
   if (!parentRuntime.controller.getSnapshot().state.isOpen) {
+    releaseHiddenFocusBeforeOpen(parentRuntime.options);
     parentRuntime.controller.setOpen(true);
     notifyOpenStateChange(parentRuntime, true);
     renderVanillaDrawer(parentRuntime.id);
@@ -29139,6 +29152,7 @@ function bindTriggerElement(runtime) {
   }
   const triggerElement = runtime.options.triggerElement;
   const handleClick = () => {
+    releaseHiddenFocusBeforeOpen(runtime.options);
     runtime.controller.setOpen(true);
     renderVanillaDrawer(runtime.id);
   };
@@ -29174,6 +29188,16 @@ function notifyOpenStateChange(runtime, open) {
 function canUseDOM3() {
   return typeof window !== "undefined" && typeof document !== "undefined";
 }
+function releaseHiddenFocusBeforeOpen(options) {
+  if (!canUseDOM3() || options.modal === false || options.autoFocus) {
+    return;
+  }
+  const activeElement = document.activeElement;
+  if (!activeElement || activeElement === document.body || typeof activeElement.blur !== "function") {
+    return;
+  }
+  activeElement.blur();
+}
 function getRuntimeDrawerElement(runtime) {
   if (!runtime.element) {
     return null;
@@ -29227,6 +29251,9 @@ function renderVanillaDrawer(id) {
     open: snapshot.state.isOpen,
     onOpenChange: (open) => {
       const previousOpen = runtime.controller.getSnapshot().state.isOpen;
+      if (open) {
+        releaseHiddenFocusBeforeOpen(runtime.options);
+      }
       runtime.controller.setOpen(open);
       if (previousOpen !== open) {
         notifyOpenStateChange(runtime, open);
@@ -29273,6 +29300,9 @@ function buildVanillaController(id) {
       if (!runtime) {
         return createDrawer({ id, open }).getSnapshot();
       }
+      if (open) {
+        releaseHiddenFocusBeforeOpen(runtime.options);
+      }
       const previousOpen = runtime.controller.getSnapshot().state.isOpen;
       const snapshot = runtime.controller.setOpen(open);
       if (previousOpen !== open) {
@@ -29343,6 +29373,9 @@ function createDrawer(options = {}) {
       notifyOpenStateChange(existing, snapshot.state.isOpen);
     }
   }
+  if (nextOptions.open && !previousOpen) {
+    releaseHiddenFocusBeforeOpen(nextOptions);
+  }
   renderVanillaDrawer(id);
   if (nextOptions.parentId && nextOptions.open) {
     openAncestorChain(nextOptions.parentId);

package/dist/index.mjs

@@ -27963,6 +27963,7 @@ function getDragPermission({
 }
 
 // src/react/components.tsx
+var useSafeLayoutEffect = typeof window === "undefined" ? import_react9.default.useEffect : import_react9.default.useLayoutEffect;
 function Root2({
   open: openProp,
   onOpenChange,
@@ -28048,6 +28049,23 @@ function Root2({
   const drawerHeightRef = import_react9.default.useRef(drawerRef.current?.getBoundingClientRect().height || 0);
   const drawerWidthRef = import_react9.default.useRef(drawerRef.current?.getBoundingClientRect().width || 0);
   const initialDrawerHeight = import_react9.default.useRef(0);
+  const releaseHiddenFocusBeforeOpen2 = import_react9.default.useCallback(() => {
+    if (!modal || autoFocus || typeof document === "undefined") {
+      return;
+    }
+    const activeElement = document.activeElement;
+    if (!activeElement || activeElement === document.body) {
+      return;
+    }
+    const activeElementNode = activeElement;
+    if (drawerRef.current?.contains(activeElementNode) || activeElementNode.closest?.("[data-drawer]")) {
+      return;
+    }
+    if (typeof activeElementNode.blur !== "function") {
+      return;
+    }
+    activeElementNode.blur();
+  }, [autoFocus, modal]);
   const onSnapPointChange = import_react9.default.useCallback((activeSnapPointIndex2) => {
     if (snapPoints && activeSnapPointIndex2 === snapPointsOffset.length - 1) openTime.current = /* @__PURE__ */ new Date();
   }, []);
@@ -28106,19 +28124,12 @@ function Root2({
     noBodyStyles,
     autoFocus
   });
-  import_react9.default.useEffect(() => {
-    if (!isOpen || !modal || autoFocus || typeof document === "undefined") {
-      return;
-    }
-    const activeElement = document.activeElement;
-    if (!(activeElement instanceof HTMLElement)) {
-      return;
-    }
-    if (drawerRef.current?.contains(activeElement) || activeElement.closest("[data-drawer]")) {
+  useSafeLayoutEffect(() => {
+    if (!isOpen) {
       return;
     }
-    activeElement.blur();
-  }, [autoFocus, isOpen, modal]);
+    releaseHiddenFocusBeforeOpen2();
+  }, [isOpen, releaseHiddenFocusBeforeOpen2]);
   function getScale() {
     return (window.innerWidth - WINDOW_TOP_OFFSET) / window.innerWidth;
   }
@@ -28502,6 +28513,7 @@ function Root2({
       onOpenChange: (open) => {
         if (!dismissible && !open) return;
         if (open) {
+          releaseHiddenFocusBeforeOpen2();
           setHasBeenOpened(true);
         } else {
           closeDrawer2(true);
@@ -28855,7 +28867,7 @@ var VISUALLY_HIDDEN_STYLE = {
   whiteSpace: "nowrap",
   border: 0
 };
-var useSafeLayoutEffect = typeof window === "undefined" ? import_react10.default.useEffect : import_react10.default.useLayoutEffect;
+var useSafeLayoutEffect2 = typeof window === "undefined" ? import_react10.default.useEffect : import_react10.default.useLayoutEffect;
 function toReactDrawerProps(options, open, onOpenChange, internalOnDragChange, internalOnReleaseChange) {
   const { id: _id, parentId: _parentId, onDragChange, onReleaseChange, ...drawerOptions } = options;
   const baseProps = {
@@ -28889,7 +28901,7 @@ function VanillaNode({
   dataAttribute
 }) {
   const ref = import_react10.default.useRef(null);
-  useSafeLayoutEffect(() => {
+  useSafeLayoutEffect2(() => {
     const element = ref.current;
     if (!element) {
       return;
@@ -29095,6 +29107,7 @@ function openAncestorChain(parentId) {
     openAncestorChain(nextParentId);
   }
   if (!parentRuntime.controller.getSnapshot().state.isOpen) {
+    releaseHiddenFocusBeforeOpen(parentRuntime.options);
     parentRuntime.controller.setOpen(true);
     notifyOpenStateChange(parentRuntime, true);
     renderVanillaDrawer(parentRuntime.id);
@@ -29114,6 +29127,7 @@ function bindTriggerElement(runtime) {
   }
   const triggerElement = runtime.options.triggerElement;
   const handleClick = () => {
+    releaseHiddenFocusBeforeOpen(runtime.options);
     runtime.controller.setOpen(true);
     renderVanillaDrawer(runtime.id);
   };
@@ -29149,6 +29163,16 @@ function notifyOpenStateChange(runtime, open) {
 function canUseDOM3() {
   return typeof window !== "undefined" && typeof document !== "undefined";
 }
+function releaseHiddenFocusBeforeOpen(options) {
+  if (!canUseDOM3() || options.modal === false || options.autoFocus) {
+    return;
+  }
+  const activeElement = document.activeElement;
+  if (!activeElement || activeElement === document.body || typeof activeElement.blur !== "function") {
+    return;
+  }
+  activeElement.blur();
+}
 function getRuntimeDrawerElement(runtime) {
   if (!runtime.element) {
     return null;
@@ -29202,6 +29226,9 @@ function renderVanillaDrawer(id) {
     open: snapshot.state.isOpen,
     onOpenChange: (open) => {
       const previousOpen = runtime.controller.getSnapshot().state.isOpen;
+      if (open) {
+        releaseHiddenFocusBeforeOpen(runtime.options);
+      }
       runtime.controller.setOpen(open);
       if (previousOpen !== open) {
         notifyOpenStateChange(runtime, open);
@@ -29248,6 +29275,9 @@ function buildVanillaController(id) {
       if (!runtime) {
         return createDrawer({ id, open }).getSnapshot();
       }
+      if (open) {
+        releaseHiddenFocusBeforeOpen(runtime.options);
+      }
       const previousOpen = runtime.controller.getSnapshot().state.isOpen;
       const snapshot = runtime.controller.setOpen(open);
       if (previousOpen !== open) {
@@ -29318,6 +29348,9 @@ function createDrawer(options = {}) {
       notifyOpenStateChange(existing, snapshot.state.isOpen);
     }
   }
+  if (nextOptions.open && !previousOpen) {
+    releaseHiddenFocusBeforeOpen(nextOptions);
+  }
   renderVanillaDrawer(id);
   if (nextOptions.parentId && nextOptions.open) {
     openAncestorChain(nextOptions.parentId);

package/dist/react/index.js

@@ -1473,6 +1473,7 @@ function getDragPermission({ targetTagName, hasNoDragAttribute, direction, timeS
     };
 }
 
+const useSafeLayoutEffect$1 = typeof window === 'undefined' ? React__namespace.default.useEffect : React__namespace.default.useLayoutEffect;
 function Root({ open: openProp, onOpenChange, children, onDrag: onDragProp, onRelease: onReleaseProp, snapPoints, shouldScaleBackground = false, setBackgroundColorOnScale = true, closeThreshold = CLOSE_THRESHOLD, scrollLockTimeout = SCROLL_LOCK_TIMEOUT, dismissible = true, handleOnly = false, fadeFromIndex = snapPoints && snapPoints.length - 1, activeSnapPoint: activeSnapPointProp, setActiveSnapPoint: setActiveSnapPointProp, fixed, modal = true, onClose, nested, noBodyStyles = false, direction = 'bottom', defaultOpen = false, disablePreventScroll = true, snapToSequentialPoint = false, preventScrollRestoration = false, repositionInputs = true, onAnimationEnd, container, autoFocus = false }) {
     var _drawerRef_current, _drawerRef_current1;
     const animationEndTimeoutRef = React__namespace.default.useRef(null);
@@ -1530,6 +1531,27 @@ function Root({ open: openProp, onOpenChange, children, onDrag: onDragProp, onRe
     const drawerHeightRef = React__namespace.default.useRef(((_drawerRef_current = drawerRef.current) == null ? void 0 : _drawerRef_current.getBoundingClientRect().height) || 0);
     const drawerWidthRef = React__namespace.default.useRef(((_drawerRef_current1 = drawerRef.current) == null ? void 0 : _drawerRef_current1.getBoundingClientRect().width) || 0);
     const initialDrawerHeight = React__namespace.default.useRef(0);
+    const releaseHiddenFocusBeforeOpen = React__namespace.default.useCallback(()=>{
+        var _drawerRef_current;
+        if (!modal || autoFocus || typeof document === 'undefined') {
+            return;
+        }
+        const activeElement = document.activeElement;
+        if (!activeElement || activeElement === document.body) {
+            return;
+        }
+        const activeElementNode = activeElement;
+        if (((_drawerRef_current = drawerRef.current) == null ? void 0 : _drawerRef_current.contains(activeElementNode)) || (activeElementNode.closest == null ? void 0 : activeElementNode.closest.call(activeElementNode, '[data-drawer]'))) {
+            return;
+        }
+        if (typeof activeElementNode.blur !== 'function') {
+            return;
+        }
+        activeElementNode.blur();
+    }, [
+        autoFocus,
+        modal
+    ]);
     const onSnapPointChange = React__namespace.default.useCallback((activeSnapPointIndex)=>{
         // Change openTime ref when we reach the last snap point to prevent dragging for 500ms incase it's scrollable.
         if (snapPoints && activeSnapPointIndex === snapPointsOffset.length - 1) openTime.current = new Date();
@@ -1580,23 +1602,14 @@ function Root({ open: openProp, onOpenChange, children, onDrag: onDragProp, onRe
         noBodyStyles,
         autoFocus
     });
-    React__namespace.default.useEffect(()=>{
-        var _drawerRef_current;
-        if (!isOpen || !modal || autoFocus || typeof document === 'undefined') {
+    useSafeLayoutEffect$1(()=>{
+        if (!isOpen) {
             return;
         }
-        const activeElement = document.activeElement;
-        if (!(activeElement instanceof HTMLElement)) {
-            return;
-        }
-        if (((_drawerRef_current = drawerRef.current) == null ? void 0 : _drawerRef_current.contains(activeElement)) || activeElement.closest('[data-drawer]')) {
-            return;
-        }
-        activeElement.blur();
+        releaseHiddenFocusBeforeOpen();
     }, [
-        autoFocus,
         isOpen,
-        modal
+        releaseHiddenFocusBeforeOpen
     ]);
     function getScale() {
         return (window.innerWidth - WINDOW_TOP_OFFSET) / window.innerWidth;
@@ -2005,6 +2018,7 @@ function Root({ open: openProp, onOpenChange, children, onDrag: onDragProp, onRe
         onOpenChange: (open)=>{
             if (!dismissible && !open) return;
             if (open) {
+                releaseHiddenFocusBeforeOpen();
                 setHasBeenOpened(true);
             } else {
                 closeDrawer(true);
@@ -2599,6 +2613,7 @@ function openAncestorChain(parentId) {
         openAncestorChain(nextParentId);
     }
     if (!parentRuntime.controller.getSnapshot().state.isOpen) {
+        releaseHiddenFocusBeforeOpen(parentRuntime.options);
         parentRuntime.controller.setOpen(true);
         notifyOpenStateChange(parentRuntime, true);
         renderVanillaDrawer(parentRuntime.id);
@@ -2618,6 +2633,7 @@ function bindTriggerElement(runtime) {
     }
     const triggerElement = runtime.options.triggerElement;
     const handleClick = ()=>{
+        releaseHiddenFocusBeforeOpen(runtime.options);
         runtime.controller.setOpen(true);
         renderVanillaDrawer(runtime.id);
     };
@@ -2653,6 +2669,16 @@ function notifyOpenStateChange(runtime, open) {
 function canUseDOM() {
     return typeof window !== 'undefined' && typeof document !== 'undefined';
 }
+function releaseHiddenFocusBeforeOpen(options) {
+    if (!canUseDOM() || options.modal === false || options.autoFocus) {
+        return;
+    }
+    const activeElement = document.activeElement;
+    if (!activeElement || activeElement === document.body || typeof activeElement.blur !== 'function') {
+        return;
+    }
+    activeElement.blur();
+}
 function getRuntimeDrawerElement(runtime) {
     if (!runtime.element) {
         return null;
@@ -2703,6 +2729,9 @@ function renderVanillaDrawer(id) {
         open: snapshot.state.isOpen,
         onOpenChange: (open)=>{
             const previousOpen = runtime.controller.getSnapshot().state.isOpen;
+            if (open) {
+                releaseHiddenFocusBeforeOpen(runtime.options);
+            }
             runtime.controller.setOpen(open);
             if (previousOpen !== open) {
                 notifyOpenStateChange(runtime, open);
@@ -2755,6 +2784,9 @@ function buildVanillaController(id) {
                     open
                 }).getSnapshot();
             }
+            if (open) {
+                releaseHiddenFocusBeforeOpen(runtime.options);
+            }
             const previousOpen = runtime.controller.getSnapshot().state.isOpen;
             const snapshot = runtime.controller.setOpen(open);
             if (previousOpen !== open) {
@@ -2848,6 +2880,9 @@ function createDrawer(options = {}) {
             notifyOpenStateChange(existing, snapshot.state.isOpen);
         }
     }
+    if (nextOptions.open && !previousOpen) {
+        releaseHiddenFocusBeforeOpen(nextOptions);
+    }
     renderVanillaDrawer(id);
     if (nextOptions.parentId && nextOptions.open) {
         openAncestorChain(nextOptions.parentId);

package/dist/react/index.mjs

@@ -1451,6 +1451,7 @@ function getDragPermission({ targetTagName, hasNoDragAttribute, direction, timeS
     };
 }
 
+const useSafeLayoutEffect$1 = typeof window === 'undefined' ? React__default.useEffect : React__default.useLayoutEffect;
 function Root({ open: openProp, onOpenChange, children, onDrag: onDragProp, onRelease: onReleaseProp, snapPoints, shouldScaleBackground = false, setBackgroundColorOnScale = true, closeThreshold = CLOSE_THRESHOLD, scrollLockTimeout = SCROLL_LOCK_TIMEOUT, dismissible = true, handleOnly = false, fadeFromIndex = snapPoints && snapPoints.length - 1, activeSnapPoint: activeSnapPointProp, setActiveSnapPoint: setActiveSnapPointProp, fixed, modal = true, onClose, nested, noBodyStyles = false, direction = 'bottom', defaultOpen = false, disablePreventScroll = true, snapToSequentialPoint = false, preventScrollRestoration = false, repositionInputs = true, onAnimationEnd, container, autoFocus = false }) {
     var _drawerRef_current, _drawerRef_current1;
     const animationEndTimeoutRef = React__default.useRef(null);
@@ -1508,6 +1509,27 @@ function Root({ open: openProp, onOpenChange, children, onDrag: onDragProp, onRe
     const drawerHeightRef = React__default.useRef(((_drawerRef_current = drawerRef.current) == null ? void 0 : _drawerRef_current.getBoundingClientRect().height) || 0);
     const drawerWidthRef = React__default.useRef(((_drawerRef_current1 = drawerRef.current) == null ? void 0 : _drawerRef_current1.getBoundingClientRect().width) || 0);
     const initialDrawerHeight = React__default.useRef(0);
+    const releaseHiddenFocusBeforeOpen = React__default.useCallback(()=>{
+        var _drawerRef_current;
+        if (!modal || autoFocus || typeof document === 'undefined') {
+            return;
+        }
+        const activeElement = document.activeElement;
+        if (!activeElement || activeElement === document.body) {
+            return;
+        }
+        const activeElementNode = activeElement;
+        if (((_drawerRef_current = drawerRef.current) == null ? void 0 : _drawerRef_current.contains(activeElementNode)) || (activeElementNode.closest == null ? void 0 : activeElementNode.closest.call(activeElementNode, '[data-drawer]'))) {
+            return;
+        }
+        if (typeof activeElementNode.blur !== 'function') {
+            return;
+        }
+        activeElementNode.blur();
+    }, [
+        autoFocus,
+        modal
+    ]);
     const onSnapPointChange = React__default.useCallback((activeSnapPointIndex)=>{
         // Change openTime ref when we reach the last snap point to prevent dragging for 500ms incase it's scrollable.
         if (snapPoints && activeSnapPointIndex === snapPointsOffset.length - 1) openTime.current = new Date();
@@ -1558,23 +1580,14 @@ function Root({ open: openProp, onOpenChange, children, onDrag: onDragProp, onRe
         noBodyStyles,
         autoFocus
     });
-    React__default.useEffect(()=>{
-        var _drawerRef_current;
-        if (!isOpen || !modal || autoFocus || typeof document === 'undefined') {
+    useSafeLayoutEffect$1(()=>{
+        if (!isOpen) {
             return;
         }
-        const activeElement = document.activeElement;
-        if (!(activeElement instanceof HTMLElement)) {
-            return;
-        }
-        if (((_drawerRef_current = drawerRef.current) == null ? void 0 : _drawerRef_current.contains(activeElement)) || activeElement.closest('[data-drawer]')) {
-            return;
-        }
-        activeElement.blur();
+        releaseHiddenFocusBeforeOpen();
     }, [
-        autoFocus,
         isOpen,
-        modal
+        releaseHiddenFocusBeforeOpen
     ]);
     function getScale() {
         return (window.innerWidth - WINDOW_TOP_OFFSET) / window.innerWidth;
@@ -1983,6 +1996,7 @@ function Root({ open: openProp, onOpenChange, children, onDrag: onDragProp, onRe
         onOpenChange: (open)=>{
             if (!dismissible && !open) return;
             if (open) {
+                releaseHiddenFocusBeforeOpen();
                 setHasBeenOpened(true);
             } else {
                 closeDrawer(true);
@@ -2577,6 +2591,7 @@ function openAncestorChain(parentId) {
         openAncestorChain(nextParentId);
     }
     if (!parentRuntime.controller.getSnapshot().state.isOpen) {
+        releaseHiddenFocusBeforeOpen(parentRuntime.options);
         parentRuntime.controller.setOpen(true);
         notifyOpenStateChange(parentRuntime, true);
         renderVanillaDrawer(parentRuntime.id);
@@ -2596,6 +2611,7 @@ function bindTriggerElement(runtime) {
     }
     const triggerElement = runtime.options.triggerElement;
     const handleClick = ()=>{
+        releaseHiddenFocusBeforeOpen(runtime.options);
         runtime.controller.setOpen(true);
         renderVanillaDrawer(runtime.id);
     };
@@ -2631,6 +2647,16 @@ function notifyOpenStateChange(runtime, open) {
 function canUseDOM() {
     return typeof window !== 'undefined' && typeof document !== 'undefined';
 }
+function releaseHiddenFocusBeforeOpen(options) {
+    if (!canUseDOM() || options.modal === false || options.autoFocus) {
+        return;
+    }
+    const activeElement = document.activeElement;
+    if (!activeElement || activeElement === document.body || typeof activeElement.blur !== 'function') {
+        return;
+    }
+    activeElement.blur();
+}
 function getRuntimeDrawerElement(runtime) {
     if (!runtime.element) {
         return null;
@@ -2681,6 +2707,9 @@ function renderVanillaDrawer(id) {
         open: snapshot.state.isOpen,
         onOpenChange: (open)=>{
             const previousOpen = runtime.controller.getSnapshot().state.isOpen;
+            if (open) {
+                releaseHiddenFocusBeforeOpen(runtime.options);
+            }
             runtime.controller.setOpen(open);
             if (previousOpen !== open) {
                 notifyOpenStateChange(runtime, open);
@@ -2733,6 +2762,9 @@ function buildVanillaController(id) {
                     open
                 }).getSnapshot();
             }
+            if (open) {
+                releaseHiddenFocusBeforeOpen(runtime.options);
+            }
             const previousOpen = runtime.controller.getSnapshot().state.isOpen;
             const snapshot = runtime.controller.setOpen(open);
             if (previousOpen !== open) {
@@ -2826,6 +2858,9 @@ function createDrawer(options = {}) {
             notifyOpenStateChange(existing, snapshot.state.isOpen);
         }
     }
+    if (nextOptions.open && !previousOpen) {
+        releaseHiddenFocusBeforeOpen(nextOptions);
+    }
     renderVanillaDrawer(id);
     if (nextOptions.parentId && nextOptions.open) {
         openAncestorChain(nextOptions.parentId);