bits-ui 2.9.5 → 2.9.6

package/dist/bits/alert-dialog/components/alert-dialog-content.svelte

@@ -57,11 +57,7 @@
 				present: contentState.root.opts.open.current,
 				open: contentState.root.opts.open.current,
 			})}
-			onCloseAutoFocus={(e) => {
-				onCloseAutoFocus(e);
-				if (e.defaultPrevented) return;
-				afterSleep(0, () => contentState.root.triggerNode?.focus());
-			}}
+			{onCloseAutoFocus}
 			onOpenAutoFocus={(e) => {
 				onOpenAutoFocus(e);
 				if (e.defaultPrevented) return;

package/dist/bits/dialog/components/dialog-content.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { afterSleep, box, mergeProps } from "svelte-toolbelt";
+	import { box, mergeProps } from "svelte-toolbelt";
 	import { DialogContentState } from "../dialog.svelte.js";
 	import type { DialogContentProps } from "../types.js";
 	import DismissibleLayer from "../../utilities/dismissible-layer/dismissible-layer.svelte";
@@ -57,11 +57,7 @@
 				open: contentState.root.opts.open.current,
 			})}
 			{onOpenAutoFocus}
-			onCloseAutoFocus={(e) => {
-				onCloseAutoFocus(e);
-				if (e.defaultPrevented) return;
-				afterSleep(1, () => contentState.root.triggerNode?.focus());
-			}}
+			{onCloseAutoFocus}
 		>
 			{#snippet focusScope({ props: focusScopeProps })}
 				<EscapeLayer

package/dist/bits/popover/components/popover-content-static.svelte

@@ -21,7 +21,6 @@
 		onInteractOutside = noop,
 		trapFocus = true,
 		preventScroll = false,
-
 		...restProps
 	}: PopoverContentStaticProps = $props();
 
@@ -33,7 +32,6 @@
 		),
 		onInteractOutside: box.with(() => onInteractOutside),
 		onEscapeKeydown: box.with(() => onEscapeKeydown),
-		onCloseAutoFocus: box.with(() => onCloseAutoFocus),
 		customAnchor: box.with(() => null),
 	});
 
@@ -52,6 +50,7 @@
 		{preventScroll}
 		loop
 		forceMount={true}
