@cube-dev/ui-kit 0.0.0-canary-1be35be → 0.0.0-canary-f2f75e5

package/es/components/forms/RadioGroup/RadioGroup.js

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.0.0-canary-1be35be
+ * @cube-dev/ui-kit v0.0.0-canary-f2f75e5
  * Released under the MIT license.
  */
 
@@ -11,7 +11,7 @@ import { useDOMRef } from '@react-spectrum/utils';
 import { useRadioGroup } from '@react-aria/radio';
 import { useRadioGroupState } from '@react-stately/radio';
 import { useProviderProps } from '../../../provider';
-import { FormContext, useFormProps } from '../Form';
+import { FormContext, useFieldProps } from '../Form';
 import { BLOCK_STYLES, extractStyles, OUTER_STYLES, tasty, } from '../../../tasty';
 import { FieldWrapper } from '../FieldWrapper';
 import { castNullableStringValue, } from '../../../utils/react/nullableValue';
@@ -32,7 +32,7 @@ const RadioGroupElement = tasty({
 function RadioGroup(props, ref) {
     props = castNullableStringValue(props);
     props = useProviderProps(props);
-    props = useFormProps(props);
+    props = useFieldProps(props, { defaultValidationTrigger: 'onChange' });
     let { isDisabled, isRequired, necessityIndicator, label, extra, labelPosition = 'top', validationState, children, orientation = 'vertical', message, description, labelStyles, requiredMark = true, tooltip, isHidden, styles, groupStyles, insideForm, labelSuffix, ...otherProps } = props;
     let domRef = useDOMRef(ref);
     styles = extractStyles(otherProps, OUTER_STYLES, styles);
@@ -47,7 +47,7 @@ function RadioGroup(props, ref) {
                 isRequired,
                 validationState,
                 isDisabled,
-            }, children: _jsx(RadioContext.Provider, { value: state, children: children }, void 0) }, void 0) }, void 0));
+            }, children: _jsx(RadioContext.Provider, { value: state, children: children }) }) }));
     return (_jsx(FieldWrapper, { ...{
             labelPosition,
             label,
@@ -69,14 +69,22 @@ function RadioGroup(props, ref) {
             Component: radioGroup,
             ref: domRef,
             labelSuffix,
-        } }, void 0));
+        } }));
 }
 /**
  * Radio groups allow users to select a single option from a list of mutually exclusive options.
  * All possible options are exposed up front for users to compare.
  */
 const _RadioGroup = forwardRef(RadioGroup);
-_RadioGroup.cubeInputType = 'RadioGroup';
+/**
+ * @legacy should be removed with legacy <Field />
+ */
+Object.defineProperty(_RadioGroup, 'cubeInputType', {
+    enumerable: false,
+    configurable: false,
+    writable: false,
+    value: 'RadioGroup',
+});
 export { _RadioGroup as RadioGroup };
 
         

package/es/components/forms/RadioGroup/context.js

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

package/es/components/forms/SearchInput/SearchInput.js

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.0.0-canary-1be35be
+ * @cube-dev/ui-kit v0.0.0-canary-f2f75e5
  * Released under the MIT license.
  */
 
