sprintify-ui 0.0.31 → 0.0.33

package/src/components/BaseAutocomplete.vue

@@ -78,10 +78,7 @@
                 <slot
                   name="option"
                   :option="option.option"
-                  :selected="
-                    normalizedModelValue &&
-                    normalizedModelValue.value == option.value
-                  "
+                  :selected="isSelected(option)"
                   :active="optionActive && optionActive.value == option.value"
                 >
                   <div
@@ -125,20 +122,16 @@
 
 <script lang="ts" setup>
 import { get } from 'lodash';
-import { PropType, Ref } from 'vue';
-import {
-  NormalizedOption,
-  Option,
-  Selection,
-  NormalizedSelection,
-} from '@/types/types';
+import { PropType, Ref, ComputedRef } from 'vue';
+import { NormalizedOption, Option } from '@/types/types';
 import { useInfiniteScroll, useMutationObserver } from '@vueuse/core';
 import BaseSkeleton from './BaseSkeleton.vue';
+import { useHasOptions } from '@/composables/hasOptions';
 
 const props = defineProps({
   modelValue: {
     default: undefined,
-    type: [Object, null] as PropType<Selection | undefined>,
+    type: [Object, null] as PropType<Option | null | undefined>,
   },
   options: {
     required: true,
@@ -193,6 +186,19 @@ const selectionIndex = ref(0);
 const inputElement = ref(null) as Ref<HTMLInputElement | null>;
 const dropdown = ref(null) as Ref<HTMLElement | null>;
 
+const hasOptions = useHasOptions(
+  computed(() => props.modelValue),
+  computed(() => props.options),
+  computed(() => props.labelKey),
+  computed(() => props.valueKey),
+  computed(() => false)
+);
+
+const isSelected = hasOptions.isSelected;
+const normalizedOptions = hasOptions.normalizedOptions;
+const normalizedModelValue =
+  hasOptions.normalizedModelValue as ComputedRef<NormalizedOption | null>;
+
 onMounted(() => {
   useInfiniteScroll(
     dropdown.value,
@@ -211,17 +217,7 @@ const optionActive = computed(() => {
   );
 });
 
-const normalizedModelValue = computed(() => {
-  if (!props.modelValue) {
-    return null;
-  }
-  return {
-    label: props.modelValue[props.labelKey] as string,
-    value: props.modelValue[props.valueKey] as string | number,
-    option: props.modelValue,
-  };
-});
-
+// Update the keywords when the model value changes
 watch(
   () => normalizedModelValue.value,
   () => {
@@ -234,16 +230,6 @@ watch(
   { immediate: true }
 );
 
-const normalizedOptions = computed(() => {
-  return props.options.map((option) => {
-    return {
-      label: option[props.labelKey] as string,
-      value: option[props.valueKey] as string | number,
-      option: option,
-    } as NormalizedOption;
-  });
-});
-
 const filteredNormalizedOptions = computed((): NormalizedOption[] => {
   return normalizedOptions.value.filter((option) => {
     if (props.filter !== undefined) {
@@ -276,6 +262,8 @@ const onTextFocus = () => {
   emit('focus');
 };
 
+// If keywords is changed but no new selection was made,
+// update keywords to original value
 const onTextBlur = () => {
   timerId.value = setTimeout(() => {
     showDropdown.value = false;
@@ -305,7 +293,7 @@ const onTextKeydown = (event: KeyboardEvent) => {
   }
 
   if (key === 'ArrowDown') {
-    if (selectionIndex.value < props.options.length - 1) {
+    if (selectionIndex.value < filteredNormalizedOptions.value.length - 1) {
       selectionIndex.value++;
     } else {
       selectionIndex.value = 0;
@@ -317,7 +305,10 @@ const onTextKeydown = (event: KeyboardEvent) => {
     if (selectionIndex.value > 0) {
       selectionIndex.value--;
     } else {
-      selectionIndex.value = Math.max(0, props.options.length - 1);
+      selectionIndex.value = Math.max(
+        0,
+        filteredNormalizedOptions.value.length - 1
+      );
     }
     return;
   }
@@ -333,9 +324,7 @@ const onTextKeydown = (event: KeyboardEvent) => {
 
 const optionClass = (option: NormalizedOption) => {
   const active = optionActive.value && optionActive.value.value == option.value;
-  const selected =
-    normalizedModelValue.value &&
-    normalizedModelValue.value.value == option.value;
+  const selected = isSelected(option);
 
   if (selected) {
     if (active) {
@@ -359,12 +348,12 @@ const clear = () => {
   inputElement.value?.focus();
 };
 
-const onSelect = (normalizedModelValue: NormalizedSelection) => {
+const onSelect = (normalizedModelValue: Option | null | undefined) => {
   update(normalizedModelValue);
   inputElement.value?.blur();
 };
 
-const update = (normalizedSelection: NormalizedSelection) => {
+const update = (normalizedSelection: Option | null | undefined) => {
   const selection = normalizedSelection ? normalizedSelection.option : null;
   if (normalizedSelection) {
     setKeywordsWithoutEvent(normalizedSelection.label);

package/src/components/BaseAutocompleteFetch.vue

@@ -61,14 +61,14 @@
 import { config } from '../';
 import { debounce } from 'lodash';
 import { PropType, Ref } from 'vue';
-import { Option, Selection } from '@/types/types';
+import { Option } from '@/types/types';
 import { RouteLocationRaw } from 'vue-router';
 import BaseAutocomplete from './BaseAutocomplete.vue';
 
 const props = defineProps({
   modelValue: {
     default: undefined,
-    type: [Object, null] as PropType<Selection | undefined>,
+    type: [Object, null] as PropType<Option | null | undefined>,
   },
   url: {
     required: true,

package/src/components/BaseBelongsTo.vue

@@ -24,12 +24,12 @@
 </template>
 
 <script lang="ts" setup>
-import { Selection } from '@/types/types';
 import { PropType } from 'vue';
 import { RouteLocationRaw } from 'vue-router';
 import { AxiosResponse } from 'axios';
 import { config } from '@/index';
 import BaseAutocompleteFetch from './BaseAutocompleteFetch.vue';
+import { Option } from '@/types/types';
 
 const props = defineProps({
   modelValue: {
@@ -72,7 +72,7 @@ const props = defineProps({
   },
   currentModel: {
     default: null,
-    type: [Object, null] as PropType<Selection>,
+    type: [Object, null] as PropType<Option | null>,
   },
   createNewUrl: {
     default: '',
@@ -120,7 +120,7 @@ watch(
   { immediate: true }
 );
 
-function onUpdate(newModel: Selection) {
+function onUpdate(newModel: Option | null) {
   if (!newModel) {
     model.value = null;
     emit('update:modelValue', null);

package/src/components/BaseButtonGroup.stories.js

@@ -0,0 +1,87 @@
+import BaseButtonGroup from './BaseButtonGroup.vue';
+
+export default {
+  title: 'Form/BaseButtonGroup',
+  component: BaseButtonGroup,
+  argTypes: {},
+  args: {
+    labelKey: 'label',
+    valueKey: 'value',
+    options: [
+      { label: 'Dark Vader', value: 'dark_vader' },
+      { label: 'Darth Maul', value: 'darth_maul' },
+      { label: 'Dark Sidious', value: 'dark_sidious' },
+      { label: 'Obi Wan Kenobi', value: 'obiwan' },
+      { label: 'Anakin Skywalker', value: 'anakin' },
+      { label: 'Mace Windu', value: 'windu' },
+    ],
+  },
+  decorators: [() => ({ template: '<div class="mb-36"><story/></div>' })],
+};
+
+const Template = (args) => ({
+  components: { BaseButtonGroup },
+  setup() {
+    const value = ref(null);
+    return { args, value };
+  },
+  template: `
+    <BaseButtonGroup v-model="value" v-bind="args"></BaseButtonGroup>
+    <p class="mt-5 text-sm">Value: <span class="bg-slate-200 font-mono px-1 py-px rounded">{{ value ?? 'NULL' }}</span></p>
+  `,
+});
+
+export const Single = Template.bind({});
+Single.args = {};
+
+export const SingleRequired = Template.bind({});
+SingleRequired.args = {
+  required: true,
+};
+
+export const Multiple = Template.bind({});
+Multiple.args = {
+  multiple: true,
+};
+
+export const Disabled = Template.bind({});
+Disabled.args = {
+  disabled: true,
+  modelValue: { label: 'Dark Maul', value: 'darth_maul' },
+};
+
+export const SlotOption = (args) => ({
+  components: { BaseButtonGroup },
+  setup() {
+    const value = ref(null);
+
+    const options = [
+      { label: 'Red', value: 'red' },
+      { label: 'Blue', value: 'blue' },
+      { label: 'Green', value: 'green' },
+      { label: 'Black', value: 'black' },
+      { label: 'Gray', value: 'gray' },
+    ];
+
+    return { value, options, args };
+  },
+  template: `
+  <BaseButtonGroup
+    v-bind="args"
+    v-model="value"
+    :options="options"
+  >
+    <template #option="{ option, selected, onSelect }">
+      <button
+        class="btn btn-xs flex items-center space-x-1 font-semibold"
+        :class="[selected ? 'btn-black' : '']"
+        type="button"
+        @click="onSelect(option)"
+      >
+        <div class="w-3 h-3 rounded" :style="{ backgroundColor: option.value }"></div>
+        <div>{{ option.label }}</div>
+      </button>
+    </template>
+  </BaseButtonGroup>
+  `,
+});

package/src/components/BaseButtonGroup.vue

@@ -0,0 +1,134 @@
+<template>
+  <div class="flex flex-wrap" :style="{ margin: '-' + spacing }">
+    <div
+      v-for="option in normalizedOptions"
+      :key="option.value"
+      :style="{ padding: spacing }"
+    >
+      <slot
+        name="option"
+        :selected="isSelected(option)"
+        :on-select="onSelect"
+        :option="option"
+      >
+        <button
+          :type="buttonType"
+          :disabled="disabled"
+          :class="[
+            buttonClass,
+            isSelected(option) ? buttonActiveClass : buttonInactiveClass,
+          ]"
+          @click="onSelect(option)"
+        >
+          {{ option.label }}
+        </button>
+      </slot>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { PropType } from 'vue';
+import { NormalizedOption, Option } from '@/types/types';
+import { cloneDeep, isArray, isObject } from 'lodash';
+import { useHasOptions } from '@/composables/hasOptions';
+
+const props = defineProps({
+  modelValue: {
+    default: undefined,
+    type: [Array, String, Number, null] as PropType<
+      Option[] | Option | undefined
+    >,
+  },
+  required: {
+    default: false,
+    type: Boolean,
+  },
+  disabled: {
+    default: false,
+    type: Boolean,
+  },
+  buttonType: {
+    default: 'button',
+    type: String as PropType<'button' | 'submit'>,
+  },
+  buttonClass: {
+    default: 'btn btn-sm',
+    type: String,
+  },
+  buttonActiveClass: {
+    default: 'btn-primary',
+    type: String,
+  },
+  buttonInactiveClass: {
+    default: '',
+    type: String,
+  },
+  spacing: {
+    default: '0.15rem',
+    type: String,
+  },
+  options: {
+    required: true,
+    type: Array as PropType<Option[]>,
+  },
+  labelKey: {
+    required: true,
+    type: String,
+  },
+  valueKey: {
+    required: true,
+    type: String,
+  },
+  multiple: {
+    default: false,
+    type: Boolean,
+  },
+});
+
+const emit = defineEmits(['update:modelValue']);
+
+const { normalizedOptions, normalizedModelValue, isSelected } = useHasOptions(
+  computed(() => props.modelValue),
+  computed(() => props.options),
+  computed(() => props.labelKey),
+  computed(() => props.valueKey),
+  computed(() => props.multiple)
+);
+
+function onSelect(option: NormalizedOption) {
+  if (props.multiple) {
+    let newModalValue = [] as NormalizedOption[];
+
+    if (isArray(normalizedModelValue.value)) {
+      newModalValue = cloneDeep(normalizedModelValue.value);
+    }
+
+    const exists = newModalValue.find((o) => o.value == option.value);
+
+    if (exists) {
+      newModalValue = newModalValue.filter((o) => o.value != option.value);
+    } else {
+      newModalValue.push(option);
+    }
+
+    emit(
+      'update:modelValue',
+      newModalValue.map((o) => o.option)
+    );
+  } else {
+    if (!props.required) {
+      if (
+        !isArray(normalizedModelValue.value) &&
+        option.value == normalizedModelValue.value?.value
+      ) {
+        emit('update:modelValue', null);
+        return;
+      }
+    }
+
+    const newOption = option.option;
+    emit('update:modelValue', newOption);
+  }
+}
+</script>

package/src/components/BaseTagAutocomplete.stories.js

@@ -64,16 +64,14 @@ export const SlotOption = (args) => ({
     v-model="value"
     :options="options"
   >
-    <template #option="{ option, active, selected }">
+    <template #option="{ option, active }">
       <div
         class="rounded px-2 font-semibold py-1 text-sm"
         :class="{
-          'hover:bg-slate-100': !active && !selected,
-          'bg-slate-200 hover:bg-slate-300': active && !selected,
-          'bg-blue-500 text-white hover:bg-blue-600': !active && selected,
-          'bg-blue-600 text-white hover:bg-blue-700': active && selected,
+          'hover:bg-slate-100': !active,
+          'bg-slate-200 hover:bg-slate-300': active,
         }"
-        :style="{ color: selected ? '' : option.value }"
+        :style="{ color: option.value }"
       >
         {{ option.label }}
       </div>

package/src/components/BaseTagAutocomplete.vue

@@ -82,7 +82,6 @@
                 <slot
                   name="option"
                   :option="option.option"
-                  :selected="optionValues.includes(option.value)"
                   :active="optionActive && optionActive.value == option.value"
                 >
                   <div
@@ -127,10 +126,11 @@
 <script lang="ts" setup>
 import { cloneDeep, get } from 'lodash';
 import { PropType, Ref, ComputedRef } from 'vue';
-import { NormalizedOption, Option, OptionValue } from '@/types/types';
+import { NormalizedOption, Option } from '@/types/types';
 import { useInfiniteScroll, useMutationObserver } from '@vueuse/core';
 import { useNotificationsStore } from '@/stores/notifications';
 import BaseSkeleton from './BaseSkeleton.vue';
+import { useHasOptions } from '@/composables/hasOptions';
 
 const props = defineProps({
   modelValue: {
@@ -194,9 +194,23 @@ const keywords = ref('');
 const showDropdown = ref(false);
 const inputElement = ref(null) as Ref<HTMLInputElement | null>;
 const dropdown = ref(null) as Ref<HTMLElement | null>;
-const selectionIndex = ref(0);
+const activeIndex = ref(0);
 const selectionToDelete = ref(null) as Ref<NormalizedOption | null>;
 
+const hasOptions = useHasOptions(
+  computed(() => props.modelValue),
+  computed(() => props.options),
+  computed(() => props.labelKey),
+  computed(() => props.valueKey),
+  computed(() => true)
+);
+
+const isSelected = hasOptions.isSelected;
+const normalizedOptions = hasOptions.normalizedOptions;
+const normalizedModelValue = hasOptions.normalizedModelValue as ComputedRef<
+  NormalizedOption[]
+>;
+
 onMounted(() => {
   useInfiniteScroll(
     dropdown.value,
@@ -210,34 +224,11 @@ onMounted(() => {
 const optionActive = computed(() => {
   return (
     filteredNormalizedOptions.value[
-      Math.min(selectionIndex.value, filteredNormalizedOptions.value.length - 1)
+      Math.min(activeIndex.value, filteredNormalizedOptions.value.length - 1)
     ] ?? null
   );
 });
 
-const normalizedModelValue = computed(() => {
-  if (!props.modelValue) {
-    return [];
-  }
-  return props.modelValue.map((o) => {
-    return {
-      label: o[props.labelKey] as string,
-      value: o[props.valueKey] as string | number,
-      option: o,
-    };
-  });
-}) as ComputedRef<NormalizedOption[]>;
-
-const normalizedOptions = computed(() => {
-  return props.options.map((option) => {
-    return {
-      label: option[props.labelKey] as string,
-      value: option[props.valueKey] as string | number,
-      option: option,
-    } as NormalizedOption;
-  });
-});
-
 const filteredNormalizedOptions = computed((): NormalizedOption[] => {
   return normalizedOptions.value
     .filter((option) => {
@@ -250,20 +241,10 @@ const filteredNormalizedOptions = computed((): NormalizedOption[] => {
       return option.label.toLowerCase().includes(keywords.value.toLowerCase());
     })
     .filter((option) => {
-      return !hasSelectedOption(option.value);
+      return !isSelected(option);
     });
 });
 
-const optionValues = computed(() => {
-  return normalizedModelValue.value.map((o) => {
-    return o.value;
-  });
-});
-
-const hasSelectedOption = (value: OptionValue): boolean => {
-  return optionValues.value.includes(value);
-};
-
 function preventUnfocus(elements: HTMLElement[]) {
   elements.forEach((e) => {
     e.removeEventListener('mousedown', dontLooseFocus);
@@ -294,7 +275,7 @@ const onTextBlur = () => {
 };
 
 const onTextInput = (event: Event) => {
-  selectionIndex.value = 0;
+  activeIndex.value = 0;
   selectionToDelete.value = null;
   setKeywords(get(event, 'target.value', '') + '');
   dropdown.value?.scrollTo({
@@ -315,19 +296,22 @@ const onTextKeydown = (event: KeyboardEvent) => {
   }
 
   if (key === 'ArrowDown') {
-    if (selectionIndex.value < props.options.length - 1) {
-      selectionIndex.value++;
+    if (activeIndex.value < filteredNormalizedOptions.value.length - 1) {
+      activeIndex.value++;
     } else {
-      selectionIndex.value = 0;
+      activeIndex.value = 0;
     }
     return;
   }
 
   if (key === 'ArrowUp') {
-    if (selectionIndex.value > 0) {
-      selectionIndex.value--;
+    if (activeIndex.value > 0) {
+      activeIndex.value--;
     } else {
-      selectionIndex.value = Math.max(0, props.options.length - 1);
+      activeIndex.value = Math.max(
+        0,
+        filteredNormalizedOptions.value.length - 1
+      );
     }
     return;
   }
@@ -343,9 +327,7 @@ const onTextKeydown = (event: KeyboardEvent) => {
 
 const optionClass = (option: NormalizedOption) => {
   const active = optionActive.value && optionActive.value.value == option.value;
-  const selected =
-    normalizedModelValue.value &&
-    normalizedModelValue.value.map((o) => o.value).includes(option.value);
+  const selected = isSelected(option);
 
   if (selected) {
     if (active) {
@@ -389,7 +371,7 @@ const addOption = (option: NormalizedOption) => {
     return;
   }
 
-  if (hasSelectedOption(option.value)) {
+  if (isSelected(option)) {
     return;
   }
 
@@ -440,19 +422,19 @@ const beforeAddOption = () => {
 };
 
 const afterUpdate = () => {
-  validateSelectionIndex();
+  validateActiveIndex();
 };
 
 const clearInput = () => {
   setKeywords('');
 };
 
-const validateSelectionIndex = () => {
+const validateActiveIndex = () => {
   // Wait for filteredOptions to update
   nextTick(() => {
-    selectionIndex.value = Math.max(
+    activeIndex.value = Math.max(
       0,
-      Math.min(selectionIndex.value, normalizedOptions.value.length - 1)
+      Math.min(activeIndex.value, filteredNormalizedOptions.value.length - 1)
     );
   });
 };

package/src/components/index.ts

@@ -11,6 +11,7 @@ import BaseBelongsTo from './BaseBelongsTo.vue';
 import BaseBoolean from './BaseBoolean.vue';
 import BaseBreadcrumbs from './BaseBreadcrumbs.vue';
 import BaseButton from './BaseButton.vue';
+import BaseButtonGroup from './BaseButtonGroup.vue';
 import BaseCard from './BaseCard.vue';
 import BaseCardRow from './BaseCardRow.vue';
 import BaseCharacterCounter from './BaseCharacterCounter.vue';
@@ -80,6 +81,7 @@ export {
   BaseBoolean,
   BaseBreadcrumbs,
   BaseButton,
+  BaseButtonGroup,
   BaseCard,
   BaseCardRow,
   BaseCharacterCounter,