sprintify-ui 0.6.32 → 0.6.33

package/src/components/BaseColor.stories.js

@@ -2,10 +2,18 @@ import { createFieldStory } from '../../.storybook/utils';
 import BaseColor from './BaseColor.vue';
 import ShowValue from '../../.storybook/components/ShowValue.vue';
 
+const sizes = ['xs', 'sm', 'md'];
+
 export default {
   title: 'Form/BaseColor',
   component: BaseColor,
   decorators: [() => ({ template: '<div class="mb-36"><story/></div>' })],
+  argTypes: {
+    size: {
+      control: { type: 'select' },
+      options: sizes,
+    },
+  },
 };
 
 const Template = (args) => ({
@@ -39,6 +47,20 @@ Disabled.args = {
   modelValue: '#16a34a',
 };
 
+export const Sizes = (args) => ({
+  components: { BaseColor },
+  setup() {
+    const value = ref(null);
+    return { args, sizes, value };
+  },
+  template: `
+    <div v-for="size in sizes" :key="size" class="mb-4">
+      <p class="text-xs text-slate-600 leading-tight mb-1"> {{ size }}</p>
+      <BaseColor v-bind="args" v-model="value" :size="size"></BaseColor>
+    </div>
+  `,
+});
+
 export const Field = createFieldStory({
   component: BaseColor,
   componentName: 'BaseColor',

package/src/components/BaseColor.vue

@@ -5,36 +5,28 @@
       :disabled="disabled"
       value-key="value"
       label-key="label"
+      :size="size"
       :required="required"
       :options="colorOptions"
       :multiple="multiple"
       :button-type="buttonType"
-      tw-button=""
-      tw-button-selected=""
-      tw-button-unselected=""
+      :button-color="buttonColor"
+      tw-button="p-0 aspect-1 justify-center items-center"
       @update:model-value="(value) => transformModelValue(value)"
     >
       <template #option="option">
         <div
-          :style="{ backgroundColor: option.option.value + '' }"
-          class="box-border rounded-md border p-3"
-          :class="[
-            option.selected.value
-              ? option.option.option.hasLowContrast
-                ? 'text-slate-700'
-                : 'text-white'
-              : 'text-transparent',
-            disabled ? ' cursor-not-allowed opacity-50' : '',
-            option.option.option.hasLowContrast
-              ? 'border-slate-400'
-              : 'border-transparent',
-          ]"
+          v-if="option.selected.value"
+          class="overflow-hidden flex h-full"
         >
           <BaseIcon
             icon="heroicons-solid:check-circle"
-            class="h-5 w-5"
+            class="block leading-none"
+            width="18"
+            height="18"
           />
         </div>
+        <div v-else />
       </template>
     </BaseButtonGroup>
   </div>
@@ -48,6 +40,7 @@ import { useField } from '@/composables/field';
 import { Option } from '@/types';
 import { palette } from '@/utils/colors';
 import { getContrast } from 'color2k';
+import { Size } from '@/utils/sizes';
 
 const props = defineProps({
   modelValue: {
@@ -64,6 +57,10 @@ const props = defineProps({
     default: false,
     type: Boolean,
   },
+  size: {
+    default: undefined,
+    type: String as PropType<Size>,
+  },
   buttonType: {
     default: 'button',
     type: String as PropType<'button' | 'submit'>,
@@ -74,6 +71,12 @@ const props = defineProps({
       return Object.values(palette).map((p) => p.high.backgroundColor);
     },
   },
+  buttonColor: {
+    default(option: Option, selected: boolean) {
+      return option.value;
+    },
+    type: Function as PropType<(option: Option, selected: boolean) => string>,
+  },
   multiple: {
     default: false,
     type: Boolean,
@@ -107,15 +110,15 @@ function hasLowContrast(color: string): boolean {
 const normalizeModelValue = computed(() => {
   return isArray(props.modelValue)
     ? props.modelValue?.map((m) => {
-        return {
-          label: m,
-          value: m,
-        };
-      })
-    : {
-        label: props.modelValue,
-        value: props.modelValue,
+      return {
+        label: m,
+        value: m,
       };
+    })
+    : {
+      label: props.modelValue,
+      value: props.modelValue,
+    };
 });
 
 const { emitUpdate } = useField({

package/src/components/BaseDropdown.stories.js

@@ -93,7 +93,6 @@ export const WithAutocomplete = (args) => ({
             size="xs"
             :options="options"
             :inline="true"
-            :visibleFocus="false"
             dropdownShow="always"
             :showModelValue="false"
             focus-on-mount
@@ -143,14 +142,14 @@ export const ModalWithScroll = (args) => ({
   },
   template: `
   <BaseModalCenter v-model="open">
-    <div class="p-10 bg-white">
+    <div class="p-10">
       <BaseDropdown v-bind="args">
         <template #button>
           <div class="btn btn-primary">Click me</div>
         </template>
         <template #dropdown>
           <div 
-            class="bg-white shadow py-1 px-1 rounded" 
+            class="bg-white ring-1 shadow-xl ring-black ring-opacity-10 py-1 px-1 rounded-md" 
             style="max-height: 200px; overflow: auto;" 
             data-scroll-lock-scrollable>
             <button type="button" v-for="item in items" :key="item.label" class="block text-sm px-4 py-1.5">{{ item.label }}</button>

package/src/components/BaseDropdownAutocomplete.vue

@@ -13,7 +13,7 @@
     </template>
     <template #dropdown="{ close }">
       <div
-        class="inline-block w-[320px] overflow-hidden rounded-md ring-1 ring-black ring-opacity-10 bg-white px-2 pt-2 shadow-2xl"
+        class="inline-block w-[320px] overflow-hidden input-rounded ring-1 ring-black ring-opacity-10 bg-white px-2 pt-2 shadow-2xl"
       >
         <component
           :is="componentName"
@@ -33,7 +33,7 @@
           <template #option="optionProps">
             <div
               :class="[optionProps.active ? 'bg-slate-100' : 'bg-white']"
-              class="mb-px flex items-center rounded px-1 py-1"
+              class="mb-px flex items-center input-rounded px-1 py-1"
             >
               <div class="flex grow items-center">
                 <slot

package/src/components/BaseField.vue

@@ -4,7 +4,8 @@
       v-if="labelNormalized"
       :label="labelNormalized"
       :required="required"
-      :class="labelClassInternal"
+      :size="inputSize.size.value"
+      :class="labelClassInternalMerged"
       :help="help"
     />
 
@@ -19,6 +20,7 @@
     <template v-if="errorMessage">
       <BaseInputError
         v-if="errorTypeInternal == 'default'"
+        :size="inputSize.size.value"
         class="mt-1"
       >
         {{ errorMessage }}
@@ -40,6 +42,9 @@ import { PropType } from 'vue';
 import BaseAlert from './BaseAlert.vue';
 import BaseInputError from './BaseInputError.vue';
 import BaseInputLabel from './BaseInputLabel.vue';
+import { useInputSize } from '@/composables/inputSize';
+import { Size } from '@/utils/sizes';
+import { ClassNameValue, twMerge } from 'tailwind-merge';
 
 const props = defineProps({
   name: {
@@ -50,6 +55,10 @@ const props = defineProps({
     type: String,
     default: '',
   },
+  size: {
+    default: undefined,
+    type: String as PropType<Size>,
+  },
   required: {
     type: Boolean,
     default: false,
@@ -68,25 +77,26 @@ const props = defineProps({
   },
   labelClass: {
     default: '',
-    type: [String, Array, Object] as PropType<
-      string | string[] | Record<string, boolean>
-    >,
+    type: [String, Array] as PropType<ClassNameValue>,
   },
 });
 
 const errorTypeInternal = ref(props.errorType);
 
+const inputSize = useInputSize(computed(() => props.size));
+
 function setErrorType(errorType: 'default' | 'alert' | null) {
   if (errorType != null) {
     errorTypeInternal.value = errorType;
   }
 }
 
-const labelClassInternal = ref(props.labelClass);
+const labelClassInternal = ref<any>('');
+const labelClassInternalMerged = computed(() => {
+  return twMerge(labelClassInternal.value, props.labelClass);
+});
 
-function setLabelClass(
-  labelClass: string | string[] | Record<string, boolean> | null
-) {
+function setLabelClass(labelClass: ClassNameValue) {
   if (labelClass != null) {
     labelClassInternal.value = labelClass;
   }
@@ -122,6 +132,7 @@ const errorMessage = computed((): string | null | undefined => {
 
 provide('field:name', readonly(ref(props.name)));
 provide('field:required', readonly(ref(props.required)));
+provide('field:size', readonly(inputSize.size));
 provide('field:onUpdate', fieldOnUpdate);
 provide('field:errorMessage', errorMessage);
 provide('field:setErrorType', setErrorType);

package/src/components/BaseInput.stories.js

@@ -19,6 +19,10 @@ export default {
     placeholder: 'Enter your name',
   },
   argTypes: {
+    size: {
+      control: { type: 'select' },
+      options: ['xs', 'sm', 'md'],
+    },
     mask: {
       control: { type: 'select' },
       options: [
@@ -144,12 +148,42 @@ CustomMask.args = {
   mask: (value) => (value.startsWith('1') ? '#-#' : '##-##'),
 };
 
+const CustomClassesT = (args) => ({
+  components: { BaseInput, ShowValue },
+  setup() {
+    const value = ref(null);
+    return { args, value };
+  },
+  template: `
+    <BaseInput v-model="value" v-bind="args" suffix="$$$" class="w-full bg-green-100 text-green-700 border-green-700 focus-within:border-red-500 focus-within:ring-red-800 placeholder:text-green-400 shadow-xl"></BaseInput>
+    <ShowValue :value="value" />
+  `,
+});
+
+export const CustomClasses = CustomClassesT.bind({});
+
 export const Field = createFieldStory({
   component: BaseInput,
   componentName: 'BaseInput',
   label: 'Name',
 });
 
+const TemplateSizes = (args) => ({
+  components: { BaseInput, ShowValue },
+  setup() {
+    const value = ref(null);
+    const sizes = ['xs', 'sm', 'md'];
+    return { args, value, sizes };
+  },
+  template: `
+  <div v-for="size in sizes" :key="size" class="mb-4">
+    <p class="text-xs text-slate-600 leading-tight mb-1">btn {{ size }}</p>
+    <BaseInput v-model="value" v-bind="args" :size="size" class="w-full"></BaseInput>
+  </div>
+  `,
+});
+
+export const Sizes = TemplateSizes.bind({});
 
 const FocusTemplate = (args) => ({
   components: { BaseInput },
@@ -161,7 +195,7 @@ const FocusTemplate = (args) => ({
   template: `
     <BaseInput ref="input" v-model="value" v-bind="args" class="w-full"></BaseInput>
 
-    <button @click="input.focus()" class="mt-4 underline">Focus</button>
+    <button @click="input.focus()" class="mt-4 btn btn-sm">Focus</button>
   `,
 });
 

package/src/components/BaseInput.vue

@@ -1,27 +1,23 @@
 <template>
-  <div
-    class="inline-flex rounded border"
-    :class="[borderColor]"
-  >
-    <div
-      v-if="iconLeft"
-      class="flex shrink-0 items-center justify-center rounded-l border-r px-3 transition-colors"
-      :class="[borderColor, backgroundColor, textColor]"
-    >
-      <BaseIcon :icon="iconLeft" />
-    </div>
-    <div
-      v-if="prefix"
-      class="flex shrink-0 items-center justify-center border-r px-4 transition-colors"
-      :class="[
-        iconLeft ? '' : 'rounded-l',
-        borderColor,
-        backgroundColor,
-        textColor,
-      ]"
-    >
-      {{ prefix }}
+  <div :class="classes">
+    <div :class="decorationWrapClasses">
+      <div
+        v-if="iconLeft"
+        :class="decorationClasses"
+      >
+        <BaseIcon
+          :icon="iconLeft"
+          :class="iconClasses"
+        />
+      </div>
+      <div
+        v-if="prefix"
+        :class="decorationClasses"
+      >
+        {{ prefix }}
+      </div>
     </div>
+
     <input
       v-if="maskOptions"
       ref="input"
@@ -30,12 +26,10 @@
       :value="modelValue"
       :type="type"
       :autocomplete="autocomplete ? 'on' : 'off'"
-      :class="{
-        'rounded-l': emptyLeft,
-        'rounded-r': emptyRight,
-        'w-full border-none bg-white outline-none focus:z-[1] focus:ring-2 focus:ring-primary-600 focus:ring-offset-1 disabled:cursor-not-allowed disabled:text-slate-300': true,
-      }"
-      @input="update"
+      :class="baseClasses"
+      @input="onInput"
+      @click="onClick"
+      @keydown="onKeydown"
     >
     <input
       v-else
@@ -44,31 +38,27 @@
       :value="modelValue"
       :type="type"
       :autocomplete="autocomplete ? 'on' : 'off'"
-      :class="{
-        'rounded-l': emptyLeft,
-        'rounded-r': emptyRight,
-        'w-full border-none bg-white outline-none focus:z-[1] focus:ring-2 focus:ring-primary-600 focus:ring-offset-1 disabled:cursor-not-allowed disabled:text-slate-300': true,
-      }"
-      @input="update"
-    >
-    <div
-      v-if="suffix"
-      class="flex shrink-0 items-center justify-center border-l px-4 transition-colors"
-      :class="[
-        iconRight ? '' : 'rounded-r',
-        borderColor,
-        backgroundColor,
-        textColor,
-      ]"
+      :class="baseClasses"
+      @input="onInput"
+      @click="onClick"
+      @keydown="onKeydown"
     >
-      {{ suffix }}
-    </div>
-    <div
-      v-if="iconRight"
-      class="flex shrink-0 items-center justify-center rounded-r border-l px-3 transition-colors"
-      :class="[borderColor, backgroundColor, textColor]"
-    >
-      <BaseIcon :icon="iconRight" />
+    <div :class="decorationWrapClasses">
+      <div
+        v-if="suffix"
+        :class="decorationClasses"
+      >
+        {{ suffix }}
+      </div>
+      <div
+        v-if="iconRight"
+        :class="decorationClasses"
+      >
+        <BaseIcon
+          :icon="iconRight"
+          :class="iconClasses"
+        />
+      </div>
     </div>
   </div>
 </template>
@@ -79,12 +69,22 @@ import { PropType } from 'vue';
 import { Icon as BaseIcon } from '@iconify/vue';
 import { useField } from '@/composables/field';
 import { vMaska } from 'maska';
+import { Size, sizes } from '@/utils/sizes';
+import { twMerge } from 'tailwind-merge';
+
+defineOptions({
+  inheritAttrs: false,
+})
 
 const props = defineProps({
   modelValue: {
     default: '',
     type: [String, Number, null] as PropType<string | number | null>,
   },
+  class: {
+    default: '',
+    type: [String, Array] as PropType<string | string[]>,
+  },
   type: {
     type: String,
     default: 'text',
@@ -140,6 +140,10 @@ const props = defineProps({
     default: false,
     type: Boolean,
   },
+  size: {
+    default: undefined,
+    type: String as PropType<Size>,
+  },
   min: {
     default: undefined,
     type: [null, Number] as PropType<undefined | null | number>,
@@ -154,9 +158,22 @@ const props = defineProps({
       return null;
     },
   },
+  visibleFocus: {
+    default: true,
+    type: Boolean,
+  },
 });
 
 const input = ref<HTMLInputElement | null>(null);
+const focus = ref(false);
+
+const hasLeftDecoration = computed(() => {
+  return props.iconLeft || props.prefix;
+});
+
+const hasRightDecoration = computed(() => {
+  return props.iconRight || props.suffix;
+});
 
 const maskOptions = computed(() => {
   if (props.mask) {
@@ -167,14 +184,6 @@ const maskOptions = computed(() => {
   return undefined;
 });
 
-const emptyLeft = computed(() => {
-  return !props.iconLeft && !props.prefix;
-});
-
-const emptyRight = computed(() => {
-  return !props.iconRight && !props.suffix;
-});
-
 const bindings = computed<any>(() => {
   return {
     name: nameInternal.value,
@@ -184,7 +193,6 @@ const bindings = computed<any>(() => {
     disabled: props.disabled,
     placeholder: props.placeholder,
     required: requiredInternal.value,
-
     onKeydown(event: KeyboardEvent) {
       if (event.code == 'Enter' && props.preventSubmit) {
         event.preventDefault();
@@ -192,9 +200,11 @@ const bindings = computed<any>(() => {
     },
     onFocus: (e: Event) => {
       emit('focus', e);
+      focus.value = true;
     },
     onBlur: (e: Event) => {
       emit('blur', e);
+      focus.value = false;
     },
   };
 });
@@ -219,17 +229,18 @@ const maskInternal = computed(() => {
   return props.mask;
 });
 
-const emit = defineEmits(['update:modelValue', 'focus', 'blur']);
+const emit = defineEmits(['update:modelValue', 'focus', 'blur', 'click', 'keydown']);
 
-const { nameInternal, requiredInternal, hasErrorInternal, emitUpdate } =
+const { nameInternal, requiredInternal, hasErrorInternal, emitUpdate, sizeInternal } =
   useField({
     name: computed(() => props.name),
     required: computed(() => props.required),
     hasError: computed(() => props.hasError),
+    size: computed(() => props.size),
     emit: emit,
   });
 
-function update(event: any | null) {
+function onInput(event: any | null) {
   if (event === null) {
     emitUpdate(null);
   }
@@ -237,28 +248,97 @@ function update(event: any | null) {
   return emitUpdate(get(event, 'target.value', ''));
 }
 
-const borderColor = computed(() => {
-  return hasErrorInternal.value ? 'border-red-500' : 'border-slate-300';
+function onClick(event: MouseEvent) {
+  emit('click', event);
+}
+
+function onKeydown(event: KeyboardEvent) {
+  emit('keydown', event);
+}
+
+const classes = computed(() => {
+  const base = `inline-flex bg-white input-rounded border transition-colors duration-200`;
+  const border = hasErrorInternal.value ? 'border-red-500' : 'border-slate-300';
+  const disabled = props.disabled ? 'cursor-not-allowed text-slate-300' : '';
+  const sizeConfig = sizes[sizeInternal.value];
+  let focusClass = '';
+  if (props.visibleFocus) {
+    if (hasErrorInternal.value) {
+      focusClass = 'focus-within:input-focus-error';
+    } else {
+      focusClass = 'focus-within:input-focus';
+    }
+  }
+
+  return twMerge([
+    base,
+    border,
+    disabled,
+    sizeConfig.height,
+    sizeConfig.fontSize,
+    focusClass,
+    props.class,
+  ]);
 });
 
-const backgroundColor = computed(() => {
-  return hasErrorInternal.value ? 'bg-red-100' : 'bg-slate-100';
+const baseClasses = computed(() => {
+  const base = `border-none outline-none bg-transparent grow min-w-0 focus:border-none focus:outline-none focus:ring-0`;
+  const sizeConfig = sizes[sizeInternal.value];
+  const disabled = props.disabled ? 'cursor-not-allowed text-slate-300' : '';
+
+  const paddingX = {
+    xs: [hasLeftDecoration.value ? 'pl-1.5' : 'pl-2', hasRightDecoration.value ? 'pr-1.5' : 'pr-2'],
+    sm: [hasLeftDecoration.value ? 'pl-2' : 'pl-2.5', hasRightDecoration.value ? 'pr-2' : 'pr-2.5'],
+    md: [hasLeftDecoration.value ? 'pl-2.5' : 'pl-3', hasRightDecoration.value ? 'pr-2.5' : 'pr-3'],
+  }[sizeInternal.value];
+
+  return [
+    base,
+    disabled,
+    paddingX,
+    sizeConfig.fontSize,
+  ];
+});
+
+const decorationWrapClasses = computed(() => {
+  const base = `flex items-center justify-center empty:hidden`;
+  const spacing = {
+    xs: 'first:pl-2 last:pr-2 gap-1',
+    sm: 'first:pl-2.5 last:pr-2.5 gap-2',
+    md: 'first:pl-3 last:pr-3 gap-3',
+  }[sizeInternal.value];
+
+  return [
+    base,
+    spacing,
+  ];
 });
 
-const textColor = computed(() => {
-  return hasErrorInternal.value ? 'text-red-800' : 'text-slate-600';
+const decorationClasses = computed(() => {
+  const base = `flex items-center justify-center`;
+  const textColor = hasErrorInternal.value ? 'text-red-800' : 'text-slate-500';
+
+  return `${base} ${textColor}`;
+});
+
+const iconClasses = computed(() => {
+  const sizeConfig = sizes[sizeInternal.value];
+
+  return [
+    sizeConfig.iconSize,
+  ];
 });
 
-function focus() {
+function focusAction() {
   input.value?.focus();
 }
 
-function blur() {
+function blurAction() {
   input.value?.blur();
 }
 
 defineExpose({
-  focus,
-  blur,
+  focus: focusAction,
+  blur: blurAction,
 });
 </script>