@jobber/components 6.104.0 → 6.105.0

package/dist/InputTime/index.cjs

@@ -8,6 +8,7 @@ require('classnames');
 require('@jobber/design');
 require('react-hook-form');
 require('../Button-cjs.js');
+var filterDataAttributes = require('../filterDataAttributes-cjs.js');
 var omit = require('../omit-cjs.js');
 require('@jobber/hooks');
 require('framer-motion');
@@ -21,7 +22,7 @@ require('../useFormFieldFocus-cjs.js');
 require('../InputValidation-cjs.js');
 require('../Spinner-cjs.js');
 require('react-router-dom');
-require('../_baseGet-cjs.js');
+require('../_getAllKeys-cjs.js');
 require('../isTypedArray-cjs.js');
 require('../identity-cjs.js');
 require('../_getTag-cjs.js');
@@ -204,23 +205,7 @@ function timeStringToDate(timeString, baseDate) {
     }
 }
 
-function InputTimeRebuilt(_a) {
-    var _b, _c;
-    var { value, onChange } = _a, params = tslib_es6.__rest(_a, ["value", "onChange"]);
-    const ref = (_b = params.inputRef) !== null && _b !== void 0 ? _b : React.useRef(null);
-    const { setTypedTime } = useTimePredict({
-        value,
-        handleChange,
-    });
-    const { inputStyle } = FormField.useFormFieldWrapperStyles(params);
-    const wrapperRef = React.useRef(null);
-    const id = getId(params);
-    return (React.createElement(FormField.FormFieldWrapper, { disabled: params.disabled, size: params.size, align: params.align, inline: params.inline, name: params.name, error: params.error || "", identifier: id, descriptionIdentifier: `descriptionUUID--${id}`, invalid: Boolean(params.invalid), description: params.description, clearable: (_c = params.clearable) !== null && _c !== void 0 ? _c : "never", onClear: handleClear, type: "time", readonly: params.readonly, placeholder: params.placeholder, value: dateToTimeString(value), wrapperRef: wrapperRef },
-        React.createElement("input", { ref: ref, type: "time", name: params.name, className: inputStyle, onBlur: handleBlur, id: id, disabled: params.disabled, readOnly: params.readonly, onChange: handleChangeEvent, onFocus: handleFocus, "data-testid": "ATL-InputTime-input", onKeyUp: e => {
-                if (params.disabled || params.readonly)
-                    return;
-                !isNaN(parseInt(e.key, 10)) && setTypedTime(prev => prev + e.key);
-            }, value: dateToTimeString(value) })));
+function useInputTimeActions({ onChange, value, inputRef, onFocus, onBlur, onKeyDown, onClick, onMouseDown, onMouseUp, onPointerDown, onPointerUp, }) {
     function handleChangeEvent(event) {
         handleChange(event.target.value);
     }
@@ -228,28 +213,104 @@ function InputTimeRebuilt(_a) {
         onChange === null || onChange === void 0 ? void 0 : onChange(timeStringToDate(newValue, value));
     }
     function handleBlur(event) {
-        var _a;
-        (_a = params.onBlur) === null || _a === void 0 ? void 0 : _a.call(params, event);
-        if (ref.current) {
-            if (!ref.current.checkValidity()) {
-                ref.current.value = "";
+        onBlur === null || onBlur === void 0 ? void 0 : onBlur(event);
+        if (inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) {
+            if (!inputRef.current.checkValidity()) {
+                inputRef.current.value = "";
             }
         }
     }
     function handleClear() {
         var _a;
-        handleBlur();
+        // Clear the value and refocus without triggering blur event
         onChange === null || onChange === void 0 ? void 0 : onChange(undefined);
-        (_a = ref.current) === null || _a === void 0 ? void 0 : _a.focus();
+        (_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
     }
     function handleFocus(event) {
-        var _a;
-        (_a = params.onFocus) === null || _a === void 0 ? void 0 : _a.call(params, event);
+        onFocus === null || onFocus === void 0 ? void 0 : onFocus(event);
+    }
+    function handleKeyDown(event) {
+        onKeyDown === null || onKeyDown === void 0 ? void 0 : onKeyDown(event);
+    }
+    function handleClick(event) {
+        onClick === null || onClick === void 0 ? void 0 : onClick(event);
     }
-    function getId(props) {
-        const generatedId = React.useId();
-        return props.id || generatedId;
+    function handleMouseDown(event) {
+        onMouseDown === null || onMouseDown === void 0 ? void 0 : onMouseDown(event);
     }
+    function handleMouseUp(event) {
+        onMouseUp === null || onMouseUp === void 0 ? void 0 : onMouseUp(event);
+    }
+    function handlePointerDown(event) {
+        onPointerDown === null || onPointerDown === void 0 ? void 0 : onPointerDown(event);
+    }
+    function handlePointerUp(event) {
+        onPointerUp === null || onPointerUp === void 0 ? void 0 : onPointerUp(event);
+    }
+    return {
+        handleChangeEvent,
+        handleChange,
+        handleBlur,
+        handleClear,
+        handleFocus,
+        handleKeyDown,
+        handleClick,
+        handleMouseDown,
+        handleMouseUp,
+        handlePointerDown,
+        handlePointerUp,
+    };
+}
+
+function InputTimeRebuilt(_a) {
+    var _b;
+    var { value, onChange, readOnly, autoComplete, inputRef } = _a, props = tslib_es6.__rest(_a, ["value", "onChange", "readOnly", "autoComplete", "inputRef"]);
+    const { internalRef, mergedRef, wrapperRef } = useInputTimeRefs(inputRef);
+    const generatedId = React.useId();
+    const id = props.id || generatedId;
+    const { inputStyle } = FormField.useFormFieldWrapperStyles(props);
+    const { handleChangeEvent, handleChange, handleBlur, handleClear, handleFocus, handleKeyDown, handleClick, handleMouseDown, handleMouseUp, handlePointerDown, handlePointerUp, } = useInputTimeActions({
+        onChange,
+        value,
+        readOnly,
+        disabled: props.disabled,
+        inputRef: internalRef,
+        onFocus: props.onFocus,
+        onBlur: props.onBlur,
+        onKeyDown: props.onKeyDown,
+        onClick: props.onClick,
+        onMouseDown: props.onMouseDown,
+        onMouseUp: props.onMouseUp,
+        onPointerDown: props.onPointerDown,
+        onPointerUp: props.onPointerUp,
+    });
+    const { setTypedTime } = useTimePredict({
+        value,
+        handleChange,
+    });
+    // Kept outside the useInputTimeActions hook to avoid circular dependency via setTypedTime and handleChange
+    function handleKeyUp(event) {
+        var _a;
+        (_a = props.onKeyUp) === null || _a === void 0 ? void 0 : _a.call(props, event);
+        if (props.disabled || readOnly)
+            return;
+        !isNaN(parseInt(event.key, 10)) && setTypedTime(prev => prev + event.key);
+    }
+    const dataAttrs = filterDataAttributes.filterDataAttributes(props);
+    const descriptionIdentifier = `descriptionUUID--${id}`;
+    const descriptionVisible = props.description && !props.inline;
+    const isInvalid = Boolean(props.error || props.invalid);
+    return (React.createElement(FormField.FormFieldWrapper, { disabled: props.disabled, size: props.size, align: props.align, inline: props.inline, name: props.name, error: props.error || "", identifier: id, descriptionIdentifier: descriptionIdentifier, invalid: props.invalid, description: props.description, clearable: (_b = props.clearable) !== null && _b !== void 0 ? _b : "never", onClear: handleClear, type: "time", readonly: readOnly, placeholder: props.placeholder, value: dateToTimeString(value), wrapperRef: wrapperRef },
+        React.createElement("input", Object.assign({ ref: mergedRef, type: "time", name: props.name, className: inputStyle, id: id, disabled: props.disabled, readOnly: readOnly, autoComplete: autoComplete, autoFocus: props.autoFocus, max: props.max, min: props.min, value: dateToTimeString(value), onChange: handleChangeEvent, onBlur: handleBlur, onFocus: handleFocus, onKeyDown: handleKeyDown, onKeyUp: handleKeyUp, onClick: handleClick, onMouseDown: handleMouseDown, onMouseUp: handleMouseUp, onPointerDown: handlePointerDown, onPointerUp: handlePointerUp, "data-testid": "ATL-InputTime-input", "aria-label": props["aria-label"], "aria-describedby": descriptionVisible ? descriptionIdentifier : props["aria-describedby"], "aria-invalid": isInvalid ? true : undefined, "aria-required": props["aria-required"] }, dataAttrs))));
+}
+function useInputTimeRefs(inputRef) {
+    const internalRef = React.useRef(null);
+    const mergedRef = FormField.mergeRefs([
+        internalRef,
+        inputRef,
+    ]);
+    const wrapperRef = React.useRef(null);
+    return { internalRef, mergedRef, wrapperRef };
 }
 
 function InputTime$1(_a) {

package/dist/InputTime/index.mjs

@@ -1,11 +1,12 @@
-import React__default, { useState, useCallback, useEffect, useRef, useId } from 'react';
+import React__default, { useState, useCallback, useEffect, useId, useRef } from 'react';
 import { _ as __rest } from '../tslib.es6-es.js';
-import { d as debounce } from '../debounce-es.js';
-import { j as useFormFieldWrapperStyles, f as FormFieldWrapper, k as FormField } from '../FormField-es.js';
+import { a as debounce } from '../debounce-es.js';
+import { j as useFormFieldWrapperStyles, f as FormFieldWrapper, m as mergeRefs, k as FormField } from '../FormField-es.js';
 import 'classnames';
 import '@jobber/design';
 import 'react-hook-form';
 import '../Button-es.js';
+import { f as filterDataAttributes } from '../filterDataAttributes-es.js';
 import { o as omit } from '../omit-es.js';
 import '@jobber/hooks';
 import 'framer-motion';
@@ -19,7 +20,7 @@ import '../useFormFieldFocus-es.js';
 import '../InputValidation-es.js';
 import '../Spinner-es.js';
 import 'react-router-dom';
-import '../_baseGet-es.js';
+import '../_getAllKeys-es.js';
 import '../isTypedArray-es.js';
 import '../identity-es.js';
 import '../_getTag-es.js';
@@ -202,23 +203,7 @@ function timeStringToDate(timeString, baseDate) {
     }
 }
 
-function InputTimeRebuilt(_a) {
-    var _b, _c;
-    var { value, onChange } = _a, params = __rest(_a, ["value", "onChange"]);
-    const ref = (_b = params.inputRef) !== null && _b !== void 0 ? _b : useRef(null);
-    const { setTypedTime } = useTimePredict({
-        value,
-        handleChange,
-    });
-    const { inputStyle } = useFormFieldWrapperStyles(params);
-    const wrapperRef = React__default.useRef(null);
-    const id = getId(params);
-    return (React__default.createElement(FormFieldWrapper, { disabled: params.disabled, size: params.size, align: params.align, inline: params.inline, name: params.name, error: params.error || "", identifier: id, descriptionIdentifier: `descriptionUUID--${id}`, invalid: Boolean(params.invalid), description: params.description, clearable: (_c = params.clearable) !== null && _c !== void 0 ? _c : "never", onClear: handleClear, type: "time", readonly: params.readonly, placeholder: params.placeholder, value: dateToTimeString(value), wrapperRef: wrapperRef },
-        React__default.createElement("input", { ref: ref, type: "time", name: params.name, className: inputStyle, onBlur: handleBlur, id: id, disabled: params.disabled, readOnly: params.readonly, onChange: handleChangeEvent, onFocus: handleFocus, "data-testid": "ATL-InputTime-input", onKeyUp: e => {
-                if (params.disabled || params.readonly)
-                    return;
-                !isNaN(parseInt(e.key, 10)) && setTypedTime(prev => prev + e.key);
-            }, value: dateToTimeString(value) })));
+function useInputTimeActions({ onChange, value, inputRef, onFocus, onBlur, onKeyDown, onClick, onMouseDown, onMouseUp, onPointerDown, onPointerUp, }) {
     function handleChangeEvent(event) {
         handleChange(event.target.value);
     }
@@ -226,28 +211,104 @@ function InputTimeRebuilt(_a) {
         onChange === null || onChange === void 0 ? void 0 : onChange(timeStringToDate(newValue, value));
     }
     function handleBlur(event) {
-        var _a;
-        (_a = params.onBlur) === null || _a === void 0 ? void 0 : _a.call(params, event);
-        if (ref.current) {
-            if (!ref.current.checkValidity()) {
-                ref.current.value = "";
+        onBlur === null || onBlur === void 0 ? void 0 : onBlur(event);
+        if (inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) {
+            if (!inputRef.current.checkValidity()) {
+                inputRef.current.value = "";
             }
         }
     }
     function handleClear() {
         var _a;
-        handleBlur();
+        // Clear the value and refocus without triggering blur event
         onChange === null || onChange === void 0 ? void 0 : onChange(undefined);
-        (_a = ref.current) === null || _a === void 0 ? void 0 : _a.focus();
+        (_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
     }
     function handleFocus(event) {
-        var _a;
-        (_a = params.onFocus) === null || _a === void 0 ? void 0 : _a.call(params, event);
+        onFocus === null || onFocus === void 0 ? void 0 : onFocus(event);
+    }
+    function handleKeyDown(event) {
+        onKeyDown === null || onKeyDown === void 0 ? void 0 : onKeyDown(event);
+    }
+    function handleClick(event) {
+        onClick === null || onClick === void 0 ? void 0 : onClick(event);
     }
-    function getId(props) {
-        const generatedId = useId();
-        return props.id || generatedId;
+    function handleMouseDown(event) {
+        onMouseDown === null || onMouseDown === void 0 ? void 0 : onMouseDown(event);
     }
+    function handleMouseUp(event) {
+        onMouseUp === null || onMouseUp === void 0 ? void 0 : onMouseUp(event);
+    }
+    function handlePointerDown(event) {
+        onPointerDown === null || onPointerDown === void 0 ? void 0 : onPointerDown(event);
+    }
+    function handlePointerUp(event) {
+        onPointerUp === null || onPointerUp === void 0 ? void 0 : onPointerUp(event);
+    }
+    return {
+        handleChangeEvent,
+        handleChange,
+        handleBlur,
+        handleClear,
+        handleFocus,
+        handleKeyDown,
+        handleClick,
+        handleMouseDown,
+        handleMouseUp,
+        handlePointerDown,
+        handlePointerUp,
+    };
+}
+
+function InputTimeRebuilt(_a) {
+    var _b;
+    var { value, onChange, readOnly, autoComplete, inputRef } = _a, props = __rest(_a, ["value", "onChange", "readOnly", "autoComplete", "inputRef"]);
+    const { internalRef, mergedRef, wrapperRef } = useInputTimeRefs(inputRef);
+    const generatedId = useId();
+    const id = props.id || generatedId;
+    const { inputStyle } = useFormFieldWrapperStyles(props);
+    const { handleChangeEvent, handleChange, handleBlur, handleClear, handleFocus, handleKeyDown, handleClick, handleMouseDown, handleMouseUp, handlePointerDown, handlePointerUp, } = useInputTimeActions({
+        onChange,
+        value,
+        readOnly,
+        disabled: props.disabled,
+        inputRef: internalRef,
+        onFocus: props.onFocus,
+        onBlur: props.onBlur,
+        onKeyDown: props.onKeyDown,
+        onClick: props.onClick,
+        onMouseDown: props.onMouseDown,
+        onMouseUp: props.onMouseUp,
+        onPointerDown: props.onPointerDown,
+        onPointerUp: props.onPointerUp,
+    });
+    const { setTypedTime } = useTimePredict({
+        value,
+        handleChange,
+    });
+    // Kept outside the useInputTimeActions hook to avoid circular dependency via setTypedTime and handleChange
+    function handleKeyUp(event) {
+        var _a;
+        (_a = props.onKeyUp) === null || _a === void 0 ? void 0 : _a.call(props, event);
+        if (props.disabled || readOnly)
+            return;
+        !isNaN(parseInt(event.key, 10)) && setTypedTime(prev => prev + event.key);
+    }
+    const dataAttrs = filterDataAttributes(props);
+    const descriptionIdentifier = `descriptionUUID--${id}`;
+    const descriptionVisible = props.description && !props.inline;
+    const isInvalid = Boolean(props.error || props.invalid);
+    return (React__default.createElement(FormFieldWrapper, { disabled: props.disabled, size: props.size, align: props.align, inline: props.inline, name: props.name, error: props.error || "", identifier: id, descriptionIdentifier: descriptionIdentifier, invalid: props.invalid, description: props.description, clearable: (_b = props.clearable) !== null && _b !== void 0 ? _b : "never", onClear: handleClear, type: "time", readonly: readOnly, placeholder: props.placeholder, value: dateToTimeString(value), wrapperRef: wrapperRef },
+        React__default.createElement("input", Object.assign({ ref: mergedRef, type: "time", name: props.name, className: inputStyle, id: id, disabled: props.disabled, readOnly: readOnly, autoComplete: autoComplete, autoFocus: props.autoFocus, max: props.max, min: props.min, value: dateToTimeString(value), onChange: handleChangeEvent, onBlur: handleBlur, onFocus: handleFocus, onKeyDown: handleKeyDown, onKeyUp: handleKeyUp, onClick: handleClick, onMouseDown: handleMouseDown, onMouseUp: handleMouseUp, onPointerDown: handlePointerDown, onPointerUp: handlePointerUp, "data-testid": "ATL-InputTime-input", "aria-label": props["aria-label"], "aria-describedby": descriptionVisible ? descriptionIdentifier : props["aria-describedby"], "aria-invalid": isInvalid ? true : undefined, "aria-required": props["aria-required"] }, dataAttrs))));
+}
+function useInputTimeRefs(inputRef) {
+    const internalRef = useRef(null);
+    const mergedRef = mergeRefs([
+        internalRef,
+        inputRef,
+    ]);
+    const wrapperRef = React__default.useRef(null);
+    return { internalRef, mergedRef, wrapperRef };
 }
 
 function InputTime$1(_a) {

package/dist/List/index.cjs

@@ -8,9 +8,9 @@ require('../identity-cjs.js');
 require('../isTypedArray-cjs.js');
 require('../isObjectLike-cjs.js');
 require('../_commonjsHelpers-cjs.js');
-require('../_baseGet-cjs.js');
-require('../_getTag-cjs.js');
+require('../_getAllKeys-cjs.js');
 require('../isSymbol-cjs.js');
+require('../_getTag-cjs.js');
 require('../_baseFor-cjs.js');
 require('../_baseAssignValue-cjs.js');
 require('../Typography-cjs.js');

package/dist/List/index.mjs

@@ -6,9 +6,9 @@ import '../identity-es.js';
 import '../isTypedArray-es.js';
 import '../isObjectLike-es.js';
 import '../_commonjsHelpers-es.js';
-import '../_baseGet-es.js';
-import '../_getTag-es.js';
+import '../_getAllKeys-es.js';
 import '../isSymbol-es.js';
+import '../_getTag-es.js';
 import '../_baseFor-es.js';
 import '../_baseAssignValue-es.js';
 import '../Typography-es.js';

package/dist/MultiSelect/index.cjs

@@ -10,6 +10,7 @@ require('../Icon-cjs.js');
 require('@jobber/design');
 require('../Text-cjs.js');
 require('../Typography-cjs.js');
+require('../filterDataAttributes-cjs.js');
 
 
 

package/dist/MultiSelect/index.mjs

@@ -8,3 +8,4 @@ import '../Icon-es.js';
 import '@jobber/design';
 import '../Text-es.js';
 import '../Typography-es.js';
+import '../filterDataAttributes-es.js';

package/dist/RecurringSelect/index.cjs

@@ -9,12 +9,12 @@ require('classnames');
 require('../Select/index.cjs');
 require('../omit-cjs.js');
 require('../_commonjsHelpers-cjs.js');
-require('../_baseGet-cjs.js');
+require('../_getAllKeys-cjs.js');
 require('../isTypedArray-cjs.js');
 require('../isObjectLike-cjs.js');
+require('../isSymbol-cjs.js');
 require('../identity-cjs.js');
 require('../_getTag-cjs.js');
-require('../isSymbol-cjs.js');
 require('../keysIn-cjs.js');
 require('../_baseAssignValue-cjs.js');
 require('../_baseFlatten-cjs.js');
@@ -31,6 +31,7 @@ require('../useFormFieldFocus-cjs.js');
 require('../InputValidation-cjs.js');
 require('../Spinner-cjs.js');
 require('react-hook-form');
+require('../filterDataAttributes-cjs.js');
 require('../InputNumber/index.cjs');
 require('../Tree-cjs.js');
 require('react-dom');

package/dist/RecurringSelect/index.mjs

@@ -7,12 +7,12 @@ import 'classnames';
 import '../Select/index.mjs';
 import '../omit-es.js';
 import '../_commonjsHelpers-es.js';
-import '../_baseGet-es.js';
+import '../_getAllKeys-es.js';
 import '../isTypedArray-es.js';
 import '../isObjectLike-es.js';
+import '../isSymbol-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';
@@ -29,6 +29,7 @@ import '../useFormFieldFocus-es.js';
 import '../InputValidation-es.js';
 import '../Spinner-es.js';
 import 'react-hook-form';
+import '../filterDataAttributes-es.js';
 import '../InputNumber/index.mjs';
 import '../Tree-es.js';
 import 'react-dom';

package/dist/Select/Select.types.d.ts

@@ -1,4 +1,5 @@
 import type { CommonFormFieldProps, FormFieldProps } from "../FormField";
+import type { FocusEvents, HTMLInputBaseProps, RebuiltInputCommonProps } from "../sharedHelpers/types";
 export interface SelectLegacyProps extends Pick<CommonFormFieldProps, "id" | "align" | "description" | "disabled" | "invalid" | "inline" | "name" | "onValidation" | "placeholder" | "size" | "value" | "onChange">, Pick<FormFieldProps, "autofocus" | "onEnter" | "onBlur" | "onFocus" | "inputRef" | "wrapperRef" | "validations" | "children" | "prefix" | "suffix" | "defaultValue" | "version"> {
     /**
      * Changes the width to roughly the same size as the maximum character length
@@ -8,12 +9,15 @@ export interface SelectLegacyProps extends Pick<CommonFormFieldProps, "id" | "al
 /**
  * Rebuilt version of the Select component without React Hook Form dependency.
  */
-export interface SelectRebuiltProps extends Omit<SelectLegacyProps, "defaultValue" | "version" | "onChange" | "value" | "validations" | "onValidation"> {
+export interface SelectRebuiltProps extends Omit<HTMLInputBaseProps, "readOnly">, FocusEvents<HTMLSelectElement>, Omit<RebuiltInputCommonProps, "clearable" | "prefix" | "suffix" | "align">, Pick<SelectLegacyProps, "prefix" | "suffix" | "align" | "children"> {
     defaultValue?: never;
     readonly value?: string | number;
     onChange?(newValue?: string | number): void;
-    version: 2;
-    error?: string;
+    readonly inputRef?: FormFieldProps["inputRef"];
+    /**
+     * @deprecated Use `onKeyDown` or `onKeyUp` instead.
+     */
+    readonly onEnter?: FormFieldProps["onEnter"];
     /**
      * Opt-in to the customizable select UI (Chromium 123+).
      * When true, the component will apply the custom select styles

package/dist/Select/hooks/useSelectActions.d.ts

@@ -1,15 +1,15 @@
-import type { ChangeEvent } from "react";
+import type { ChangeEvent, FocusEvent } from "react";
 interface UseSelectActionsProps {
     readonly onChange?: (newValue: string | number, event?: ChangeEvent<HTMLSelectElement>) => void;
-    readonly onBlur?: () => void;
-    readonly onFocus?: () => void;
+    readonly onBlur?: (event: FocusEvent<HTMLSelectElement>) => void;
+    readonly onFocus?: (event: FocusEvent<HTMLSelectElement>) => void;
 }
 /**
  * Hook with actions on the Select component.
  */
 export declare function useSelectActions({ onChange, onBlur, onFocus, }: UseSelectActionsProps): {
     handleChange: (event: ChangeEvent<HTMLSelectElement>) => void;
-    handleBlur: () => void;
-    handleFocus: () => void;
+    handleBlur: (event: FocusEvent<HTMLSelectElement>) => void;
+    handleFocus: (event: FocusEvent<HTMLSelectElement>) => void;
 };
 export {};

package/dist/Select/index.cjs

@@ -10,13 +10,14 @@ require('@jobber/hooks');
 require('framer-motion');
 require('@jobber/design');
 require('../Button-cjs.js');
+var filterDataAttributes = require('../filterDataAttributes-cjs.js');
 require('../_commonjsHelpers-cjs.js');
-require('../_baseGet-cjs.js');
+require('../_getAllKeys-cjs.js');
 require('../isTypedArray-cjs.js');
 require('../isObjectLike-cjs.js');
+require('../isSymbol-cjs.js');
 require('../identity-cjs.js');
 require('../_getTag-cjs.js');
-require('../isSymbol-cjs.js');
 require('../keysIn-cjs.js');
 require('../_baseAssignValue-cjs.js');
 require('../_baseFlatten-cjs.js');
@@ -42,11 +43,11 @@ function useSelectActions({ onChange, onBlur, onFocus, }) {
         const newValue = event.currentTarget.value;
         onChange === null || onChange === void 0 ? void 0 : onChange(newValue, event);
     }
-    function handleBlur() {
-        onBlur === null || onBlur === void 0 ? void 0 : onBlur();
+    function handleBlur(event) {
+        onBlur === null || onBlur === void 0 ? void 0 : onBlur(event);
     }
-    function handleFocus() {
-        onFocus === null || onFocus === void 0 ? void 0 : onFocus();
+    function handleFocus(event) {
+        onFocus === null || onFocus === void 0 ? void 0 : onFocus(event);
     }
     return {
         handleChange,
@@ -55,27 +56,16 @@ function useSelectActions({ onChange, onBlur, onFocus, }) {
     };
 }
 
-/**
- * Hook for managing the props of a Select component.
- * Extracted from FormField's useAtlantisFormField.
- */
-function useSelectFormField({ id, name, disabled, autofocus, description, inline, value, handleChange, handleBlur, handleFocus, }) {
-    const descriptionIdentifier = `descriptionUUID--${id}`;
-    const fieldProps = Object.assign({ id,
-        name,
-        disabled, autoFocus: autofocus, onChange: handleChange, onBlur: handleBlur, onFocus: handleFocus, value }, (description &&
-        !inline && { "aria-describedby": descriptionIdentifier }));
-    return { fieldProps, descriptionIdentifier };
-}
-
 var styles = {"select":"-hmXAsAfH9U-","selectPostfix":"_5ST4c1fXDYU-","spinning":"oOACJmrVDf0-"};
 
 function SelectRebuilt(props) {
-    var _a, _b;
-    const selectRef = (_a = props.inputRef) !== null && _a !== void 0 ? _a : React.useRef(null);
-    const wrapperRef = React.useRef(null);
+    var _a;
+    const { mergedRef, wrapperRef } = useSelectRefs(props.inputRef);
     const { inputStyle } = FormField.useFormFieldWrapperStyles(Object.assign({}, omit.omit(props, ["version"])));
-    const id = useSelectId(props);
+    const dataAttrs = filterDataAttributes.filterDataAttributes(props);
+    const generatedId = React.useId();
+    const id = props.id || generatedId;
+    const descriptionIdentifier = `descriptionUUID--${id}`;
     const { name } = FormField.useAtlantisFormFieldName({
         nameProp: props.name,
         id: id,
@@ -85,27 +75,23 @@ function SelectRebuilt(props) {
         onBlur: props.onBlur,
         onFocus: props.onFocus,
     });
-    const inputProps = omit.omit(props, [
-        "onChange",
-        "onBlur",
-        "onFocus",
-        "size",
-        "placeholder",
-        "version",
-    ]);
-    const { fieldProps, descriptionIdentifier } = useSelectFormField(Object.assign(Object.assign({}, inputProps), { id,
-        name,
-        handleChange,
-        handleBlur,
-        handleFocus }));
-    return (React.createElement(FormField.FormFieldWrapper, { disabled: props.disabled, size: props.size, align: props.align, inline: props.inline, autofocus: props.autofocus, name: name, wrapperRef: wrapperRef, error: (_b = props.error) !== null && _b !== void 0 ? _b : "", invalid: props.invalid, identifier: id, descriptionIdentifier: descriptionIdentifier, description: props.description, type: "select", placeholder: props.placeholder, value: props.value, prefix: props.prefix, suffix: props.suffix, clearable: "never", maxLength: props.maxLength },
+    const descriptionVisible = props.description && !props.inline;
+    const isInvalid = Boolean(props.error || props.invalid);
+    return (React.createElement(FormField.FormFieldWrapper, { disabled: props.disabled, size: props.size, align: props.align, inline: props.inline, name: name, wrapperRef: wrapperRef, error: (_a = props.error) !== null && _a !== void 0 ? _a : "", invalid: props.invalid, identifier: id, descriptionIdentifier: descriptionIdentifier, description: props.description, type: "select", placeholder: props.placeholder, value: props.value, prefix: props.prefix, suffix: props.suffix, clearable: "never" },
         React.createElement(React.Fragment, null,
-            React.createElement("select", Object.assign({}, fieldProps, { ref: selectRef, className: classnames(inputStyle, props.UNSAFE_experimentalStyles && styles.select) }), props.children),
+            React.createElement("select", Object.assign({ id: id, name: name, disabled: props.disabled, autoFocus: props.autoFocus, onChange: handleChange, onBlur: handleBlur, onFocus: handleFocus, value: props.value, "aria-label": props["aria-label"], "aria-describedby": descriptionVisible
+                    ? descriptionIdentifier
+                    : props["aria-describedby"], "aria-invalid": isInvalid ? true : undefined, "aria-required": props["aria-required"], ref: mergedRef, className: classnames(inputStyle, props.UNSAFE_experimentalStyles && styles.select) }, dataAttrs), props.children),
             React.createElement(FormField.FormFieldPostFix, { variation: "select", className: styles.selectPostfix }))));
 }
-function useSelectId(props) {
-    const generatedId = React.useId();
-    return props.id || generatedId;
+function useSelectRefs(inputRef) {
+    const internalRef = React.useRef(null);
+    const mergedRef = FormField.mergeRefs([
+        internalRef,
+        inputRef,
+    ]);
+    const wrapperRef = React.useRef(null);
+    return { mergedRef, wrapperRef };
 }
 
 function SelectOption({ children, disabled, value }) {