@antify/ui-module 1.6.0 → 1.7.1

package/src/runtime/components/AntToast.vue

@@ -10,57 +10,58 @@ import {
 } from '@fortawesome/free-solid-svg-icons';
 import AntIcon from './AntIcon.vue';
 import AntButton from './buttons/AntButton.vue';
-import {ColorType, InputColorType} from '../enums';
+import {State, InputState, Size} from '../enums';
+import {IconSize} from './__types/AntIcon.types';
 
 const props = withDefaults(defineProps<{
   title?: string,
-  colorType?: InputColorType,
+  state?: InputState,
   showUndo?: boolean,
   icon?: boolean
 }>(), {
-  colorType: InputColorType.base,
+  state: InputState.base,
   showUndo: false,
   icon: true
 });
 
 const icons = {
-  [InputColorType.base]: faInfoCircle,
-  [InputColorType.info]: faInfoCircle,
-  [InputColorType.danger]: faExclamationCircle,
-  [InputColorType.warning]: faExclamationTriangle,
-  [InputColorType.success]: faCheckCircle,
+  [InputState.base]: faInfoCircle,
+  [InputState.info]: faInfoCircle,
+  [InputState.danger]: faExclamationCircle,
+  [InputState.warning]: faExclamationTriangle,
+  [InputState.success]: faCheckCircle,
 };
 