@@ -18,7 +18,7 @@ import { ariaToCubeButtonProps } from '../../../utils/react/mapProps';
 import { castNullableStringValue, } from '../../../utils/react/nullableValue';
 import { tasty } from '../../../tasty';
 const ClearButton = tasty(Button, {
-    icon: _jsx(CloseOutlined, {}, void 0),
+    icon: _jsx(CloseOutlined, {}),
     styles: {
         radius: 'right (1r - 1bw)',
         width: '4x',
@@ -41,9 +41,9 @@ export const SearchInput = forwardRef(function SearchInput(props, ref) {
     }, [combinedRef, value]);
     let state = useSearchFieldState(props);
     let { inputProps, clearButtonProps } = useSearchField(props, state, inputRef);
-    return (_jsx(TextInputBase, { ref: ref, inputProps: inputProps, inputRef: inputRef, type: "search", icon: _jsx(SearchOutlined, {}, void 0), suffixPosition: "after", suffix: isClearable &&
+    return (_jsx(TextInputBase, { ref: ref, inputProps: inputProps, inputRef: inputRef, type: "search", icon: _jsx(SearchOutlined, {}), suffixPosition: "after", suffix: isClearable &&
             state.value !== '' &&
-            !props.isReadOnly && (_jsx(ClearButton, { type: validationState === 'invalid' ? 'clear' : 'neutral', theme: validationState === 'invalid' ? 'danger' : undefined, ...ariaToCubeButtonProps(clearButtonProps) }, void 0)), ...props }, void 0));
+            !props.isReadOnly && (_jsx(ClearButton, { type: validationState === 'invalid' ? 'clear' : 'neutral', theme: validationState === 'invalid' ? 'danger' : undefined, ...ariaToCubeButtonProps(clearButtonProps) })), ...props }));
 });
 
         

package/es/components/forms/Slider/Gradation.js

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.0.0-canary-1be35be
+ * @cube-dev/ui-kit v0.0.0-canary-f2f75e5
  * Released under the MIT license.
  */
 
@@ -18,7 +18,7 @@ export function Gradation(props) {
     };
     return (_jsx(SliderGradationElement, { children: values.map((value, idx) => (_jsx(SliderGradeElement, { mods: {
                 active: getIsActive(value, idx),
-            }, children: value }, value))) }, void 0));
+            }, children: value }, value))) }));
 }
 
         

package/es/components/forms/Slider/Header.js

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

package/es/components/forms/Slider/RangeSlider.js

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.0.0-canary-1be35be
+ * @cube-dev/ui-kit v0.0.0-canary-f2f75e5
  * Released under the MIT license.
  */
 