+		{onCloseAutoFocus}
 	>
 		{#snippet popper({ props })}
 			{@const finalProps = mergeProps(props, {
@@ -78,6 +77,7 @@
 		{preventScroll}
 		loop
 		forceMount={false}
+		{onCloseAutoFocus}
 	>
 		{#snippet popper({ props })}
 			{@const finalProps = mergeProps(props, {

package/dist/bits/popover/components/popover-content.svelte

@@ -33,7 +33,6 @@
 		),
 		onInteractOutside: box.with(() => onInteractOutside),
 		onEscapeKeydown: box.with(() => onEscapeKeydown),
-		onCloseAutoFocus: box.with(() => onCloseAutoFocus),
 		customAnchor: box.with(() => customAnchor),
 	});
 
@@ -52,6 +51,7 @@
 		loop
 		forceMount={true}
 		{customAnchor}
+		{onCloseAutoFocus}
 	>
 		{#snippet popper({ props, wrapperProps })}
 			{@const finalProps = mergeProps(props, {
@@ -80,6 +80,7 @@
 		loop
 		forceMount={false}
 		{customAnchor}
+		{onCloseAutoFocus}
 	>
 		{#snippet popper({ props, wrapperProps })}
 			{@const finalProps = mergeProps(props, {

package/dist/bits/popover/popover.svelte.d.ts

@@ -43,7 +43,6 @@ export declare class PopoverTriggerState {
 interface PopoverContentStateOpts extends WithRefOpts, ReadableBoxedValues<{
     onInteractOutside: (e: PointerEvent) => void;
     onEscapeKeydown: (e: KeyboardEvent) => void;
-    onCloseAutoFocus: (e: Event) => void;
     customAnchor: string | HTMLElement | null | Measurable;
 }> {
 }
@@ -55,7 +54,6 @@ export declare class PopoverContentState {
     constructor(opts: PopoverContentStateOpts, root: PopoverRootState);
     onInteractOutside: (e: PointerEvent) => void;
     onEscapeKeydown: (e: KeyboardEvent) => void;
-    onCloseAutoFocus: (e: Event) => void;
     readonly snippetProps: {
         open: boolean;
     };
@@ -70,7 +68,6 @@ export declare class PopoverContentState {
     readonly popperProps: {
         onInteractOutside: (e: PointerEvent) => void;
         onEscapeKeydown: (e: KeyboardEvent) => void;
-        onCloseAutoFocus: (e: Event) => void;
     };
 }
 interface PopoverCloseStateOpts extends WithRefOpts {

package/dist/bits/popover/popover.svelte.js

@@ -124,13 +124,6 @@ export class PopoverContentState {
             return;
         this.root.handleClose();
     };
-    onCloseAutoFocus = (e) => {
-        this.opts.onCloseAutoFocus.current?.(e);
-        if (e.defaultPrevented)
-            return;
-        e.preventDefault();
-        this.root.triggerNode?.focus();
-    };
     snippetProps = $derived.by(() => ({ open: this.root.opts.open.current }));
     props = $derived.by(() => ({
         id: this.opts.id.current,
@@ -145,7 +138,6 @@ export class PopoverContentState {
     popperProps = {
         onInteractOutside: this.onInteractOutside,
         onEscapeKeydown: this.onEscapeKeydown,
-        onCloseAutoFocus: this.onCloseAutoFocus,
     };
 }
 export class PopoverCloseState {

package/dist/bits/utilities/focus-scope/focus-scope-manager.d.ts

@@ -9,4 +9,7 @@ export declare class FocusScopeManager {
     setFocusMemory(scope: FocusScope, element: HTMLElement): void;
     getFocusMemory(scope: FocusScope): HTMLElement | undefined;
     isActiveScope(scope: FocusScope): boolean;
+    setPreFocusMemory(scope: FocusScope, element: HTMLElement): void;
+    getPreFocusMemory(scope: FocusScope): HTMLElement | undefined;
+    clearPreFocusMemory(scope: FocusScope): void;
 }

package/dist/bits/utilities/focus-scope/focus-scope-manager.js

@@ -4,6 +4,7 @@ export class FocusScopeManager {
     static instance;
     #scopeStack = box([]);
     #focusHistory = new WeakMap();
+    #preFocusHistory = new WeakMap();
     static getInstance() {
         if (!this.instance) {
             this.instance = new FocusScopeManager();
@@ -15,6 +16,11 @@ export class FocusScopeManager {
         if (current && current !== scope) {
             current.pause();
         }
+        // capture the currently focused element before this scope becomes active
+        const activeElement = document.activeElement;
+        if (activeElement && activeElement !== document.body) {
+            this.#preFocusHistory.set(scope, activeElement);
+        }
         this.#scopeStack.current = this.#scopeStack.current.filter((s) => s !== scope);
         this.#scopeStack.current.unshift(scope);
     }
@@ -37,4 +43,13 @@ export class FocusScopeManager {
     isActiveScope(scope) {
         return this.getActive() === scope;
     }
+    setPreFocusMemory(scope, element) {
+        this.#preFocusHistory.set(scope, element);
+    }
+    getPreFocusMemory(scope) {
+        return this.#preFocusHistory.get(scope);
+    }
+    clearPreFocusMemory(scope) {
+        this.#preFocusHistory.delete(scope);
+    }
 }

package/dist/bits/utilities/focus-scope/focus-scope.svelte.js

@@ -43,6 +43,7 @@ export class FocusScope {
         // handle close auto-focus
         this.#handleCloseAutoFocus();
         this.#manager.unregister(this);
+        this.#manager.clearPreFocusMemory(this);
         this.#container = null;
     }
     #handleOpenAutoFocus() {
@@ -75,10 +76,17 @@ export class FocusScope {
         });
         this.#opts.onCloseAutoFocus.current?.(event);
         if (!event.defaultPrevented) {
-            // return focus to previously focused element
-            const prevFocused = document.activeElement;
-            if (prevFocused && prevFocused !== document.body) {
-                prevFocused.focus();
+            // return focus to the element that was focused before this scope opened
+            const preFocusedElement = this.#manager.getPreFocusMemory(this);
+            if (preFocusedElement && document.contains(preFocusedElement)) {
+                // ensure the element is still focusable and in the document
+                try {
+                    preFocusedElement.focus();
+                }
+                catch {
+                    // fallback if focus fails
+                    document.body.focus();
+                }
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bits-ui",
-  "version": "2.9.5",
+  "version": "2.9.6",
   "license": "MIT",
   "repository": "github:huntabyte/bits-ui",
   "funding": "https://github.com/sponsors/huntabyte",