-const _icon = computed(() => icons[props.colorType]);
+const _icon = computed(() => icons[props.state]);
 const classes = computed(() => {
-  const variants: Record<InputColorType, string> = {
-    [InputColorType.base]: 'bg-neutral-100 border-neutral-500 text-neutral-500',
-    [InputColorType.danger]: 'bg-danger-100 border-danger-500 text-danger-500',
-    [InputColorType.info]: 'bg-info-100 border-info-500 text-info-500',
-    [InputColorType.success]: 'bg-success-100 border-success-500 text-success-500',
-    [InputColorType.warning]: 'bg-warning-100 border-warning-500 text-warning-500',
+  const variants: Record<InputState, string> = {
+    [InputState.base]: 'bg-neutral-100 border-neutral-500 text-neutral-500',
+    [InputState.danger]: 'bg-danger-100 border-danger-500 text-danger-500',
+    [InputState.info]: 'bg-info-100 border-info-500 text-info-500',
+    [InputState.success]: 'bg-success-100 border-success-500 text-success-500',
+    [InputState.warning]: 'bg-warning-100 border-warning-500 text-warning-500',
   };
 
   return {
-    'inline-flex flex-col gap-2.5 rounded-md p-2.5 border transition-colors shadow-md': true,
-    [variants[props.colorType]]: true,
+    'inline-flex flex-col gap-2 rounded-md p-2 border transition-colors shadow-md': true,
+    [variants[props.state]]: true,
   };
 });
 const hasDefaultSlot = computed(() => useSlots()['default'] || false);
 const iconColor = computed(() => {
   const variants = {
-    [InputColorType.base]: 'text-neutral-100-font',
-    [InputColorType.danger]: 'text-danger-500',
-    [InputColorType.info]: 'text-info-500',
-    [InputColorType.success]: 'text-success-500',
-    [InputColorType.warning]: 'text-warning-500',
+    [InputState.base]: 'text-neutral-100-font',
+    [InputState.danger]: 'text-danger-500',
+    [InputState.info]: 'text-info-500',
+    [InputState.success]: 'text-success-500',
+    [InputState.warning]: 'text-warning-500',
   };
 
-  return variants[props.colorType];
+  return variants[props.state];
 });
 
 onMounted(() => {
-  handleEnumValidation(props.colorType, InputColorType, 'colorType');
+  handleEnumValidation(props.state, InputState, 'state');
 });
 </script>
 
@@ -68,17 +69,21 @@ onMounted(() => {
   <div
     :class="classes"
     data-e2e="toast"
-    :data-e2e-color-type="props.colorType"
+    :data-e2e-state="props.state"
   >
-    <div class="inline-flex items-center justify-between w-content gap-2.5">
-      <div class="inline-flex items-center gap-2.5">
+    <div class="inline-flex items-center justify-between w-content gap-2">
+      <div class="inline-flex items-center gap-2">
         <AntIcon
           v-if="icon"
           :icon="_icon"
           :color="iconColor"
+          :size="IconSize.sm"
         />
 
-        <div class="whitespace-pre" :class="{'font-semibold': hasDefaultSlot}">
+        <div
+          class="whitespace-pre text-sm"
+          :class="{'font-semibold': hasDefaultSlot}"
+        >
           <slot name="title">
             {{ title }}
           </slot>
@@ -94,12 +99,16 @@ onMounted(() => {
     </div>
 
     <div v-if="hasDefaultSlot">
-      <slot/>
+      <slot />
     </div>
 
-    <div v-if="showUndo" class="flex justify-end">
+    <div
+      v-if="showUndo"
+      class="flex justify-end"
+    >
       <AntButton
-        :color-type="props.colorType as unknown as ColorType"
+        :state="props.state as unknown as State"
+        :size="Size.md"
         filled
         @click="() => $emit('undo')"
       >

package/src/runtime/components/AntToaster.vue

@@ -13,29 +13,34 @@ const props = withDefaults(defineProps<{
 });
 
 const classes = computed(() => ({
-  'left-0 top-0': props.position === CornerPosition.topLeft,
-  'right-0 top-0': props.position === CornerPosition.topRight,
-  'left-0 bottom-0': props.position === CornerPosition.bottomLeft,
-  'right-0 bottom-0': props.position === CornerPosition.bottomRight,
+  'left-0 top-0 items-start': props.position === CornerPosition.topLeft,
+  'right-0 top-0 items-end': props.position === CornerPosition.topRight,
+  'left-0 bottom-0 items-start': props.position === CornerPosition.bottomLeft,
+  'right-0 bottom-0 items-end': props.position === CornerPosition.bottomRight,
 }));
 </script>
 
 <template>
   <div
-    class="absolute flex flex-col items-baseline space-y-2.5 p-2.5"
+    class="absolute flex flex-col space-y-2.5 p-2.5"
     :class="classes"
     data-e2e="toaster"
   >
     <TransitionGroup name="list">
       <AntToast
         v-for="toast of $uiModule.toaster.getToasts()"
+        :key="`ant-toast-${toast.id}`"
         :title="toast.title"
-        :color-type="toast.type"
+        :state="toast.type"
         :icon="toast.hasIcon"
         @close="$uiModule.toaster.removeToast(toast)"
-        v-bind:key="`ant-toast-${toast.id}`"
       >
-        <template v-if="toast.content" #default>{{ toast.content }}</template>
+        <template
+          v-if="toast.content"
+          #default
+        >
+          {{ toast.content }}
+        </template>
       </AntToast>
     </TransitionGroup>
   </div>
@@ -47,24 +52,18 @@ const classes = computed(() => ({
 }
 
 .list-enter-active{
-  animation: bounce-in-left .6s;
+  animation: fade-in .6s;
 }
 
 .list-leave-active {
-  animation: bounce-in-left .4s reverse;
+  animation: fade-in .4s reverse;
 }
 
-@keyframes bounce-in-left {
+@keyframes fade-in {
   0% {
-    transform: translateX(-10rem);
     opacity: 0;
   }
-  50% {
-    transform: translateX(.5rem);
-    opacity: 1;
-  }
   100% {
-    transform: translateX(0);
     opacity: 1;
   }
 }

package/src/runtime/components/AntTooltip.vue

@@ -1,20 +1,20 @@
 <script lang="ts" setup>
 import {computed, onMounted, ref, getCurrentInstance} from 'vue';
 import {handleEnumValidation} from '../handler';
-import {InputColorType, Position} from '../enums';
+import {InputState, Position} from '../enums';
 import {classesToObjectSyntax} from '../utils';
 import {hasSlotContent} from '../utils';
 
 const props = withDefaults(defineProps<{
 	position?: Position
 	tooltipClasses?: string | Record<string, boolean>
-	colorType?: InputColorType
+	state?: InputState
 	expanded?: boolean
 	delay?: number
 }>(), {
 	position: Position.left,
 	tooltipClasses: '',
-	colorType: InputColorType.base,
+	state: InputState.base,
 	expanded: false,
 	delay: 800
 });
@@ -43,45 +43,45 @@ const itemContainerClasses = computed(() => ({
 	'justify-center rotate-90': props.position === Position.left,
 }));
 const contentClasses = computed(() => {
-	const variants: Record<InputColorType, string> = {
-		[InputColorType.base]: 'text-for-white-bg-font bg-white border-neutral-300',
-		[InputColorType.danger]: 'text-danger-500-font bg-danger-500 border-danger-500',
-		[InputColorType.info]: 'text-info-500-font bg-info-500 border-info-500',
-		[InputColorType.success]: 'text-success-500-font bg-success-500 border-success-500',
-		[InputColorType.warning]: 'text-warning-500-font bg-warning-500 border-warning-500',
+	const variants: Record<InputState, string> = {
+		[InputState.base]: 'text-for-white-bg-font bg-white border-neutral-300',
+		[InputState.danger]: 'text-danger-500-font bg-danger-500 border-danger-500',
+		[InputState.info]: 'text-info-500-font bg-info-500 border-info-500',
+		[InputState.success]: 'text-success-500-font bg-success-500 border-success-500',
+		[InputState.warning]: 'text-warning-500-font bg-warning-500 border-warning-500',
 	};
 
-	return {[variants[props.colorType]]: true};
+	return {[variants[props.state]]: true};
 });
 const svgPathClasses = computed(() => {
-	const variants: Record<InputColorType, string> = {
-		[InputColorType.base]: 'fill-white stroke-white',
-		[InputColorType.danger]: 'fill-danger-500 stroke-danger-500',
-		[InputColorType.info]: 'fill-info-500 stroke-info-500',
-		[InputColorType.success]: 'fill-success-500 stroke-success-500',
-		[InputColorType.warning]: 'fill-warning-500 stroke-warning-500',
+	const variants: Record<InputState, string> = {
+		[InputState.base]: 'fill-white stroke-white',
+		[InputState.danger]: 'fill-danger-500 stroke-danger-500',
+		[InputState.info]: 'fill-info-500 stroke-info-500',
+		[InputState.success]: 'fill-success-500 stroke-success-500',
+		[InputState.warning]: 'fill-warning-500 stroke-warning-500',
 	};
 
-	return {[variants[props.colorType]]: true};
+	return {[variants[props.state]]: true};
 });
 const arrowSvgPathClasses = computed(() => {
-	const variants: Record<InputColorType, string> = {
-		[InputColorType.base]: 'stroke-neutral-300',
-		[InputColorType.danger]: 'stroke-danger-500',
-		[InputColorType.info]: 'stroke-info-500',
-		[InputColorType.success]: 'stroke-success-500',
-		[InputColorType.warning]: 'stroke-warning-500',
+	const variants: Record<InputState, string> = {
+		[InputState.base]: 'stroke-neutral-300',
+		[InputState.danger]: 'stroke-danger-500',
+		[InputState.info]: 'stroke-info-500',
+		[InputState.success]: 'stroke-success-500',
+		[InputState.warning]: 'stroke-warning-500',
 	};
 
-	return {[variants[props.colorType]]: true};
+	return {[variants[props.state]]: true};
 });
 const timeout = ref<number | undefined>();
 const clickLock = ref(false);
-const uuid = ref(getCurrentInstance()?.uid)
+const uuid = ref(getCurrentInstance()?.uid);
 
 onMounted(() => {
-	handleEnumValidation(props.position, Position, 'Position')
-	handleEnumValidation(props.colorType, InputColorType, 'colorType')
+	handleEnumValidation(props.position, Position, 'Position');
+	handleEnumValidation(props.state, InputState, 'state');
 });
 
 function onMouseOver() {
@@ -89,21 +89,21 @@ function onMouseOver() {
 		return;
 	}
 
-	timeout.value = setTimeout(() => visible.value = true, props.delay) as unknown as number
+	timeout.value = setTimeout(() => visible.value = true, props.delay) as unknown as number;
 }
 
 function onMouseLeave() {
-	clearTimeout(timeout.value)
+	clearTimeout(timeout.value);
 
-	visible.value = false
-	clickLock.value = false
+	visible.value = false;
+	clickLock.value = false;
 }
 
 function onClick() {
-	clearTimeout(timeout.value)
+	clearTimeout(timeout.value);
 
-	visible.value = false
-	clickLock.value = true
+	visible.value = false;
+	clickLock.value = true;
 }
 </script>
 
@@ -172,7 +172,7 @@ function onClick() {
         </div>
 
         <div
-          class="p-2.5 rounded-md border"
+          class="p-2 rounded-md border"
           :class="contentClasses"
         >
           <slot name="content" />

package/src/runtime/components/buttons/AntActionButton.vue

@@ -3,7 +3,7 @@
  * This button is used for everything what is the primary
  * action like save, confirm, create, etc.
  */
-import {Position, ColorType, InputColorType, Size, Grouped} from '../../enums';
+import {Position, State, InputState, Size, Grouped} from '../../enums';
 import AntButton from './AntButton.vue';
 import type {IconDefinition} from '@fortawesome/free-solid-svg-icons';
 import {computed, useSlots} from 'vue';
@@ -17,20 +17,20 @@ const props = withDefaults(
 		size?: Size;
 		disabled?: boolean;
 		grouped?: Grouped;
-		colorType?: ColorType;
+		state?: State;
 		skeleton?: boolean;
 		expanded?: boolean;
 		filled?: boolean;
 		hasPermission?: boolean;
 		tooltipPosition?: Position;
-		tooltipColorType?: InputColorType;
+		tooltipState?: InputState;
 		tooltipDelay?: number;
 	}>(), {
-		colorType: ColorType.primary,
+		state: State.primary,
 		hasPermission: true,
 		filled: true
 	}
-)
+);
 const slots = useSlots();
 const hasTooltip = computed(() => !props.skeleton && !props.disabled && props.hasPermission && hasSlotContent(slots['tooltipContent']));
 const hasPermissionTooltip = computed(() => !props.skeleton && !props.disabled && !props.hasPermission && hasSlotContent(slots['invalidPermissionTooltipContent']));
@@ -45,10 +45,10 @@ const hasPermissionTooltip = computed(() => !props.skeleton && !props.disabled &
     :grouped="grouped"
     :skeleton="skeleton"
     :expanded="expanded"
-    :color-type="colorType"
+    :state="state"
     :filled="filled"
     :tooltip-position="tooltipPosition"
-    :tooltip-color-type="hasPermissionTooltip ? InputColorType.info : tooltipColorType"
+    :tooltip-state="hasPermissionTooltip ? InputState.info : tooltipState"
     :tooltip-delay="hasPermissionTooltip ? 300 : tooltipDelay"
     data-e2e="action-button"
     @click="$emit('click')"

package/src/runtime/components/buttons/AntButton.vue

@@ -7,7 +7,7 @@ import AntSpinner from '../AntSpinner.vue';
 import {Grouped} from '../../enums/Grouped.enum';
 import {Size} from '../../enums/Size.enum';
 import {handleEnumValidation} from '../../handler';
-import {ColorType, InputColorType, Position} from '../../enums';
+import {State, InputState, Position} from '../../enums';
 import {ButtonType} from './__types';
 import AntIcon from '../AntIcon.vue';
 import AntTooltip from '../AntTooltip.vue';
@@ -18,7 +18,7 @@ defineEmits(['click', 'blur']);
 const props = withDefaults(defineProps<{
 	filled?: boolean;
 	size?: Size;
-	colorType?: ColorType;
+	state?: State;
 	iconLeft?: IconDefinition;
 	iconRight?: IconDefinition;
 	to?: RouteLocationRaw;
@@ -32,10 +32,10 @@ const props = withDefaults(defineProps<{
 	outlined?: boolean;
 	noFocus?: boolean;
 	tooltipPosition?: Position;
-	tooltipColorType?: InputColorType;
+	tooltipState?: InputState;
 	tooltipDelay?: number;
 }>(), {
-	colorType: ColorType.base,
+	state: State.base,
 	disabled: false,
 	filled: false,
 	skeleton: false,
@@ -48,11 +48,11 @@ const props = withDefaults(defineProps<{
 	outlined: true,
 	noFocus: false,
 	tooltipPosition: Position.bottom,
-	tooltipColorType: InputColorType.base,
+	tooltipState: InputState.base,
 	tooltipDelay: 800
 });
 
-const hasAction = computed(() => (props.skeleton || props.readonly || props.disabled))
+const hasInputState = computed(() => props.skeleton || props.readonly || props.disabled);
 const groupedClassList = computed(() => ({
 	'rounded-tl-md rounded-bl-md rounded-tr-none rounded-br-none -mr-px': props.grouped === Grouped.left,
 	'rounded-none -mx-px': props.grouped === Grouped.center,
@@ -61,93 +61,96 @@ const groupedClassList = computed(() => ({
 }));
 const classes = computed(() => {
 	const variants = {
-		[ColorType.base]: 'ring-primary-200 outline-neutral-300',
-		[ColorType.danger]: 'ring-danger-200 outline-danger-500',
-		[ColorType.info]: 'ring-info-200 outline-info-500',
-		[ColorType.primary]: 'ring-primary-200 outline-primary-500',
-		[ColorType.secondary]: 'ring-secondary-200 outline-secondary-500',
-		[ColorType.success]: 'ring-success-200 outline-success-500',
-		[ColorType.warning]: 'ring-warning-200 outline-warning-500',
+		[State.base]: 'ring-primary-200 outline-neutral-300',
+		[State.danger]: 'ring-danger-200 outline-danger-500',
+		[State.info]: 'ring-info-200 outline-info-500',
+		[State.primary]: 'ring-primary-200 outline-primary-500',
+		[State.secondary]: 'ring-secondary-200 outline-secondary-500',
+		[State.success]: 'ring-success-200 outline-success-500',
+		[State.warning]: 'ring-warning-200 outline-warning-500',
 	};
 	const notFilledVariants = {
-		[ColorType.base]: 'bg-white text-for-white-bg-font',
-		[ColorType.danger]: 'bg-white text-danger-500',
-		[ColorType.info]: 'bg-white text-info-500',
-		[ColorType.primary]: 'bg-white text-primary-500',
-		[ColorType.secondary]: 'bg-white text-secondary-500',
-		[ColorType.success]: 'bg-white text-success-500',
-		[ColorType.warning]: 'bg-white text-warning-500',
+		[State.base]: 'bg-white text-for-white-bg-font',
+		[State.danger]: 'bg-white text-danger-500',
+		[State.info]: 'bg-white text-info-500',
+		[State.primary]: 'bg-white text-primary-500',
+		[State.secondary]: 'bg-white text-secondary-500',
+		[State.success]: 'bg-white text-success-500',
+		[State.warning]: 'bg-white text-warning-500',
 	};
 	const notFilledHoverVariants = {
-		[ColorType.base]: 'hover:bg-neutral-100',
-		[ColorType.danger]: 'hover:bg-danger-100',
-		[ColorType.info]: 'hover:bg-info-100',
-		[ColorType.primary]: 'hover:bg-primary-100',
-		[ColorType.secondary]: 'hover:bg-secondary-100',
-		[ColorType.success]: 'hover:bg-success-100',
-		[ColorType.warning]: 'hover:bg-warning-100',
+		[State.base]: 'hover:bg-neutral-100',
+		[State.danger]: 'hover:bg-danger-100',
+		[State.info]: 'hover:bg-info-100',
+		[State.primary]: 'hover:bg-primary-100',
+		[State.secondary]: 'hover:bg-secondary-100',
+		[State.success]: 'hover:bg-success-100',
+		[State.warning]: 'hover:bg-warning-100',
 	};
 	const filledVariants = {
-		[ColorType.base]: 'bg-neutral-50 text-neutral-50-font',
-		[ColorType.danger]: 'bg-danger-500 text-danger-500-font',
-		[ColorType.info]: 'bg-info-500 text-info-500-font',
-		[ColorType.primary]: 'bg-primary-500 text-primary-500-font',
-		[ColorType.secondary]: 'bg-secondary-500 text-secondary-500-font',
-		[ColorType.success]: 'bg-success-500 text-success-500-font',
-		[ColorType.warning]: 'bg-warning-500 text-warning-500-font',
+		[State.base]: 'bg-neutral-50 text-neutral-50-font',
+		[State.danger]: 'bg-danger-500 text-danger-500-font',
+		[State.info]: 'bg-info-500 text-info-500-font',
+		[State.primary]: 'bg-primary-500 text-primary-500-font',
+		[State.secondary]: 'bg-secondary-500 text-secondary-500-font',
+		[State.success]: 'bg-success-500 text-success-500-font',
+		[State.warning]: 'bg-warning-500 text-warning-500-font',
 	};
 	const filledHoverVariants = {
-		[ColorType.base]: 'hover:bg-neutral-200',
-		[ColorType.danger]: 'hover:bg-danger-600',
-		[ColorType.info]: 'hover:bg-info-600',
-		[ColorType.primary]: 'hover:bg-primary-600',
-		[ColorType.secondary]: 'hover:bg-secondary-600',
-		[ColorType.success]: 'hover:bg-success-600',
-		[ColorType.warning]: 'hover:bg-warning-600',
+		[State.base]: 'hover:bg-neutral-200',
+		[State.danger]: 'hover:bg-danger-600',
+		[State.info]: 'hover:bg-info-600',
+		[State.primary]: 'hover:bg-primary-600',
+		[State.secondary]: 'hover:bg-secondary-600',
+		[State.success]: 'hover:bg-success-600',
+		[State.warning]: 'hover:bg-warning-600',
 	};
 
 	return {
 		'transition-all inline-flex items-center justify-center relative font-medium': true,
 		'focus:z-10': true,
-		'active:shadow-[inset_0_4px_4px_rgba(0,0,0,0.25)]': !hasAction.value,
-		'py-1.5 px-2.5 text-xs gap-1': props.size === Size.sm,
-		'py-2.5 px-3.5 text-sm gap-2.5': props.size === Size.md,
+		'active:shadow-[inset_0_4px_4px_rgba(0,0,0,0.25)]': !hasInputState.value,
+		'p-1 text-xs gap-1': props.size === Size.xs2,
+		'p-1.5 text-xs gap-1.5': props.size === Size.xs,
+		'p-1.5 text-sm gap-1.5': props.size === Size.sm,
+		'p-2 text-sm gap-2': props.size === Size.md,
+		'p-2.5 text-sm gap-2.5': props.size === Size.lg,
 		'disabled:opacity-50 disabled:cursor-not-allowed': true,
 		'cursor-default': props.readonly,
-		'focus:ring-2': !props.readonly && props.size === Size.sm,
-		'focus:ring-4': !props.readonly && props.size === Size.md,
+		'focus:ring-2': !props.readonly && props.size === Size.sm || props.size === Size.xs || props.size === Size.xs2,
+		'focus:ring-4': !props.readonly && props.size === Size.md || props.size === Size.lg,
 		'w-full': props.expanded,
 		'invisible': props.skeleton,
 		'outline outline-1 outline-offset-[-1px]': props.outlined,
 		...groupedClassList.value,
-		[variants[props.colorType]]: true,
-		[notFilledVariants[props.colorType]]: !props.filled,
-		[notFilledHoverVariants[props.colorType]]: !props.filled && !hasAction.value,
-		[filledVariants[props.colorType]]: props.filled,
-		[filledHoverVariants[props.colorType]]: props.filled && !hasAction.value,
+		[variants[props.state]]: true,
+		[notFilledVariants[props.state]]: !props.filled,
+		[notFilledHoverVariants[props.state]]: !props.filled && !hasInputState.value,
+		[filledVariants[props.state]]: props.filled,
+		[filledHoverVariants[props.state]]: props.filled && !hasInputState.value,
 	};
 });
 const iconColor = computed(() => {
 	const notFilledVariants = {
-		[ColorType.base]: 'text-for-white-bg-font',
-		[ColorType.danger]: 'text-danger-500',
-		[ColorType.info]: 'text-info-500',
-		[ColorType.primary]: 'text-primary-500',
-		[ColorType.secondary]: 'text-secondary-500',
-		[ColorType.success]: 'text-success-500',
-		[ColorType.warning]: 'text-warning-500',
+		[State.base]: 'text-for-white-bg-font',
+		[State.danger]: 'text-danger-500',
+		[State.info]: 'text-info-500',
+		[State.primary]: 'text-primary-500',
+		[State.secondary]: 'text-secondary-500',
+		[State.success]: 'text-success-500',
+		[State.warning]: 'text-warning-500',
 	};
 	const filledVariants = {
-		[ColorType.base]: 'text-for-white-bg-font',
-		[ColorType.danger]: 'text-danger-500-font',
-		[ColorType.info]: 'text-info-500-font',
-		[ColorType.primary]: 'text-primary-500-font',
-		[ColorType.secondary]: 'text-secondary-500-font',
-		[ColorType.success]: 'text-success-500-font',
-		[ColorType.warning]: 'text-warning-500-font',
+		[State.base]: 'text-for-white-bg-font',
+		[State.danger]: 'text-danger-500-font',
+		[State.info]: 'text-info-500-font',
+		[State.primary]: 'text-primary-500-font',
+		[State.secondary]: 'text-secondary-500-font',
+		[State.success]: 'text-success-500-font',
+		[State.warning]: 'text-warning-500-font',
 	};
 
-	return props.filled ? filledVariants[props.colorType] : notFilledVariants[props.colorType];
+	return props.filled ? filledVariants[props.state] : notFilledVariants[props.state];
 });
 const type = computed(() => {
 	if (props.to !== undefined) {
@@ -161,12 +164,19 @@ const is = computed(() => {
 		return 'div';
 	}
 
-	return props.to !== undefined ? 'router-link' : 'button'
-})
+	return props.to !== undefined ? 'router-link' : 'button';
+});
+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.colorType, ColorType, 'colorType');
+	handleEnumValidation(props.state, State, 'state');
 	handleEnumValidation(props.grouped, Grouped, 'grouped');
 });
 </script>
@@ -176,7 +186,7 @@ onMounted(() => {
     class="relative inline-flex h-fit"
     :class="{'w-full': props.expanded}"
     data-e2e="button"
-    :data-e2e-color-type="props.colorType"
+    :data-e2e-state="props.state"
   >
     <AntSkeleton
       v-if="skeleton"
@@ -188,7 +198,7 @@ onMounted(() => {
     <AntTooltip
       :expanded="expanded"
       :position="tooltipPosition"
-      :color-type="tooltipColorType"
+      :state="tooltipState"
       :delay="tooltipDelay"
     >
       <template #default>
@@ -198,14 +208,14 @@ onMounted(() => {
           :type="type"
           :to="to"
           :disabled="disabled || undefined"
-          :tabindex="noFocus || hasAction ? '-1' : '0'"
+          :tabindex="noFocus || hasInputState ? '-1' : '0'"
           @click="() => !props.readonly ? $emit('click') : null"
           @blur="() => !props.readonly ? $emit('blur') : null"
         >
           <AntSpinner
             v-if="spinner"
             :size="size"
-            :color-type="colorType"
+            :state="state"
             :inverted="!filled"
           />
 
@@ -216,7 +226,7 @@ onMounted(() => {
             <AntIcon
               v-if="iconLeft"
               :icon="iconLeft"
-              :size="size as unknown as IconSize"
+              :size="getIconSize"
               :color="iconColor"
             />
           </slot>
@@ -232,7 +242,7 @@ onMounted(() => {
             <AntIcon
               v-if="iconRight"
               :icon="iconRight"
-              :size="size as unknown as IconSize"
+              :size="getIconSize"
               :color="iconColor"
             />
           </slot>