@antify/ui-module 1.6.0 → 1.7.2

package/{src/runtime/components/form → dist/runtime/components/inputs}/AntTagInput.vue

@@ -1,23 +1,20 @@
 <script setup lang="ts">
-
-import { AntField } from './Elements';
-import type { SelectOption } from './__types';
-import { Grouped, InputColorType, Size } from '../../enums';
-import type { FieldValidator } from '@antify/validate';
-import { useVModel } from '@vueuse/core';
-import {
-  faChevronRight,
-  type IconDefinition
-} from '@fortawesome/free-solid-svg-icons';
-import { computed, type Ref, ref } from 'vue';
+import {AntField} from './Elements';
+import type {SelectOption} from './__types';
+import {Grouped, InputState, Size} from '../../enums';
+import {useVModel} from '@vueuse/core';
+import {faChevronRight, type IconDefinition} from '@fortawesome/free-solid-svg-icons';
+import {computed, onMounted, type Ref, ref, watch} from 'vue';
 import AntTag from '../AntTag.vue';
 import AntIcon from '../AntIcon.vue';
-import { IconSize } from '../__types';
+import {AntTagSize, IconSize} from '../__types';
 import AntDropDown from './Elements/AntDropDown.vue';
 import AntSkeleton from '../AntSkeleton.vue';
-import { vOnClickOutside } from '@vueuse/components'
+import {vOnClickOutside} from '@vueuse/components';
+import {AntTagInputSize} from './__types/AntTagInput.types';
+import type {TagState} from '../__types/AntTag.types';
 