@@ -18,8 +18,8 @@ const INTL_MESSAGES = {
 function RangeSlider(props, ref) {
     let { isDisabled, styles, gradation, ...otherProps } = props;
     return (_jsx(SliderBase, { ...otherProps, children: ({ trackRef, inputRef, state }) => {
-            return (_jsxs(_Fragment, { children: [_jsx(Gradation, { state: state, ranges: [0, 1], values: gradation }, void 0), _jsx(SliderTrack, { state: state, isDisabled: isDisabled }, void 0), _jsx(SliderThumb, { index: 0, "aria-label": INTL_MESSAGES['minimum'], state: state, inputRef: inputRef, trackRef: trackRef, isDisabled: isDisabled }, void 0), _jsx(SliderThumb, { index: 1, "aria-label": INTL_MESSAGES['maximum'], state: state, inputRef: inputRef, trackRef: trackRef, isDisabled: isDisabled }, void 0)] }, void 0));
-        } }, void 0));
+            return (_jsxs(_Fragment, { children: [_jsx(Gradation, { state: state, ranges: [0, 1], values: gradation }), _jsx(SliderTrack, { state: state, isDisabled: isDisabled }), _jsx(SliderThumb, { index: 0, "aria-label": INTL_MESSAGES['minimum'], state: state, inputRef: inputRef, trackRef: trackRef, isDisabled: isDisabled }), _jsx(SliderThumb, { index: 1, "aria-label": INTL_MESSAGES['maximum'], state: state, inputRef: inputRef, trackRef: trackRef, isDisabled: isDisabled })] }));
+        } }));
 }
 const _RangeSlider = forwardRef(RangeSlider);
 const __RangeSlider = Object.assign(_RangeSlider, {

package/es/components/forms/Slider/Slider.js

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.0.0-canary-1be35be
+ * @cube-dev/ui-kit v0.0.0-canary-f2f75e5
  * Released under the MIT license.
  */
 
@@ -25,12 +25,13 @@ function Slider(props, ref) {
         onChangeEnd: (v) => {
             onChangeEnd?.(v[0]);
         },
-        getValueLabel: getValueLabel ? ([v]) => getValueLabel?.(v) : undefined,
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        getValueLabel: getValueLabel ? ([v]) => getValueLabel(v) : undefined,
     };
     styles = extractStyles(otherProps, OUTER_STYLES, styles);
     return (_jsx(SliderBase, { ...otherProps, ...baseProps, orientation: orientation, styles: styles, children: ({ trackRef, inputRef, state }) => {
-            return (_jsxs(_Fragment, { children: [_jsx(Gradation, { state: state, ranges: [0, 1], values: gradation }, void 0), _jsx(SliderTrack, { state: state, isDisabled: isDisabled, orientation: orientation }, void 0), _jsx(SliderThumb, { index: 0, state: state, inputRef: inputRef, trackRef: trackRef, isDisabled: isDisabled }, void 0)] }, void 0));
-        } }, void 0));
+            return (_jsxs(_Fragment, { children: [_jsx(Gradation, { state: state, ranges: [0, 1], values: gradation }), _jsx(SliderTrack, { state: state, isDisabled: isDisabled, orientation: orientation }), _jsx(SliderThumb, { index: 0, state: state, inputRef: inputRef, trackRef: trackRef, isDisabled: isDisabled })] }));
+        } }));
 }
 const _Slider = forwardRef(Slider);
 const __Slider = Object.assign(_Slider, {

package/es/components/forms/Slider/SliderBase.js

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.0.0-canary-1be35be
+ * @cube-dev/ui-kit v0.0.0-canary-f2f75e5
  * Released under the MIT license.
  */
 
@@ -11,7 +11,7 @@ import { useFocusableRef } from '@react-spectrum/utils';
 import { useSliderState } from '@react-stately/slider';
 import { useSlider } from '@react-aria/slider';
 import { useNumberFormatter } from '@react-aria/i18n';
-import { FieldWrapper } from '../../forms/FieldWrapper';
+import { FieldWrapper } from '../FieldWrapper';
 import { extractStyles, OUTER_STYLES, tasty } from '../../../tasty';
 import { useFormProps } from '../Form';
 import { Text } from '../../content/Text';
@@ -95,7 +95,7 @@ function SliderBase(allProps, ref) {
                     width: `${maxLabelLength + 1}ch`,
                     minWidth: `${maxLabelLength + 1}ch`,
                 }
-                : undefined, children: displayValue }, void 0));
+                : undefined, children: displayValue }));
     const sliderField = (_jsx(SliderElement, { ref: domRef, ...groupProps, mods: {
             'side-label': labelPosition === 'side',
             horizontal: orientation === 'horizontal',
@@ -105,7 +105,7 @@ function SliderBase(allProps, ref) {
                 trackRef,
                 inputRef,
                 state,
-            }) }, void 0) }, void 0));
+            }) }) }));
     styles = extractStyles(otherProps, OUTER_STYLES, styles);
     return (_jsx(FieldWrapper, { ...{
             labelPosition,
@@ -124,7 +124,7 @@ function SliderBase(allProps, ref) {
             labelSuffix,
             Component: sliderField,
             ref: ref,
-        } }, void 0));
+        } }));
 }
 const _SliderBase = forwardRef(SliderBase);
 export { _SliderBase as SliderBase };

package/es/components/forms/Slider/SliderInput.js

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.0.0-canary-1be35be
+ * @cube-dev/ui-kit v0.0.0-canary-f2f75e5
  * Released under the MIT license.
  */
 
@@ -28,7 +28,7 @@ export function SliderInput(props) {
     const maxLength = typeof max !== 'undefined' ? String(max).length : undefined;
     return (_jsx(NumberInput, { insideForm: false, labelPosition: "top", ...otherProps, hideStepper: true, size: "small", wrapperStyles: {
             width: inputWidth,
-        }, textAlign: "center", formatOptions: formatOptions, value: value, minValue: state.getThumbMinValue(index), maxValue: state.getThumbMaxValue(index), maxLength: maxLength, onChange: onChange }, void 0));
+        }, textAlign: "center", formatOptions: formatOptions, value: value, minValue: state.getThumbMinValue(index), maxValue: state.getThumbMaxValue(index), maxLength: maxLength, onChange: onChange }));
 }
 
         

