@cube-dev/ui-kit 0.12.2 → 0.12.3

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

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.12.2
+ * @cube-dev/ui-kit v0.12.3
  * Released under the MIT license.
  */
 
@@ -39,7 +39,7 @@ function getDefaultValidateTrigger(type) {
     type = type || '';
     return type === 'Number' || type.includes('Text') ? 'onBlur' : 'onChange';
 }
-function getValueProps(type, value, onChange) {
+function getValueProps(type, value, onChange, allowsCustomValue) {
     type = type || '';
     if (type === 'Number') {
         return {
@@ -71,7 +71,8 @@ function getValueProps(type, value, onChange) {
     else if (type === 'ComboBox') {
         return {
             inputValue: value != null ? value : '',
-            onInputChange: onChange,
+            onInputChange: (val) => onChange(val, !allowsCustomValue),
+            onSelectionChange: onChange,
         };
     }
     else if (type === 'Select') {
@@ -151,6 +152,7 @@ function Field(allProps) {
     if (!field) {
         return (0, react_1.cloneElement)(child, (0, react_2.mergeProps)(child.props, {
             ...getValueProps(inputType),
+            label: fieldName,
             name: fieldName,
             id: fieldId,
         }));
@@ -158,7 +160,7 @@ function Field(allProps) {
     if (!validateTrigger) {
         validateTrigger = defaultValidateTrigger;
     }
-    function onChangeHandler(val) {
+    function onChangeHandler(val, dontTouch) {
         const field = form.getFieldInstance(fieldName);
         if (shouldUpdate) {
             const fieldsValue = form.getFieldsValue();
@@ -173,9 +175,10 @@ function Field(allProps) {
                 return;
             }
         }
-        form.setFieldValue(fieldName, val, true);
-        if (validateTrigger === 'onChange' ||
-            (field && field.errors && field.errors.length)) {
+        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
         }
     }
@@ -232,7 +235,7 @@ function Field(allProps) {
             newProps.message = field.errors[0];
         }
     }
-    Object.assign(newProps, getValueProps(inputType, field === null || field === void 0 ? void 0 : field.value, onChangeHandler));
+    Object.assign(newProps, getValueProps(inputType, field === null || field === void 0 ? void 0 : field.inputValue, onChangeHandler, child.props.allowsCustomValue));
     const { onChange, onSelectionChange, ...childProps } = child.props;
     // onChange event passed to the child should be executed after Form onChange logic
     return (0, react_1.cloneElement)(child, (0, react_2.mergeProps)(childProps, newProps, onChange ? { onChange } : {}, onSelectionChange ? { onSelectionChange } : {}));

package/cjs/components/forms/Form/Form.js

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

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

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

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

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

package/cjs/components/forms/Form/useForm.js

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.12.2
+ * @cube-dev/ui-kit v0.12.3
  * Released under the MIT license.
  */
 
@@ -34,7 +34,7 @@ class CubeFormInstance {
         this.isSubmitting = false;
         this.onValuesChange = () => { };
         this.onSubmit = () => { };
-        this.setFieldsValue = (newData, touched, skipRender, createFields = false) => {
+        this.setFieldsValue = (newData, touched, skipRender, createFields = false, inputOnly = false) => {
             let flag = false;
             Object.keys(newData).forEach((name) => {
                 let field = this.fields[name];
@@ -49,7 +49,10 @@ class CubeFormInstance {
                     return;
                 }
                 flag = true;
-                field.value = newData[name];
+                if (!inputOnly) {
+                    field.value = newData[name];
+                }
+                field.inputValue = newData[name];
                 if (touched === true) {
                     field.touched = touched;
                 }
@@ -60,7 +63,7 @@ class CubeFormInstance {
             });
             if (flag && !skipRender) {
                 this.forceReRender();
-                if (touched) {
+                if (touched && !inputOnly) {
                     this.onValuesChange && this.onValuesChange(this.getFormData());
                 }
             }
@@ -108,12 +111,15 @@ class CubeFormInstance {
             return map;
         }, {});
     }
-    setFieldValue(name, value, touched = false, skipRender = false) {
+    setFieldValue(name, value, touched = false, skipRender = false, inputOnly = false) {
         const field = this.fields[name];
         if (!field || isEqual(value, field.value)) {
             return;
         }
-        field.value = value;
+        if (!inputOnly) {
+            field.value = value;
+        }
+        field.inputValue = value;
         if (touched) {
             field.touched = touched;
         }
@@ -121,7 +127,7 @@ class CubeFormInstance {
             field.errors = [];
             this.forceReRender();
         }
-        if (touched) {
+        if (touched && !inputOnly) {
             this.onValuesChange && this.onValuesChange(this.getFormData());
         }
     }
@@ -238,13 +244,18 @@ class CubeFormInstance {
         this.forceReRender();
     }
     _createField(name, data) {
-        return {
+        let obj = {
             name,
             validating: false,
             touched: false,
             errors: [],
             ...data,
         };
+        if (obj) {
+            // condition is here to avoid typing issues
+            obj.inputValue = obj.value;
+        }
+        return obj;
     }
 }
 exports.CubeFormInstance = CubeFormInstance;

package/cjs/components/forms/Form/validation.js

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

package/cjs/components/forms/Input/Input.js

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

package/cjs/components/forms/Input/index.js

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

package/cjs/components/forms/Label.js

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.12.2
+ * @cube-dev/ui-kit v0.12.3
  * Released under the MIT license.
  */
 
@@ -30,7 +30,6 @@ exports.INLINE_LABEL_STYLES = {
     color: {
         '': '#dark.85',
         invalid: '#danger-text',
-        disabled: '#dark.30',
     },
     whiteSpace: 'nowrap',
 };
@@ -41,7 +40,6 @@ exports.LABEL_STYLES = {
     color: {
         '': '#dark',
         invalid: '#danger-text',
-        disabled: '#dark.30',
     },
     whiteSpace: 'nowrap',
     width: {

package/cjs/components/forms/NumberInput/NumberInput.js

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

package/cjs/components/forms/NumberInput/StepButton.js

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.12.2
+ * @cube-dev/ui-kit v0.12.3
  * Released under the MIT license.
  */
 
@@ -12,7 +12,7 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const actions_1 = require("../../actions");
 const icons_1 = require("@ant-design/icons");
 const STEP_BUTTON_STYLES = {
-    padding: '0 .5x',
+    width: '4x',
     radius: {
         '': '0 (1r - 1bw) 0 0',
         down: '0 0 (1r - 1bw) 0',

package/cjs/components/forms/PasswordInput/PasswordInput.js

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.12.2
+ * @cube-dev/ui-kit v0.12.3
  * Released under the MIT license.
  */
 
@@ -28,7 +28,7 @@ function PasswordInput(props, ref) {
     const toggleType = (0, react_1.useCallback)((e) => {
         setType((type) => (type === 'password' ? 'text' : 'password'));
     }, []);
-    const wrappedSuffix = ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [suffix, (0, jsx_runtime_1.jsx)(actions_1.Button, { type: "neutral", htmlType: "button", onPress: toggleType, placeSelf: "stretch", height: "auto", radius: "right (1r - 1bw)", padding: ".5x 1x", width: "auto", label: "Toggle masking", excludeFromTabOrder: true, icon: type === 'password' ? (0, jsx_runtime_1.jsx)(icons_1.EyeInvisibleOutlined, {}, void 0) : (0, jsx_runtime_1.jsx)(icons_1.EyeOutlined, {}, void 0) }, void 0)] }, void 0));
+    const wrappedSuffix = ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [suffix, (0, jsx_runtime_1.jsx)(actions_1.Button, { type: "neutral", htmlType: "button", onPress: toggleType, placeSelf: "stretch", height: "auto", radius: "right", width: "4x", label: "Toggle masking", excludeFromTabOrder: true, icon: type === 'password' ? (0, jsx_runtime_1.jsx)(icons_1.EyeInvisibleOutlined, {}, void 0) : (0, jsx_runtime_1.jsx)(icons_1.EyeOutlined, {}, void 0) }, void 0)] }, void 0));
     return ((0, jsx_runtime_1.jsx)(TextInputBase_1.TextInputBase, { labelProps: labelProps, inputProps: inputProps, ref: ref, inputRef: inputRef, inputStyles: { paddingRight: '4x' }, type: type, suffixPosition: "after", suffix: wrappedSuffix, multiLine: multiLine, ...otherProps }, void 0));
 }
 /**

package/cjs/components/forms/RadioGroup/Radio.js

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

package/cjs/components/forms/RadioGroup/RadioGroup.js

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

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

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

package/cjs/components/forms/SearchInput/SearchInput.js

@@ -1,7 +1,7 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.12.2
+ * @cube-dev/ui-kit v0.12.3
  * Released under the MIT license.
  */
 
@@ -19,10 +19,20 @@ const provider_1 = require("../../../provider");
 const actions_1 = require("../../actions");
 const mapProps_1 = require("../../../utils/react/mapProps");
 const nullableValue_1 = require("../../../utils/react/nullableValue");
+const tasty_1 = require("../../../tasty");
+const ClearButton = (0, tasty_1.tasty)(actions_1.Button, {
+    icon: (0, jsx_runtime_1.jsx)(icons_1.CloseOutlined, {}, void 0),
+    styles: {
+        radius: 'right (1r - 1bw)',
+        width: '4x',
+        height: 'auto',
+        placeSelf: 'stretch',
+    },
+});
 exports.SearchInput = (0, react_1.forwardRef)((props, ref) => {
     props = (0, nullableValue_1.castNullableStringValue)(props);
     props = (0, provider_1.useProviderProps)(props);
-    let { isClearable, value } = props;
+    let { isClearable, value, validationState } = props;
     const localRef = (0, react_1.useRef)(null);
     const combinedRef = (0, react_2.useCombinedRefs)(ref, localRef);
     let inputRef = (0, react_1.useRef)(null);
@@ -34,12 +44,9 @@ exports.SearchInput = (0, react_1.forwardRef)((props, ref) => {
     }, [combinedRef, value]);
     let state = (0, searchfield_1.useSearchFieldState)(props);
     let { inputProps, clearButtonProps } = (0, searchfield_2.useSearchField)(props, state, inputRef);
-    return ((0, jsx_runtime_1.jsx)(TextInputBase_1.TextInputBase, { inputProps: inputProps, ref: ref, inputRef: inputRef, type: "search", prefix: (0, jsx_runtime_1.jsx)(icons_1.SearchOutlined, {}, void 0), suffixPosition: "after", suffix: isClearable &&
+    return ((0, jsx_runtime_1.jsx)(TextInputBase_1.TextInputBase, { inputProps: inputProps, ref: ref, inputRef: inputRef, type: "search", icon: (0, jsx_runtime_1.jsx)(icons_1.SearchOutlined, {}, void 0), suffixPosition: "after", suffix: isClearable &&
             state.value !== '' &&
-            !props.isReadOnly && ((0, jsx_runtime_1.jsx)(actions_1.Button, { type: "clear", ...(0, mapProps_1.ariaToCubeButtonProps)(clearButtonProps), color: {
-                '': '#dark.50',
-                'hovered | pressed': '#purple-text',
-            }, radius: "right (1r - 1bw)", padding: ".5x 1x", placeSelf: "stretch", icon: (0, jsx_runtime_1.jsx)(icons_1.CloseOutlined, {}, void 0) }, void 0)), ...props }, void 0));
+            !props.isReadOnly && ((0, jsx_runtime_1.jsx)(ClearButton, { type: validationState === 'invalid' ? 'clear' : 'neutral', theme: validationState === 'invalid' ? 'danger' : undefined, ...(0, mapProps_1.ariaToCubeButtonProps)(clearButtonProps) }, void 0)), ...props }, void 0));
 });
 
         

package/cjs/components/forms/Switch/Switch.js

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

package/cjs/components/forms/TextArea/TextArea.js

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

package/cjs/components/forms/TextInput/TextInput.js

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

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

@@ -1,13 +1,13 @@
 /**
  * @license MIT
  * author: Cube Dev Team
- * @cube-dev/ui-kit v0.12.2
+ * @cube-dev/ui-kit v0.12.3
  * Released under the MIT license.
  */
 
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TextInputBase = exports.DEFAULT_INPUT_STYLES = void 0;
+exports.TextInputBase = exports.DEFAULT_INPUT_STYLES = exports.INPUT_WRAPPER_STYLES = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const icons_1 = require("@ant-design/icons");
 const utils_1 = require("@react-spectrum/utils");
@@ -17,39 +17,26 @@ const interactions_1 = require("@react-aria/interactions");
 const provider_1 = require("../../../provider");
 const tasty_1 = require("../../../tasty");
 const interactions_2 = require("../../../utils/react/interactions");
-const Prefix_1 = require("../../layout/Prefix");
-const Suffix_1 = require("../../layout/Suffix");
 const FieldWrapper_1 = require("../FieldWrapper");
-const Space_1 = require("../../layout/Space");
-const Block_1 = require("../../Block");
 const react_2 = require("../../../utils/react");
-const InputWrapperElement = (0, tasty_1.tasty)({
-    styles: {
-        display: 'grid',
-        position: 'relative',
-        Prefix: {
-            padding: {
-                '': '0 1x 0 1.5x',
-                'text-prefix': '0 1x 0 2.5x',
-            },
-        },
-        Suffix: {
-            padding: '.5x left',
-        },
-    },
-});
-const STYLE_LIST = [...tasty_1.POSITION_STYLES, ...tasty_1.DIMENSION_STYLES];
-const INPUT_STYLE_PROPS_LIST = [...tasty_1.BLOCK_STYLES, 'resize'];
-exports.DEFAULT_INPUT_STYLES = {
-    display: 'block',
-    width: 'initial 100% initial',
-    height: 'initial initial initial',
-    color: {
-        '': '#dark.85',
-        invalid: '#danger-text',
-        focused: '#dark.85',
-        disabled: '#dark.30',
+const ADD_STYLES = {
+    display: 'grid',
+    placeContent: 'stretch',
+    placeItems: 'center',
+    flow: 'column',
+    gap: 0,
+    cursor: 'inherit',
+    opacity: {
+        '': 1,
+        disabled: '@disabled-opacity',
     },
+};
+exports.INPUT_WRAPPER_STYLES = {
+    display: 'grid',
+    position: 'relative',
+    gridAreas: '"prefix input suffix"',
+    gridColumns: 'auto 1fr auto',
+    placeItems: 'stretch',
     fill: {
         '': '#white',
         disabled: '#dark.04',
@@ -67,12 +54,70 @@ exports.DEFAULT_INPUT_STYLES = {
         'invalid & focused': '#danger.50',
         'valid & focused': '#success.50',
     },
-    transition: 'theme',
     radius: true,
-    padding: {
-        '': '(1.25x - 1bw) 1x (1.25x - 1bw) (1.5x - 1bw)',
-        '[data-size="small"]': '(.75x - 1px) (1.5x - 1px)',
+    cursor: 'text',
+    color: {
+        '': '#dark.85',
+        focused: '#dark.85',
+        invalid: '#danger-text',
+        disabled: '#dark.30',
+    },
+    zIndex: {
+        '': 'initial',
+        focused: 1,
+    },
+    boxSizing: 'border-box',
+    Prefix: {
+        ...ADD_STYLES,
+        gridArea: 'prefix',
+    },
+    Suffix: {
+        ...ADD_STYLES,
+        gridArea: 'suffix',
+    },
+    State: {
+        display: 'flex',
     },
+    InputIcon: {
+        display: 'grid',
+        placeItems: 'center',
+        width: 'min 4x',
+        color: 'inherit',
+        fontSize: {
+            '': 'initial',
+            '[data-size="small"]': '14px',
+            '[data-size="medium"]': '16px',
+        },
+    },
+    ValidationIcon: {
+        display: 'grid',
+        placeItems: 'center',
+        width: {
+            '': 'min 4x',
+            suffix: 'min 3x',
+        },
+        fontSize: {
+            '': 'initial',
+            '[data-size="small"]': '14px',
+            '[data-size="medium"]': '16px',
+        },
+    },
+};
+const InputWrapperElement = (0, tasty_1.tasty)({
+    styles: exports.INPUT_WRAPPER_STYLES,
+});
+const STYLE_LIST = [...tasty_1.POSITION_STYLES, ...tasty_1.DIMENSION_STYLES];
+const INPUT_STYLE_PROPS_LIST = [...tasty_1.BLOCK_STYLES, 'resize'];
+exports.DEFAULT_INPUT_STYLES = {
+    display: 'block',
+    width: 'initial 100% initial',
+    height: 'initial initial initial',
+    color: 'inherit',
+    fill: '#clear',
+    border: 0,
+    transition: 'theme',
+    radius: true,
+    padding: '@vertical-padding @right-padding @vertical-padding @left-padding',
     fontWeight: 400,
     textAlign: 'left',
     reset: 'input',
@@ -80,26 +125,33 @@ exports.DEFAULT_INPUT_STYLES = {
     flexGrow: 1,
     margin: 0,
     resize: 'none',
+    '@vertical-padding': {
+        '': '(1.25x - 1bw)',
+        '[data-size="small"]': '(.75x - 1bw)',
+    },
+    '@left-padding': {
+        '': '(1.5x - 1bw)',
+        prefix: '0',
+    },
+    '@right-padding': {
+        '': '(1.5x - 1bw)',
+        suffix: '0',
+    },
 };
 const InputElement = (0, tasty_1.tasty)({
     qa: 'Input',
-    styles: exports.DEFAULT_INPUT_STYLES,
+    styles: {
+        ...exports.DEFAULT_INPUT_STYLES,
+        gridArea: 'input',
+    },
 });
 function TextInputBase(props, ref) {
     props = (0, provider_1.useProviderProps)(props);
     props = (0, Form_1.useFormProps)(props);
-    let { qa, label, extra, 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, labelSuffix, ...otherProps } = props;
-    let [suffixWidth, setSuffixWidth] = (0, react_1.useState)(0);
-    let [prefixWidth, setPrefixWidth] = (0, react_1.useState)(0);
+    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, ...otherProps } = props;
     let styles = (0, tasty_1.extractStyles)(otherProps, STYLE_LIST);
     let type = otherProps.type;
     inputStyles = (0, tasty_1.extractStyles)(otherProps, INPUT_STYLE_PROPS_LIST, inputStyles);
-    if (prefix) {
-        inputStyles.paddingLeft = `${prefixWidth}px`;
-    }
-    if (validationState || isLoading || suffix) {
-        inputStyles.paddingRight = `${suffixWidth}px`;
-    }
     let ElementType = multiLine ? 'textarea' : 'input';
     let { isFocused, focusProps } = (0, interactions_2.useFocus)({ isDisabled });
     let { hoverProps, isHovered } = (0, interactions_1.useHover)({ isDisabled });
@@ -119,10 +171,8 @@ function TextInputBase(props, ref) {
         },
     }));
     let isInvalid = validationState === 'invalid';
-    let validationIcon = isInvalid ? ((0, jsx_runtime_1.jsx)(icons_1.WarningOutlined, { style: { color: 'var(--danger-color)' } }, void 0)) : ((0, jsx_runtime_1.jsx)(icons_1.CheckOutlined, { style: { color: 'var(--success-color)' } }, void 0));
+    let validationIcon = isInvalid ? ((0, jsx_runtime_1.jsx)(icons_1.WarningOutlined, { "data-element": "ValidationIcon", style: { color: 'var(--danger-color)' } }, void 0)) : ((0, jsx_runtime_1.jsx)(icons_1.CheckOutlined, { "data-element": "ValidationIcon", style: { color: 'var(--success-color)' } }, void 0));
     let validation = (0, react_1.cloneElement)(validationIcon);
-    suffix =
-        typeof suffix === 'string' ? ((0, jsx_runtime_1.jsx)(Block_1.Block, { padding: "1x right", children: suffix }, void 0)) : (suffix);
     // Fix safari bug: https://github.com/philipwalton/flexbugs/issues/270
     if (!(inputProps === null || inputProps === void 0 ? void 0 : inputProps.placeholder)) {
         if (!inputProps) {
@@ -130,21 +180,41 @@ function TextInputBase(props, ref) {
         }
         inputProps.placeholder = ' ';
     }
-    let textField = ((0, jsx_runtime_1.jsxs)(InputWrapperElement, { ref: wrapperRef, qa: qa || 'TextInput', mods: {
-            invalid: isInvalid,
-            valid: validationState === 'valid',
-            loadable: !!loadingIndicator,
-            multiline: multiLine,
-            'text-prefix': prefix === 'string',
-        }, "data-size": size, styles: wrapperStyles, ...wrapperProps, children: [(0, jsx_runtime_1.jsx)(InputElement, { as: ElementType, ...(0, react_2.mergeProps)(inputProps, focusProps, hoverProps), ref: inputRef, rows: multiLine ? rows : undefined, mods: {
-                    invalid: isInvalid,
-                    valid: validationState === 'valid',
-                    disabled: isDisabled,
-                    hovered: isHovered,
-                    focused: isFocused,
-                }, style: {
+    if (icon) {
+        icon = (0, jsx_runtime_1.jsx)("div", { "data-element": "InputIcon", children: icon }, void 0);
+        if (prefix) {
+            prefix = ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [icon, prefix] }, void 0));
+        }
+        else {
+            prefix = icon;
+        }
+    }
+    const modifiers = (0, react_1.useMemo)(() => ({
+        invalid: isInvalid,
+        valid: validationState === 'valid',
+        loadable: !!loadingIndicator,
+        focused: isFocused,
+        hovered: isHovered,
+        disabled: isDisabled,
+        multiline: multiLine,
+        prefix: !!prefix,
+        suffix: !!suffix,
+        ...mods,
+    }), [
+        mods,
+        isInvalid,
+        validationState,
+        loadingIndicator,
+        isFocused,
+        isDisabled,
+        isHovered,
+        multiLine,
+        prefix,
+        suffix,
+    ]);
+    let textField = ((0, jsx_runtime_1.jsxs)(InputWrapperElement, { ref: wrapperRef, qa: qa || 'TextInput', mods: modifiers, "data-size": size, styles: wrapperStyles, ...wrapperProps, children: [(0, jsx_runtime_1.jsx)(InputElement, { as: ElementType, ...(0, react_2.mergeProps)(inputProps, focusProps, hoverProps), ref: inputRef, rows: multiLine ? rows : undefined, mods: modifiers, style: {
                     WebkitTextSecurity: multiLine && type === 'password' ? 'disc' : 'initial',
-                }, autoFocus: autoFocus, "data-size": size, styles: inputStyles, isDisabled: isDisabled }, void 0), (0, jsx_runtime_1.jsx)(Prefix_1.Prefix, { onWidthChange: setPrefixWidth, opacity: isDisabled ? '@disabled-opacity' : false, placeItems: "center", children: prefix }, void 0), (0, jsx_runtime_1.jsxs)(Suffix_1.Suffix, { onWidthChange: setSuffixWidth, opacity: isDisabled ? '@disabled-opacity' : false, children: [suffixPosition === 'before' ? suffix : null, (validationState && !isLoading) || isLoading ? ((0, jsx_runtime_1.jsxs)(Space_1.Space, { gap: false, padding: `0 ${suffix ? '1x' : '1.5x'} 0 0`, children: [validationState && !isLoading ? validation : null, isLoading && (0, jsx_runtime_1.jsx)(icons_1.LoadingOutlined, {}, void 0)] }, void 0)) : null, suffixPosition === 'after' ? suffix : null] }, void 0)] }, void 0));
+                }, autoFocus: autoFocus, "data-size": size, styles: inputStyles, isDisabled: isDisabled }, void 0), prefix ? (0, jsx_runtime_1.jsx)("div", { "data-element": "Prefix", children: prefix }, void 0) : null, (0, jsx_runtime_1.jsxs)("div", { "data-element": "Suffix", children: [suffixPosition === 'before' ? suffix : null, (validationState && !isLoading) || isLoading ? ((0, jsx_runtime_1.jsxs)("div", { "data-element": "State", children: [validationState && !isLoading ? validation : null, isLoading && (0, jsx_runtime_1.jsx)(icons_1.LoadingOutlined, { "data-element": "InputIcon" }, void 0)] }, void 0)) : null, suffixPosition === 'after' ? suffix : null] }, void 0)] }, void 0));
     return ((0, jsx_runtime_1.jsx)(FieldWrapper_1.FieldWrapper, { ...{
             labelPosition,
             label,

package/cjs/components/forms/index.js

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