@jobber/components 6.103.2-JOB-140609-8386817.45 → 6.103.2-JOB-141426-ee803fd.19

package/dist/InputTime/index.cjs

@@ -21,7 +21,7 @@ require('../useFormFieldFocus-cjs.js');
 require('../InputValidation-cjs.js');
 require('../Spinner-cjs.js');
 require('react-router-dom');
-require('../_getAllKeys-cjs.js');
+require('../_baseGet-cjs.js');
 require('../isTypedArray-cjs.js');
 require('../identity-cjs.js');
 require('../_getTag-cjs.js');
@@ -204,7 +204,23 @@ function timeStringToDate(timeString, baseDate) {
     }
 }
 
-function useInputTimeActions({ onChange, value, inputRef, onFocus, onBlur, onKeyDown, }) {
+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 handleChangeEvent(event) {
         handleChange(event.target.value);
     }
@@ -212,76 +228,30 @@ function useInputTimeActions({ onChange, value, inputRef, onFocus, onBlur, onKey
         onChange === null || onChange === void 0 ? void 0 : onChange(timeStringToDate(newValue, value));
     }
     function handleBlur(event) {
-        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 = "";
+        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 = "";
             }
         }
     }
     function handleClear() {
         var _a;
-        // Clear the value and refocus without triggering blur event
+        handleBlur();
         onChange === null || onChange === void 0 ? void 0 : onChange(undefined);
-        (_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+        (_a = ref.current) === null || _a === void 0 ? void 0 : _a.focus();
     }
     function handleFocus(event) {
-        onFocus === null || onFocus === void 0 ? void 0 : onFocus(event);
+        var _a;
+        (_a = params.onFocus) === null || _a === void 0 ? void 0 : _a.call(params, event);
     }
-    function handleKeyDown(event) {
-        onKeyDown === null || onKeyDown === void 0 ? void 0 : onKeyDown(event);
+    function getId(props) {
+        const generatedId = React.useId();
+        return props.id || generatedId;
     }
-    return {
-        handleChangeEvent,
-        handleChange,
-        handleBlur,
-        handleClear,
-        handleFocus,
-        handleKeyDown,
-    };
 }
 
-const InputTimeRebuilt = React.forwardRef(function InputTimeRebuilt(_a, forwardedRef) {
-    var _b;
-    var { value, onChange, readOnly, autoComplete, 
-    // Deprecated props
-    inputRef: deprecatedInputRef } = _a, params = tslib_es6.__rest(_a, ["value", "onChange", "readOnly", "autoComplete", "inputRef"]);
-    const internalRef = React.useRef(null);
-    const mergedRef = FormField.mergeRefs([
-        internalRef,
-        deprecatedInputRef,
-        forwardedRef,
-    ]);
-    const id = params.id || React.useId();
-    const wrapperRef = React.useRef(null);
-    const { inputStyle } = FormField.useFormFieldWrapperStyles(params);
-    const { handleChangeEvent, handleChange, handleBlur, handleClear, handleFocus, handleKeyDown, } = useInputTimeActions({
-        onChange,
-        value,
-        readOnly,
-        disabled: params.disabled,
-        inputRef: internalRef,
-        onFocus: params.onFocus,
-        onBlur: params.onBlur,
-        onKeyDown: params.onKeyDown,
-    });
-    const { setTypedTime } = useTimePredict({
-        value,
-        handleChange,
-    });
-    // Kept outside the useInputTimeActions hook to avoid circular dependency via setTypedTime and handleChange
-    function handleKeyUp(event) {
-        var _a;
-        (_a = params.onKeyUp) === null || _a === void 0 ? void 0 : _a.call(params, event);
-        if (params.disabled || readOnly)
-            return;
-        !isNaN(parseInt(event.key, 10)) && setTypedTime(prev => prev + event.key);
-    }
-    const isInvalid = Boolean(params.error || params.invalid);
-    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, maxLength: params.maxLength, clearable: (_b = params.clearable) !== null && _b !== void 0 ? _b : "never", onClear: handleClear, type: "time", readonly: readOnly, placeholder: params.placeholder, value: dateToTimeString(value), wrapperRef: wrapperRef },
-        React.createElement("input", { ref: mergedRef, type: "time", name: params.name, className: inputStyle, id: id, disabled: params.disabled, readOnly: readOnly, autoComplete: autoComplete, maxLength: params.maxLength, max: params.max, min: params.min, value: dateToTimeString(value), onChange: handleChangeEvent, onBlur: handleBlur, onFocus: handleFocus, onKeyDown: handleKeyDown, onKeyUp: handleKeyUp, "data-testid": "ATL-InputTime-input", "aria-label": params.ariaLabel, "aria-describedby": params.ariaDescribedBy, "aria-invalid": isInvalid ? true : undefined, "aria-required": params.ariaRequired })));
-});
-
 function InputTime$1(_a) {
     var { defaultValue, value, onChange } = _a, params = tslib_es6.__rest(_a, ["defaultValue", "value", "onChange"]);
     const ref = React.useRef(null);
@@ -312,13 +282,13 @@ function InputTime$1(_a) {
 function isNewInputTimeProps(props) {
     return props.version === 2;
 }
-const InputTime = React.forwardRef(function InputTimeShim(props, ref) {
+function InputTime(props) {
     if (isNewInputTimeProps(props)) {
-        return React.createElement(InputTimeRebuilt, Object.assign({}, props, { ref: ref }));
+        return React.createElement(InputTimeRebuilt, Object.assign({}, props));
     }
     else {
         return React.createElement(InputTime$1, Object.assign({}, props));
     }
-});
+}
 
 exports.InputTime = InputTime;

package/dist/InputTime/index.d.ts

@@ -1,4 +1,4 @@
 import React from "react";
 import type { InputTimeLegacyProps, InputTimeRebuiltProps } from "./InputTime.types";
 export type InputTimeShimProps = InputTimeLegacyProps | InputTimeRebuiltProps;
-export declare const InputTime: React.ForwardRefExoticComponent<InputTimeShimProps & React.RefAttributes<HTMLInputElement>>;
+export declare function InputTime(props: InputTimeShimProps): React.JSX.Element;

package/dist/InputTime/index.mjs

@@ -1,7 +1,7 @@
-import React__default, { useState, useCallback, useEffect, forwardRef, useRef, useId } from 'react';
+import React__default, { useState, useCallback, useEffect, useRef, useId } from 'react';
 import { _ as __rest } from '../tslib.es6-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 { d as debounce } from '../debounce-es.js';
+import { j as useFormFieldWrapperStyles, f as FormFieldWrapper, k as FormField } from '../FormField-es.js';
 import 'classnames';
 import '@jobber/design';
 import 'react-hook-form';
@@ -19,7 +19,7 @@ import '../useFormFieldFocus-es.js';
 import '../InputValidation-es.js';
 import '../Spinner-es.js';
 import 'react-router-dom';
-import '../_getAllKeys-es.js';
+import '../_baseGet-es.js';
 import '../isTypedArray-es.js';
 import '../identity-es.js';
 import '../_getTag-es.js';
@@ -202,7 +202,23 @@ function timeStringToDate(timeString, baseDate) {
     }
 }
 
-function useInputTimeActions({ onChange, value, inputRef, onFocus, onBlur, onKeyDown, }) {
+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 handleChangeEvent(event) {
         handleChange(event.target.value);
     }
@@ -210,76 +226,30 @@ function useInputTimeActions({ onChange, value, inputRef, onFocus, onBlur, onKey
         onChange === null || onChange === void 0 ? void 0 : onChange(timeStringToDate(newValue, value));
     }
     function handleBlur(event) {
-        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 = "";
+        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 = "";
             }
         }
     }
     function handleClear() {
         var _a;
-        // Clear the value and refocus without triggering blur event
+        handleBlur();
         onChange === null || onChange === void 0 ? void 0 : onChange(undefined);
-        (_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+        (_a = ref.current) === null || _a === void 0 ? void 0 : _a.focus();
     }
     function handleFocus(event) {
-        onFocus === null || onFocus === void 0 ? void 0 : onFocus(event);
+        var _a;
+        (_a = params.onFocus) === null || _a === void 0 ? void 0 : _a.call(params, event);
     }
-    function handleKeyDown(event) {
-        onKeyDown === null || onKeyDown === void 0 ? void 0 : onKeyDown(event);
+    function getId(props) {
+        const generatedId = useId();
+        return props.id || generatedId;
     }
-    return {
-        handleChangeEvent,
-        handleChange,
-        handleBlur,
-        handleClear,
-        handleFocus,
-        handleKeyDown,
-    };
 }
 
-const InputTimeRebuilt = forwardRef(function InputTimeRebuilt(_a, forwardedRef) {
-    var _b;
-    var { value, onChange, readOnly, autoComplete, 
-    // Deprecated props
-    inputRef: deprecatedInputRef } = _a, params = __rest(_a, ["value", "onChange", "readOnly", "autoComplete", "inputRef"]);
-    const internalRef = useRef(null);
-    const mergedRef = mergeRefs([
-        internalRef,
-        deprecatedInputRef,
-        forwardedRef,
-    ]);
-    const id = params.id || useId();
-    const wrapperRef = React__default.useRef(null);
-    const { inputStyle } = useFormFieldWrapperStyles(params);
-    const { handleChangeEvent, handleChange, handleBlur, handleClear, handleFocus, handleKeyDown, } = useInputTimeActions({
-        onChange,
-        value,
-        readOnly,
-        disabled: params.disabled,
-        inputRef: internalRef,
-        onFocus: params.onFocus,
-        onBlur: params.onBlur,
-        onKeyDown: params.onKeyDown,
-    });
-    const { setTypedTime } = useTimePredict({
-        value,
-        handleChange,
-    });
-    // Kept outside the useInputTimeActions hook to avoid circular dependency via setTypedTime and handleChange
-    function handleKeyUp(event) {
-        var _a;
-        (_a = params.onKeyUp) === null || _a === void 0 ? void 0 : _a.call(params, event);
-        if (params.disabled || readOnly)
-            return;
-        !isNaN(parseInt(event.key, 10)) && setTypedTime(prev => prev + event.key);
-    }
-    const isInvalid = Boolean(params.error || params.invalid);
-    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, maxLength: params.maxLength, clearable: (_b = params.clearable) !== null && _b !== void 0 ? _b : "never", onClear: handleClear, type: "time", readonly: readOnly, placeholder: params.placeholder, value: dateToTimeString(value), wrapperRef: wrapperRef },
-        React__default.createElement("input", { ref: mergedRef, type: "time", name: params.name, className: inputStyle, id: id, disabled: params.disabled, readOnly: readOnly, autoComplete: autoComplete, maxLength: params.maxLength, max: params.max, min: params.min, value: dateToTimeString(value), onChange: handleChangeEvent, onBlur: handleBlur, onFocus: handleFocus, onKeyDown: handleKeyDown, onKeyUp: handleKeyUp, "data-testid": "ATL-InputTime-input", "aria-label": params.ariaLabel, "aria-describedby": params.ariaDescribedBy, "aria-invalid": isInvalid ? true : undefined, "aria-required": params.ariaRequired })));
-});
-
 function InputTime$1(_a) {
     var { defaultValue, value, onChange } = _a, params = __rest(_a, ["defaultValue", "value", "onChange"]);
     const ref = useRef(null);
@@ -310,13 +280,13 @@ function InputTime$1(_a) {
 function isNewInputTimeProps(props) {
     return props.version === 2;
 }
-const InputTime = forwardRef(function InputTimeShim(props, ref) {
+function InputTime(props) {
     if (isNewInputTimeProps(props)) {
-        return React__default.createElement(InputTimeRebuilt, Object.assign({}, props, { ref: ref }));
+        return React__default.createElement(InputTimeRebuilt, Object.assign({}, props));
     }
     else {
         return React__default.createElement(InputTime$1, Object.assign({}, props));
     }
-});
+}
 
 export { InputTime };

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('../_getAllKeys-cjs.js');
-require('../isSymbol-cjs.js');
+require('../_baseGet-cjs.js');
 require('../_getTag-cjs.js');
+require('../isSymbol-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 '../_getAllKeys-es.js';
-import '../isSymbol-es.js';
+import '../_baseGet-es.js';
 import '../_getTag-es.js';
+import '../isSymbol-es.js';
 import '../_baseFor-es.js';
 import '../_baseAssignValue-es.js';
 import '../Typography-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('../_getAllKeys-cjs.js');
+require('../_baseGet-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');

package/dist/RecurringSelect/index.mjs

@@ -7,12 +7,12 @@ import 'classnames';
 import '../Select/index.mjs';
 import '../omit-es.js';
 import '../_commonjsHelpers-es.js';
-import '../_getAllKeys-es.js';
+import '../_baseGet-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';

package/dist/Select/Select.rebuilt.d.ts

@@ -1,3 +1,3 @@
 import React from "react";
 import type { SelectRebuiltProps } from "./Select.types";
-export declare const SelectRebuilt: React.ForwardRefExoticComponent<SelectRebuiltProps & React.RefAttributes<HTMLSelectElement>>;
+export declare function SelectRebuilt(props: SelectRebuiltProps): React.JSX.Element;

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

@@ -1,5 +1,4 @@
 import type { CommonFormFieldProps, FormFieldProps } from "../FormField";
-import type { AriaInputProps, FocusEvents } 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
@@ -9,24 +8,12 @@ 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" | "autofocus" | "inputRef" | "onEnter" | "onBlur" | "onFocus">, AriaInputProps, FocusEvents<HTMLSelectElement> {
+export interface SelectRebuiltProps extends Omit<SelectLegacyProps, "defaultValue" | "version" | "onChange" | "value" | "validations" | "onValidation"> {
     defaultValue?: never;
     readonly value?: string | number;
     onChange?(newValue?: string | number): void;
     version: 2;
     error?: string;
-    /**
-     * Automatically focus the select when mounted.
-     */
-    readonly autoFocus?: boolean;
-    /**
-     * @deprecated Use `ref` instead. Note: `ref` support requires React 18+ forwardRef.
-     */
-    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, FocusEvent } from "react";
+import type { ChangeEvent } from "react";
 interface UseSelectActionsProps {
     readonly onChange?: (newValue: string | number, event?: ChangeEvent<HTMLSelectElement>) => void;
-    readonly onBlur?: (event: FocusEvent<HTMLSelectElement>) => void;
-    readonly onFocus?: (event: FocusEvent<HTMLSelectElement>) => void;
+    readonly onBlur?: () => void;
+    readonly onFocus?: () => void;
 }
 /**
  * Hook with actions on the Select component.
  */
 export declare function useSelectActions({ onChange, onBlur, onFocus, }: UseSelectActionsProps): {
     handleChange: (event: ChangeEvent<HTMLSelectElement>) => void;
-    handleBlur: (event: FocusEvent<HTMLSelectElement>) => void;
-    handleFocus: (event: FocusEvent<HTMLSelectElement>) => void;
+    handleBlur: () => void;
+    handleFocus: () => void;
 };
 export {};

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

@@ -0,0 +1,34 @@
+import type { ChangeEvent, ReactNode } from "react";
+export interface UseSelectFormFieldProps {
+    readonly id: string;
+    readonly name: string;
+    readonly disabled?: boolean;
+    readonly autofocus?: boolean;
+    readonly description?: ReactNode;
+    readonly inline?: boolean;
+    readonly error?: string;
+    readonly invalid?: boolean;
+    readonly value?: string | number;
+    readonly handleChange: (event: ChangeEvent<HTMLSelectElement>) => void;
+    readonly handleBlur: () => void;
+    readonly handleFocus: () => void;
+}
+export interface UseSelectFormFieldReturn {
+    readonly fieldProps: {
+        readonly id: string;
+        readonly name: string;
+        readonly disabled?: boolean;
+        readonly autoFocus?: boolean;
+        readonly onChange: (event: ChangeEvent<HTMLSelectElement>) => void;
+        readonly onBlur: () => void;
+        readonly onFocus: () => void;
+        readonly value?: string | number;
+        readonly "aria-describedby"?: string;
+    };
+    readonly descriptionIdentifier: string;
+}
+/**
+ * Hook for managing the props of a Select component.
+ * Extracted from FormField's useAtlantisFormField.
+ */
+export declare function useSelectFormField({ id, name, disabled, autofocus, description, inline, value, handleChange, handleBlur, handleFocus, }: UseSelectFormFieldProps): UseSelectFormFieldReturn;

package/dist/Select/index.cjs

@@ -11,12 +11,12 @@ require('framer-motion');
 require('@jobber/design');
 require('../Button-cjs.js');
 require('../_commonjsHelpers-cjs.js');
-require('../_getAllKeys-cjs.js');
+require('../_baseGet-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 +42,11 @@ function useSelectActions({ onChange, onBlur, onFocus, }) {
         const newValue = event.currentTarget.value;
         onChange === null || onChange === void 0 ? void 0 : onChange(newValue, event);
     }
-    function handleBlur(event) {
-        onBlur === null || onBlur === void 0 ? void 0 : onBlur(event);
+    function handleBlur() {
+        onBlur === null || onBlur === void 0 ? void 0 : onBlur();
     }
-    function handleFocus(event) {
-        onFocus === null || onFocus === void 0 ? void 0 : onFocus(event);
+    function handleFocus() {
+        onFocus === null || onFocus === void 0 ? void 0 : onFocus();
     }
     return {
         handleChange,
@@ -55,22 +55,27 @@ 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-"};
 
-const SelectRebuilt = React.forwardRef(function SelectRebuilt(props, forwardedRef) {
-    var _a;
-    // Deprecated props
-    const { inputRef: deprecatedInputRef } = props;
-    const internalRef = React.useRef(null);
-    const mergedRef = FormField.mergeRefs([
-        internalRef,
-        deprecatedInputRef,
-        forwardedRef,
-    ]);
+function SelectRebuilt(props) {
+    var _a, _b;
+    const selectRef = (_a = props.inputRef) !== null && _a !== void 0 ? _a : React.useRef(null);
     const wrapperRef = React.useRef(null);
     const { inputStyle } = FormField.useFormFieldWrapperStyles(Object.assign({}, omit.omit(props, ["version"])));
     const id = useSelectId(props);
-    const descriptionIdentifier = `descriptionUUID--${id}`;
     const { name } = FormField.useAtlantisFormFieldName({
         nameProp: props.name,
         id: id,
@@ -80,15 +85,24 @@ const SelectRebuilt = React.forwardRef(function SelectRebuilt(props, forwardedRe
         onBlur: props.onBlur,
         onFocus: props.onFocus,
     });
-    const isInvalid = Boolean(props.error || props.invalid);
-    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: (_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", maxLength: props.maxLength },
+    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 },
         React.createElement(React.Fragment, null,
-            React.createElement("select", { id: id, name: name, disabled: props.disabled, autoFocus: props.autoFocus, onChange: handleChange, onBlur: handleBlur, onFocus: handleFocus, value: props.value, "aria-label": props.ariaLabel, "aria-describedby": props.ariaDescribedBy ||
-                    (props.description && !props.inline
-                        ? descriptionIdentifier
-                        : undefined), "aria-invalid": isInvalid ? true : undefined, "aria-required": props.ariaRequired, ref: mergedRef, className: classnames(inputStyle, props.UNSAFE_experimentalStyles && styles.select) }, props.children),
+            React.createElement("select", Object.assign({}, fieldProps, { ref: selectRef, className: classnames(inputStyle, props.UNSAFE_experimentalStyles && styles.select) }), props.children),
             React.createElement(FormField.FormFieldPostFix, { variation: "select", className: styles.selectPostfix }))));
-});
+}
 function useSelectId(props) {
     const generatedId = React.useId();
     return props.id || generatedId;
@@ -105,15 +119,14 @@ function OptionGroup({ children, label, disabled, UNSAFE_className, UNSAFE_style
 function isNewSelectProps(props) {
     return props.version === 2;
 }
-const SelectBase = React.forwardRef(function SelectShim(props, ref) {
+function Select(props) {
     if (isNewSelectProps(props)) {
-        return React.createElement(SelectRebuilt, Object.assign({}, props, { ref: ref }));
+        return React.createElement(SelectRebuilt, Object.assign({}, props));
     }
     else {
         return React.createElement(Select$1, Object.assign({}, props));
     }
-});
-const Select = SelectBase;
+}
 Select.Option = SelectOption;
 Select.OptionGroup = OptionGroup;
 

package/dist/Select/index.d.ts

@@ -1,12 +1,10 @@
 import React from "react";
-import { Option } from "./Option";
-import { OptionGroup } from "./OptionGroup";
 import { type SelectLegacyProps, type SelectRebuiltProps } from "./Select.types";
 export { Option } from "./Option";
 export type SelectShimProps = SelectLegacyProps | SelectRebuiltProps;
-type SelectComponent = React.ForwardRefExoticComponent<SelectShimProps & React.RefAttributes<HTMLSelectElement>> & {
-    Option: typeof Option;
-    OptionGroup: typeof OptionGroup;
-};
-export declare const Select: SelectComponent;
+export declare function Select(props: SelectShimProps): React.JSX.Element;
+export declare namespace Select {
+    var Option: typeof import("./Option").Option;
+    var OptionGroup: typeof import("./OptionGroup").OptionGroup;
+}
 export type { SelectRebuiltProps, SelectLegacyProps };