package/es/components/forms/Slider/SliderThumb.js

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.0.0-canary-1be35be
+ * @cube-dev/ui-kit v0.0.0-canary-f2f75e5
  * Released under the MIT license.
  */
 
@@ -26,7 +26,7 @@ export function SliderThumb(props) {
             dragged: isDragging,
             focused: !isDragging && isFocused,
             disabled: isDisabled,
-        }, ...mergeProps(thumbProps, hoverProps), role: "presentation", children: _jsx(VisuallyHidden, { children: _jsx("input", { ref: inputRef, ...inputProps }, void 0) }, void 0) }, void 0));
+        }, ...mergeProps(thumbProps, hoverProps), role: "presentation", children: _jsx(VisuallyHidden, { children: _jsx("input", { ref: inputRef, ...inputProps }) }) }));
 }
 
         

package/es/components/forms/Slider/SliderTrack.js

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.0.0-canary-1be35be
+ * @cube-dev/ui-kit v0.0.0-canary-f2f75e5
  * Released under the MIT license.
  */
 
@@ -14,7 +14,7 @@ export function SliderTrack(props) {
         disabled: isDisabled,
         horizontal: orientation === 'horizontal',
     }), [isDisabled]);
-    return _jsx(SliderTrackContainerElement, { mods: mods }, void 0);
+    return _jsx(SliderTrackContainerElement, { mods: mods });
 }
 
         

package/es/components/forms/Slider/elements.js

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

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

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

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

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

package/es/components/forms/Switch/Switch.js

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.0.0-canary-1be35be
+ * @cube-dev/ui-kit v0.0.0-canary-f2f75e5
  * Released under the MIT license.
  */
 
@@ -18,10 +18,10 @@ import { useFocus } from '../../../utils/react/interactions';
 import { mergeProps } from '../../../utils/react';
 import { HiddenInput } from '../../HiddenInput';
 import { INLINE_LABEL_STYLES, LABEL_STYLES } from '../Label';
-import { useFormProps } from '../Form/Form';
 import { Text } from '../../content/Text';
 import { FieldWrapper } from '../FieldWrapper';
 import { castNullableIsSelected, } from '../../../utils/react/nullableValue';
