@jobber/components 6.101.4 → 6.101.5-JOB-140604-4487daa.55

package/dist/Autocomplete/index.mjs

@@ -1,5 +1,5 @@
 import React__default, { useState, useRef, useEffect, useCallback, useMemo, forwardRef } from 'react';
-import { u as useFloating, b as autoUpdate, o as offset, f as flip, c as size, e as useListNavigation, d as useDismiss, g as useInteractions, r as useTransitionStyles, F as FloatingPortal, p as FloatingFocusManager } from '../floating-ui.react-es.js';
+import { u as useFloating, b as autoUpdate, o as offset, f as flip, c as size, r as useClick, e as useListNavigation, d as useDismiss, g as useInteractions, t as useTransitionStyles, F as FloatingPortal, p as FloatingFocusManager } from '../floating-ui.react-es.js';
 import classnames from 'classnames';
 import { tokens } from '@jobber/design';
 import { useCallbackRef, useDebounce, useSafeLayoutEffect, useIsMounted, useOnKeyDown } from '@jobber/hooks';
@@ -10,7 +10,8 @@ import { T as Typography } from '../Typography-es.js';
 import { I as Icon } from '../Icon-es.js';
 import { InputText } from '../InputText/index.mjs';
 import { G as Glimmer } from '../Glimmer-es.js';
-import { m as mergeRefs } from '../FormField-es.js';
+import { n as mergeRefs } from '../FormField-es.js';
+import { f as filterDataAttributes } from '../filterDataAttributes-es.js';
 import { _ as __rest, a as __awaiter } from '../tslib.es6-es.js';
 import 'react/jsx-runtime';
 import 'react-dom';
@@ -18,18 +19,6 @@ import 'react-hook-form';
 import 'framer-motion';
 import '../Button-es.js';
 import 'react-router-dom';
-import '../omit-es.js';
-import '../_commonjsHelpers-es.js';
-import '../_baseGet-es.js';
-import '../isTypedArray-es.js';
-import '../isObjectLike-es.js';
-import '../identity-es.js';
-import '../_getTag-es.js';
-import '../isSymbol-es.js';
-import '../keysIn-es.js';
-import '../_baseAssignValue-es.js';
-import '../_baseFlatten-es.js';
-import '../_setToString-es.js';
 import '../useFormFieldFocus-es.js';
 import '../InputValidation-es.js';
 import '../Spinner-es.js';
@@ -138,7 +127,7 @@ function invokeActiveItemOnEnter(event, activeIndex, renderable, onSelect, onAct
 
 const MENU_OFFSET = tokens["space-small"];
 const AUTOCOMPLETE_MAX_HEIGHT$1 = 300;
-function useAutocompleteListNav({ navigableCount, shouldResetActiveIndexOnClose, onMenuClose, selectedIndex, }) {
+function useAutocompleteListNav({ navigableCount, shouldResetActiveIndexOnClose, onMenuClose, selectedIndex, readOnly = false, }) {
     const [open, setOpen] = useState(false);
     const [activeIndex, setActiveIndex] = useState(null);
     const listRef = useRef([]);
@@ -170,6 +159,10 @@ function useAutocompleteListNav({ navigableCount, shouldResetActiveIndexOnClose,
             }),
         ],
     });
