@samline/drawer 2.0.5 → 2.0.6

package/README.md

@@ -17,6 +17,7 @@ bun add @samline/drawer
 ## Quick Start
 
 ```ts
+import '@samline/drawer/styles.css'
 import { createDrawer } from '@samline/drawer'
 
 const drawer = createDrawer({

package/dist/{svelte/components-client-D4tSixHM.js → browser/components-client-CJuQ5vtW.js}

@@ -1470,6 +1470,7 @@ function getDragPermission({ targetTagName, hasNoDragAttribute, direction, timeS
     };
 }
 
+const useSafeLayoutEffect = 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);
@@ -1577,19 +1578,23 @@ function Root({ open: openProp, onOpenChange, children, onDrag: onDragProp, onRe
         noBodyStyles,
         autoFocus
     });
-    React__namespace.default.useEffect(()=>{
+    useSafeLayoutEffect(()=>{
         var _drawerRef_current;
         if (!isOpen || !modal || autoFocus || typeof document === 'undefined') {
             return;
         }
         const activeElement = document.activeElement;
-        if (!(activeElement instanceof HTMLElement)) {
+        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 (((_drawerRef_current = drawerRef.current) == null ? void 0 : _drawerRef_current.contains(activeElement)) || activeElement.closest('[data-drawer]')) {
+        if (typeof activeElementNode.blur !== 'function') {
             return;
         }
-        activeElement.blur();
+        activeElementNode.blur();
     }, [
         autoFocus,
         isOpen,

package/dist/browser/{components-client-BnT3P9Or.mjs → components-client-tfLTRxPH.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);
@@ -1557,19 +1558,23 @@ function Root({ open: openProp, onOpenChange, children, onDrag: onDragProp, onRe
         noBodyStyles,
         autoFocus
     });
-    React__default.useEffect(()=>{
+    useSafeLayoutEffect(()=>{
         var _drawerRef_current;
         if (!isOpen || !modal || autoFocus || typeof document === 'undefined') {
             return;
         }
         const activeElement = document.activeElement;
-        if (!(activeElement instanceof HTMLElement)) {
+        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 (((_drawerRef_current = drawerRef.current) == null ? void 0 : _drawerRef_current.contains(activeElement)) || activeElement.closest('[data-drawer]')) {
+        if (typeof activeElementNode.blur !== 'function') {
             return;
         }
-        activeElement.blur();
+        activeElementNode.blur();
     }, [
         autoFocus,
         isOpen,

package/dist/browser/index.cjs

@@ -27989,6 +27989,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,
@@ -28132,18 +28133,22 @@ function Root2({
     noBodyStyles,
     autoFocus
   });
-  import_react9.default.useEffect(() => {
+  useSafeLayoutEffect(() => {
     if (!isOpen || !modal || autoFocus || typeof document === "undefined") {
       return;
     }
     const activeElement = document.activeElement;
-    if (!(activeElement instanceof HTMLElement)) {
+    if (!activeElement || activeElement === document.body) {
+      return;
+    }
+    const activeElementNode = activeElement;
+    if (drawerRef.current?.contains(activeElementNode) || activeElementNode.closest?.("[data-drawer]")) {
       return;
     }
-    if (drawerRef.current?.contains(activeElement) || activeElement.closest("[data-drawer]")) {
+    if (typeof activeElementNode.blur !== "function") {
       return;
     }
-    activeElement.blur();
+    activeElementNode.blur();
   }, [autoFocus, isOpen, modal]);
   function getScale() {
     return (window.innerWidth - WINDOW_TOP_OFFSET) / window.innerWidth;
@@ -28881,7 +28886,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 = {
@@ -28915,7 +28920,7 @@ function VanillaNode({
   dataAttribute
 }) {
   const ref = import_react10.default.useRef(null);
-  useSafeLayoutEffect(() => {
+  useSafeLayoutEffect2(() => {
     const element = ref.current;
     if (!element) {
       return;
@@ -29121,6 +29126,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);
@@ -29140,6 +29146,7 @@ function bindTriggerElement(runtime) {
   }
   const triggerElement = runtime.options.triggerElement;
   const handleClick = () => {
+    releaseHiddenFocusBeforeOpen(runtime.options);
     runtime.controller.setOpen(true);
     renderVanillaDrawer(runtime.id);
   };
@@ -29175,6 +29182,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;
@@ -29228,6 +29245,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);
@@ -29274,6 +29294,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) {
@@ -29344,6 +29367,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/browser/index.js

@@ -27989,6 +27989,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
   }
 
   // src/react/components.tsx
+  var useSafeLayoutEffect = typeof window === "undefined" ? import_react9.default.useEffect : import_react9.default.useLayoutEffect;
   function Root2({
     open: openProp,
     onOpenChange,
@@ -28132,18 +28133,22 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       noBodyStyles,
       autoFocus
     });
-    import_react9.default.useEffect(() => {
+    useSafeLayoutEffect(() => {
       if (!isOpen || !modal || autoFocus || typeof document === "undefined") {
         return;
       }
       const activeElement = document.activeElement;
-      if (!(activeElement instanceof HTMLElement)) {
+      if (!activeElement || activeElement === document.body) {
+        return;
+      }
+      const activeElementNode = activeElement;
+      if (drawerRef.current?.contains(activeElementNode) || activeElementNode.closest?.("[data-drawer]")) {
         return;
       }
-      if (drawerRef.current?.contains(activeElement) || activeElement.closest("[data-drawer]")) {
+      if (typeof activeElementNode.blur !== "function") {
         return;
       }
-      activeElement.blur();
+      activeElementNode.blur();
     }, [autoFocus, isOpen, modal]);
     function getScale() {
       return (window.innerWidth - WINDOW_TOP_OFFSET) / window.innerWidth;
@@ -28881,7 +28886,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
     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 = {
@@ -28915,7 +28920,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
     dataAttribute
   }) {
     const ref = import_react10.default.useRef(null);
-    useSafeLayoutEffect(() => {
+    useSafeLayoutEffect2(() => {
       const element = ref.current;
       if (!element) {
         return;
@@ -29121,6 +29126,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       openAncestorChain(nextParentId);
     }
     if (!parentRuntime.controller.getSnapshot().state.isOpen) {
+      releaseHiddenFocusBeforeOpen(parentRuntime.options);
       parentRuntime.controller.setOpen(true);
       notifyOpenStateChange(parentRuntime, true);
       renderVanillaDrawer(parentRuntime.id);
@@ -29140,6 +29146,7 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
     }
     const triggerElement = runtime.options.triggerElement;
     const handleClick = () => {
+      releaseHiddenFocusBeforeOpen(runtime.options);
       runtime.controller.setOpen(true);
       renderVanillaDrawer(runtime.id);
     };
@@ -29175,6 +29182,16 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
   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;
@@ -29228,6 +29245,9 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
       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);
@@ -29274,6 +29294,9 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
         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) {
@@ -29344,6 +29367,9 @@ For more information, see https://radix-ui.com/primitives/docs/components/${titl
         notifyOpenStateChange(existing, snapshot.state.isOpen);
       }
     }
+    if (nextOptions.open && !previousOpen) {
+      releaseHiddenFocusBeforeOpen(nextOptions);
+    }
     renderVanillaDrawer(id);
     if (nextOptions.parentId && nextOptions.open) {
       openAncestorChain(nextOptions.parentId);

package/dist/browser/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,
@@ -28106,18 +28107,22 @@ function Root2({
     noBodyStyles,
     autoFocus
   });
-  import_react9.default.useEffect(() => {
+  useSafeLayoutEffect(() => {
     if (!isOpen || !modal || autoFocus || typeof document === "undefined") {
       return;
     }
     const activeElement = document.activeElement;
-    if (!(activeElement instanceof HTMLElement)) {
+    if (!activeElement || activeElement === document.body) {
+      return;
+    }
+    const activeElementNode = activeElement;
+    if (drawerRef.current?.contains(activeElementNode) || activeElementNode.closest?.("[data-drawer]")) {
       return;
     }
-    if (drawerRef.current?.contains(activeElement) || activeElement.closest("[data-drawer]")) {
+    if (typeof activeElementNode.blur !== "function") {
       return;
     }
-    activeElement.blur();
+    activeElementNode.blur();
   }, [autoFocus, isOpen, modal]);
   function getScale() {
     return (window.innerWidth - WINDOW_TOP_OFFSET) / window.innerWidth;
@@ -28855,7 +28860,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 +28894,7 @@ function VanillaNode({
   dataAttribute
 }) {
   const ref = import_react10.default.useRef(null);
-  useSafeLayoutEffect(() => {
+  useSafeLayoutEffect2(() => {
     const element = ref.current;
     if (!element) {
       return;
@@ -29095,6 +29100,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 +29120,7 @@ function bindTriggerElement(runtime) {
   }
   const triggerElement = runtime.options.triggerElement;
   const handleClick = () => {
+    releaseHiddenFocusBeforeOpen(runtime.options);
     runtime.controller.setOpen(true);
     renderVanillaDrawer(runtime.id);
   };
@@ -29149,6 +29156,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 +29219,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 +29268,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 +29341,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/{browser/components-client-D4tSixHM.js → components-client-CJuQ5vtW.js}

@@ -1470,6 +1470,7 @@ function getDragPermission({ targetTagName, hasNoDragAttribute, direction, timeS
     };
 }
 
+const useSafeLayoutEffect = 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);
@@ -1577,19 +1578,23 @@ function Root({ open: openProp, onOpenChange, children, onDrag: onDragProp, onRe
         noBodyStyles,
         autoFocus
     });
-    React__namespace.default.useEffect(()=>{
+    useSafeLayoutEffect(()=>{
         var _drawerRef_current;
         if (!isOpen || !modal || autoFocus || typeof document === 'undefined') {
             return;
         }
         const activeElement = document.activeElement;
-        if (!(activeElement instanceof HTMLElement)) {
+        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 (((_drawerRef_current = drawerRef.current) == null ? void 0 : _drawerRef_current.contains(activeElement)) || activeElement.closest('[data-drawer]')) {
+        if (typeof activeElementNode.blur !== 'function') {
             return;
         }
-        activeElement.blur();
+        activeElementNode.blur();
     }, [
         autoFocus,
         isOpen,

package/dist/{svelte/components-client-BnT3P9Or.mjs → components-client-tfLTRxPH.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);
@@ -1557,19 +1558,23 @@ function Root({ open: openProp, onOpenChange, children, onDrag: onDragProp, onRe
         noBodyStyles,
         autoFocus
     });
-    React__default.useEffect(()=>{
+    useSafeLayoutEffect(()=>{
         var _drawerRef_current;
         if (!isOpen || !modal || autoFocus || typeof document === 'undefined') {
             return;
         }
         const activeElement = document.activeElement;
-        if (!(activeElement instanceof HTMLElement)) {
+        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 (((_drawerRef_current = drawerRef.current) == null ? void 0 : _drawerRef_current.contains(activeElement)) || activeElement.closest('[data-drawer]')) {
+        if (typeof activeElementNode.blur !== 'function') {
             return;
         }
-        activeElement.blur();
+        activeElementNode.blur();
     }, [
         autoFocus,
         isOpen,

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,
@@ -28131,18 +28132,22 @@ function Root2({
     noBodyStyles,
     autoFocus
   });
-  import_react9.default.useEffect(() => {
+  useSafeLayoutEffect(() => {
     if (!isOpen || !modal || autoFocus || typeof document === "undefined") {
       return;
     }
     const activeElement = document.activeElement;
-    if (!(activeElement instanceof HTMLElement)) {
+    if (!activeElement || activeElement === document.body) {
+      return;
+    }
+    const activeElementNode = activeElement;
+    if (drawerRef.current?.contains(activeElementNode) || activeElementNode.closest?.("[data-drawer]")) {
       return;
     }
-    if (drawerRef.current?.contains(activeElement) || activeElement.closest("[data-drawer]")) {
+    if (typeof activeElementNode.blur !== "function") {
       return;
     }
-    activeElement.blur();
+    activeElementNode.blur();
   }, [autoFocus, isOpen, modal]);
   function getScale() {
     return (window.innerWidth - WINDOW_TOP_OFFSET) / window.innerWidth;
@@ -28880,7 +28885,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 +28919,7 @@ function VanillaNode({
   dataAttribute
 }) {
   const ref = import_react10.default.useRef(null);
-  useSafeLayoutEffect(() => {
+  useSafeLayoutEffect2(() => {
     const element = ref.current;
     if (!element) {
       return;
@@ -29120,6 +29125,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 +29145,7 @@ function bindTriggerElement(runtime) {
   }
   const triggerElement = runtime.options.triggerElement;
   const handleClick = () => {
+    releaseHiddenFocusBeforeOpen(runtime.options);
     runtime.controller.setOpen(true);
     renderVanillaDrawer(runtime.id);
   };
@@ -29174,6 +29181,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 +29244,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 +29293,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 +29366,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);