-const emit = defineEmits([ 'update:modelValue' ]);
+const emit = defineEmits(['update:modelValue', 'blur', 'validate']);
 const props = withDefaults(
   defineProps<{
     modelValue: (string | number)[] | null;
@@ -25,68 +22,61 @@ const props = withDefaults(
     label?: string;
     description?: string;
     placeholder?: string;
-    size?: Size;
-    colorType?: InputColorType;
+    size?: AntTagInputSize;
+    state?: InputState;
     disabled?: boolean;
     skeleton?: boolean;
-    validator?: FieldValidator;
     name?: string;
     expanded?: boolean;
     icon?: IconDefinition;
     grouped?: Grouped;
     nullable?: boolean;
-
+    messages?: string[];
     allowCreate?: boolean;
     allowDuplicates?: boolean;
     openOnFocus?: boolean;
     autoCloseAfterSelection?: boolean;
-
     createCallback?: (item: string) => Promise<SelectOption>;
   }>(), {
-    size: Size.md,
-    colorType: InputColorType.base,
+    size: AntTagInputSize.md,
+    state: InputState.base,
     icon: () => faChevronRight,
+    messages: () => [],
     grouped: Grouped.none,
-
     allowCreate: false,
     allowDuplicates: false,
     openOnFocus: true,
     autoCloseAfterSelection: false,
-
     placeholder: 'Add new tag'
   }
 );
 
 const _modelValue: Ref<(string | number)[] | null> = useVModel(props, 'modelValue', emit);
 const _skeleton = useVModel(props, 'skeleton', emit);
-
 const dropDownOpen = ref(false);
 const focusedDropDownItem: Ref<string | number | null> = ref(null);
 const tagInput = ref('');
 const filteredOptions = ref(props.options);
-
 const inputRef: Ref<HTMLElement | null> = ref(null);
-
-const _colorType = computed(() => props.validator?.hasErrors() ? InputColorType.danger : props.colorType);
-
 const inputContainerClasses = computed(() => {
-  const variants: Record<InputColorType, string> = {
-    [InputColorType.base]: 'outline-neutral-300 focus-within:outline-primary-500 focus-within:ring-primary-200 bg-white',
-    [InputColorType.danger]: 'outline-danger-500 focus-within:outline-danger-500 focus-within:ring-danger-200 bg-danger-100',
-    [InputColorType.info]: 'outline-info-500 focus-within:outline-info-500 focus-within:ring-info-200 bg-info-100',
-    [InputColorType.success]: 'outline-success-500 focus-within:outline-success-500 focus-within:ring-success-200 bg-success-100',
-    [InputColorType.warning]: 'outline-warning-500 focus-within:outline-warning-500 focus-within:ring-warning-200 bg-warning-100',
+  const variants: Record<InputState, string> = {
+    [InputState.base]: 'outline-neutral-300 focus-within:outline-primary-500 focus-within:ring-primary-200 bg-white',
+    [InputState.danger]: 'outline-danger-500 focus-within:outline-danger-500 focus-within:ring-danger-200 bg-danger-100',
+    [InputState.info]: 'outline-info-500 focus-within:outline-info-500 focus-within:ring-info-200 bg-info-100',
+    [InputState.success]: 'outline-success-500 focus-within:outline-success-500 focus-within:ring-success-200 bg-success-100',
+    [InputState.warning]: 'outline-warning-500 focus-within:outline-warning-500 focus-within:ring-warning-200 bg-warning-100',
   };
 
   return {
-    'flex gap-1 items-center flex-wrap': true,
+    'flex items-center flex-wrap': true,
     'transition-colors relative border-none outline w-full focus-within:z-10': true,
     'outline-offset-[-1px] outline-1 focus-within:outline-offset-[-1px] focus-within:outline-1': true,
     'opacity-50 cursor-not-allowed': props.disabled,
-    [variants[_colorType.value]]: true,
+    [variants[props.state]]: true,
     // Size
-    'focus-within:ring-2 px-1.5 py-1.5 text-xs': props.size === Size.sm,
-    'focus-within:ring-4 px-2.5 py-1.5 text-sm': props.size === Size.md,
+    'focus-within:ring-2 p-1.5 text-sm': props.size === AntTagInputSize.sm,
+    'focus-within:ring-4 p-2 text-sm': props.size === AntTagInputSize.md,
+    'focus-within:ring-4 p-2.5 text-sm': props.size === AntTagInputSize.lg,
     // Grouping
     'rounded-tl-md rounded-bl-md rounded-tr-none rounded-br-none': props.grouped === Grouped.left,
     'rounded-none': props.grouped === Grouped.center,
@@ -96,23 +86,21 @@ const inputContainerClasses = computed(() => {
     'invisible': props.skeleton,
   };
 });
-
 const inputClasses = computed(() => {
-  const variants: Record<InputColorType, string> = {
-    [InputColorType.base]: 'placeholder:text-neutral-500',
-    [InputColorType.danger]: 'placeholder:text-danger-700',
-    [InputColorType.info]: 'placeholder:text-info-700',
-    [InputColorType.success]: 'placeholder:text-success-700',
-    [InputColorType.warning]: 'placeholder:text-warning-700',
+  const variants: Record<InputState, string> = {
+    [InputState.base]: 'placeholder:text-neutral-500',
+    [InputState.danger]: 'placeholder:text-danger-700',
+    [InputState.info]: 'placeholder:text-info-700',
+    [InputState.success]: 'placeholder:text-success-700',
+    [InputState.warning]: 'placeholder:text-warning-700',
   };
 
   return {
-    'outline-0 border:none ring:none bg-transparent w-full py-1': true,
+    'outline-0 border:none ring:none bg-transparent w-full': true,
     'opacity-50 cursor-not-allowed': props.disabled,
-    [variants[_colorType.value]]: true,
-  }
+    [variants[props.state]]: true,
+  };
 });
-
 const skeletonGrouped = computed(() => {
   if (!props.nullable || (props.nullable && _modelValue.value === null)) {
     return props.grouped;
@@ -166,11 +154,15 @@ function addTagFromOptions(item: string | number) {
 function addTag(tagValue: string | number): void {
   _modelValue.value = _modelValue.value || [];
 
-  if (!props.allowDuplicates && _modelValue.value.includes(tagValue) || !tagValue) {
+  if (!props.allowDuplicates && _modelValue.value?.includes(tagValue) || !tagValue) {
     return;
   }
 
-  _modelValue.value.push(tagValue);
+  if (Array.isArray(_modelValue.value)) {
+    _modelValue.value.push(tagValue);
+  } else {
+    _modelValue.value = [tagValue];
+  }
 
   tagInput.value = '';
 
@@ -178,7 +170,7 @@ function addTag(tagValue: string | number): void {
 }
 
 function removeLastTag() {
-  if (tagInput.value === '' && _modelValue.value && _modelValue.value.length > 0) {
+  if (tagInput.value === '' && Array.isArray(_modelValue.value) && _modelValue.value.length > 0) {
     _modelValue.value.splice(-1, 1);
 
     filterDropDown();
@@ -221,17 +213,45 @@ function filterDropDown() {
     focusedDropDownItem.value = filteredOptions.value[0]?.value;
   }
 }
+
+function onBlur(e: FocusEvent) {
+  emit('validate', props.modelValue);
+  emit('blur', e);
+}
+
+/**
+ * Validate default value if given after delayed data fetching.
+ */
+watch(() => props.skeleton, (val) => {
+  if (!val && props.modelValue !== null) {
+    emit('validate', props.modelValue);
+  }
+});
+watch(_modelValue, (val) => {
+  if ([InputState.danger, InputState.warning, InputState.info].includes(props.state)) {
+    emit('validate', val);
+  }
+}, {deep: true});
+
+onMounted(() => {
+  /**
+   * Validate default value without delayed data fetching.
+   */
+  if (!props.skeleton && props.modelValue !== null) {
+    emit('validate', props.modelValue);
+  }
+});
 </script>
 
 <template>
   <AntField
     :label="label"
-    :size="size"
+    :size="Size.sm"
     :skeleton="_skeleton"
     :description="description"
-    :color-type="colorType"
-    :validator="validator"
+    :state="state"
     :expanded="expanded"
+    :messages="messages"
   >
     <div
       v-on-click-outside="onClickOutside"
@@ -246,24 +266,28 @@ function filterDropDown() {
 
       <div
         :class="inputContainerClasses"
-        class="w-full flex gap-2.5 items-center"
+        class="w-full flex items-center"
       >
-        <AntTag
-          v-for="(tag, index) in _modelValue"
-          :key="`tag-input-tag-${index}`"
-          :size="size"
-          :color-type="_colorType"
-          dismiss
-          @close="removeTag(tag)"
+        <div
+          class="flex gap-2.5 items-center"
         >
-          {{ options.find((option: SelectOption) => option.value === tag)?.label }}
-        </AntTag>
+          <AntTag
+            v-for="(tag, index) in _modelValue"
+            :key="`tag-input-tag-${index}`"
+            :size="AntTagSize.xs3"
+            :state="state as unknown as TagState"
+            :dismiss="true"
+            @close="removeTag(tag)"
+          >
+            {{ options.find((option: SelectOption) => option.value === tag)?.label }}
+          </AntTag>
+        </div>
 
         <!-- Input -->
-        <div class="flex items-center gap-1 w-32 shrink grow">
+        <div class="flex items-center w-32 shrink grow">
           <AntIcon
             :icon="icon"
-            :size="size === Size.sm ? IconSize.xs : IconSize.sm"
+            :size="size === AntTagInputSize.sm ? IconSize.xs : IconSize.sm"
           />
 
           <input
@@ -277,6 +301,7 @@ function filterDropDown() {
             @input="filterDropDown"
             @keydown.delete="removeLastTag"
             @keydown.enter.prevent="checkCreateTag(tagInput)"
+            @blur="onBlur"
           />
         </div>
       </div>
@@ -290,8 +315,8 @@ function filterDropDown() {
         :auto-select-first-on-open="!allowCreate"
         :options="filteredOptions"
         :input-ref="inputRef"
-        :size="size"
-        :color-type="_colorType"
+        :size="size as unknown as Size"
+        :state="state"
         :focus-on-open="false"
         @select-element="addTagFromOptions"
       >

package/dist/runtime/components/inputs/AntTextInput.vue

@@ -0,0 +1,72 @@
+<script lang="ts" setup>
+import {onMounted} from 'vue';
+import AntField from '../forms/AntField.vue';
+import AntBaseInput from './Elements/AntBaseInput.vue';
+import {Size} from '../../enums/Size.enum';
+import {TextInputType} from './__types/AntTextInput.types';
+import {handleEnumValidation} from '../../handler';
+import {useVModel} from '@vueuse/core';
+import {InputState} from '../../enums';
+import {BaseInputType} from './Elements/__types';
+
+defineOptions({inheritAttrs: false});
+
+const emit = defineEmits(['update:modelValue', 'update:skeleton', 'validate']);
+const props = withDefaults(defineProps<{
+  modelValue: string | null;
+  label?: string;
+  placeholder?: string;
+  description?: string;
+  size?: Size;
+  state?: InputState;
+  disabled?: boolean;
+  skeleton?: boolean;
+  type?: TextInputType;
+  limiter?: boolean;
+  max?: number;
+  messages?: string[];
+}>(), {
+  state: InputState.base,
+  disabled: false,
+  skeleton: false,
+  size: Size.md,
+  type: TextInputType.text,
+  limiter: false,
+  messages: () => []
+});
+
+const _value = useVModel(props, 'modelValue', emit);
+
+onMounted(() => {
+  handleEnumValidation(props.size, Size, 'size');
+  handleEnumValidation(props.state, InputState, 'state');
+  handleEnumValidation(props.type, TextInputType, 'type');
+});
+</script>
+
+<template>
+  <AntField
+    :label="label"
+    :size="size"
+    :skeleton="skeleton"
+    :description="description"
+    :state="state"
+    :limiter-max-value="limiter && max !== undefined ? max : undefined"
+    :limiter-value="limiter ? _value?.length : undefined"
+    :messages="messages"
+  >
+    <AntBaseInput
+      v-model="_value"
+      :type="type as unknown as BaseInputType"
+      wrapper-class="flex-grow"
+      :state="state"
+      :size="size"
+      :skeleton="skeleton"
+      :disabled="disabled"
+      :placeholder="placeholder !== undefined ? placeholder : label"
+      :show-icon="true"
+      v-bind="$attrs"
+      @validate="val => $emit('validate', val)"
+    />
+  </AntField>
+</template>

package/dist/runtime/components/{form → inputs}/AntTextarea.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import {computed, onMounted, watch} from 'vue';
-import {Size} from '../../enums/Size.enum'
+import {Size} from '../../enums/Size.enum';
 import AntSkeleton from '../AntSkeleton.vue';
 import AntIcon from '../AntIcon.vue';
 import {Grouped} from '../../enums/Grouped.enum';
@@ -12,18 +12,18 @@ import {
 } from '@fortawesome/free-solid-svg-icons';
 import {handleEnumValidation} from '../../handler';
 import {classesToObjectSyntax} from '../../utils';
-import AntField from './Elements/AntField.vue';
+import AntField from '../forms/AntField.vue';
 import {useVModel} from '@vueuse/core';
-import {InputColorType} from '../../enums';
+import {InputState} from '../../enums';
 import {IconSize} from '../__types';
 
-defineOptions({ inheritAttrs: false });
+defineOptions({inheritAttrs: false});
 
 const emit = defineEmits(['update:modelValue', 'validate', 'blur']);
 const props = withDefaults(defineProps<{
   modelValue: string | null;
   size?: Size;
-  colorType?: InputColorType;
+  state?: InputState;
   disabled?: boolean;
   skeleton?: boolean;
   grouped?: Grouped;
@@ -34,44 +34,52 @@ const props = withDefaults(defineProps<{
   description?: string;
   limiter?: boolean;
   max?: number;
-  errors?: string[];
+  messages?: string[];
 }>(), {
-  colorType: InputColorType.base,
+  state: InputState.base,
   disabled: false,
   size: Size.md,
   skeleton: false,
   grouped: Grouped.none,
   showIcon: true,
   limiter: false,
-  errors: []
+  messages: () => []
 });
 const _modelValue = useVModel(props, 'modelValue', emit);
 const icons = {
-  [InputColorType.info]: faCircleInfo,
-  [InputColorType.warning]: faExclamationTriangle,
-  [InputColorType.danger]: faExclamationCircle,
-  [InputColorType.success]: faCircleCheck,
-  [InputColorType.base]: null,
+  [InputState.info]: faCircleInfo,
+  [InputState.warning]: faExclamationTriangle,
+  [InputState.danger]: faExclamationCircle,
+  [InputState.success]: faCircleCheck,
+  [InputState.base]: null,
 };
+/*TODO #59:: If the scrollbar is showing than the pr is moving and the gap between icon and text is bigger and the icon is stuck in the scrollbar*/
 const inputClasses = computed(() => {
-  const variants: Record<InputColorType, string> = {
-    [InputColorType.base]: 'outline-neutral-300 focus:outline-primary-500 focus:ring-primary/25 bg-white placeholder:text-neutral-500',
-    [InputColorType.danger]: 'outline-danger-500 focus:outline-danger-500 focus:ring-danger/25 bg-danger-100 placeholder:text-danger-700',
-    [InputColorType.info]: 'outline-info-500 focus:outline-info-500 focus:ring-info/25 bg-info-100 placeholder:text-info-700',
-    [InputColorType.success]: 'outline-success-500 focus:outline-success-500 focus:ring-success/25 bg-success-100 placeholder:text-success-700',
-    [InputColorType.warning]: 'outline-warning-500 focus:outline-warning-500 focus:ring-warning/25 bg-warning-100 placeholder:text-warning-700',
+  const variants: Record<InputState, string> = {
+    [InputState.base]: 'outline-neutral-300 focus:ring-primary-200 bg-white placeholder:text-neutral-500',
+    [InputState.danger]: 'outline-danger-500 focus:ring-danger-200 bg-danger-100 placeholder:text-danger-700',
+    [InputState.info]: 'outline-info-500 focus:ring-info-200 bg-info-100 placeholder:text-info-700',
+    [InputState.success]: 'outline-success-500 focus:ring-success-200 bg-success-100 placeholder:text-success-700',
+    [InputState.warning]: 'outline-warning-500 focus:ring-warning-200 bg-warning-100 placeholder:text-warning-700',
   };
+
   return {
     'block transition-colors relative border-none outline w-full focus:z-10': true,
     'outline-offset-[-1px] outline-1 focus:outline-offset-[-1px] focus:outline-1': true,
     'disabled:opacity-50 disabled:cursor-not-allowed': props.disabled,
-    [variants[_colorType.value]]: true,
+    [variants[props.state]]: true,
     // Size
-    'focus:ring-2 p-1.5 text-xs': props.size === Size.sm,
-    'focus:ring-4 p-2.5 text-sm': props.size === Size.md,
+    'focus:ring-2 p-1 text-xs': props.size === Size.xs2,
+    'focus:ring-2 p-1.5 text-xs': props.size === Size.xs,
+    'focus:ring-2 p-1.5 text-sm': props.size === Size.sm,
+    'focus:ring-4 p-2 text-sm': props.size === Size.md,
+    'focus:ring-4 p-2.5 text-sm': props.size === Size.lg,
     // Icon right
-    'pr-7': props.size === Size.sm && props.showIcon && icon.value,
-    'pr-10': props.size === Size.md && props.showIcon && icon.value,
+    'pr-6': props.size === Size.xs2 && props.showIcon && icon.value,
+    'pr-7': props.size === Size.xs && props.showIcon && icon.value,
+    'pr-8': props.size === Size.sm && props.showIcon && icon.value,
+    'pr-9': props.size === Size.md && props.showIcon && icon.value,
+    'pr-10': props.size === Size.lg && props.showIcon && icon.value,
     // Grouped
     'rounded-tl-md rounded-bl-md rounded-tr-none rounded-br-none': props.grouped === Grouped.left,
     'rounded-none': props.grouped === Grouped.center,
@@ -91,35 +99,39 @@ const iconColor = computed(() => {
     'warning': 'text-warning-500',
   };
 
-  return variants[_colorType.value];
+  return variants[props.state];
 });
 const _wrapperClass = computed(() => classesToObjectSyntax(props.wrapperClass));
-const icon = computed(() => icons[_colorType.value]);
-const hasErrors = computed(() => props.errors.length > 0);
-const _colorType = computed(() => hasErrors.value ? InputColorType.danger : props.colorType);
+const icon = computed(() => icons[props.state]);
+const getIconSize = computed(() => {
+  if (props.size === Size.xs || props.size === Size.xs2) {
+    return IconSize.xs;
+  } else {
+    return IconSize.sm;
+  }
+});
 
 onMounted(() => {
   handleEnumValidation(props.size, Size, 'size');
   handleEnumValidation(props.grouped, Grouped, 'grouped');
-  handleEnumValidation(props.colorType, InputColorType, 'colorType');
+  handleEnumValidation(props.state, InputState, 'state');
 
   if (!props.skeleton && props.modelValue !== null) {
     emit('validate', props.modelValue);
   }
 });
 
+watch(_modelValue, (val) => {
+  if ([InputState.danger, InputState.warning, InputState.info].includes(props.state)) {
+    emit('validate', val);
+  }
+}, {deep: true});
 watch(() => props.skeleton, (val) => {
   if (!val && props.modelValue !== null) {
     emit('validate', props.modelValue);
   }
 });
 
-watch(_modelValue, (val) => {
-  if (hasErrors.value) {
-    emit('validate', val);
-  }
-});
-
 function onBlur(e: FocusEvent) {
   emit('validate', props.modelValue);
   emit('blur', e);
@@ -132,10 +144,10 @@ function onBlur(e: FocusEvent) {
     :size="size"
     :skeleton="skeleton"
     :description="description"
-    :color-type="colorType"
+    :state="state"
     :limiter-max-value="limiter && max !== undefined ? max : undefined"
-    :limiter-value="limiter ? _modelValue.length : undefined"
-    :errors="errors"
+    :limiter-value="limiter ? _modelValue?.length : undefined"
+    :messages="messages"
   >
     <div
       class="block relative w-full"
@@ -152,12 +164,12 @@ function onBlur(e: FocusEvent) {
 
       <div
         v-if="showIcon && icon"
-        class="absolute flex w-fit right-0 top-0 transition-all z-20"
-        :class="{'p-1.5': size === Size.sm, 'p-2.5': size === Size.md}"
+        class="absolute flex h-[95%] right-0 top-0 transition-all z-20"
+        :class="{'p-1': size === Size.xs2, 'p-1.5': size === Size.sm || size === Size.xs, 'p-2': size === Size.md, 'p-2.5': size === Size.lg}"
       >
         <AntIcon
           :icon="icon"
-          :size="size as unknown as IconSize"
+          :size="getIconSize"
           :color="iconColor"
         />
       </div>

package/dist/runtime/components/{form → inputs}/AntUnitInput.vue

@@ -1,18 +1,17 @@
 <script lang="ts" setup>
-import {computed, onMounted} from 'vue';
-import AntButton from '../buttons/AntButton.vue'
-import AntField from './Elements/AntField.vue'
-import AntBaseInput from './Elements/AntBaseInput.vue'
-import {Size} from '../../enums/Size.enum'
+import {onMounted} from 'vue';
+import AntButton from '../buttons/AntButton.vue';
+import AntField from '../forms/AntField.vue';
+import AntBaseInput from './Elements/AntBaseInput.vue';
+import {Size} from '../../enums/Size.enum';
 import {type IconDefinition} from '@fortawesome/free-solid-svg-icons';
 import {useVModel} from '@vueuse/core';
-import {ColorType, InputColorType} from '../../enums';
+import {State, InputState} from '../../enums';
 import {Grouped} from '../../enums/Grouped.enum';
 import {BaseInputType} from './Elements/__types';
 import {handleEnumValidation} from '../../handler';
-import {FieldValidator} from '@antify/validate';
 
-defineOptions({ inheritAttrs: false });
+defineOptions({inheritAttrs: false});
 
 const props = withDefaults(defineProps<{
   modelValue: number | null;
@@ -23,28 +22,25 @@ const props = withDefaults(defineProps<{
   limiter?: boolean;
   min?: number;
   max?: number;
-  validator?: FieldValidator;
   size?: Size;
-  colorType?: InputColorType;
+  state?: InputState;
   disabled?: boolean;
   skeleton?: boolean;
   wrapperClass?: string | Record<string, boolean>;
-  errors?: string[];
+  messages?: string[];
 }>(), {
-  colorType: InputColorType.base,
+  state: InputState.base,
   disabled: false,
   skeleton: false,
   size: Size.md,
   limiter: false,
-  errors: []
+  messages: () => []
 });
 const emit = defineEmits(['update:modelValue', 'validate']);
 const _modelValue = useVModel(props, 'modelValue', emit);
-const _colorType = computed(() => hasErrors.value ? InputColorType.danger : props.colorType);
-const hasErrors = computed(() => props.errors.length > 0);
 
 onMounted(() => {
-  handleEnumValidation(props.colorType, InputColorType, 'colorType');
+  handleEnumValidation(props.state, InputState, 'state');
   handleEnumValidation(props.size, Size, 'size');
 });
 </script>
@@ -55,21 +51,20 @@ onMounted(() => {
     :size="size"
     :skeleton="skeleton"
     :description="description"
-    :colorType="colorType"
-    :validator="validator"
+    :state="state"
     :limiter-max-value="limiter && max !== undefined ? max : undefined"
     :limiter-value="limiter && _modelValue !== undefined && _modelValue !== null ? _modelValue : undefined"
-    :errors="errors"
+    :messages="messages"
   >
     <div
       class="flex relative"
     >
       <AntBaseInput
-        v-model:value="_modelValue"
+        v-model="_modelValue"
         :type="BaseInputType.number"
         :grouped="Grouped.left"
         wrapper-class="flex-grow"
-        :color-type="colorType"
+        :state="state"
         :size="size"
         :min="min"
         :max="max"
@@ -77,7 +72,6 @@ onMounted(() => {
         :disabled="disabled"
         :placeholder="placeholder || label"
         :show-icon="false"
-        :has-errors="hasErrors"
         v-bind="$attrs"
         @validate="val => $emit('validate', val)"
       />
@@ -85,7 +79,7 @@ onMounted(() => {
       <AntButton
         :icon-left="typeof unit === 'object' ? unit : undefined"
         :grouped="Grouped.right"
-        :color-type="_colorType as unknown as ColorType"
+        :state="state as unknown as State"
         :size="size"
         :skeleton="skeleton"
         :readonly="true"