@cube-dev/ui-kit 0.18.2 → 0.19.0

package/es/components/forms/{FieldWrapper.js → FieldWrapper/FieldWrapper.js}

@@ -1,21 +1,21 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.18.2
+ * @cube-dev/ui-kit v0.19.0
  * Released under the MIT license.
  */
 
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { forwardRef } from 'react';
 import { InfoCircleOutlined } from '@ant-design/icons';
-import { Paragraph } from '../content/Paragraph';
-import { tasty } from '../../tasty';
-import { TooltipProvider } from '../overlays/Tooltip/TooltipProvider';
-import { Text } from '../content/Text';
-import { wrapNodeIfPlain } from '../../utils/react';
-import { Space } from '../layout/Space';
-import { Flex } from '../layout/Flex';
-import { Label } from './Label';
+import { Paragraph } from '../../content/Paragraph';
+import { tasty } from '../../../tasty';
+import { TooltipProvider } from '../../overlays/Tooltip/TooltipProvider';
+import { Text } from '../../content/Text';
+import { wrapNodeIfPlain } from '../../../utils/react';
+import { Space } from '../../layout/Space';
+import { Flex } from '../../layout/Flex';
+import { Label } from '../Label';
 const FieldElement = tasty({
     qa: 'Field',
     styles: {
@@ -49,6 +49,9 @@ const FieldElement = tasty({
         },
     },
 });
+if (process.env.NODE_ENV === 'development') {
+    FieldElement.displayName = 'FieldWrapperElement';
+}
 const MessageElement = tasty({
     qa: 'Field_Message',
     styles: {
@@ -63,7 +66,11 @@ const MessageElement = tasty({
         userSelect: 'none',
     },
 });
-function FieldWrapper(props, ref) {
+/**
+ * A wrapper for form fields to provide additional decoration for inputs.
+ * @internal Do not use this component directly.
+ */
+export const FieldWrapper = forwardRef(function FieldWrapper(props, ref) {
     const { as, labelPosition = 'top', label, extra, styles, isRequired, isDisabled, labelStyles, necessityIndicator, labelProps, fieldProps, message, messageStyles, description, Component, validationState, requiredMark = true, tooltip, isHidden, labelSuffix, } = props;
     const labelComponent = label ? (_jsx(Label, { as: as === 'label' ? 'div' : 'label', styles: labelStyles, labelPosition: labelPosition, isRequired: requiredMark ? isRequired : false, isDisabled: isDisabled, necessityIndicator: necessityIndicator, validationState: validationState, "aria-label": label, ...labelProps, children: _jsxs(Flex, { placeContent: "baseline space-between", width: "100%", children: [_jsxs(Space, { placeItems: "center", gap: "0.25x", children: [_jsx("div", { children: label }), tooltip ? (_jsx(TooltipProvider, { activeWrap: true, title: tooltip, width: "initial max-content 40x", children: _jsx(InfoCircleOutlined, { style: {
                                     color: 'var(--primary-color)',
@@ -76,12 +83,7 @@ function FieldWrapper(props, ref) {
         invalid: validationState === 'invalid',
         valid: validationState === 'valid',
     };
-    return (_jsxs(FieldElement, { ref: ref, as: as || 'div', mods: mods, isHidden: isHidden, styles: styles, ...fieldProps, children: [labelComponent || descriptionComponent ? (_jsxs("div", { "data-element": "LabelArea", children: [labelComponent, descriptionComponent] })) : null, _jsxs("div", { "data-element": "InputArea", children: [Component, message && !isDisabled && (_jsx(MessageElement, { mods: mods, styles: messageStyles, role: validationState === 'invalid' ? 'alert' : undefined, children: message }))] })] }));
-}
-/**
- * A wrapper for form fields to provide additional decoration for inputs.
- */
-const _FieldWrapper = forwardRef(FieldWrapper);
-export { _FieldWrapper as FieldWrapper };
+    return (_jsxs(FieldElement, { ref: ref, as: as ?? 'div', mods: mods, isHidden: isHidden, styles: styles, ...fieldProps, children: [labelComponent || descriptionComponent ? (_jsxs("div", { "data-element": "LabelArea", children: [labelComponent, descriptionComponent] })) : null, _jsxs("div", { "data-element": "InputArea", children: [Component, message && !isDisabled && (_jsx(MessageElement, { mods: mods, styles: messageStyles, role: validationState === 'invalid' ? 'alert' : undefined, children: message }))] })] }));
+});
 
         

package/es/components/forms/FieldWrapper/extract-field-wrapper-props.js

@@ -0,0 +1,46 @@
+/**
+ * @license MIT
+ * author: Cube Dev Team
+ * @cube-dev/ui-kit v0.19.0
+ * Released under the MIT license.
+ */
+
+const createFieldWrapperPropsKeys = (arr) => new Set(arr);
+const fieldWrapperPropsKeys = createFieldWrapperPropsKeys([
+    'as',
+    'validationState',
+    'styles',
+    'isRequired',
+    'isDisabled',
+    'fieldProps',
+    'isHidden',
+    'label',
+    'labelPosition',
+    'labelSuffix',
+    'labelStyles',
+    'labelProps',
+    'description',
+    'requiredMark',
+    'tooltip',
+    'extra',
+    'necessityLabel',
+    'necessityIndicator',
+    'message',
+    'messageStyles',
+    'Component',
+]);
+export function extractFieldWrapperProps(props) {
+    const fieldWrapperProps = {};
+    const rest = {};
+    for (const [key, prop] of Object.entries(props)) {
+        if (fieldWrapperPropsKeys.has(key)) {
+            fieldWrapperProps[key] = prop;
+        }
+        else {
+            rest[key] = prop;
+        }
+    }
+    return { fieldWrapperProps, rest };
+}
+
+        

package/es/components/forms/FieldWrapper/index.js

@@ -0,0 +1,12 @@
+/**
+ * @license MIT
+ * author: Cube Dev Team
+ * @cube-dev/ui-kit v0.19.0
+ * Released under the MIT license.
+ */
+
+export * from './FieldWrapper';
+export * from './extract-field-wrapper-props';
+export * from './types';
+
+        

package/es/components/forms/FieldWrapper/types.js

@@ -0,0 +1,10 @@
+/**
+ * @license MIT
+ * author: Cube Dev Team
+ * @cube-dev/ui-kit v0.19.0
+ * Released under the MIT license.
+ */
+
+export {};
+
+        

package/es/components/forms/FileInput/FileInput.js

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.18.2
+ * @cube-dev/ui-kit v0.19.0
  * Released under the MIT license.
  */
 

package/es/components/forms/Form/Field.js

@@ -1,37 +1,18 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.18.2
+ * @cube-dev/ui-kit v0.19.0
  * Released under the MIT license.
  */
 
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Children, cloneElement, useEffect, useRef, useState, } from 'react';
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { Children, cloneElement, createContext, useContext, useMemo, } from 'react';
 import { mergeProps } from '../../../utils/react';
 import { FieldWrapper } from '../FieldWrapper';
 import { warn } from '../../../utils/warnings';
 import { useFormProps } from './Form';
-const ID_MAP = {};
-function createId(name) {
-    if (!name)
-        return;
-    if (!ID_MAP[name]) {
-        ID_MAP[name] = [];
-    }
-    let i = 0;
-    let id;
-    do {
-        id = i ? `${name}_${i}` : name;
-        i++;
-    } while (ID_MAP[name].includes(id));
-    ID_MAP[name].push(id);
-    return id;
-}
-function removeId(name, id) {
-    if (!ID_MAP[name])
-        return;
-    ID_MAP[name] = ID_MAP[name].filter((_id) => _id !== id);
-}
+import { useField } from './use-field';
 function getDefaultValidateTrigger(type) {
     type = type || '';
     return type === 'Number' || type.includes('Text') ? 'onBlur' : 'onChange';
@@ -89,113 +70,39 @@ function getValueProps(type, value, onChange, allowsCustomValue) {
         onChange,
     };
 }
-export function Field(allProps) {
-    const props = useFormProps(allProps);
-    let { defaultValue, type: inputType, id, idPrefix, children, name, form, rules, label, extra, validateTrigger, validationState, necessityLabel, necessityIndicator, shouldUpdate, message, description, tooltip, isHidden, isDisabled, isLoading, styles, labelPosition = 'top', labelStyles, labelSuffix, } = props;
-    const nonInput = !name;
-    const fieldName = name != null ? (Array.isArray(name) ? name.join('.') : name) : '';
-    let firstRunRef = useRef(true);
-    let [fieldId, setFieldId] = useState(id || (idPrefix ? `${idPrefix}_${fieldName}` : fieldName));
-    useEffect(() => {
-        let newId;
-        if (!id && !nonInput) {
-            newId = createId(fieldId);
-            setFieldId(newId);
-        }
-        return () => {
-            if (!id) {
-                removeId(idPrefix ? `${idPrefix}_${fieldName}` : fieldName, newId);
-            }
-            if (fieldName && form) {
-                form.removeField(fieldName);
-            }
-        };
-    }, []);
-    let field = form?.getFieldInstance(fieldName);
-    if (field) {
-        field.rules = rules;
-    }
-    let isRequired = rules && !!rules.find((rule) => rule.required);
-    useEffect(() => {
-        if (!form)
-            return;
-        if (field) {
-            form.forceReRender();
-        }
-        else {
-            form.createField(fieldName);
-        }
-    }, [field]);
+export function Field(props) {
+    const allProps = useFormProps(props);
+    let { type: inputType, children, form, label, extra, validationState, necessityLabel, necessityIndicator, message, description, tooltip, isHidden, isDisabled, isLoading, styles, labelPosition = 'top', labelStyles, labelSuffix, } = allProps;
     if (typeof children === 'function') {
         children = children(form);
     }
-    if (!children)
-        return null;
     let child = Children.only(children);
-    if (nonInput) {
-        return (_jsx(FieldWrapper, { isHidden: isHidden, isDisabled: isDisabled, validationState: validationState, necessityIndicator: necessityIndicator, necessityLabel: necessityLabel, isRequired: isRequired, label: label, extra: extra, tooltip: tooltip, message: message, description: description, Component: child, styles: styles, labelPosition: labelPosition, labelStyles: labelStyles, labelSuffix: labelSuffix }));
+    inputType = inputType ?? (child?.type).cubeInputType ?? 'Text';
+    const __props = useField(allProps, {
+        defaultValidationTrigger: getDefaultValidateTrigger(inputType),
+    });
+    const { field, isRequired, name, id } = __props;
+    if (!child)
+        return null;
+    if (__props.nonInput) {
+        return (_jsx(LegacyFieldProvider, { children: _jsx(FieldWrapper, { isHidden: isHidden, isDisabled: isDisabled, validationState: validationState, necessityIndicator: necessityIndicator, necessityLabel: necessityLabel, isRequired: isRequired, label: label, extra: extra, tooltip: tooltip, message: message, description: description, Component: child, styles: styles, labelPosition: labelPosition, labelStyles: labelStyles, labelSuffix: labelSuffix }) }));
     }
     if (!form) {
         warn('Form Field requires declared form instance if field name is specified');
         return null;
     }
-    inputType =
-        inputType || child.type.cubeInputType || 'Text';
-    const defaultValidateTrigger = getDefaultValidateTrigger(inputType);
-    if (firstRunRef.current && defaultValue != null) {
-        if (!field) {
-            form.createField(fieldName, true);
-        }
-        if (field?.value == null) {
-            form.setFieldValue(fieldName, defaultValue, false, true);
-            field = form?.getFieldInstance(fieldName);
-        }
-    }
-    firstRunRef.current = false;
-    if (!field) {
-        return cloneElement(child, mergeProps(child.props, {
-            ...getValueProps(inputType),
-            label: fieldName,
-            name: fieldName,
-            id: fieldId,
-        }));
-    }
-    if (!validateTrigger) {
-        validateTrigger = defaultValidateTrigger;
-    }
-    function onChangeHandler(val, dontTouch) {
-        const field = form.getFieldInstance(fieldName);
-        if (shouldUpdate) {
-            const fieldsValue = form.getFieldsValue();
-            // check if we should update the value of the field
-            const shouldNotBeUpdated = typeof shouldUpdate === 'boolean'
-                ? !shouldUpdate
-                : !shouldUpdate(fieldsValue, {
-                    ...fieldsValue,
-                    [fieldName]: val,
-                });
-            if (shouldNotBeUpdated) {
-                return;
-            }
-        }
-        form.setFieldValue(fieldName, val, !dontTouch, false, dontTouch);
-        if (!dontTouch &&
-            (validateTrigger === 'onChange' ||
-                (field && field.errors && field.errors.length))) {
-            form.validateField(fieldName).catch(() => { }); // do nothing on fail
-        }
+    if (!__props.field) {
+        return (_jsx(LegacyFieldProvider, { children: cloneElement(child, mergeProps(child.props, {
+                ...getValueProps(inputType),
+                label: name,
+                name,
+                id,
+            })) }));
     }
     const newProps = {
-        id: fieldId,
-        name: fieldName,
-        onBlur() {
-            if (validateTrigger === 'onBlur') {
-                // We need a timeout so the change event can be done.
-                setTimeout(() => {
-                    form.validateField(fieldName).catch(() => { }); // do nothing on fail
-                });
-            }
-        },
+        id,
+        name,
+        onBlur: __props.onBlur,
     };
     if (necessityIndicator != null) {
         newProps.necessityIndicator = necessityIndicator;
@@ -230,7 +137,7 @@ export function Field(allProps) {
     if (isLoading != null) {
         newProps.isLoading = isLoading;
     }
-    if (field && field.errors && field.errors.length) {
+    if (field?.errors?.length) {
         if (!validationState) {
             newProps.validationState = 'invalid';
         }
@@ -238,10 +145,21 @@ export function Field(allProps) {
             newProps.message = field.errors[0];
         }
     }
-    Object.assign(newProps, getValueProps(inputType, field?.inputValue, onChangeHandler, child.props.allowsCustomValue));
+    Object.assign(newProps, getValueProps(inputType, __props.field?.inputValue, __props.onChange, child.props.allowsCustomValue));
     const { onChange, onSelectionChange, ...childProps } = child.props;
     // onChange event passed to the child should be executed after Form onChange logic
-    return cloneElement(child, mergeProps(childProps, newProps, onChange ? { onChange } : {}, onSelectionChange ? { onSelectionChange } : {}));
+    return (_jsx(LegacyFieldProvider, { children: cloneElement(child, mergeProps(childProps, newProps, onChange ? { onChange: __props.onChange } : {}, onSelectionChange ? { onSelectionChange: __props.onChange } : {})) }));
+}
+const LegacyFieldContext = createContext({
+    insideLegacyField: false,
+});
+function LegacyFieldProvider(props) {
+    const value = useMemo(() => ({ insideLegacyField: true }), []);
+    return (_jsx(LegacyFieldContext.Provider, { value: value, children: props.children }));
+}
+export function useInsideLegacyField() {
+    const { insideLegacyField } = useContext(LegacyFieldContext);
+    return insideLegacyField;
 }
 
         

package/es/components/forms/Form/Form.js

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.18.2
+ * @cube-dev/ui-kit v0.19.0
  * Released under the MIT license.
  */
 

package/es/components/forms/Form/Submit/Submit.js

@@ -0,0 +1,22 @@
+/**
+ * @license MIT
+ * author: Cube Dev Team
+ * @cube-dev/ui-kit v0.19.0
+ * Released under the MIT license.
+ */
+
+import { jsx as _jsx } from "react/jsx-runtime";
+import { forwardRef } from 'react';
+import { useProviderProps } from '../../../../provider';
+import { useFormProps } from '../Form';
+import { Button } from '../../../actions';
+export const Submit = forwardRef(function Submit(props, ref) {
+    props = useProviderProps(props);
+    props = useFormProps(props);
+    const { form, ...otherProps } = props;
+    const formData = form?.getFieldsValue() ?? {};
+    const isInvalid = Object.keys(formData).some((name) => form?.isFieldInvalid(name) ?? false);
+    return (_jsx(Button, { ref: ref, type: "primary", htmlType: "submit", isLoading: form?.isSubmitting, isDisabled: isInvalid, ...otherProps }));
+});
+
+        

package/es/components/forms/Form/Submit/index.js

@@ -0,0 +1,10 @@
+/**
+ * @license MIT
+ * author: Cube Dev Team
+ * @cube-dev/ui-kit v0.19.0
+ * Released under the MIT license.
+ */
+
+export * from './Submit';
+
+        

package/es/components/forms/Form/SubmitError.js

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.18.2
+ * @cube-dev/ui-kit v0.19.0
  * Released under the MIT license.
  */
 

package/es/components/forms/Form/index.js

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.18.2
+ * @cube-dev/ui-kit v0.19.0
  * Released under the MIT license.
  */
 

package/es/components/forms/Form/types.js

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.18.2
+ * @cube-dev/ui-kit v0.19.0
  * Released under the MIT license.
  */
 

package/es/components/forms/Form/use-field/index.js

@@ -0,0 +1,12 @@
+/**
+ * @license MIT
+ * author: Cube Dev Team
+ * @cube-dev/ui-kit v0.19.0
+ * Released under the MIT license.
+ */
+
+export * from './use-field';
+export * from './use-field-props';
+export * from './types';
+
+        

package/es/components/forms/Form/use-field/types.js

@@ -0,0 +1,10 @@
+/**
+ * @license MIT
+ * author: Cube Dev Team
+ * @cube-dev/ui-kit v0.19.0
+ * Released under the MIT license.
+ */
+
+export {};
+
+        

package/es/components/forms/Form/use-field/use-field-props.js

@@ -0,0 +1,57 @@
+/**
+ * @license MIT
+ * author: Cube Dev Team
+ * @cube-dev/ui-kit v0.19.0
+ * Released under the MIT license.
+ */
+
+import { useRef } from 'react';
+import { useDebugValue } from 'react';
+import { useChainedCallback, useEvent, useWarn } from '../../../../_internal';
+import { useInsideLegacyField } from '../Field';
+import { useField } from './use-field';
+export function useFieldProps(props, params = {}) {
+    // We use ref here to "memoize" initial value
+    const isDisabledRef = useRef(params.unsafe__isDisabled ?? false);
+    const { valuePropsMapper = ({ value, onChange }) => ({
+        value: value ?? null,
+        onChange,
+    }), defaultValidationTrigger = 'onBlur', } = params;
+    const isInsideLegacyField = useInsideLegacyField();
+    useWarn(isInsideLegacyField, '<Field /> is deprecated, use component without <Field /> instead.');
+    if (isInsideLegacyField || isDisabledRef.current || props.name == null) {
+        return props;
+    }
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    const field = useField(props, {
+        defaultValidationTrigger: params.defaultValidationTrigger,
+    });
+    const isOutsideOfForm = field?.form == null;
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    const onBlurChained = useChainedCallback(field?.onBlur, 
+    // TODO: remove type casting after updating to typescipt@4.9
+    'onBlur' in props ? props.onBlur : undefined);
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    const onChangeEvent = useEvent((value, dontTouch) => {
+        return field?.onChange?.(value, dontTouch, field?.validateTrigger ?? defaultValidationTrigger);
+    });
+    const result = isOutsideOfForm
+        ? props
+        : {
+            ...props,
+            ...field,
+            ...valuePropsMapper({
+                value: field.value,
+                onChange: onChangeEvent,
+            }),
+            validateTrigger: field.validateTrigger ?? defaultValidationTrigger,
+            onBlur: onBlurChained,
+        };
+    if (process.env.NODE_ENV === 'development') {
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        useDebugValue(result);
+    }
+    return result;
+}
+
+        

package/es/components/forms/Form/use-field/use-field.js

@@ -0,0 +1,142 @@
+/**
+ * @license MIT
+ * author: Cube Dev Team
+ * @cube-dev/ui-kit v0.19.0
+ * Released under the MIT license.
+ */
+
+import { useEffect, useMemo, useState } from 'react';
+import { useEvent, useIsFirstRender } from '../../../../_internal';
+import { useFormProps } from '../Form';
+const ID_MAP = {};
+function createId(name) {
+    if (!name)
+        return;
+    if (!ID_MAP[name]) {
+        ID_MAP[name] = [];
+    }
+    let i = 0;
+    let id;
+    do {
+        id = i ? `${name}_${i}` : name;
+        i++;
+    } while (ID_MAP[name].includes(id));
+    ID_MAP[name].push(id);
+    return id;
+}
+function removeId(name, id) {
+    if (!ID_MAP[name])
+        return;
+    ID_MAP[name] = ID_MAP[name].filter((_id) => _id !== id);
+}
+export function useField(props, params) {
+    props = useFormProps(props);
+    let { defaultValue, id, idPrefix, name, form, rules, validateTrigger = params.defaultValidationTrigger, validationState, shouldUpdate, } = props;
+    const nonInput = !name;
+    const fieldName = name != null ? (Array.isArray(name) ? name.join('.') : name) : '';
+    const isFirstRender = useIsFirstRender();
+    let [fieldId, setFieldId] = useState(id || (idPrefix ? `${idPrefix}_${fieldName}` : fieldName));
+    useEffect(() => {
+        let newId;
+        if (!id && !nonInput) {
+            newId = createId(fieldId);
+            setFieldId(newId);
+        }
+        return () => {
+            if (!id) {
+                removeId(idPrefix ? `${idPrefix}_${fieldName}` : fieldName, newId);
+            }
+            if (fieldName && form) {
+                form.removeField(fieldName);
+            }
+        };
+    }, []);
+    let field = form?.getFieldInstance(fieldName);
+    if (field) {
+        field.rules = rules;
+    }
+    let isRequired = rules && !!rules.find((rule) => rule.required);
+    useEffect(() => {
+        if (!form)
+            return;
+        if (field) {
+            form.forceReRender();
+        }
+        else {
+            form.createField(fieldName);
+        }
+    }, [field]);
+    if (form) {
+        if (isFirstRender) {
+            if (!field) {
+                field = form.createField(fieldName, true);
+            }
+            if (field?.value == null) {
+                form.setFieldValue(fieldName, defaultValue, false, true);
+                field = form?.getFieldInstance(fieldName);
+            }
+        }
+        if (!field?.touched && defaultValue != null) {
+            form.setFieldValue(fieldName, defaultValue, false, true);
+        }
+    }
+    const onChangeHandler = useEvent((val, dontTouch) => {
+        if (!form)
+            return;
+        const field = form.getFieldInstance(fieldName);
+        if (shouldUpdate) {
+            const fieldsValue = form.getFieldsValue();
+            // check if we should update the value of the field
+            const shouldNotBeUpdated = typeof shouldUpdate === 'boolean'
+                ? !shouldUpdate
+                : !shouldUpdate(fieldsValue, {
+                    ...fieldsValue,
+                    [fieldName]: val,
+                });
+            if (shouldNotBeUpdated) {
+                return;
+            }
+        }
+        form.setFieldValue(fieldName, val, !dontTouch, false, dontTouch);
+        if (!dontTouch &&
+            (validateTrigger === 'onChange' ||
+                (field && field.errors && field.errors.length))) {
+            form.validateField(fieldName).catch(() => { }); // do nothing on fail
+        }
+    });
+    const onBlurHandler = useEvent(() => {
+        if (validateTrigger === 'onBlur') {
+            // We need a timeout so the change event can be done.
+            setTimeout(() => {
+                form?.validateField(fieldName).catch(() => { }); // do nothing on fail
+            });
+        }
+    });
+    return useMemo(() => ({
+        id: fieldId,
+        name: fieldName,
+        value: field?.inputValue,
+        validateTrigger,
+        form,
+        field,
+        nonInput,
+        validationState: validationState ?? (field?.errors?.length ? 'invalid' : undefined),
+        ...(isRequired && { isRequired }),
+        ...(field?.errors?.length && { message: field.errors[0] }),
+        onBlur: onBlurHandler,
+        onChange: onChangeHandler,
+    }), [
+        form,
+        field,
+        fieldId,
+        fieldName,
+        isRequired,
+        onBlurHandler,
+        onChangeHandler,
+        validateTrigger,
+        validationState,
+        nonInput,
+    ]);
+}
+
+