bits-ui 2.9.5 → 2.9.7

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/checkbox/checkbox.svelte.d.ts

@@ -1,7 +1,7 @@
 import { type ReadableBoxedValues, type WritableBoxedValues } from "svelte-toolbelt";
 import type { HTMLButtonAttributes } from "svelte/elements";
 import { Context } from "runed";
-import type { BitsKeyboardEvent, BitsMouseEvent, OnChangeFn, RefAttachment, WithRefOpts } from "../../internal/types.js";
+import type { BitsFocusEvent, BitsKeyboardEvent, BitsMouseEvent, OnChangeFn, RefAttachment, WithRefOpts } from "../../internal/types.js";
 interface CheckboxGroupStateOpts extends WithRefOpts, ReadableBoxedValues<{
     name: string | undefined;
     disabled: boolean;
@@ -91,6 +91,7 @@ export declare class CheckboxInputState {
     readonly trueChecked: boolean;
     readonly shouldRender: boolean;
     constructor(root: CheckboxRootState);
+    onfocus(_: BitsFocusEvent): void;
     readonly props: {
         readonly type: "checkbox";
         readonly checked: boolean;
@@ -99,6 +100,7 @@ export declare class CheckboxInputState {
         readonly name: string | undefined;
         readonly value: string | undefined;
         readonly readonly: boolean;
+        readonly onfocus: (_: BitsFocusEvent) => void;
     };
 }
 export {};

package/dist/bits/checkbox/checkbox.svelte.js

@@ -3,6 +3,7 @@ import { Context, watch } from "runed";
 import { createBitsAttrs, getAriaChecked, getAriaReadonly, getAriaRequired, getDataDisabled, getDataReadonly, } from "../../internal/attrs.js";
 import { kbd } from "../../internal/kbd.js";
 import { arraysAreEqual } from "../../internal/arrays.js";
+import { isHTMLElement } from "../../internal/is.js";
 const checkboxAttrs = createBitsAttrs({
     component: "checkbox",
     parts: ["root", "group", "group-label", "input"],
@@ -192,6 +193,12 @@ export class CheckboxInputState {
     shouldRender = $derived.by(() => Boolean(this.root.trueName));
     constructor(root) {
         this.root = root;
+        this.onfocus = this.onfocus.bind(this);
+    }
+    onfocus(_) {
+        if (!isHTMLElement(this.root.opts.ref.current))
+            return;
+        this.root.opts.ref.current.focus();
     }
     props = $derived.by(() => ({
         type: "checkbox",
@@ -201,6 +208,7 @@ export class CheckboxInputState {
         name: this.root.trueName,
         value: this.root.opts.value.current,
         readonly: this.root.trueReadonly,
+        onfocus: this.onfocus,
     }));
 }
 function getCheckboxDataState(checked, indeterminate) {

package/dist/bits/command/command.svelte.js

@@ -528,7 +528,6 @@ export class CommandRootState {
         this.#scheduleUpdate();
         return () => {
             const selectedItem = this.#getSelectedItem();
-            this.allIds.delete(id);
             this.allItems.delete(id);
             this.commandState.filtered.items.delete(id);
             this.#filterItems();
@@ -1132,16 +1131,21 @@ export class CommandItemState {
             () => this.#group?.trueValue,
             () => this.opts.forceMount.current,
         ], () => {
-            if (this.opts.forceMount.current)
+            if (this.opts.forceMount.current || !this.trueValue)
                 return;
             return this.root.registerItem(this.trueValue, this.#group?.trueValue);
         });
         watch([() => this.opts.value.current, () => this.opts.ref.current], () => {
-            if (!this.opts.value.current && this.opts.ref.current?.textContent) {
+            if (this.opts.value.current) {
+                this.trueValue = this.opts.value.current;
+            }
+            else if (this.opts.ref.current?.textContent) {
                 this.trueValue = this.opts.ref.current.textContent.trim();
             }
-            this.root.registerValue(this.trueValue, opts.keywords.current.map((kw) => kw.trim()));
-            this.opts.ref.current?.setAttribute(COMMAND_VALUE_ATTR, this.trueValue);
+            if (this.trueValue) {
+                this.root.registerValue(this.trueValue, opts.keywords.current.map((kw) => kw.trim()));
+                this.opts.ref.current?.setAttribute(COMMAND_VALUE_ATTR, this.trueValue);
+            }
         });
         // bindings
         this.onclick = this.onclick.bind(this);

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/radio-group/radio-group.svelte.d.ts

@@ -73,12 +73,14 @@ export declare class RadioGroupInputState {
     static create(): RadioGroupInputState;
     readonly root: RadioGroupRootState;
     readonly shouldRender: boolean;
+    constructor(root: RadioGroupRootState);
+    onfocus(_: BitsFocusEvent): void;
     readonly props: {
         readonly name: string | undefined;
         readonly value: string;
         readonly required: boolean;
         readonly disabled: boolean;
+        readonly onfocus: (_: BitsFocusEvent) => void;
     };
-    constructor(root: RadioGroupRootState);
 }
 export {};

package/dist/bits/radio-group/radio-group.svelte.js

@@ -130,13 +130,18 @@ export class RadioGroupInputState {
     }
     root;
     shouldRender = $derived.by(() => this.root.opts.name.current !== undefined);
+    constructor(root) {
+        this.root = root;
+        this.onfocus = this.onfocus.bind(this);
+    }
+    onfocus(_) {
+        this.root.rovingFocusGroup.focusCurrentTabStop();
+    }
     props = $derived.by(() => ({
         name: this.root.opts.name.current,
         value: this.root.opts.value.current,
         required: this.root.opts.required.current,
         disabled: this.root.opts.disabled.current,
+        onfocus: this.onfocus,
     }));
-    constructor(root) {
-        this.root = root;
-    }
 }

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/dist/internal/roving-focus-group.d.ts

@@ -39,5 +39,6 @@ export declare class RovingFocusGroup {
     handleKeydown(node: HTMLElement | null | undefined, e: KeyboardEvent, both?: boolean): HTMLElement | undefined;
     getTabIndex(node: HTMLElement | null | undefined): 0 | -1;
     setCurrentTabStopId(id: string): void;
+    focusCurrentTabStop(): void;
 }
 export {};

package/dist/internal/roving-focus-group.js

@@ -3,6 +3,7 @@ import { getElemDirection } from "./locale.js";
 import { getDirectionalKeys } from "./get-directional-keys.js";
 import { kbd } from "./kbd.js";
 import { BROWSER } from "esm-env";
+import { isHTMLElement } from "./is.js";
 export class RovingFocusGroup {
     #opts;
     #currentTabStopId = box(null);
@@ -84,4 +85,13 @@ export class RovingFocusGroup {
     setCurrentTabStopId(id) {
         this.#currentTabStopId.current = id;
     }
+    focusCurrentTabStop() {
+        const currentTabStopId = this.#currentTabStopId.current;
+        if (!currentTabStopId)
+            return;
+        const currentTabStop = this.#opts.rootNode.current?.querySelector(`#${currentTabStopId}`);
+        if (!currentTabStop || !isHTMLElement(currentTabStop))
+            return;
+        currentTabStop.focus();
+    }
 }

package/dist/internal/warn.d.ts

@@ -0,0 +1 @@
+export declare function warn(...messages: string[]): void;

package/dist/internal/warn.js

@@ -0,0 +1,14 @@
+import { DEV } from "esm-env";
+let set;
+if (DEV) {
+    set = new Set();
+}
+export function warn(...messages) {
+    if (!DEV)
+        return;
+    const msg = messages.join(" ");
+    if (set.has(msg))
+        return;
+    set.add(msg);
+    console.warn(`[Bits UI]: ${msg}`);
+}

package/dist/shared/date/types.d.ts

@@ -72,7 +72,7 @@ export type EditableTimeSegmentPart = (typeof EDITABLE_TIME_SEGMENT_PARTS)[numbe
 export type EditableSegmentPart = (typeof EDITABLE_SEGMENT_PARTS)[number];
 export type NonEditableSegmentPart = (typeof NON_EDITABLE_SEGMENT_PARTS)[number];
 export type SegmentPart = EditableSegmentPart | NonEditableSegmentPart;
-export type TimeSegmentPart = EditableTimeSegmentPart | "literal";
+export type TimeSegmentPart = EditableTimeSegmentPart | "literal" | "timeZoneName";
 export type AnyTimeExceptLiteral = Exclude<TimeSegmentPart, "literal">;
 export type AnyExceptLiteral = Exclude<SegmentPart, "literal">;
 export type DayPeriod = "AM" | "PM" | null;

package/package.json

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