@jobber/components 6.103.2-JOB-140609-fafe469.18 → 6.103.2-JOB-135467-8ed574a.0

package/dist/InputPhoneNumber/index.cjs

@@ -115,7 +115,7 @@ const DEFAULT_PATTERN = "(***) ***-****";
 function useInputPhoneActions({ onChange, inputRef, onFocus, onBlur, onKeyDown, onEnter, }) {
     function handleClear() {
         var _a;
-        // Don't call blur handler when programmatically clearing
+        handleBlur();
         onChange && onChange("");
         (_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
     }
@@ -149,27 +149,28 @@ function useInputPhoneActions({ onChange, inputRef, onFocus, onBlur, onKeyDown,
     };
 }
 
-const InputPhoneNumberRebuilt = React.forwardRef(
-// eslint-disable-next-line max-statements
-function InputPhoneNumberInternal(_a, ref) {
+/**
+ * Provides the props for the html fields rendered by the html input.
+ *  DO not repeat this pattern. We are doing this as a proof of concept relating to the refactoring of Form inputs to see what can be removed.
+ */
+function useInputPhoneFormField(_a) {
+    var { id, name, description, inline, handleChange, handleBlur, handleFocus, handleKeyDown, error, disabled, autofocus, value, readonly } = _a, rest = tslib_es6.__rest(_a, ["id", "name", "description", "inline", "handleChange", "handleBlur", "handleFocus", "handleKeyDown", "error", "disabled", "autofocus", "value", "readonly"]);
+    const descriptionIdentifier = `descriptionUUID--${id}`;
+    const fieldProps = Object.assign(Object.assign(Object.assign(Object.assign({}, rest), { id,
+        name,
+        disabled, autoFocus: autofocus, onChange: handleChange, onBlur: handleBlur, onFocus: handleFocus, onKeyDown: handleKeyDown, value, invalid: error || rest.invalid ? "true" : undefined }), (description &&
+        !inline && { "aria-describedby": descriptionIdentifier })), { readOnly: readonly });
+    return { fieldProps, descriptionIdentifier };
+}
+
+const InputPhoneNumberRebuilt = React.forwardRef(function InputPhoneNumberInternal(_a, ref) {
     var _b, _c, _d, _e;
     var { pattern = DEFAULT_PATTERN } = _a, props = tslib_es6.__rest(_a, ["pattern"]);
     const inputPhoneNumberRef = (_b = ref) !== null && _b !== void 0 ? _b : React.useRef(null);
     const wrapperRef = React.useRef(null);
-    const { inputStyle } = FormField.useFormFieldWrapperStyles({
-        size: props.size,
-        align: props.align,
-        placeholder: props.placeholder,
-        value: props.value,
-        invalid: props.invalid,
-        error: props.error,
-        maxLength: undefined, // v2: maxLength not used for width styling
-        disabled: props.disabled,
-        inline: props.inline,
-        type: "tel",
-    });
+    const { inputStyle } = FormField.useFormFieldWrapperStyles(Object.assign(Object.assign({}, props), { type: "tel" }));
     const generatedId = React.useId();
-    const id = props.identifier || props.id || generatedId;
+    const id = props.id || generatedId;
     const { name } = FormField.useAtlantisFormFieldName({
         nameProp: props.name,
         id: id,
@@ -187,14 +188,25 @@ function InputPhoneNumberInternal(_a, ref) {
         onEnter: props.onEnter,
         inputRef: inputPhoneNumberRef,
     });
-    const descriptionIdentifier = `descriptionUUID--${id}`;
-    const hasDescription = props.description && !props.inline;
-    const isInvalid = Boolean(props["aria-invalid"] || props.error || props.invalid);
-    const effectiveReadOnly = props.readonly || props.readOnly;
-    return (React.createElement(FormField.FormFieldWrapper, { disabled: props.disabled, size: props.size, inline: props.inline, wrapperRef: wrapperRef, error: (_c = props.error) !== null && _c !== void 0 ? _c : "", invalid: Boolean(props.error || props.invalid), identifier: id, descriptionIdentifier: descriptionIdentifier, description: props.description, clearable: (_d = props.clearable) !== null && _d !== void 0 ? _d : "never", onClear: handleClear, type: "tel", placeholder: props.placeholder, value: formattedValue, prefix: props.prefix, suffix: props.suffix, readonly: effectiveReadOnly, loading: props.loading },
-        React.createElement("input", { id: id, name: name, type: "tel", ref: inputPhoneNumberRef, className: classnames(inputStyle, {
+    const { fieldProps, descriptionIdentifier } = useInputPhoneFormField({
+        id,
+        name,
+        handleChange,
+        handleBlur,
+        handleFocus,
+        handleKeyDown,
+        autofocus: props.autoFocus,
+        disabled: props.disabled,
+        readonly: props.readonly,
+        invalid: props.invalid,
+        error: props.error,
+        description: props.description,
+        inline: props.inline,
+    });
+    return (React.createElement(FormField.FormFieldWrapper, { disabled: props.disabled, size: props.size, inline: props.inline, wrapperRef: wrapperRef, error: (_c = props.error) !== null && _c !== void 0 ? _c : "", invalid: Boolean(props.error || props.invalid), identifier: id, descriptionIdentifier: descriptionIdentifier, description: props.description, clearable: (_d = props.clearable) !== null && _d !== void 0 ? _d : "never", onClear: handleClear, type: "tel", placeholder: props.placeholder, value: formattedValue, prefix: props.prefix, suffix: props.suffix, readonly: props.readonly, loading: props.loading },
+        React.createElement("input", Object.assign({ type: "tel" }, fieldProps, { ref: inputPhoneNumberRef, className: classnames(inputStyle, {
                 [styles.emptyValue]: inputValue.length === 0 && pattern[0] === "(",
-            }), value: formattedValue, disabled: props.disabled, readOnly: effectiveReadOnly, required: props.required, autoFocus: props.autoFocus, autoComplete: props.autoComplete, inputMode: props.inputMode, tabIndex: props.tabIndex, role: props.role, "aria-label": props["aria-label"], "aria-describedby": hasDescription ? descriptionIdentifier : props["aria-describedby"], "aria-invalid": isInvalid ? true : undefined, "aria-controls": props["aria-controls"], "aria-expanded": props["aria-expanded"], "aria-activedescendant": props["aria-activedescendant"], "aria-autocomplete": props["aria-autocomplete"], "aria-required": props["aria-required"], onChange: handleChange, onBlur: handleBlur, onFocus: handleFocus, onKeyDown: handleKeyDown }),
+            }), value: formattedValue })),
         React.createElement(MaskElement, { isMasking: isMasking, formattedValue: formattedValue, placeholderMask: placeholderMask }),
         React.createElement(FormField.FormFieldPostFix, { variation: "spinner", visible: (_e = props.loading) !== null && _e !== void 0 ? _e : false })));
 });

package/dist/InputPhoneNumber/index.mjs

@@ -113,7 +113,7 @@ const DEFAULT_PATTERN = "(***) ***-****";
 function useInputPhoneActions({ onChange, inputRef, onFocus, onBlur, onKeyDown, onEnter, }) {
     function handleClear() {
         var _a;
-        // Don't call blur handler when programmatically clearing
+        handleBlur();
         onChange && onChange("");
         (_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
     }
@@ -147,27 +147,28 @@ function useInputPhoneActions({ onChange, inputRef, onFocus, onBlur, onKeyDown,
     };
 }
 
-const InputPhoneNumberRebuilt = forwardRef(
-// eslint-disable-next-line max-statements
-function InputPhoneNumberInternal(_a, ref) {
+/**
+ * Provides the props for the html fields rendered by the html input.
+ *  DO not repeat this pattern. We are doing this as a proof of concept relating to the refactoring of Form inputs to see what can be removed.
+ */
+function useInputPhoneFormField(_a) {
+    var { id, name, description, inline, handleChange, handleBlur, handleFocus, handleKeyDown, error, disabled, autofocus, value, readonly } = _a, rest = __rest(_a, ["id", "name", "description", "inline", "handleChange", "handleBlur", "handleFocus", "handleKeyDown", "error", "disabled", "autofocus", "value", "readonly"]);
+    const descriptionIdentifier = `descriptionUUID--${id}`;
+    const fieldProps = Object.assign(Object.assign(Object.assign(Object.assign({}, rest), { id,
+        name,
+        disabled, autoFocus: autofocus, onChange: handleChange, onBlur: handleBlur, onFocus: handleFocus, onKeyDown: handleKeyDown, value, invalid: error || rest.invalid ? "true" : undefined }), (description &&
+        !inline && { "aria-describedby": descriptionIdentifier })), { readOnly: readonly });
+    return { fieldProps, descriptionIdentifier };
+}
+
+const InputPhoneNumberRebuilt = forwardRef(function InputPhoneNumberInternal(_a, ref) {
     var _b, _c, _d, _e;
     var { pattern = DEFAULT_PATTERN } = _a, props = __rest(_a, ["pattern"]);
     const inputPhoneNumberRef = (_b = ref) !== null && _b !== void 0 ? _b : React__default.useRef(null);
     const wrapperRef = React__default.useRef(null);
-    const { inputStyle } = useFormFieldWrapperStyles({
-        size: props.size,
-        align: props.align,
-        placeholder: props.placeholder,
-        value: props.value,
-        invalid: props.invalid,
-        error: props.error,
-        maxLength: undefined, // v2: maxLength not used for width styling
-        disabled: props.disabled,
-        inline: props.inline,
-        type: "tel",
-    });
+    const { inputStyle } = useFormFieldWrapperStyles(Object.assign(Object.assign({}, props), { type: "tel" }));
     const generatedId = useId();
-    const id = props.identifier || props.id || generatedId;
+    const id = props.id || generatedId;
     const { name } = useAtlantisFormFieldName({
         nameProp: props.name,
         id: id,
@@ -185,14 +186,25 @@ function InputPhoneNumberInternal(_a, ref) {
         onEnter: props.onEnter,
         inputRef: inputPhoneNumberRef,
     });
-    const descriptionIdentifier = `descriptionUUID--${id}`;
-    const hasDescription = props.description && !props.inline;
-    const isInvalid = Boolean(props["aria-invalid"] || props.error || props.invalid);
-    const effectiveReadOnly = props.readonly || props.readOnly;
-    return (React__default.createElement(FormFieldWrapper, { disabled: props.disabled, size: props.size, inline: props.inline, wrapperRef: wrapperRef, error: (_c = props.error) !== null && _c !== void 0 ? _c : "", invalid: Boolean(props.error || props.invalid), identifier: id, descriptionIdentifier: descriptionIdentifier, description: props.description, clearable: (_d = props.clearable) !== null && _d !== void 0 ? _d : "never", onClear: handleClear, type: "tel", placeholder: props.placeholder, value: formattedValue, prefix: props.prefix, suffix: props.suffix, readonly: effectiveReadOnly, loading: props.loading },
-        React__default.createElement("input", { id: id, name: name, type: "tel", ref: inputPhoneNumberRef, className: classnames(inputStyle, {
+    const { fieldProps, descriptionIdentifier } = useInputPhoneFormField({
+        id,
+        name,
+        handleChange,
+        handleBlur,
+        handleFocus,
+        handleKeyDown,
+        autofocus: props.autoFocus,
+        disabled: props.disabled,
+        readonly: props.readonly,
+        invalid: props.invalid,
+        error: props.error,
+        description: props.description,
+        inline: props.inline,
+    });
+    return (React__default.createElement(FormFieldWrapper, { disabled: props.disabled, size: props.size, inline: props.inline, wrapperRef: wrapperRef, error: (_c = props.error) !== null && _c !== void 0 ? _c : "", invalid: Boolean(props.error || props.invalid), identifier: id, descriptionIdentifier: descriptionIdentifier, description: props.description, clearable: (_d = props.clearable) !== null && _d !== void 0 ? _d : "never", onClear: handleClear, type: "tel", placeholder: props.placeholder, value: formattedValue, prefix: props.prefix, suffix: props.suffix, readonly: props.readonly, loading: props.loading },
+        React__default.createElement("input", Object.assign({ type: "tel" }, fieldProps, { ref: inputPhoneNumberRef, className: classnames(inputStyle, {
                 [styles.emptyValue]: inputValue.length === 0 && pattern[0] === "(",
-            }), value: formattedValue, disabled: props.disabled, readOnly: effectiveReadOnly, required: props.required, autoFocus: props.autoFocus, autoComplete: props.autoComplete, inputMode: props.inputMode, tabIndex: props.tabIndex, role: props.role, "aria-label": props["aria-label"], "aria-describedby": hasDescription ? descriptionIdentifier : props["aria-describedby"], "aria-invalid": isInvalid ? true : undefined, "aria-controls": props["aria-controls"], "aria-expanded": props["aria-expanded"], "aria-activedescendant": props["aria-activedescendant"], "aria-autocomplete": props["aria-autocomplete"], "aria-required": props["aria-required"], onChange: handleChange, onBlur: handleBlur, onFocus: handleFocus, onKeyDown: handleKeyDown }),
+            }), value: formattedValue })),
         React__default.createElement(MaskElement, { isMasking: isMasking, formattedValue: formattedValue, placeholderMask: placeholderMask }),
         React__default.createElement(FormFieldPostFix, { variation: "spinner", visible: (_e = props.loading) !== null && _e !== void 0 ? _e : false })));
 });

package/dist/InputText/InputText.d.ts

@@ -24,11 +24,11 @@ export declare const InputText: React.ForwardRefExoticComponent<({
     readonly toolbar?: React.ReactNode;
     readonly defaultValue?: (string | Date) | undefined;
     readonly prefix?: import("../FormField").Affix | undefined;
-    readonly maxLength?: number | undefined;
     readonly autofocus?: boolean | undefined;
     readonly autocomplete?: (boolean | import("../FormField").AutocompleteTypes) | undefined;
     inputRef?: React.RefObject<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement> | undefined;
     readonly keyboard?: ("numeric" | "decimal") | undefined;
+    readonly maxLength?: number | undefined;
     readonly suffix?: import("ts-xor").XOR<import("../FormField").Affix, import("../FormField").Suffix> | undefined;
     onEnter?: ((event: React.KeyboardEvent) => void) | undefined;
     readonly readonly?: boolean | undefined;
@@ -58,11 +58,11 @@ export declare const InputText: React.ForwardRefExoticComponent<({
     readonly toolbar?: React.ReactNode;
     readonly defaultValue?: (string | Date) | undefined;
     readonly prefix?: import("../FormField").Affix | undefined;
-    readonly maxLength?: number | undefined;
     readonly autofocus?: boolean | undefined;
     readonly autocomplete?: (boolean | import("../FormField").AutocompleteTypes) | undefined;
     inputRef?: React.RefObject<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement> | undefined;
     readonly keyboard?: ("numeric" | "decimal") | undefined;
+    readonly maxLength?: number | undefined;
     readonly suffix?: import("ts-xor").XOR<import("../FormField").Affix, import("../FormField").Suffix> | undefined;
     onEnter?: ((event: React.KeyboardEvent) => void) | undefined;
     readonly readonly?: boolean | undefined;

package/dist/InputText/InputText.types.d.ts

@@ -1,5 +1,6 @@
+import type { Clearable } from "@jobber/hooks";
 import type { XOR } from "ts-xor";
-import type { CommonFormFieldProps, FocusEvents, FormFieldProps, FormFieldTypes, HTMLInputBaseProps, KeyboardEvents, RebuiltInputCommonProps } from "../FormField";
+import type { AutocompleteTypes, CommonFormFieldProps, FormFieldProps, FormFieldTypes } from "../FormField";
 export interface RowRange {
     min: number;
     max: number;
@@ -9,7 +10,15 @@ export type InputTextVersion = 1 | 2 | undefined;
  * Experimental version 2 of the InputText component.
  * Do not use unless you have talked with Atlantis first.
  */
-export interface InputTextRebuiltProps extends HTMLInputBaseProps, FocusEvents<HTMLInputElement | HTMLTextAreaElement>, KeyboardEvents<HTMLInputElement | HTMLTextAreaElement>, RebuiltInputCommonProps {
+export interface InputTextRebuiltProps extends Omit<React.InputHTMLAttributes<HTMLInputElement | HTMLTextAreaElement>, "onChange" | "onBlur" | "maxLength" | "rows" | "size" | "suffix" | "prefix" | "value" | "max" | "min" | "defaultValue"> {
+    readonly error?: string;
+    readonly invalid?: boolean;
+    readonly identifier?: string;
+    readonly autocomplete?: boolean | AutocompleteTypes;
+    readonly loading?: boolean;
+    readonly onKeyUp?: (event: React.KeyboardEvent<HTMLInputElement>) => void;
+    readonly children?: React.ReactNode;
+    readonly clearable?: Clearable;
     /**
      * Use this when you're expecting a long answer.
      */
@@ -21,48 +30,24 @@ export interface InputTextRebuiltProps extends HTMLInputBaseProps, FocusEvents<H
      * maximum number of visible rows.
      */
     readonly rows?: number | RowRange;
-    /**
-     * Determines what kind of form field should the component give you.
-     */
     readonly type?: FormFieldTypes;
     /**
-     * Toolbar to render content below the input.
-     */
-    readonly toolbar?: React.ReactNode;
-    /**
-     * Determines the visibility of the toolbar.
-     */
-    readonly toolbarVisibility?: "always" | "while-editing";
-    /**
-     * The current value of the input.
-     */
-    readonly value: string;
-    /**
-     * Custom onChange handler that provides the new value as the first argument.
+     * Version 2 is highly experimental. Avoid using it unless you have talked with Atlantis first.
      */
+    readonly version: 2;
     readonly onChange?: (newValue: string, event?: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
-    /**
-     * A callback to handle "Enter" keypress. This will only run
-     * if Enter is the only key. Will not run if Shift or Control
-     * are being held.
-     */
     readonly onEnter?: FormFieldProps["onEnter"];
-    /**
-     * @deprecated Use `id` instead. This prop will be removed in a future version.
-     */
-    readonly identifier?: string;
-    /**
-     * @deprecated Use `autoComplete` with string values instead. This prop will be removed in a future version.
-     */
-    readonly autocomplete?: never;
-    /**
-     * @deprecated Use `aria-label` instead. This prop will be removed in a future version.
-     */
-    readonly ariaLabel?: never;
-    /**
-     * @deprecated Use `readOnly` instead. This prop will be removed in a future version.
-     */
-    readonly readonly?: never;
+    readonly onBlur?: FormFieldProps["onBlur"];
+    readonly value: string;
+    readonly maxLength?: number;
+    readonly size?: FormFieldProps["size"];
+    readonly inline?: FormFieldProps["inline"];
+    readonly align?: FormFieldProps["align"];
+    readonly toolbar?: FormFieldProps["toolbar"];
+    readonly toolbarVisibility?: FormFieldProps["toolbarVisibility"];
+    readonly prefix?: FormFieldProps["prefix"];
+    readonly suffix?: FormFieldProps["suffix"];
+    readonly description?: FormFieldProps["description"];
 }
 interface BaseProps extends CommonFormFieldProps, Pick<FormFieldProps, "autofocus" | "maxLength" | "readonly" | "autocomplete" | "keyboard" | "onEnter" | "onFocus" | "onBlur" | "onChange" | "inputRef" | "validations" | "defaultValue" | "prefix" | "suffix" | "toolbar" | "toolbarVisibility" | "version"> {
     multiline?: boolean;

package/dist/InputText/index.cjs

@@ -4,11 +4,12 @@ var React = require('react');
 var jobberHooks = require('@jobber/hooks');
 var FormField = require('../FormField-cjs.js');
 require('classnames');
-require('../tslib.es6-cjs.js');
+var tslib_es6 = require('../tslib.es6-cjs.js');
 require('react-hook-form');
 require('framer-motion');
 require('@jobber/design');
 require('../Button-cjs.js');
+var omit = require('../omit-cjs.js');
 require('../Icon-cjs.js');
 require('../Text-cjs.js');
 require('../Typography-cjs.js');
@@ -16,6 +17,17 @@ require('../useFormFieldFocus-cjs.js');
 require('../InputValidation-cjs.js');
 require('../Spinner-cjs.js');
 require('react-router-dom');
+require('../_commonjsHelpers-cjs.js');
+require('../_baseGet-cjs.js');
+require('../isTypedArray-cjs.js');
+require('../isObjectLike-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');
+require('../_setToString-cjs.js');
 
 /**
  * Hook for resizing a textarea based on its content. The textarea will grow up to the max number of rows specified.
@@ -150,7 +162,7 @@ function insertAtCursor(input, newText) {
 function useInputTextActions({ onChange, inputRef, onEnter, onFocus, onBlur, onKeyDown, }) {
     function handleClear() {
         var _a;
-        // Don't call blur handler when programmatically clearing
+        handleBlur();
         onChange && onChange("");
         (_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
     }
@@ -184,10 +196,23 @@ function useInputTextActions({ onChange, inputRef, onEnter, onFocus, onBlur, onK
     };
 }
 
+/**
+ * Provides the props for the html fields rendered by the html input.
+ *  DO not repeat this pattern. We are doing this as a proof of concept relating to the refactoring of Form inputs to see what can be removed.
+ */
+function useInputTextFormField(_a) {
+    var { id, name, description, inline, handleChange, handleBlur, handleFocus, handleKeyDown, error } = _a, rest = tslib_es6.__rest(_a, ["id", "name", "description", "inline", "handleChange", "handleBlur", "handleFocus", "handleKeyDown", "error"]);
+    const descriptionIdentifier = `descriptionUUID--${id}`;
+    const fieldProps = Object.assign(Object.assign(Object.assign(Object.assign({}, rest), { id, className: FormField.styles.input, name, disabled: rest.disabled, inputMode: rest.inputMode, onChange: handleChange, onBlur: handleBlur, onFocus: handleFocus }), (description &&
+        !inline && { "aria-describedby": descriptionIdentifier })), { "aria-invalid": rest["aria-invalid"] || error || rest.invalid ? true : undefined, autoFocus: rest.autoFocus, invalid: error || rest.invalid ? "true" : undefined, onKeyDown: handleKeyDown });
+    return { fieldProps, descriptionIdentifier };
+}
+
 const InputTextSPAR = React.forwardRef(function InputTextInternal(props, inputRefs) {
     var _a, _b, _c;
     const inputTextRef = React.useRef(null);
     const wrapperRef = React.useRef(null);
+    const legacyPropHelper = Object.assign(Object.assign({}, props), { version: 1 });
     const id = useInputTextId(props);
     const { rowRange } = useTextAreaResize({
         rows: props.rows,
@@ -195,19 +220,8 @@ const InputTextSPAR = React.forwardRef(function InputTextInternal(props, inputRe
         inputRef: inputTextRef,
         wrapperRef: wrapperRef,
     });
-    const { inputStyle } = FormField.useFormFieldWrapperStyles({
-        size: props.size,
-        align: props.align,
-        placeholder: props.placeholder,
-        value: props.value,
-        invalid: props.invalid,
-        error: props.error,
-        max: typeof props.max === "string" ? parseFloat(props.max) : props.max,
-        maxLength: undefined, // v2: maxLength is for HTML validation only, not for width styling
-        type: props.multiline ? "textarea" : "text",
-        disabled: props.disabled,
-        inline: props.inline,
-    });
+    const type = props.multiline ? "textarea" : "text";
+    const { inputStyle } = FormField.useFormFieldWrapperStyles(legacyPropHelper);
     const { name } = FormField.useAtlantisFormFieldName({
         nameProp: props.name,
         id: id,
@@ -220,25 +234,40 @@ const InputTextSPAR = React.forwardRef(function InputTextInternal(props, inputRe
         onEnter: props.onEnter,
         inputRef: inputTextRef,
     });
-    const descriptionIdentifier = `descriptionUUID--${id}`;
-    const hasDescription = props.description && !props.inline;
-    const isInvalid = Boolean(props["aria-invalid"] || props.error || props.invalid);
+    const inputProps = omit.omit(props, [
+        "onChange",
+        "onBlur",
+        "onFocus",
+        "onEnter",
+        "size",
+        "placeholder",
+        "multiline",
+        "prefix",
+        "suffix",
+        "version",
+    ]);
+    const { fieldProps, descriptionIdentifier } = useInputTextFormField(Object.assign(Object.assign({}, inputProps), { id,
+        name,
+        handleChange,
+        handleBlur,
+        handleFocus,
+        handleKeyDown }));
     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: Boolean(props.error || props.invalid), identifier: id, descriptionIdentifier: descriptionIdentifier, description: props.description, clearable: (_b = props.clearable) !== null && _b !== void 0 ? _b : "never", onClear: handleClear, type: props.multiline ? "textarea" : "text", placeholder: props.placeholder, value: props.value, prefix: props.prefix, suffix: props.suffix, rows: rowRange.min, toolbar: props.toolbar, toolbarVisibility: props.toolbarVisibility },
         React.createElement(React.Fragment, null,
-            props.multiline ? (React.createElement(TextArea, { id: id, name: name, className: inputStyle, value: props.value, rows: rowRange.min, disabled: props.disabled, readOnly: props.readOnly, required: props.required, autoFocus: props.autoFocus, autoComplete: props.autoComplete, maxLength: props.maxLength, minLength: props.minLength, inputMode: props.inputMode, tabIndex: props.tabIndex, role: props.role, "aria-label": props["aria-label"], "aria-describedby": hasDescription ? descriptionIdentifier : props["aria-describedby"], "aria-invalid": isInvalid ? true : undefined, "aria-controls": props["aria-controls"], "aria-expanded": props["aria-expanded"], "aria-activedescendant": props["aria-activedescendant"], "aria-autocomplete": props["aria-autocomplete"], "aria-required": props["aria-required"], invalid: isInvalid ? "true" : undefined, onChange: handleChange, onBlur: handleBlur, onFocus: handleFocus, onKeyDown: handleKeyDown, onKeyUp: props.onKeyUp, ref: FormField.mergeRefs([inputRefs, inputTextRef]) })) : (React.createElement(TextInput, { id: id, name: name, className: inputStyle, value: props.value, disabled: props.disabled, readOnly: props.readOnly, required: props.required, autoFocus: props.autoFocus, autoComplete: props.autoComplete, maxLength: props.maxLength, minLength: props.minLength, max: props.max, min: props.min, pattern: props.pattern, inputMode: props.inputMode, tabIndex: props.tabIndex, role: props.role, "aria-label": props["aria-label"], "aria-describedby": hasDescription ? descriptionIdentifier : props["aria-describedby"], "aria-invalid": isInvalid ? true : undefined, "aria-controls": props["aria-controls"], "aria-expanded": props["aria-expanded"], "aria-activedescendant": props["aria-activedescendant"], "aria-autocomplete": props["aria-autocomplete"], "aria-required": props["aria-required"], invalid: isInvalid ? "true" : undefined, onChange: handleChange, onBlur: handleBlur, onFocus: handleFocus, onKeyDown: handleKeyDown, onKeyUp: props.onKeyUp, ref: FormField.mergeRefs([inputRefs, inputTextRef]) })),
+            type === "textarea" ? (React.createElement(TextArea, { fieldProps: fieldProps, rowRange: rowRange, inputRefs: [inputRefs, inputTextRef], value: props.value, inputStyle: inputStyle })) : (React.createElement(TextInput, { fieldProps: fieldProps, inputRefs: [inputRefs, inputTextRef], value: props.value, inputStyle: inputStyle })),
             React.createElement(FormField.FormFieldPostFix, { variation: "spinner", visible: (_c = props.loading) !== null && _c !== void 0 ? _c : false }),
             props.children)));
 });
 function useInputTextId(props) {
     const generatedId = React.useId();
-    return props.identifier || props.id || generatedId;
+    return props.id || generatedId;
+}
+function TextArea({ fieldProps, rowRange, inputRefs, value, inputStyle, }) {
+    return (React.createElement("textarea", Object.assign({}, fieldProps, { rows: rowRange.min, ref: FormField.mergeRefs(inputRefs), className: inputStyle, value: value })));
+}
+function TextInput({ fieldProps, inputRefs, value, inputStyle, }) {
+    return (React.createElement("input", Object.assign({}, fieldProps, { ref: FormField.mergeRefs(inputRefs), className: inputStyle, value: value })));
 }
-const TextArea = React.forwardRef(function TextArea(props, ref) {
-    return React.createElement("textarea", Object.assign({}, props, { ref: ref }));
-});
-const TextInput = React.forwardRef(function TextInput(props, ref) {
-    return React.createElement("input", Object.assign({}, props, { ref: ref }));
-});
 
 function isNewInputTextProps(props) {
     return props.version === 2;

package/dist/InputText/index.mjs

@@ -1,12 +1,13 @@
 import React__default, { forwardRef, useRef, useImperativeHandle, useId } from 'react';
 import { useSafeLayoutEffect } from '@jobber/hooks';
-import { k as FormField, j as useFormFieldWrapperStyles, b as useAtlantisFormFieldName, f as FormFieldWrapper, m as mergeRefs, l as FormFieldPostFix } from '../FormField-es.js';
+import { k as FormField, s as styles, j as useFormFieldWrapperStyles, b as useAtlantisFormFieldName, f as FormFieldWrapper, l as FormFieldPostFix, m as mergeRefs } from '../FormField-es.js';
 import 'classnames';
-import '../tslib.es6-es.js';
+import { _ as __rest } from '../tslib.es6-es.js';
 import 'react-hook-form';
 import 'framer-motion';
 import '@jobber/design';
 import '../Button-es.js';
+import { o as omit } from '../omit-es.js';
 import '../Icon-es.js';
 import '../Text-es.js';
 import '../Typography-es.js';
@@ -14,6 +15,17 @@ import '../useFormFieldFocus-es.js';
 import '../InputValidation-es.js';
 import '../Spinner-es.js';
 import 'react-router-dom';
+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';
 
 /**
  * Hook for resizing a textarea based on its content. The textarea will grow up to the max number of rows specified.
@@ -148,7 +160,7 @@ function insertAtCursor(input, newText) {
 function useInputTextActions({ onChange, inputRef, onEnter, onFocus, onBlur, onKeyDown, }) {
     function handleClear() {
         var _a;
-        // Don't call blur handler when programmatically clearing
+        handleBlur();
         onChange && onChange("");
         (_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
     }
@@ -182,10 +194,23 @@ function useInputTextActions({ onChange, inputRef, onEnter, onFocus, onBlur, onK
     };
 }
 
+/**
+ * Provides the props for the html fields rendered by the html input.
+ *  DO not repeat this pattern. We are doing this as a proof of concept relating to the refactoring of Form inputs to see what can be removed.
+ */
+function useInputTextFormField(_a) {
+    var { id, name, description, inline, handleChange, handleBlur, handleFocus, handleKeyDown, error } = _a, rest = __rest(_a, ["id", "name", "description", "inline", "handleChange", "handleBlur", "handleFocus", "handleKeyDown", "error"]);
+    const descriptionIdentifier = `descriptionUUID--${id}`;
+    const fieldProps = Object.assign(Object.assign(Object.assign(Object.assign({}, rest), { id, className: styles.input, name, disabled: rest.disabled, inputMode: rest.inputMode, onChange: handleChange, onBlur: handleBlur, onFocus: handleFocus }), (description &&
+        !inline && { "aria-describedby": descriptionIdentifier })), { "aria-invalid": rest["aria-invalid"] || error || rest.invalid ? true : undefined, autoFocus: rest.autoFocus, invalid: error || rest.invalid ? "true" : undefined, onKeyDown: handleKeyDown });
+    return { fieldProps, descriptionIdentifier };
+}
+
 const InputTextSPAR = forwardRef(function InputTextInternal(props, inputRefs) {
     var _a, _b, _c;
     const inputTextRef = React__default.useRef(null);
     const wrapperRef = React__default.useRef(null);
+    const legacyPropHelper = Object.assign(Object.assign({}, props), { version: 1 });
     const id = useInputTextId(props);
     const { rowRange } = useTextAreaResize({
         rows: props.rows,
@@ -193,19 +218,8 @@ const InputTextSPAR = forwardRef(function InputTextInternal(props, inputRefs) {
         inputRef: inputTextRef,
         wrapperRef: wrapperRef,
     });
-    const { inputStyle } = useFormFieldWrapperStyles({
-        size: props.size,
-        align: props.align,
-        placeholder: props.placeholder,
-        value: props.value,
-        invalid: props.invalid,
-        error: props.error,
-        max: typeof props.max === "string" ? parseFloat(props.max) : props.max,
-        maxLength: undefined, // v2: maxLength is for HTML validation only, not for width styling
-        type: props.multiline ? "textarea" : "text",
-        disabled: props.disabled,
-        inline: props.inline,
-    });
+    const type = props.multiline ? "textarea" : "text";
+    const { inputStyle } = useFormFieldWrapperStyles(legacyPropHelper);
     const { name } = useAtlantisFormFieldName({
         nameProp: props.name,
         id: id,
@@ -218,25 +232,40 @@ const InputTextSPAR = forwardRef(function InputTextInternal(props, inputRefs) {
         onEnter: props.onEnter,
         inputRef: inputTextRef,
     });
-    const descriptionIdentifier = `descriptionUUID--${id}`;
-    const hasDescription = props.description && !props.inline;
-    const isInvalid = Boolean(props["aria-invalid"] || props.error || props.invalid);
+    const inputProps = omit(props, [
+        "onChange",
+        "onBlur",
+        "onFocus",
+        "onEnter",
+        "size",
+        "placeholder",
+        "multiline",
+        "prefix",
+        "suffix",
+        "version",
+    ]);
+    const { fieldProps, descriptionIdentifier } = useInputTextFormField(Object.assign(Object.assign({}, inputProps), { id,
+        name,
+        handleChange,
+        handleBlur,
+        handleFocus,
+        handleKeyDown }));
     return (React__default.createElement(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: Boolean(props.error || props.invalid), identifier: id, descriptionIdentifier: descriptionIdentifier, description: props.description, clearable: (_b = props.clearable) !== null && _b !== void 0 ? _b : "never", onClear: handleClear, type: props.multiline ? "textarea" : "text", placeholder: props.placeholder, value: props.value, prefix: props.prefix, suffix: props.suffix, rows: rowRange.min, toolbar: props.toolbar, toolbarVisibility: props.toolbarVisibility },
         React__default.createElement(React__default.Fragment, null,
-            props.multiline ? (React__default.createElement(TextArea, { id: id, name: name, className: inputStyle, value: props.value, rows: rowRange.min, disabled: props.disabled, readOnly: props.readOnly, required: props.required, autoFocus: props.autoFocus, autoComplete: props.autoComplete, maxLength: props.maxLength, minLength: props.minLength, inputMode: props.inputMode, tabIndex: props.tabIndex, role: props.role, "aria-label": props["aria-label"], "aria-describedby": hasDescription ? descriptionIdentifier : props["aria-describedby"], "aria-invalid": isInvalid ? true : undefined, "aria-controls": props["aria-controls"], "aria-expanded": props["aria-expanded"], "aria-activedescendant": props["aria-activedescendant"], "aria-autocomplete": props["aria-autocomplete"], "aria-required": props["aria-required"], invalid: isInvalid ? "true" : undefined, onChange: handleChange, onBlur: handleBlur, onFocus: handleFocus, onKeyDown: handleKeyDown, onKeyUp: props.onKeyUp, ref: mergeRefs([inputRefs, inputTextRef]) })) : (React__default.createElement(TextInput, { id: id, name: name, className: inputStyle, value: props.value, disabled: props.disabled, readOnly: props.readOnly, required: props.required, autoFocus: props.autoFocus, autoComplete: props.autoComplete, maxLength: props.maxLength, minLength: props.minLength, max: props.max, min: props.min, pattern: props.pattern, inputMode: props.inputMode, tabIndex: props.tabIndex, role: props.role, "aria-label": props["aria-label"], "aria-describedby": hasDescription ? descriptionIdentifier : props["aria-describedby"], "aria-invalid": isInvalid ? true : undefined, "aria-controls": props["aria-controls"], "aria-expanded": props["aria-expanded"], "aria-activedescendant": props["aria-activedescendant"], "aria-autocomplete": props["aria-autocomplete"], "aria-required": props["aria-required"], invalid: isInvalid ? "true" : undefined, onChange: handleChange, onBlur: handleBlur, onFocus: handleFocus, onKeyDown: handleKeyDown, onKeyUp: props.onKeyUp, ref: mergeRefs([inputRefs, inputTextRef]) })),
+            type === "textarea" ? (React__default.createElement(TextArea, { fieldProps: fieldProps, rowRange: rowRange, inputRefs: [inputRefs, inputTextRef], value: props.value, inputStyle: inputStyle })) : (React__default.createElement(TextInput, { fieldProps: fieldProps, inputRefs: [inputRefs, inputTextRef], value: props.value, inputStyle: inputStyle })),
             React__default.createElement(FormFieldPostFix, { variation: "spinner", visible: (_c = props.loading) !== null && _c !== void 0 ? _c : false }),
             props.children)));
 });
 function useInputTextId(props) {
     const generatedId = useId();
-    return props.identifier || props.id || generatedId;
+    return props.id || generatedId;
+}
+function TextArea({ fieldProps, rowRange, inputRefs, value, inputStyle, }) {
+    return (React__default.createElement("textarea", Object.assign({}, fieldProps, { rows: rowRange.min, ref: mergeRefs(inputRefs), className: inputStyle, value: value })));
+}
+function TextInput({ fieldProps, inputRefs, value, inputStyle, }) {
+    return (React__default.createElement("input", Object.assign({}, fieldProps, { ref: mergeRefs(inputRefs), className: inputStyle, value: value })));
 }
-const TextArea = forwardRef(function TextArea(props, ref) {
-    return React__default.createElement("textarea", Object.assign({}, props, { ref: ref }));
-});
-const TextInput = forwardRef(function TextInput(props, ref) {
-    return React__default.createElement("input", Object.assign({}, props, { ref: ref }));
-});
 
 function isNewInputTextProps(props) {
     return props.version === 2;

package/dist/InputText/useInputTextActions.d.ts

@@ -12,5 +12,5 @@ export declare function useInputTextActions({ onChange, inputRef, onEnter, onFoc
     handleChange: (event: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
     handleKeyDown: (event: KeyboardEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
     handleFocus: (event: FocusEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
-    handleBlur: (event: FocusEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
+    handleBlur: (event?: FocusEvent) => void;
 };