@onereach/ui-components 4.1.1-beta.2541.0 → 4.1.1

package/src/components/or-select-v3/OrSelect.stories3.ts

@@ -1,14 +1,16 @@
 import { action } from '@storybook/addon-actions';
 import { Meta, StoryFn } from '@storybook/vue3';
-import { ref, watch } from 'vue-demi';
+import { ref, watch, onMounted } from 'vue-demi';
 import { OrIconV3 as OrIcon } from '../or-icon-v3';
+import { OrInputV3 as OrInput } from '../or-input-v3';
+import { OrButtonV3 as OrButton } from '../or-button-v3';
 import OrSelectDocs from './OrSelect.docs.mdx';
 import OrSelect from './OrSelect.vue';
 import { SelectSize } from './props';
 import { SelectOption, SelectSearchFunction } from './types';
 
 export default {
-  title: 'Components/Select',
+  title: 'Components/Forms/Select',
   component: OrSelect,
 
   argTypes: {
@@ -217,6 +219,113 @@ const Template: StoryFn<typeof OrSelect> = (args) => ({
   `,
 });
 
+const AddTemplate: StoryFn<typeof OrSelect> = (args) => ({
+  components: {
+    OrIcon,
+    OrInput,
+    OrButton,
+    OrSelect,
+  },
+
+  setup() {
+    // State
+    const model = ref<string | string[]>();
+    const inputValue = ref<string>();
+    const options = ref<SelectOption[]>();
+    const searchOptions = ref<SelectOption[]>();
+
+    // Handlers
+    const onSearch = (searchText: string) => {
+      if (args.externalControl) {
+        searchOptions.value = searchText
+          ? (args.options as SelectOption[]).filter((option) => option.label === searchText)
+          : args.options;
+      }
+
+      action('search')(searchText);
+    };
+
+    const addModel = () => {
+      if (!inputValue.value || !options.value) return;
+
+      const newOption = {
+        value: inputValue.value.toLowerCase(),
+        label: inputValue.value,
+      } as SelectOption;
+
+      options.value.push(newOption);
+
+      if (args.multiple) {
+        (model.value as string[]).push(newOption.value as string);
+      } else {
+        model.value = newOption.value as string;
+      }
+
+      inputValue.value = undefined;
+    };
+
+    // Effects
+    watch(model, (value) => {
+      console.debug(value);
+    }, { deep: true });
+
+    // delayed setting of options case
+    onMounted(() => {
+      options.value = args.options;
+      searchOptions.value = args.options;
+    });
+
+    return {
+      args,
+      model,
+      inputValue,
+      options,
+      searchOptions,
+      onUpdate: action('update:modelValue'),
+      onFocus: action('focus'),
+      onBlur: action('blur'),
+      onSearch,
+      addModel,
+    };
+  },
+
+  template: `
+    <div class="flex flex-col gap-md">
+      <OrSelect
+        v-model="model"
+        v-bind="args"
+        :options="options"
+        :search-options="searchOptions"
+        @update:modelValue="onUpdate"
+        @focus="onFocus"
+        @blur="onBlur"
+        @search="onSearch"
+      >
+        <template #addon>
+          ${args.addon}
+        </template>
+
+        ${args.valueTemplate}
+        ${args.optionTemplate}
+        ${args.noSearchResultsTemplate}
+      </OrSelect>
+      <div class="flex flex-row gap-sm">
+        <OrInput
+          v-model="inputValue"
+          placeholder="Enter new option to add & select it"
+          class="grow"
+        />
+        <OrButton
+          variant="outlined"
+          @click="addModel"
+        >
+          Add
+        </OrButton>
+      </div>
+    </div>
+  `,
+});
+
 export const Default = Template.bind({});
 
 Default.args = {
@@ -261,6 +370,12 @@ Default.args = {
   hint: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
 };
 
+export const ExternalModelUpdateTemplate = AddTemplate.bind({});
+
+ExternalModelUpdateTemplate.args = {
+  ...Default.args,
+};
+
 export const CustomValueTemplate = Template.bind({});
 
 CustomValueTemplate.args = {

package/src/components/or-select-v3/OrSelect.vue

@@ -452,7 +452,7 @@ export default defineComponent({
       } else {
         internalSearchOptions.value = await props.searchFunction(searchText, options);
       }
-    });
+    }, { deep: true });
 
     const groupedOptions = computed(() => {
       const groupBy = props.groupByFunction;

package/src/components/or-switch-v3/OrSwitch.stories3.ts

@@ -7,7 +7,7 @@ import OrSwitchDocs from './OrSwitch.docs.mdx';
 import OrSwitch from './OrSwitch.vue';
 
 export default {
-  title: 'Components/Switch',
+  title: 'Components/Forms/Switch',
   component: OrSwitch,
 
   argTypes: {

package/src/components/or-switch-v3/styles.ts

@@ -39,8 +39,8 @@ export const SwitchControl: string[] = [
   'dark:theme-border-1-outline-dark',
 
   // Theme (focus)
-  'focus:theme-outline-2-primary',
-  'dark:focus:theme-outline-2-primary-dark',
+  'focus:theme-outline-primary',
+  'dark:focus:theme-outline-primary-dark',
 
   // Theme (checked)
   'checked:theme-preset-1-primary',

package/src/components/or-textarea-v3/OrTextarea.stories3.ts

@@ -7,7 +7,7 @@ import OrTextarea from './OrTextarea.vue';
 import { TextareaSize } from './props';
 
 export default {
-  title: 'Components/Textarea',
+  title: 'Components/Forms/Textarea',
   component: OrTextarea,
 
   argTypes: {

package/src/directives/dropdown-close.ts

@@ -3,7 +3,6 @@ import { DirectiveBinding, DirectiveHook, isVue3 } from 'vue-demi';
 const created: DirectiveHook = (element: HTMLElement, binding: DirectiveBinding<(event: Event) => void>) => {
   element.addEventListener('keydown', (event) => {
     event.preventDefault();
-    event.stopPropagation();
 
     if (['Escape'].includes(event.key)) {
       binding.value(event);

package/src/directives/dropdown-open.ts

@@ -3,19 +3,13 @@ import { DirectiveBinding, DirectiveHook, isVue3 } from 'vue-demi';
 const created: DirectiveHook = (element: HTMLElement, binding: DirectiveBinding<(event: Event) => void>) => {
   element.addEventListener('keydown', (event) => {
     event.preventDefault();
-    event.stopPropagation();
 
     if (['Enter', ' '].includes(event.key)) {
       binding.value(event);
     }
   });
 
-  element.addEventListener('click', (event) => {
-    event.preventDefault();
-    event.stopPropagation();
-
-    binding.value(event);
-  });
+  element.addEventListener('click', binding.value);
 };
 
 export const DropdownOpen = {