+import { useFieldProps } from '../Form';
 const SwitchWrapperElement = tasty({
     qa: 'SwitchWrapper',
     styles: {
@@ -96,10 +96,21 @@ const SwitchElement = tasty({
         },
     },
 });
-function Switch(props, ref) {
+/**
+ * Switches allow users to turn an individual option on or off.
+ * They are usually used to activate or deactivate a specific setting.
+ */
+export const Switch = forwardRef(function Switch(props, ref) {
     props = castNullableIsSelected(props);
     props = useProviderProps(props);
-    props = useFormProps(props);
+    props = useFieldProps(props, {
+        defaultValidationTrigger: 'onChange',
+        valuePropsMapper: ({ value, onChange }) => ({
+            isSelected: value != null ? value : false,
+            isIndeterminate: false,
+            onChange: onChange,
+        }),
+    });
     let { qa, isDisabled = false, autoFocus, children, label, extra, labelProps, labelStyles, isLoading, insideForm, validationState, message, description, labelPosition, inputStyles, requiredMark = true, tooltip, labelSuffix, ...otherProps } = props;
     let styles = extractStyles(props, OUTER_STYLES);
     inputStyles = extractStyles(props, BLOCK_STYLES, inputStyles);
@@ -121,7 +132,7 @@ function Switch(props, ref) {
         hovered: isHovered,
         focused: isFocused,
     };
-    const switchField = (_jsxs(SwitchWrapperElement, { mods: mods, children: [_jsx(HiddenInput, { "data-qa": "HiddenInput", ...mergeProps(inputProps, focusProps), ref: inputRef }, void 0), _jsx(SwitchElement, { qa: qa || 'Switch', mods: mods, styles: inputStyles, children: _jsx("div", { "data-element": "Thumb", "aria-hidden": "true" }, void 0) }, void 0), children ? _jsx(Text, { children: children }, void 0) : null] }, void 0));
+    const switchField = (_jsxs(SwitchWrapperElement, { mods: mods, children: [_jsx(HiddenInput, { "data-qa": "HiddenInput", ...mergeProps(inputProps, focusProps), ref: inputRef }), _jsx(SwitchElement, { qa: qa || 'Switch', mods: mods, styles: inputStyles, children: _jsx("div", { "data-element": "Thumb", "aria-hidden": "true" }) }), children ? _jsx(Text, { children: children }) : null] }));
     if (insideForm) {
         return (_jsx(FieldWrapper, { ...{
                 as: 'label',
@@ -141,18 +152,11 @@ function Switch(props, ref) {
                 labelSuffix,
                 Component: switchField,
                 ref: domRef,
-            } }, void 0));
+            } }));
     }
     return (_jsxs(SwitchLabelElement, { styles: styles, mods: mods, ...hoverProps, ...filterBaseProps(otherProps), ref: domRef, children: [switchField, label ? (_jsxs(Element, { styles: labelStyles, mods: {
                     disabled: isDisabled,
-                }, ...filterBaseProps(labelProps), children: [label, isLoading ? (_jsxs(_Fragment, { children: [label ? _jsx(_Fragment, { children: "\u00A0" }, void 0) : null, _jsx(LoadingOutlined, {}, void 0)] }, void 0)) : null] }, void 0)) : null] }, void 0));
-}
-/**
- * Switches allow users to turn an individual option on or off.
- * They are usually used to activate or deactivate a specific setting.
- */
-let _Switch = forwardRef(Switch);
-_Switch.cubeInputType = 'Checkbox';
-export { _Switch as Switch };
+                }, ...filterBaseProps(labelProps), children: [label, isLoading ? (_jsxs(_Fragment, { children: [label ? _jsx(_Fragment, { children: "\u00A0" }) : null, _jsx(LoadingOutlined, {})] })) : null] })) : null] }));
+});
 
         

package/es/components/forms/TextArea/TextArea.js

@@ -1,30 +1,43 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.0.0-canary-1be35be
+ * @cube-dev/ui-kit v0.0.0-canary-f2f75e5
  * Released under the MIT license.
  */
 
 import { jsx as _jsx } from "react/jsx-runtime";
-import { forwardRef, useCallback, useRef } from 'react';
+import { forwardRef, useRef } from 'react';
 import { useControlledState } from '@react-stately/utils';
 import { useTextField } from '@react-aria/textfield';
-import { TextInputBase, } from '../TextInput/TextInputBase';
+import { TextInputBase } from '../TextInput';
 import { useProviderProps } from '../../../provider';
 import { castNullableStringValue, } from '../../../utils/react/nullableValue';
 import { chain, useLayoutEffect } from '../../../utils/react';