+    const click = useClick(context, {
+        enabled: !readOnly,
+        toggle: false, // Only open, never close on click
+    });
     const listNav = useListNavigation(context, {
         listRef,
         activeIndex,
@@ -191,7 +184,7 @@ function useAutocompleteListNav({ navigableCount, shouldResetActiveIndexOnClose,
         escapeKey: true,
         outsidePressEvent: "click",
     });
-    const { getReferenceProps, getFloatingProps, getItemProps } = useInteractions([listNav, dismiss]);
+    const { getReferenceProps, getFloatingProps, getItemProps } = useInteractions([click, listNav, dismiss]);
     useEffect(() => {
         listRef.current.length = navigableCount;
         setActiveIndex(prev => {
@@ -218,11 +211,34 @@ function useAutocompleteListNav({ navigableCount, shouldResetActiveIndexOnClose,
     };
 }
 
+/**
+ * Handler that prevents default pointer behavior.
+ * Used to prevent blur/focus issues when clicking on non-interactive menu elements.
+ */
+function preventDefaultPointerDown(e) {
+    e.preventDefault();
+}
+/**
+ * Creates a handler for pointer down events on interactive menu items (options/actions).
+ * Prevents default to avoid blur and sets flag for focus management.
+ *
+ * @param isHandlingMenuInteractionRef - Ref to track if a menu interaction is in progress
+ * @returns A pointer down event handler
+ */
+function createInteractionPointerDownHandler(isHandlingMenuInteractionRef) {
+    return (e) => {
+        e.preventDefault();
+        // Set flag to prevent blur/focus handlers from interfering
+        isHandlingMenuInteractionRef.current = true;
+    };
+}
+
 // Keeping this hook cohesive improves readability by centralizing related
 // interactions and state transitions.
 // eslint-disable-next-line max-statements
 function useAutocomplete(props) {
     const { menu, emptyActions, getOptionLabel: getOptionLabelProp, isOptionEqualToValue, inputValue, onInputChange, value, onChange, multiple, openOnFocus = true, readOnly = false, debounce: debounceMs = 300, } = props;
+    const isHandlingMenuInteractionRef = useRef(false);
     // TODO: Clean up the types in these refs by enhancing the type system in useCallbackRef
     const getOptionLabelPropRef = useCallbackRef((opt) => getOptionLabelProp === null || getOptionLabelProp === void 0 ? void 0 : getOptionLabelProp(opt));
     const getOptionLabel = useCallback((opt) => {
@@ -265,7 +281,8 @@ function useAutocomplete(props) {
     const [debouncedInputValue, setDebouncedInputValue] = useState(inputValue);
     const debouncedSetter = useDebounce(setDebouncedInputValue, debounceMs);
     useEffect(() => {
-        if (debounceMs === 0) {
+        // Skip debounce when clearing input for immediate feedback, preventing flickering of last selected item
+        if (debounceMs === 0 || inputValue === "") {
             setDebouncedInputValue(inputValue);
             return;
         }
@@ -355,6 +372,7 @@ function useAutocomplete(props) {
         navigableCount: totalNavigableCount,
         shouldResetActiveIndexOnClose: () => !hasSelection,
         selectedIndex,
+        readOnly,
         onMenuClose: () => {
             if (props.allowFreeForm !== true) {
                 const hasText = inputValue.trim().length > 0;
@@ -366,7 +384,6 @@ function useAutocomplete(props) {
             }
         },
     });
-    const [inputFocused, setInputFocused] = useState(false);
     // Handles activeIndex reset and, in single-select mode only, clearing selection when input is empty
     useEffect(() => {
         const hasText = inputValue.trim().length > 0;
@@ -462,13 +479,24 @@ function useAutocomplete(props) {
         selectOption(option);
         // Might not always want to close on selection. Multi for example.
         setOpen(false);
+        if (refs.domReference.current instanceof HTMLElement) {
+            refs.domReference.current.focus();
+        }
     }, [selectOption, setOpen]);
     const onAction = useCallback((action) => {
         action.run();
         setActiveIndex(null);
         if (action.closeOnRun !== false)
             setOpen(false);
+        if (refs.domReference.current instanceof HTMLElement) {
+            refs.domReference.current.focus();
+        }
     }, [setOpen, setActiveIndex]);
+    /**
+     * Handler for mousedown on interactive menu items (options/actions)
+     * Prevents default to avoid blur and sets flag for focus management
+     */
+    const onInteractionPointerDown = useMemo(() => createInteractionPointerDownHandler(isHandlingMenuInteractionRef), []);
     function commitFromInputText(inputText) {
         var _a;
         if (inputText.length === 0)
@@ -508,18 +536,24 @@ function useAutocomplete(props) {
         multiple,
         value,
     ]);
-    const onInputFocus = useCallback(() => {
+    const onInputFocus = useCallback((event) => {
         var _a;
-        setInputFocused(true);
-        if (!readOnly && openOnFocus)
+        if (!readOnly && openOnFocus && !isHandlingMenuInteractionRef.current) {
             setOpen(true);
-        (_a = props.onFocus) === null || _a === void 0 ? void 0 : _a.call(props);
+        }
+        // Only call user's onFocus for genuine focus events, not programmatic restorations
+        if (!isHandlingMenuInteractionRef.current) {
+            (_a = props.onFocus) === null || _a === void 0 ? void 0 : _a.call(props, event);
+        }
+        isHandlingMenuInteractionRef.current = false;
     }, [props.onFocus, readOnly, openOnFocus, setOpen]);
-    const onInputBlur = useCallback(() => {
+    const onInputBlur = useCallback((event) => {
         var _a, _b;
-        setInputFocused(false);
+        if (isHandlingMenuInteractionRef.current) {
+            return;
+        }
         if (readOnly) {
-            (_a = props.onBlur) === null || _a === void 0 ? void 0 : _a.call(props);
+            (_a = props.onBlur) === null || _a === void 0 ? void 0 : _a.call(props, event);
             return;
         }
         if (props.allowFreeForm === true) {
@@ -531,7 +565,7 @@ function useAutocomplete(props) {
             tryRestoreInputToSelectedLabel();
         }
         lastInputWasUser.current = false;
-        (_b = props.onBlur) === null || _b === void 0 ? void 0 : _b.call(props);
+        (_b = props.onBlur) === null || _b === void 0 ? void 0 : _b.call(props, event);
     }, [
         readOnly,
         props.allowFreeForm,
@@ -623,11 +657,11 @@ function useAutocomplete(props) {
             setActiveIndex(null);
         }
         // Important: update open state before propagating the change so that downstream effects
-        // don’t see an intermediate state where inputValue changed but open was stale
+        // don't see an intermediate state where inputValue changed but open was stale
         if (!readOnly) {
             const hasText = val.trim().length > 0;
             const mustSelectFromOptions = hasText && !props.allowFreeForm;
-            const keepOpenOnEmpty = openOnFocus && inputFocused;
+            const keepOpenOnEmpty = openOnFocus;
             setOpen(mustSelectFromOptions || keepOpenOnEmpty);
         }
         onInputChange === null || onInputChange === void 0 ? void 0 : onInputChange(val);
@@ -638,7 +672,6 @@ function useAutocomplete(props) {
         readOnly,
         props.allowFreeForm,
         openOnFocus,
-        inputFocused,
         setOpen,
     ]);
     return {
@@ -667,6 +700,7 @@ function useAutocomplete(props) {
         // actions
         onSelection,
         onAction,
+        onInteractionPointerDown,
         // input handlers
         onInputChangeFromUser,
         onInputBlur,
@@ -677,7 +711,7 @@ function useAutocomplete(props) {
     };
 }
 
-function MenuList({ items, activeIndex, indexOffset = 0, getItemProps, listRef, listboxId, customRenderOption, customRenderSection, customRenderAction, getOptionLabel, onSelect, onAction, isOptionSelected, slotOverrides, }) {
+function MenuList({ items, activeIndex, indexOffset = 0, getItemProps, listRef, listboxId, customRenderOption, customRenderSection, customRenderAction, getOptionLabel, onSelect, onAction, onInteractionPointerDown, isOptionSelected, slotOverrides, }) {
     let navigableIndex = -1;
     function renderItemNode(item) {
         var _a, _b, _c, _d, _e, _f;
@@ -701,6 +735,7 @@ function MenuList({ items, activeIndex, indexOffset = 0, getItemProps, listRef,
                 customRenderOption,
                 getOptionLabel,
                 onSelect,
+                onInteractionPointerDown,
                 indexOffset,
                 optionClassName: (_c = slotOverrides === null || slotOverrides === void 0 ? void 0 : slotOverrides.option) === null || _c === void 0 ? void 0 : _c.className,
                 optionStyle: (_d = slotOverrides === null || slotOverrides === void 0 ? void 0 : slotOverrides.option) === null || _d === void 0 ? void 0 : _d.style,
@@ -717,6 +752,7 @@ function MenuList({ items, activeIndex, indexOffset = 0, getItemProps, listRef,
             listboxId,
             customRenderAction,
             onAction,
+            onInteractionPointerDown,
             indexOffset,
             actionClassName: (_e = slotOverrides === null || slotOverrides === void 0 ? void 0 : slotOverrides.action) === null || _e === void 0 ? void 0 : _e.className,
             actionStyle: (_f = slotOverrides === null || slotOverrides === void 0 ? void 0 : slotOverrides.action) === null || _f === void 0 ? void 0 : _f.style,
@@ -730,12 +766,12 @@ function MenuList({ items, activeIndex, indexOffset = 0, getItemProps, listRef,
 function handleSectionRendering({ customRenderSection, section, sectionClassName, sectionStyle, }) {
     var _a;
     const headerContent = customRenderSection ? (customRenderSection(section)) : (React__default.createElement(DefaultSectionContent, { section: section }));
-    return (React__default.createElement("div", { key: `section-${String((_a = section.key) !== null && _a !== void 0 ? _a : section.label)}`, role: "presentation", tabIndex: -1, "data-testid": "ATL-AutocompleteRebuilt-Section", className: classnames(styles$1.section, styles$1.stickyTop, sectionClassName), style: sectionStyle }, headerContent));
+    return (React__default.createElement("div", { key: `section-${String((_a = section.key) !== null && _a !== void 0 ? _a : section.label)}`, role: "presentation", tabIndex: -1, "data-testid": "ATL-AutocompleteRebuilt-Section", className: classnames(styles$1.section, styles$1.stickyTop, sectionClassName), style: sectionStyle, onPointerDown: preventDefaultPointerDown }, headerContent));
 }
 function DefaultSectionContent({ section, }) {
     return React__default.createElement(Heading, { level: 5 }, section.label);
 }
-function handleOptionRendering({ option, activeIndex, navigableIndex, getItemProps, listRef, listboxId, isOptionSelected, customRenderOption, getOptionLabel, onSelect, indexOffset = 0, optionClassName, optionStyle, }) {
+function handleOptionRendering({ option, activeIndex, navigableIndex, getItemProps, listRef, listboxId, isOptionSelected, customRenderOption, getOptionLabel, onSelect, onInteractionPointerDown, indexOffset = 0, optionClassName, optionStyle, }) {
     var _a;
     const nextNavigableIndex = navigableIndex + 1;
     const isActive = activeIndex === nextNavigableIndex;
@@ -749,6 +785,7 @@ function handleOptionRendering({ option, activeIndex, navigableIndex, getItemPro
                     listRef.current[idx] = node;
             },
             onClick: () => onSelect(option),
+            onPointerDown: onInteractionPointerDown,
             className: classnames(styles$1.option, isActive && styles$1.optionActive, optionClassName),
             style: optionStyle,
         }), { role: "option", tabIndex: -1, "aria-selected": isSelected ? true : false, id: `${listboxId}-item-${nextNavigableIndex + indexOffset}`, "data-index": nextNavigableIndex + indexOffset, "data-active": isActive ? true : undefined }), optionContent)),
@@ -760,7 +797,7 @@ function DefaultOptionContent({ isSelected, text, }) {
         React__default.createElement("div", { className: styles$1.icon }, isSelected && React__default.createElement(Icon, { name: "checkmark", size: "small" })),
         React__default.createElement(Text, null, text)));
 }
-function handleActionRendering({ action, activeIndex, navigableIndex, getItemProps, listRef, listboxId, customRenderAction, onAction, indexOffset = 0, actionClassName, actionStyle, origin, }) {
+function handleActionRendering({ action, activeIndex, navigableIndex, getItemProps, listRef, listboxId, customRenderAction, onAction, onInteractionPointerDown, indexOffset = 0, actionClassName, actionStyle, origin, }) {
     var _a;
     const nextNavigableIndex = navigableIndex + 1;
     const isActive = activeIndex === nextNavigableIndex;
@@ -778,6 +815,7 @@ function handleActionRendering({ action, activeIndex, navigableIndex, getItemPro
                 closeOnRun: action.shouldClose,
             });
         },
+        onPointerDown: onInteractionPointerDown,
         className: classnames(styles$1.action, isActive && styles$1.actionActive, actionClassName),
         style: actionStyle,
     });
@@ -795,7 +833,7 @@ function DefaultActionContent({ textContent, }) {
         } }, textContent));
 }
 
-function PersistentRegion({ items, position, activeIndex, indexOffset, getItemProps, listRef, customRenderHeader, customRenderFooter, className, style, onAction, }) {
+function PersistentRegion({ items, position, activeIndex, indexOffset, getItemProps, listRef, customRenderHeader, customRenderFooter, className, style, onAction, onInteractionPointerDown, }) {
     if (!items || items.length === 0)
         return null;
     let navigableIndex = -1;
@@ -810,13 +848,14 @@ function PersistentRegion({ items, position, activeIndex, indexOffset, getItemPr
             customRenderFooter,
             listRef,
             onAction,
+            onInteractionPointerDown,
             navigableIndex,
         });
         navigableIndex = result.nextNavigableIndex;
         return result.node;
     })));
 }
-function handlePersistentRendering({ persistent, position, activeIndex, indexOffset, getItemProps, customRenderHeader, customRenderFooter, listRef, onAction, navigableIndex, }) {
+function handlePersistentRendering({ persistent, position, activeIndex, indexOffset, getItemProps, customRenderHeader, customRenderFooter, listRef, onAction, onInteractionPointerDown, navigableIndex, }) {
     const interactive = Boolean(persistent.onClick);
     if (!interactive) {
         const node = handleTextPersistentRendering({
@@ -837,6 +876,7 @@ function handlePersistentRendering({ persistent, position, activeIndex, indexOff
         customRenderFooter,
         listRef,
         onAction,
+        onInteractionPointerDown,
         navigableIndex,
     });
 }
@@ -852,9 +892,9 @@ function handleTextPersistentRendering({ persistent, position, customRenderHeade
     else {
         content = React__default.createElement(DefaultTextPersistentContent, { persistent: persistent });
     }
-    return (React__default.createElement("div", { key: `persistent-${position}-${String((_a = persistent.key) !== null && _a !== void 0 ? _a : persistent.label)}`, role: "presentation", tabIndex: -1, className: styles$1.textPersistent }, content));
+    return (React__default.createElement("div", { key: `persistent-${position}-${String((_a = persistent.key) !== null && _a !== void 0 ? _a : persistent.label)}`, role: "presentation", tabIndex: -1, className: styles$1.textPersistent, onPointerDown: preventDefaultPointerDown }, content));
 }
-function handleActionPersistentRendering({ persistent, position, activeIndex, indexOffset, getItemProps, customRenderHeader, customRenderFooter, listRef, onAction, navigableIndex, }) {
+function handleActionPersistentRendering({ persistent, position, activeIndex, indexOffset, getItemProps, customRenderHeader, customRenderFooter, listRef, onAction, onInteractionPointerDown, navigableIndex, }) {
     var _a;
     const nextNavigableIndex = navigableIndex + 1;
     const isActive = activeIndex === indexOffset + nextNavigableIndex;
@@ -881,13 +921,16 @@ function handleActionPersistentRendering({ persistent, position, activeIndex, in
                 if (persistNode)
                     listRef.current[idx] = persistNode;
             },
-            onClick: () => onAction({
-                run: () => {
-                    var _a;
-                    (_a = persistent.onClick) === null || _a === void 0 ? void 0 : _a.call(persistent);
-                },
-                closeOnRun: persistent.shouldClose,
-            }),
+            onClick: () => {
+                onAction({
+                    run: () => {
+                        var _a;
+                        (_a = persistent.onClick) === null || _a === void 0 ? void 0 : _a.call(persistent);
+                    },
+                    closeOnRun: persistent.shouldClose,
+                });
+            },
+            onPointerDown: onInteractionPointerDown,
             className: classnames(styles$1.action, isActive && styles$1.actionActive),
         }), { role: "button", tabIndex: -1 }), content)),
         nextNavigableIndex,
@@ -902,7 +945,7 @@ const AutocompleteRebuilt = forwardRef(AutocompleteRebuiltInternal);
 function AutocompleteRebuiltInternal(props, forwardedRef) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     const { inputValue, placeholder, disabled, error, invalid, description, size: sizeProp, loading = false, } = props;
-    const { renderable, optionCount, persistentsHeaders, persistentsFooters, headerInteractiveCount, middleNavigableCount, getOptionLabel, isOptionSelected, refs, floatingStyles, context, getReferenceProps, getFloatingProps, getItemProps, activeIndex, open, listRef, onSelection, onAction, onInputChangeFromUser, onInputBlur, onInputFocus, onInputKeyDown, setReferenceElement, } = useAutocomplete(props);
+    const { renderable, optionCount, persistentsHeaders, persistentsFooters, headerInteractiveCount, middleNavigableCount, getOptionLabel, isOptionSelected, refs, floatingStyles, context, getReferenceProps, getFloatingProps, getItemProps, activeIndex, open, listRef, onSelection, onAction, onInteractionPointerDown, onInputChangeFromUser, onInputBlur, onInputFocus, onInputKeyDown, setReferenceElement, } = useAutocomplete(props);
     const listboxId = React__default.useId();
     // Provides mount/unmount-aware transition styles for the floating element
     const { isMounted, styles: transitionStyles } = useTransitionStyles(context, {
@@ -918,10 +961,11 @@ function AutocompleteRebuiltInternal(props, forwardedRef) {
         onFocus: onInputFocus,
         onBlur: onInputBlur,
     });
-    const inputProps = Object.assign(Object.assign(Object.assign(Object.assign({ version: 2, value: inputValue, onChange: props.readOnly ? undefined : onInputChangeFromUser }, (props.readOnly ? { onFocus: onInputFocus, onBlur: onInputBlur } : {})), { placeholder,
-        disabled, readOnly: props.readOnly, error: error !== null && error !== void 0 ? error : undefined, name: props.name, invalid, autoComplete: "off", description, size: sizeProp ? sizeProp : undefined, prefix: props.prefix, suffix: props.suffix }), (props.readOnly ? {} : composedReferenceProps)), { role: "combobox", "aria-autocomplete": "list", "aria-expanded": open ? true : false, "aria-controls": listboxId, "aria-activedescendant": open && activeIndex != null
+    const dataAttrs = filterDataAttributes(props);
+    const inputProps = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ version: 2, value: inputValue, onChange: props.readOnly ? undefined : onInputChangeFromUser }, (props.readOnly ? { onFocus: onInputFocus, onBlur: onInputBlur } : {})), { placeholder,
+        disabled, readOnly: props.readOnly, error: error !== null && error !== void 0 ? error : undefined, name: props.name, invalid, autoComplete: "off", autoFocus: props.autoFocus, description, size: sizeProp ? sizeProp : undefined, prefix: props.prefix, suffix: props.suffix }), (props.readOnly ? {} : composedReferenceProps)), { role: "combobox", "aria-autocomplete": "list", "aria-expanded": open ? true : false, "aria-controls": listboxId, "aria-activedescendant": open && activeIndex != null
             ? `${listboxId}-item-${activeIndex}`
-            : undefined });
+            : undefined }), dataAttrs);
     const referenceInputRef = (node) => {
         setReferenceElement(node);
         // Workaround to get the width of the visual InputText element, which is not the same as
@@ -961,10 +1005,10 @@ function AutocompleteRebuiltInternal(props, forwardedRef) {
                         ? { width: menuWidth, maxWidth: menuWidth }
                         : {})),
                 })),
-                    React__default.createElement(PersistentRegion, { items: persistentsHeaders, position: "header", activeIndex: activeIndex, indexOffset: 0, listboxId: listboxId, getItemProps: getItemProps, listRef: listRef, customRenderHeader: props.customRenderHeader, customRenderFooter: props.customRenderFooter, onAction: onAction, className: classnames(styles$1.persistentHeader, (_c = props.UNSAFE_className) === null || _c === void 0 ? void 0 : _c.header), style: (_d = props.UNSAFE_styles) === null || _d === void 0 ? void 0 : _d.header }),
+                    React__default.createElement(PersistentRegion, { items: persistentsHeaders, position: "header", activeIndex: activeIndex, indexOffset: 0, listboxId: listboxId, getItemProps: getItemProps, listRef: listRef, customRenderHeader: props.customRenderHeader, customRenderFooter: props.customRenderFooter, onAction: onAction, onInteractionPointerDown: onInteractionPointerDown, className: classnames(styles$1.persistentHeader, (_c = props.UNSAFE_className) === null || _c === void 0 ? void 0 : _c.header), style: (_d = props.UNSAFE_styles) === null || _d === void 0 ? void 0 : _d.header }),
                     React__default.createElement("div", { className: styles$1.scrollRegion }, loading ? ((_e = props.customRenderLoading) !== null && _e !== void 0 ? _e : React__default.createElement(LoadingContent, null)) : (React__default.createElement(React__default.Fragment, null,
                         showEmptyStateMessage && (React__default.createElement(EmptyStateMessage, { emptyState: props.emptyStateMessage })),
-                        renderable.length > 0 && (React__default.createElement(MenuList, { items: renderable, activeIndex: activeIndexForMiddle, indexOffset: headerInteractiveCount, listboxId: listboxId, getItemProps: getItemProps, listRef: listRef, customRenderOption: props.customRenderOption, customRenderSection: props.customRenderSection, customRenderAction: props.customRenderAction, getOptionLabel: getOptionLabel, onSelect: onSelection, onAction: onAction, isOptionSelected: isOptionSelected, slotOverrides: {
+                        renderable.length > 0 && (React__default.createElement(MenuList, { items: renderable, activeIndex: activeIndexForMiddle, indexOffset: headerInteractiveCount, listboxId: listboxId, getItemProps: getItemProps, listRef: listRef, customRenderOption: props.customRenderOption, customRenderSection: props.customRenderSection, customRenderAction: props.customRenderAction, getOptionLabel: getOptionLabel, onSelect: onSelection, onAction: onAction, onInteractionPointerDown: onInteractionPointerDown, isOptionSelected: isOptionSelected, slotOverrides: {
                                 option: {
                                     className: (_f = props.UNSAFE_className) === null || _f === void 0 ? void 0 : _f.option,
                                     style: (_g = props.UNSAFE_styles) === null || _g === void 0 ? void 0 : _g.option,
@@ -978,10 +1022,10 @@ function AutocompleteRebuiltInternal(props, forwardedRef) {
                                     style: (_l = props.UNSAFE_styles) === null || _l === void 0 ? void 0 : _l.section,
                                 },
                             } }))))),
-                    React__default.createElement(PersistentRegion, { items: persistentsFooters, position: "footer", activeIndex: activeIndex, indexOffset: headerInteractiveCount + middleNavigableCount, listboxId: listboxId, getItemProps: getItemProps, listRef: listRef, customRenderHeader: props.customRenderHeader, customRenderFooter: props.customRenderFooter, onAction: onAction, className: classnames(styles$1.persistentFooter, (_m = props.UNSAFE_className) === null || _m === void 0 ? void 0 : _m.footer), style: (_o = props.UNSAFE_styles) === null || _o === void 0 ? void 0 : _o.footer })))))));
+                    React__default.createElement(PersistentRegion, { items: persistentsFooters, position: "footer", activeIndex: activeIndex, indexOffset: headerInteractiveCount + middleNavigableCount, listboxId: listboxId, getItemProps: getItemProps, listRef: listRef, customRenderHeader: props.customRenderHeader, customRenderFooter: props.customRenderFooter, onAction: onAction, onInteractionPointerDown: onInteractionPointerDown, className: classnames(styles$1.persistentFooter, (_m = props.UNSAFE_className) === null || _m === void 0 ? void 0 : _m.footer), style: (_o = props.UNSAFE_styles) === null || _o === void 0 ? void 0 : _o.footer })))))));
 }
 function LoadingContent() {
-    return (React__default.createElement("div", { className: styles$1.loadingList },
+    return (React__default.createElement("div", { className: styles$1.loadingList, onPointerDown: preventDefaultPointerDown },
         React__default.createElement(Glimmer, { shape: "rectangle", size: "base" }),
         React__default.createElement(Glimmer, { shape: "rectangle", size: "base" }),
         React__default.createElement(Glimmer, { shape: "rectangle", size: "base" })));
@@ -989,7 +1033,7 @@ function LoadingContent() {
 function EmptyStateMessage({ emptyState, }) {
     const emptyStateDefault = "No options";
     const emptyStateContent = emptyState !== null && emptyState !== void 0 ? emptyState : emptyStateDefault;
-    return React__default.createElement("div", { className: styles$1.emptyStateMessage }, emptyStateContent);
+    return (React__default.createElement("div", { className: styles$1.emptyStateMessage, onPointerDown: preventDefaultPointerDown }, emptyStateContent));
 }
 
 var styles = {"autocomplete":"_7mObJiwfPh4-","options":"dL5JShAJlKM-","heading":"PWZL-94hH7k-","visible":"_2RzcnTdaPyc-","option":"y9zhi8Wr8QA-","active":"_3Xg49dtL1Q8-","separator":"LIeh390F3W8-","icon":"K2phy6IC3TY-","text":"a6-LbUm5WnY-","label":"tQNbuxcE9nU-","details":"qacStG9-XbE-","spinning":"P9cQDL4MZ-s-"};

package/dist/Autocomplete/tests/Autocomplete.setup.d.ts

@@ -1,6 +1,6 @@
 import React from "react";
 import { type AutocompleteRebuiltProps, type MenuItem, type OptionLike } from "../Autocomplete.types";
-export declare function Wrapper<T extends OptionLike>({ initialValue, initialInputValue, onChange, onInputChange, onBlur, onFocus, menu, openOnFocus, filterOptions, emptyActions, customRenderOption, customRenderAction, customRenderSection, customRenderInput, customRenderHeader, customRenderFooter, loading, customRenderLoading, emptyStateMessage, ref, readOnly, UNSAFE_className, UNSAFE_styles, debounce, }: {
+export declare function Wrapper<T extends OptionLike>({ initialValue, initialInputValue, onChange, onInputChange, onBlur, onFocus, menu, openOnFocus, filterOptions, emptyActions, customRenderOption, customRenderAction, customRenderSection, customRenderInput, customRenderHeader, customRenderFooter, loading, customRenderLoading, emptyStateMessage, ref, readOnly, UNSAFE_className, UNSAFE_styles, debounce, ...props }: {
     readonly initialValue?: T;
     readonly initialInputValue?: string;
     readonly onChange?: (v: T | undefined) => void;
@@ -36,3 +36,16 @@ export declare function FreeFormWrapper({ initialValue, initialInputValue, onCha
     readonly inputEqualsOption?: (input: string, option: OptionLike) => boolean;
     readonly debounce?: number;
 }): React.JSX.Element;
+/**
+ * Wrapper for testing focus and blur behavior with tabbable siblings
+ * Includes tabbable elements before and after the autocomplete
+ * so tests can use tab navigation to focus without clicking
+ */
+export declare function FocusableSiblingsWrapper<T extends OptionLike>({ onFocus, onChange, onInputChange, menu, readOnly, openOnFocus, }: {
+    readonly onChange?: (v: T | undefined) => void;
+    readonly onInputChange?: (v: string) => void;
+    readonly menu?: MenuItem<T>[];
+    readonly readOnly?: boolean;
+    readonly onFocus?: () => void;
+    readonly openOnFocus?: boolean;
+}): React.JSX.Element;

package/dist/Autocomplete/useAutocomplete.d.ts

@@ -55,12 +55,13 @@ export declare function useAutocomplete<Value extends OptionLike, Multiple exten
     setOpen: (open: boolean) => void;
     activeIndex: number | null;
     setActiveIndex: (index: number | null) => void;
-    listRef: React.MutableRefObject<(HTMLElement | null)[]>;
+    listRef: React.RefObject<(HTMLElement | null)[]>;
     onSelection: (option: Value) => void;
     onAction: (action: ActionConfig) => void;
+    onInteractionPointerDown: (e: React.PointerEvent) => void;
     onInputChangeFromUser: (val: string) => void;
-    onInputBlur: () => void;
-    onInputFocus: () => void;
+    onInputBlur: (event: React.FocusEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
+    onInputFocus: (event: React.FocusEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
     onInputKeyDown: (event: React.KeyboardEvent) => void;
     setReferenceElement: (el: HTMLElement | null) => void;
 };

package/dist/Autocomplete/utils/interactionUtils.d.ts

@@ -0,0 +1,14 @@
+import type React from "react";
+/**
+ * Handler that prevents default pointer behavior.
+ * Used to prevent blur/focus issues when clicking on non-interactive menu elements.
+ */
+export declare function preventDefaultPointerDown(e: React.PointerEvent): void;
+/**
+ * Creates a handler for pointer down events on interactive menu items (options/actions).
+ * Prevents default to avoid blur and sets flag for focus management.
+ *
+ * @param isHandlingMenuInteractionRef - Ref to track if a menu interaction is in progress
+ * @returns A pointer down event handler
+ */
+export declare function createInteractionPointerDownHandler(isHandlingMenuInteractionRef: React.RefObject<boolean>): (e: React.PointerEvent) => void;

package/dist/Card-cjs.js

@@ -19,7 +19,7 @@ const SPACEBAR_KEY = " ";
  * Please use `<Card onClick={onClick} />` component instead.
  */
 function CardClickable({ className, onClick, children, UNSAFE_style = {}, }) {
-    const cardRef = React.useRef();
+    const cardRef = React.useRef(null);
     return (React.createElement("div", { ref: cardRef, "data-testid": "clickable-card", className: className, style: UNSAFE_style, onClick: onClick, onKeyUp: handleKeyup, onKeyDown: handleKeyDown, role: "button", tabIndex: 0 }, children));
     function isCardFocused() {
         return document.activeElement === cardRef.current;

package/dist/Card-es.js

@@ -17,7 +17,7 @@ const SPACEBAR_KEY = " ";
  * Please use `<Card onClick={onClick} />` component instead.
  */
 function CardClickable({ className, onClick, children, UNSAFE_style = {}, }) {
-    const cardRef = useRef();
+    const cardRef = useRef(null);
     return (React__default.createElement("div", { ref: cardRef, "data-testid": "clickable-card", className: className, style: UNSAFE_style, onClick: onClick, onKeyUp: handleKeyup, onKeyDown: handleKeyDown, role: "button", tabIndex: 0 }, children));
     function isCardFocused() {
         return document.activeElement === cardRef.current;

package/dist/Checkbox/Checkbox.rebuilt.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
-export declare const CheckboxRebuilt: React.ForwardRefExoticComponent<Omit<import("./Checkbox.types").BaseCheckboxProps, "children" | "onChange" | "label" | "description"> & {
+export declare const CheckboxRebuilt: React.ForwardRefExoticComponent<import("./Checkbox.types").CheckboxCoreProps & import("../sharedHelpers/types").AriaInputProps & import("../sharedHelpers/types").FocusEvents<HTMLInputElement> & import("../sharedHelpers/types").MouseEvents<HTMLInputElement> & Pick<import("../sharedHelpers/types").HTMLInputBaseProps, "id" | "name" | "disabled"> & Pick<import("../sharedHelpers/types").RebuiltInputCommonProps, "version"> & {
     label?: string | React.ReactElement;
     description?: React.ReactNode;
+    invalid?: boolean;
     onChange?(newValue: boolean, event: React.ChangeEvent<HTMLInputElement>): void;
-    version: 2;
 } & React.RefAttributes<HTMLInputElement>>;

package/dist/Checkbox/Checkbox.types.d.ts

@@ -1,6 +1,10 @@
 import type { ReactElement, ReactNode } from "react";
 import type { XOR } from "ts-xor";
-export interface BaseCheckboxProps {
+import type { AriaInputProps, FocusEvents, HTMLInputBaseProps, MouseEvents, RebuiltInputCommonProps } from "../sharedHelpers/types";
+/**
+ * Shared checkbox-specific props used by both legacy and rebuilt versions
+ */
+export interface CheckboxCoreProps {
     /**
      * Determines if the checkbox is checked or not.
      */
@@ -11,24 +15,29 @@ export interface BaseCheckboxProps {
      * state. If a state is controlling it, use the `checked` prop instead.
      */
     readonly defaultChecked?: boolean;
-    /**
-     * Disables the checkbox.
-     */
-    readonly disabled?: boolean;
     /**
      * When `true` the checkbox to appears in indeterminate.
      *
      * @default false
      */
     readonly indeterminate?: boolean;
-    /**
-     * Checkbox input name
-     */
-    readonly name?: string;
     /**
      * Value of the checkbox.
      */
     readonly value?: string;
+}
+/**
+ * Base props for legacy checkbox
+ */
+export interface BaseCheckboxProps extends CheckboxCoreProps {
+    /**
+     * Disables the checkbox.
+     */
+    readonly disabled?: boolean;
+    /**
+     * Checkbox input name
+     */
+    readonly name?: string;
     /**
      * Further description of the label
      */
@@ -49,10 +58,6 @@ export interface BaseCheckboxProps {
      * Called when the checkbox loses focus
      */
     onBlur?(event: React.FocusEvent<HTMLInputElement>): void;
-    /**
-     * Whether the checkbox is invalid
-     */
-    invalid?: boolean;
 }
 interface CheckboxLabelProps extends BaseCheckboxProps {
     /**
@@ -66,7 +71,7 @@ interface CheckboxChildrenProps extends BaseCheckboxProps {
      */
     readonly children?: ReactElement;
 }
-export type CheckboxRebuiltProps = Omit<BaseCheckboxProps, "label" | "description" | "children" | "onChange"> & {
+export type CheckboxRebuiltProps = CheckboxCoreProps & AriaInputProps & FocusEvents<HTMLInputElement> & MouseEvents<HTMLInputElement> & Pick<HTMLInputBaseProps, "id" | "name" | "disabled"> & Pick<RebuiltInputCommonProps, "version"> & {
     /**
      * Label that shows up beside the checkbox.
      * String will be rendered with the default markup.
@@ -79,15 +84,16 @@ export type CheckboxRebuiltProps = Omit<BaseCheckboxProps, "label" | "descriptio
      * ReactElement will be rendered with provided positioning.
      */
     description?: ReactNode;
+    /**
+     * Whether the checkbox is invalid
+     */
+    invalid?: boolean;
     /**
      * Called when the checkbox value changes.
      * Includes the change event as a second argument.
+     * This is the recommended event handler to access the new value.
      */
     onChange?(newValue: boolean, event: React.ChangeEvent<HTMLInputElement>): void;
-    /**
-     * Version 2 is highly experimental, avoid using it unless you have talked with Atlantis first.
-     */
-    version: 2;
 };
 export type CheckboxLegacyProps = XOR<CheckboxLabelProps, CheckboxChildrenProps> & {
     version?: 1;

package/dist/Checkbox/index.cjs

@@ -6,6 +6,7 @@ var classnames = require('classnames');
 var reactHookForm = require('react-hook-form');
 var Icon = require('../Icon-cjs.js');
 var Text = require('../Text-cjs.js');
+var filterDataAttributes = require('../filterDataAttributes-cjs.js');
 require('@jobber/design');
 require('../Typography-cjs.js');
 
@@ -54,12 +55,16 @@ function CheckboxLegacy({ checked, defaultChecked, disabled, label, name, value,
         } }));
 }
 
-const CheckboxRebuilt = React.forwardRef(function CheckboxRebuiltInternal({ checked, defaultChecked, disabled, label, name, value, indeterminate = false, description, id, onBlur, onChange, onFocus, invalid, }, ref) {
+const CheckboxRebuilt = React.forwardRef(function CheckboxRebuiltInternal(props, ref) {
+    const { checked, defaultChecked, disabled, label, name, value, indeterminate = false, description, id, onBlur, onChange, onFocus, onClick, onMouseDown, onMouseUp, onPointerDown, onPointerUp, invalid, } = props;
     const descriptionIdentifier = React.useId();
+    const descriptionVisible = Boolean(description);
     const wrapperClassName = classnames(styles.wrapper, disabled && styles.disabled, invalid && styles.invalid);
+    const isInvalid = Boolean(invalid);
     const inputClassName = classnames(styles.input, {
         [styles.indeterminate]: indeterminate,
     });
+    const dataAttrs = filterDataAttributes.filterDataAttributes(props);
     const iconName = indeterminate ? "minus2" : "checkmark";
     const labelContent = typeof label === "string" ? React.createElement(Text.Text, null, label) : label;
     const descriptionContent = typeof description === "string" ? (React.createElement(Text.Text, { size: "small", variation: "subdued" }, description)) : (description);
@@ -70,7 +75,9 @@ const CheckboxRebuilt = React.forwardRef(function CheckboxRebuiltInternal({ chec
     return (React.createElement("div", { className: styles.checkBoxParent },
         React.createElement("label", { className: wrapperClassName },
             React.createElement("span", { className: styles.checkHolder },
-                React.createElement("input", { ref: ref, type: "checkbox", id: id, className: inputClassName, name: name, "aria-describedby": description ? descriptionIdentifier : undefined, checked: checked, value: value, defaultChecked: defaultChecked, disabled: disabled, onChange: handleChange, onFocus: onFocus, onBlur: onBlur }),
+                React.createElement("input", Object.assign({ ref: ref, type: "checkbox", id: id, className: inputClassName, name: name, "aria-label": props["aria-label"], "aria-describedby": descriptionVisible
+                        ? descriptionIdentifier
+                        : props["aria-describedby"], "aria-invalid": isInvalid ? true : undefined, "aria-required": props["aria-required"], checked: checked, value: value, defaultChecked: defaultChecked, disabled: disabled, onChange: handleChange, onFocus: onFocus, onBlur: onBlur, onClick: onClick, onMouseDown: onMouseDown, onMouseUp: onMouseUp, onPointerDown: onPointerDown, onPointerUp: onPointerUp }, dataAttrs)),
                 React.createElement("span", { className: styles.checkBox },
                     React.createElement(Icon.Icon, { name: iconName, color: "surface" }))),
             labelContent && React.createElement("span", { className: styles.label }, labelContent)),