@antify/ui 4.2.0 → 4.2.2

package/dist/components/inputs/AntCheckbox.vue

@@ -65,6 +65,7 @@ const props =
   });
 const _modelValue = useVModel(props, 'modelValue', emit);
 const delayedValue = ref(_modelValue.value);
+const inputRef = ref<HTMLInputElement | null>(null);
 const hasInputState = computed(() => props.skeleton || props.readonly || props.disabled);
 const inputClasses = computed(() => {
   const focusColorVariant: Record<InputState, string> = {
@@ -106,7 +107,7 @@ const inputClasses = computed(() => {
   };
 });
 const contentClasses = computed(() => ({
-  'text-for-white-bg-font': true,
+  'text-for-white-bg-font w-fit': true,
   'cursor-pointer': !hasInputState.value,
   'cursor-not-allowed opacity-50': props.disabled,
   'text-sm': props.size === Size.lg || props.size === Size.md || props.size === Size.sm,
@@ -119,6 +120,20 @@ const itemSize = computed(() => {
     return IconSize.sm;
   }
 });
+const gapSize = computed(() => {
+  switch (props.size) {
+    case Size.lg:
+      return 'gap-2.5';
+    case Size.md:
+      return 'gap-2';
+    case Size.sm:
+      return 'gap-1.5';
+    case Size.xs:
+      return 'gap-1.5';
+    default:
+      return 'gap-1';
+  }
+});
 const iconColor = computed(() => {
   switch (props.state) {
     case InputState.base:
@@ -167,6 +182,12 @@ function onBlur(e: FocusEvent) {
   emit('blur', e);
 }
 
+const onClickContent = () => {
+  if (inputRef.value && !props.disabled && !props.readonly) {
+    inputRef.value.focus();
+  }
+};
+
 onMounted(() => {
   handleEnumValidation(props.size, Size, 'size');
   handleEnumValidation(props.state, InputState, 'state');
@@ -187,8 +208,12 @@ onMounted(() => {
     :size="size"
     :expanded="false"
     :messages="messages"
+    @mousedown.prevent="onClickContent"
   >
-    <div class="flex gap-1.5">
+    <div
+      class="flex"
+      :class="gapSize"
+    >
       <div
         class="relative flex"
         :class="{
@@ -199,8 +224,10 @@ onMounted(() => {
         <AntSkeleton
           :visible="skeleton"
           rounded
+          @click.prevent
         >
           <input
+            ref="inputRef"
             v-model="_modelValue"
             :class="inputClasses"
             type="checkbox"
@@ -223,7 +250,10 @@ onMounted(() => {
         </AntSkeleton>
       </div>
 
-      <span :class="contentClasses">
+      <span
+        :class="contentClasses"
+        @mousedown.prevent="onClickContent"
+      >
         <AntSkeleton
           :visible="skeleton"
           rounded

package/dist/components/inputs/AntCheckboxGroup.vue

@@ -13,8 +13,9 @@ import {
   Direction,
 } from '../../enums/Direction.enum';
 import {
-  InputState, Size,
+  InputState, LayoutVariant, Size,
 } from '../../enums';
+import AntSkeleton from '../AntSkeleton.vue';
 
 const emit = defineEmits([
   'update:modelValue',
@@ -30,6 +31,7 @@ const props = withDefaults(
     direction?: Direction;
     state?: InputState;
     size?: Size;
+    layoutVariant?: LayoutVariant;
     skeleton?: boolean;
     readonly?: boolean;
     disabled?: boolean;
@@ -48,8 +50,10 @@ const props = withDefaults(
     activeColorClass?: string;
   }>(),
   {
+    checkboxes: () => [],
     direction: Direction.column,
     state: InputState.base,
+    layoutVariant: LayoutVariant.default,
     size: Size.md,
     skeleton: false,
     readonly: false,
@@ -60,12 +64,67 @@ const props = withDefaults(
     activeColorClass: 'text-primary-500',
   },
 );
+
 const containerClasses = computed(() => ({
   'flex gap-2.5': true,
   'flex-row': props.direction === Direction.row,
   'flex-col': props.direction === Direction.column,
 }));
+const blockContainerClasses = computed(() => ({
+  'flex flex-col gap-px rounded-md border overflow-hidden': true,
+  'bg-base-300 border-base-300': props.state === InputState.base,
+  'bg-info-500 border-info-500': props.state === InputState.info,
+  'bg-success-500 border-success-500': props.state === InputState.success,
+  'bg-warning-500 border-warning-500': props.state === InputState.warning,
+  'bg-danger-500 border-danger-500': props.state === InputState.danger,
+  'cursor-not-allowed': props.disabled,
+}));
+const blockItemClasses = computed(() => ({
+  'p-2.5': props.size === Size.lg,
+  'p-2': props.size === Size.md,
+  'p-1.5': props.size === Size.sm || props.size === Size.xs,
+  'p-1': props.size === Size.xs2,
+}));
+const tabContainerClasses = computed(() => ({
+  'flex rounded-md overflow-hidden': true,
+  'cursor-not-allowed': props.disabled,
+}));
+const tabItemClasses = computed(() => ({
+  'flex justify-center grow transition-colors': true,
+  'text-sm': props.size === Size.lg || props.size === Size.md || props.size === Size.sm,
+  'text-xs': props.size === Size.xs || props.size === Size.xs2,
+  'p-2.5': props.size === Size.lg,
+  'p-2': props.size === Size.md,
+  'p-1.5': props.size === Size.sm || props.size === Size.xs,
+  'p-1': props.size === Size.xs2,
+}));
+const getTabItemColorClasses = (checkbox: AntCheckboxType, index: number) => {
+  const borderClasses = {
+    'border-base-300': props.modelValue?.includes(checkbox.value) || (!props.modelValue?.includes(checkbox.value) && props.state === InputState.base),
+    'border-info-500': !props.modelValue?.includes(checkbox.value) && props.state === InputState.info,
+    'border-success-500': !props.modelValue?.includes(checkbox.value) && props.state === InputState.success,
+    'border-warning-500': !props.modelValue?.includes(checkbox.value) && props.state === InputState.warning,
+    'border-danger-500': !props.modelValue?.includes(checkbox.value) && props.state === InputState.danger,
+  };
+
+  return {
+    ...borderClasses,
+    'border-y': true,
+    'border-l': index !== props.checkboxes.length - 1,
+    'border-x': index === props.checkboxes.length - 1,
+    'rounded-l-md': index === 0,
+    'rounded-r-md': index === props.checkboxes.length - 1,
+    'opacity-50': props.disabled || checkbox.disabled,
+    'bg-white text-for-white-bg-font': !props.modelValue?.includes(checkbox.value),
+    '!bg-primary-500 text-primary-500-font': !props.skeleton && props.modelValue?.includes(checkbox.value) && props.state === InputState.base,
+    '!bg-info-500 text-info-500-font': !props.skeleton && props.modelValue?.includes(checkbox.value) && props.state === InputState.info,
+    '!bg-success-500 text-success-500-font': !props.skeleton && props.modelValue?.includes(checkbox.value) && props.state === InputState.success,
+    '!bg-warning-500 text-warning-500-font': !props.skeleton && props.modelValue?.includes(checkbox.value) && props.state === InputState.warning,
+    '!bg-danger-500 text-danger-500-font': !props.skeleton && props.modelValue?.includes(checkbox.value) && props.state === InputState.danger,
+  };
+};
 const containerRef = ref<null | HTMLElement>(null);
+const checkboxRef = ref<Array<InstanceType<typeof AntCheckbox>>>([]);
 
 watch(() => props.modelValue, (val) => {
   if ([
@@ -115,6 +174,34 @@ function onBlurCheckbox() {
   }, 100);
 }
 
+const onClickBlockItem = (checkbox: AntCheckboxType, index: number) => {
+  if (props.skeleton || props.disabled || props.readonly || checkbox.disabled || checkbox.readonly) {
+    return;
+  }
+
+  updateValue(checkbox.value);
+
+  setTimeout(() => {
+    const checkboxComponent = checkboxRef.value[index];
+
+    if (checkboxComponent && checkboxComponent.$el) {
+      const input = checkboxComponent.$el.querySelector('input[type="checkbox"]');
+
+      if (input) {
+        input.focus();
+      }
+    }
+  });
+};
+
+const onClickTabItem = (checkbox: AntCheckboxType) => {
+  if (props.skeleton || props.disabled || props.readonly || checkbox.disabled || checkbox.readonly) {
+    return;
+  }
+
+  updateValue(checkbox.value);
+};
+
 onMounted(() => {
   if (!props.skeleton && props.modelValue !== null) {
     emit('validate', props.modelValue);
@@ -134,6 +221,7 @@ onMounted(() => {
     label-for="noop"
   >
     <div
+      v-if="layoutVariant === LayoutVariant.default"
       ref="containerRef"
       :class="containerClasses"
     >
@@ -155,5 +243,65 @@ onMounted(() => {
         {{ checkbox.label }}
       </AntCheckbox>
     </div>
+
+    <div
+      v-if="layoutVariant === LayoutVariant.block"
+      ref="containerRef"
+      :class="blockContainerClasses"
+    >
+      <div
+        v-for="(checkbox, index) in checkboxes"
+        :key="`checkbox-widget_${checkbox.value}-${index}`"
+        :class="{
+          ...blockItemClasses,
+          'cursor-not-allowed': props.disabled || checkbox.disabled,
+          'cursor-pointer hover:bg-base-50': !props.skeleton && !props.disabled && !props.readonly && !checkbox.disabled && !checkbox.readonly,
+          'bg-base-100': !skeleton && modelValue?.includes(checkbox.value),
+          'bg-white': skeleton || !modelValue?.includes(checkbox.value),
+        }"
+        @click="onClickBlockItem(checkbox, index)"
+      >
+        <AntCheckbox
+          :ref="el => checkboxRef[index] = el"
+          :model-value="modelValue !== null ? modelValue?.indexOf(checkbox.value) !== -1 : null"
+          :skeleton="skeleton"
+          :disabled="disabled || checkbox.disabled"
+          :readonly="readonly || checkbox.readonly"
+          :state="state"
+          :size="size"
+          @update:model-value="updateValue(checkbox.value)"
+          @blur="() => onBlurCheckbox()"
+          @click.stop
+        >
+          {{ checkbox.label }}
+        </AntCheckbox>
+      </div>
+    </div>
+
+    <div
+      v-if="layoutVariant === LayoutVariant.tab"
+      :class="tabContainerClasses"
+    >
+      <div
+        v-for="(checkbox, index) in checkboxes"
+        :key="`checkbox-widget_${checkbox.value}-${index}`"
+        :class="{
+          ...tabItemClasses,
+          ...getTabItemColorClasses(checkbox, index),
+          'cursor-not-allowed': props.disabled || checkbox.disabled,
+          'cursor-pointer hover:bg-base-50': !props.skeleton && !props.disabled && !props.readonly && !checkbox.disabled && !checkbox.readonly,
+          'bg-base-100': !skeleton && modelValue?.includes(checkbox.value),
+          'bg-white': skeleton || !modelValue?.includes(checkbox.value),
+        }"
+        @click="onClickTabItem(checkbox)"
+      >
+        <AntSkeleton
+          :visible="skeleton"
+          rounded
+        >
+          {{ checkbox.label }}
+        </AntSkeleton>
+      </div>
+    </div>
   </AntField>
 </template>

package/dist/components/inputs/AntPhoneNumberInput.vue

@@ -24,16 +24,15 @@ import {
   ref, nextTick,
 } from 'vue';
 
-const phoneInputNativeRef = ref<HTMLInputElement | null>(null);
-
 defineOptions({
   inheritAttrs: false,
 });
 
 const props = withDefaults(defineProps<{
   modelValue: string | null;
-  countryValue: string | number | null;
+  countryValue?: string | number | null;
   countries?: Country[];
+  inputRef?: null | HTMLInputElement;
 
   //Common Props
   size?: Size;
@@ -53,7 +52,6 @@ const props = withDefaults(defineProps<{
   searchable?: boolean;
   countryMaxHeight?: string;
   countryValueKey?: CountryValueKey;
-  countryErrorMessage?: string;
   countrySortable?: boolean;
 
   //AntBaseInput Props
@@ -61,6 +59,7 @@ const props = withDefaults(defineProps<{
   nullable?: boolean;
   locale?: Locale;
 }>(), {
+  inputRef: null,
   size: Size.md,
   state: InputState.base,
   searchable: true,
@@ -68,7 +67,6 @@ const props = withDefaults(defineProps<{
   countryPlaceholder: 'Select country',
   placeholder: 'Enter phone number',
   countryValueKey: CountryValueKey.dialCode,
-  countryErrorMessage: 'Please select a country code or start with "+"',
   countrySortable: true,
   messages: () => [],
   nullable: true,
@@ -79,13 +77,27 @@ const props = withDefaults(defineProps<{
 const emit = defineEmits([
   'update:modelValue',
   'update:countryValue',
+  'update:inputRef',
   'select-country',
   'validate',
   'blur',
 ]);
 
-const _countryValue = useVModel(props, 'countryValue', emit);
 const _phoneNumber = useVModel(props, 'modelValue', emit);
+const internalInputRef = ref<HTMLInputElement | null>(null);
+const _inputRef = useVModel(props, 'inputRef', emit);
+const internalCountryValue = ref<string | number | null>(null);
+
+const _countryValue = computed({
+  get: () => {
+    return props.countryValue !== undefined ? props.countryValue : internalCountryValue.value;
+  },
+  set: (val) => {
+    emit('update:countryValue', val);
+
+    internalCountryValue.value = val;
+  },
+});
 
 const updateFullValue = (countryId: string | number | null, rawPhone: string | null) => {
   if (!rawPhone) {
@@ -104,26 +116,8 @@ const updateFullValue = (countryId: string | number | null, rawPhone: string | n
   }
 };
 
-const showCountryError = computed(() => {
-  const val = props.modelValue || '';
-
-  return props.countryValue == null && val.length > 0 && !val.startsWith('+');
-});
-
-const allMessages = computed(() => {
-  const msgs = [
-    ...(props.messages || []),
-  ];
-
-  if (showCountryError.value) {
-    msgs.push(props.countryErrorMessage);
-  }
-
-  return msgs;
-});
-
 const currentCountry = computed(() => {
-  return props.countries.find(c => String(c[props.countryValueKey]) === String(props.countryValue));
+  return props.countries.find(c => String(c[props.countryValueKey]) === String(_countryValue.value));
 });
 
 const sortedCountriesByDialCode = computed(() => {
@@ -213,7 +207,7 @@ function onCountrySelect(country: Country) {
   emit('select-country', country);
 
   nextTick(() => {
-    phoneInputNativeRef.value?.focus();
+    internalInputRef.value?.focus();
   });
 }
 
@@ -232,13 +226,13 @@ function onKeyPress(event: KeyboardEvent) {
     return;
   }
 
-  if (props.countryValue && charStr === '+') {
+  if (_countryValue.value && charStr === '+') {
     event.preventDefault();
 
     return;
   }
 
-  if (!props.countryValue && charStr === '+' && currentRawValue.length > 0) {
+  if (!_countryValue.value && charStr === '+' && currentRawValue.length > 0) {
     event.preventDefault();
   }
 
@@ -269,6 +263,11 @@ function onPaste(event: ClipboardEvent) {
   }
 }
 
+function onBlur(e: FocusEvent) {
+  emit('blur', e);
+  emit('validate', _phoneNumber.value);
+}
+
 watch(_countryValue, (newCountryId, oldCountryId) => {
   if (newCountryId === oldCountryId) {
     return;
@@ -284,13 +283,29 @@ watch(_countryValue, (newCountryId, oldCountryId) => {
 
   updateFullValue(newCountryId, body);
 });
+
+watch(() => props.modelValue, (newVal) => {
+  if (newVal && newVal.startsWith('+') && !_countryValue.value) {
+    const country = findCountryByPhone(newVal);
+
+    if (country) {
+      _countryValue.value = country[props.countryValueKey] as string | number;
+    }
+  }
+}, {
+  immediate: true,
+});
+
+watch(internalInputRef, (el) => {
+  _inputRef.value = el;
+});
 </script>
 
 <template>
   <AntField
     :label="label"
-    :messages="allMessages"
-    :state="showCountryError ? InputState.danger : state"
+    :messages="messages"
+    :state="state"
     :size="size"
     :skeleton="skeleton"
     :description="description"
@@ -305,7 +320,7 @@ watch(_countryValue, (newCountryId, oldCountryId) => {
         :countries="countries"
         :size="size"
         :locale="locale"
-        :state="showCountryError ? InputState.danger : state"
+        :state="state"
         :disabled="disabled"
         :readonly="readonly"
         :skeleton="skeleton"
@@ -324,10 +339,10 @@ watch(_countryValue, (newCountryId, oldCountryId) => {
 
       <AntBaseInput
         v-model="formattedNumber"
-        v-model:input-ref="phoneInputNativeRef"
+        v-model:input-ref="internalInputRef"
         :nullable="nullable"
         :type="BaseInputType.text"
-        :state="showCountryError ? InputState.danger : state"
+        :state="state"
         :size="size"
         :skeleton="skeleton"
         v-bind="$attrs"
@@ -337,8 +352,7 @@ watch(_countryValue, (newCountryId, oldCountryId) => {
         :grouped="Grouped.right"
         wrapper-class="flex-grow"
         class="-ml-px"
-        @validate="val => $emit('validate', val)"
-        @blur="e => $emit('blur', e)"
+        @blur="onBlur"
         @keydown="onKeyPress"
         @paste="onPaste"
       />

package/dist/components/inputs/AntRadio.vue

@@ -107,13 +107,6 @@ const gapSize = computed(() => {
       return 'gap-1';
   }
 });
-const valueSize = computed(() => {
-  if (props.size === Size.xs || props.size === Size.xs2) {
-    return 'h-4';
-  } else {
-    return 'h-5';
-  }
-});
 const innerRadioClass = computed(() => (
   {
     'bg-primary-500': props.state === InputState.base,
@@ -177,50 +170,51 @@ onMounted(() => {
     data-e2e="radio"
   >
     <div
-      class="flex items-center"
+      class="flex"
       :class="gapSize"
     >
-      <div class="relative full-height flex items-center">
-        <div class="absolute flex items-center justify-center w-full h-full">
-          <Transition name="fade-radio">
-            <div
-              v-if="isActive"
-              class="rounded-full transition-all"
-              :class="innerRadioClass"
-            />
-          </Transition>
-        </div>
-
-        <input
-          v-model="_modelValue"
-          :value="value.value"
-          :class="inputClasses"
-          type="radio"
-          :aria-checked="isActive"
-          :disabled="disabled || readonly"
-          @blur="onBlur"
-        >
-
+      <div
+        class="relative flex"
+        :class="{
+          'h-5 w-5': size === Size.lg || size === Size.md || size === Size.sm,
+          'h-4 w-4': size === Size.xs || size === Size.xs2,
+        }"
+      >
         <AntSkeleton
           :visible="skeleton"
-          absolute
           rounded-full
-        />
+          @click.prevent
+        >
+          <div class="absolute flex items-center justify-center w-full h-full">
+            <Transition name="fade-radio">
+              <div
+                v-if="isActive"
+                class="rounded-full transition-all"
+                :class="innerRadioClass"
+              />
+            </Transition>
+          </div>
+
+          <input
+            v-model="_modelValue"
+            :value="value.value"
+            :class="inputClasses"
+            type="radio"
+            :aria-checked="isActive"
+            :disabled="disabled || readonly"
+            @blur="onBlur"
+          >
+        </AntSkeleton>
       </div>
 
-      <div
-        class="flex items-center"
-        :class="valueSize"
+      <AntSkeleton
+        :visible="skeleton"
+        rounded
       >
         <span :class="valueClass">
-          <AntSkeleton
-            :visible="skeleton"
-            rounded
-          >
-            {{ value.label }}
-          </AntSkeleton>
+          {{ value.label }}
         </span>
-      </div>
+      </AntSkeleton>
     </div>
   </AntField>
 </template>