-function TextArea(props, ref) {
+import { useFieldProps } from '../Form';
+import { useEvent } from '../../../_internal';
+/**
+ * TextInputs are text inputs that allow users to input custom text entries
+ * with a keyboard. Various decorations can be displayed around the field to
+ * communicate the entry requirements.
+ */
+export const TextArea = forwardRef(function TextArea(props, ref) {
     props = castNullableStringValue(props);
     props = useProviderProps(props);
-    let { autoSize = false, isDisabled = false, isReadOnly = false, isRequired = false, onChange, rows, ...otherProps } = props;
-    rows = rows || 3;
-    let [inputValue, setInputValue] = useControlledState(props.value, props.defaultValue, () => { });
-    let inputRef = useRef(null);
-    let onHeightChange = useCallback(() => {
+    props = useFieldProps(props, {
+        defaultValidationTrigger: 'onBlur',
+        valuePropsMapper: ({ value, onChange }) => ({
+            onChange,
+            value: value?.toString() ?? '',
+        }),
+    });
+    const { autoSize = false, isDisabled = false, isReadOnly = false, isRequired = false, onChange, rows = 3, ...otherProps } = props;
+    const [inputValue, setInputValue] = useControlledState(props.value, props.defaultValue, () => { });
+    const inputRef = useRef(null);
+    const onHeightChange = useEvent(() => {
         if (autoSize && inputRef.current) {
-            let input = inputRef.current;
-            let prevAlignment = input.style.alignSelf;
-            let computedStyle = getComputedStyle(input);
+            const input = inputRef.current;
+            const prevAlignment = input.style.alignSelf;
+            const computedStyle = getComputedStyle(input);
             input.style.alignSelf = 'start';
             input.style.height = 'auto';
             input.style.height = input.scrollHeight
@@ -35,26 +48,16 @@ function TextArea(props, ref) {
                     2}px`;
             input.style.alignSelf = prevAlignment;
         }
-    }, [inputRef]);
+    });
     useLayoutEffect(() => {
-        if (inputRef.current) {
-            onHeightChange();
-        }
-    }, [onHeightChange, inputValue, inputRef]);
-    let { labelProps, inputProps } = useTextField({
+        onHeightChange();
+    }, [onHeightChange, inputValue]);
+    const { labelProps, inputProps } = useTextField({
         ...props,
         onChange: chain(onChange, setInputValue),
         inputElementType: 'textarea',
     }, inputRef);
-    return (_jsx(TextInputBase, { ...otherProps, ref: ref, multiLine: true, inputRef: inputRef, labelProps: labelProps, inputProps: inputProps, isDisabled: isDisabled, isReadOnly: isReadOnly, isRequired: isRequired, rows: rows }, void 0));
-}
-/**
- * TextInputs are text inputs that allow users to input custom text entries
- * with a keyboard. Various decorations can be displayed around the field to
- * communicate the entry requirements.
- */
-const _TextArea = forwardRef(TextArea);
-_TextArea.cubeInputType = 'Text';
-export { _TextArea as TextArea };
+    return (_jsx(TextInputBase, { ...otherProps, ref: ref, multiLine: true, inputRef: inputRef, labelProps: labelProps, inputProps: inputProps, isDisabled: isDisabled, isReadOnly: isReadOnly, isRequired: isRequired, rows: rows }));
+});
 
         

package/es/components/forms/TextInput/TextInput.js

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.0.0-canary-1be35be
+ * @cube-dev/ui-kit v0.0.0-canary-f2f75e5
  * Released under the MIT license.
  */
 
@@ -10,19 +10,26 @@ import { forwardRef, useRef } from 'react';
 import { useTextField } from '@react-aria/textfield';
 import { useProviderProps } from '../../../provider';
 import { castNullableStringValue, } from '../../../utils/react/nullableValue';
+import { useFieldProps } from '../Form';
 import { TextInputBase } from './TextInputBase';
-export const TextInput = forwardRef(function TextInput(props, ref) {
-    castNullableStringValue(props);
-    props = useProviderProps(props);
-    let inputRef = useRef(null);
-    let { labelProps, inputProps } = useTextField(props, inputRef);
-    return (_jsx(TextInputBase, { ...props, ref: ref, labelProps: labelProps, inputProps: inputProps, inputRef: inputRef }, void 0));
-});
 /**
  * TextInputs are text inputs that allow users to input custom text entries
  * with a keyboard. Various decorations can be displayed around the field to
  * communicate the entry requirements.
  */
-TextInput.cubeInputType = 'Text';
+export const TextInput = forwardRef(function TextInput(props, ref) {
+    props = castNullableStringValue(props);
+    props = useProviderProps(props);
+    props = useFieldProps(props, {
+        defaultValidationTrigger: 'onBlur',
+        valuePropsMapper: ({ value, onChange }) => ({
+            onChange,
+            value: value?.toString() ?? '',
+        }),
+    });
+    const inputRef = useRef(null);
+    const { labelProps, inputProps } = useTextField(props, inputRef);
+    return (_jsx(TextInputBase, { ...props, ref: ref, labelProps: labelProps, inputProps: inputProps, inputRef: inputRef }));
+});
 
         

package/es/components/forms/TextInput/TextInputBase.js

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.0.0-canary-1be35be
+ * @cube-dev/ui-kit v0.0.0-canary-f2f75e5
  * Released under the MIT license.
  */
 
@@ -10,11 +10,9 @@ import { CheckOutlined, LoadingOutlined, WarningOutlined, } from '@ant-design/ic
 import { createFocusableRef } from '@react-spectrum/utils';
 import { cloneElement, forwardRef, useImperativeHandle, useMemo, useRef, } from 'react';
 import { useHover } from '@react-aria/interactions';
-import { useFormProps } from '../Form';
-import { useProviderProps } from '../../../provider';
 import { BLOCK_STYLES, DIMENSION_STYLES, extractStyles, POSITION_STYLES, tasty, } from '../../../tasty';
 import { useFocus } from '../../../utils/react/interactions';
-import { FieldWrapper } from '../FieldWrapper';
+import { extractFieldWrapperProps, FieldWrapper } from '../FieldWrapper';
 import { mergeProps } from '../../../utils/react';
 const ADD_STYLES = {
     display: 'grid',
@@ -129,12 +127,10 @@ export const DEFAULT_INPUT_STYLES = {
     },
 };
 const InputElement = tasty({ qa: 'Input', styles: DEFAULT_INPUT_STYLES });
-function TextInputBase(props, ref) {
-    props = useProviderProps(props);
-    props = useFormProps(props);
-    let { qa, label, extra, mods, labelPosition = 'top', labelStyles, isRequired, necessityIndicator, necessityLabel, validationState, message, description, prefix, isDisabled, multiLine, autoFocus, labelProps, inputProps, wrapperProps, inputRef, isLoading, loadingIndicator, value, inputStyles = {}, wrapperStyles = {}, suffix, suffixPosition = 'before', wrapperRef, requiredMark = true, tooltip, isHidden, rows = 1, size, icon, labelSuffix, maxLength, minLength, ...otherProps } = props;
-    let styles = extractStyles(otherProps, STYLE_LIST);
-    let type = otherProps.type;
+export const TextInputBase = forwardRef(function TextInputBase(props, ref) {
+    let { qa, mods, prefix, isDisabled, multiLine, autoFocus, inputProps, wrapperProps, inputRef, isLoading, loadingIndicator, value, inputStyles = {}, wrapperStyles = {}, suffix, suffixPosition = 'before', wrapperRef, rows = 1, size, validationState, icon, type, maxLength, minLength, ...otherProps } = props;
+    const { fieldWrapperProps, rest } = extractFieldWrapperProps(props);
+    const styles = extractStyles(rest, STYLE_LIST);
     inputStyles = extractStyles(otherProps, INPUT_STYLE_PROPS_LIST, inputStyles);
     let ElementType = multiLine ? 'textarea' : 'input';
     let { isFocused, focusProps } = useFocus({ isDisabled });
@@ -146,16 +142,14 @@ function TextInputBase(props, ref) {
     useImperativeHandle(ref, () => ({
         ...createFocusableRef(domRef, inputRef),
         select() {
-            if (inputRef?.current) {
-                inputRef.current.select();
-            }
+            inputRef?.current?.select();
         },
         getInputElement() {
             return inputRef?.current;
         },
     }));
     let isInvalid = validationState === 'invalid';
-    let validationIcon = isInvalid ? (_jsx(WarningOutlined, { "data-element": "ValidationIcon", style: { color: 'var(--danger-color)' } }, void 0)) : (_jsx(CheckOutlined, { "data-element": "ValidationIcon", style: { color: 'var(--success-color)' } }, void 0));
+    let validationIcon = isInvalid ? (_jsx(WarningOutlined, { "data-element": "ValidationIcon", style: { color: 'var(--danger-color)' } })) : (_jsx(CheckOutlined, { "data-element": "ValidationIcon", style: { color: 'var(--success-color)' } }));
     let validation = cloneElement(validationIcon);
     // Fix safari bug: https://github.com/philipwalton/flexbugs/issues/270
     if (!inputProps?.placeholder) {
@@ -165,9 +159,9 @@ function TextInputBase(props, ref) {
         inputProps.placeholder = ' ';
     }
     if (icon) {
-        icon = _jsx("div", { "data-element": "InputIcon", children: icon }, void 0);
+        icon = _jsx("div", { "data-element": "InputIcon", children: icon });
         if (prefix) {
-            prefix = (_jsxs(_Fragment, { children: [icon, prefix] }, void 0));
+            prefix = (_jsxs(_Fragment, { children: [icon, prefix] }));
         }
         else {
             prefix = icon;
@@ -203,30 +197,8 @@ function TextInputBase(props, ref) {
             WebkitTextSecurity: 'disc',
         }
         : {};
-    const textField = (_jsxs(InputWrapperElement, { ref: wrapperRef, qa: qa || 'TextInput', mods: modifiers, "data-size": size, styles: wrapperStyles, ...wrapperProps, children: [_jsx(InputElement, { as: ElementType, ...mergeProps(inputProps, focusProps, hoverProps), ref: inputRef, rows: multiLine ? rows : undefined, mods: modifiers, style: textSecurityStyles, autoFocus: autoFocus, "data-size": size, styles: inputStyles, isDisabled: isDisabled, maxLength: maxLength, minLength: minLength }, void 0), prefix ? _jsx("div", { "data-element": "Prefix", children: prefix }, void 0) : null, (validationState && !isLoading) || isLoading || suffix ? (_jsxs("div", { "data-element": "Suffix", children: [suffixPosition === 'before' ? suffix : null, (validationState && !isLoading) || isLoading ? (_jsxs("div", { "data-element": "State", children: [validationState && !isLoading ? validation : null, isLoading && _jsx(LoadingOutlined, { "data-element": "InputIcon" }, void 0)] }, void 0)) : null, suffixPosition === 'after' ? suffix : null] }, void 0)) : null] }, void 0));
-    return (_jsx(FieldWrapper, { ...{
-            labelPosition,
-            label,
-            extra,
-            styles,
-            isRequired,
-            labelStyles,
-            necessityIndicator,
-            necessityLabel,
-            labelProps,
-            isDisabled,
-            validationState,
-            message,
-            description,
-            requiredMark,
-            tooltip,
-            isHidden,
-            labelSuffix,
-            Component: textField,
-            ref: domRef,
-        } }, void 0));
-}
-const _TextInputBase = forwardRef(TextInputBase);
-export { _TextInputBase as TextInputBase };
+    const textField = (_jsxs(InputWrapperElement, { ref: wrapperRef, qa: qa || 'TextInput', mods: modifiers, "data-size": size, styles: wrapperStyles, ...wrapperProps, children: [_jsx(InputElement, { as: ElementType, ...mergeProps(inputProps, focusProps, hoverProps), ref: inputRef, rows: multiLine ? rows : undefined, mods: modifiers, style: textSecurityStyles, autoFocus: autoFocus, "data-size": size, styles: inputStyles, isDisabled: isDisabled, maxLength: maxLength, minLength: minLength }), prefix ? _jsx("div", { "data-element": "Prefix", children: prefix }) : null, (validationState && !isLoading) || isLoading || suffix ? (_jsxs("div", { "data-element": "Suffix", children: [suffixPosition === 'before' ? suffix : null, (validationState && !isLoading) || isLoading ? (_jsxs("div", { "data-element": "State", children: [validationState && !isLoading ? validation : null, isLoading && _jsx(LoadingOutlined, { "data-element": "InputIcon" })] })) : null, suffixPosition === 'after' ? suffix : null] })) : null] }));
+    return (_jsx(FieldWrapper, { ...fieldWrapperProps, ref: domRef, styles: styles, isDisabled: isDisabled, Component: textField }));
+});
 
         

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

@@ -0,0 +1,11 @@
+/**
+ * @license MIT
+ * author: Cube Dev Team
+ * @cube-dev/ui-kit v0.0.0-canary-f2f75e5
+ * Released under the MIT license.
+ */
+
+export * from './TextInput';
+export * from './TextInputBase';
+
+        

package/es/components/forms/index.js

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