@onereach/ui-components 5.0.2-beta.3149.0 → 5.0.2-beta.3150.0

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

@@ -39,14 +39,14 @@
         @blur="$emit('blur', $event)"
       >
         <template v-if="multiple">
-          <template v-if="proxyModelValue && proxyModelValue.length > 0">
+          <template v-if="!isEmptyModelValue">
             <slot
               name="valueTemplate"
               :model="proxyModelValue"
             >
               <OrTag
-                v-for="(option, i) in selection"
-                :key="i"
+                v-for="option in selection"
+                :key="option.value"
                 :variant="'reset'"
                 :disabled="disabled || readonly"
                 @reset="deselect(option)"
@@ -54,27 +54,80 @@
                 {{ option.label }}
               </OrTag>
             </slot>
+
+            <template v-if="popoverState === 'open' && enableSearch && isDesktop">
+              <OrInput
+                ref="searchControl"
+                v-model="searchText"
+                :class="searchControlStyles"
+                :type="'search'"
+                :placeholder="placeholder"
+                :size="size"
+                :disable-default-styles="true"
+                @click.stop
+              />
+            </template>
           </template>
 
           <template v-else>
-            <span :class="placeholderStyles">{{ placeholder }}</span>
+            <template v-if="popoverState === 'open' && enableSearch && isDesktop">
+              <OrInput
+                ref="searchControl"
+                v-model="searchText"
+                :class="searchControlStyles"
+                :type="'search'"
+                :placeholder="placeholder"
+                :size="size"
+                :disable-default-styles="true"
+                @click.stop
+              />
+            </template>
+
+            <template v-else>
+              <span
+                :class="placeholderStyles"
+                :disabled="disabled ? '' : null"
+              >
+                {{ placeholder }}
+              </span>
+            </template>
           </template>
         </template>
 
         <template v-else>
-          <template v-if="!isEmptyModelValue">
-            <slot
-              name="valueTemplate"
-              :model="proxyModelValue"
-            >
-              <span class="truncate">
-                {{ selection && selection.label }}
-              </span>
-            </slot>
+          <template v-if="popoverState === 'open' && enableSearch && isDesktop">
+            <OrInput
+              ref="searchControl"
+              v-model="searchText"
+              :class="searchControlStyles"
+              :type="'search'"
+              :placeholder="placeholder"
+              :size="size"
+              :disable-default-styles="true"
+              @click.stop
+            />
           </template>
 
           <template v-else>
-            <span :class="placeholderStyles">{{ placeholder }}</span>
+            <template v-if="!isEmptyModelValue">
+              <slot
+                name="valueTemplate"
+                :model="proxyModelValue"
+              >
+                <span class="truncate">
+                  {{ selection && selection.label }}
+                </span>
+              </slot>
+            </template>
+
+            <template v-else>
+              <span
+                :class="placeholderStyles"
+                :disabled="disabled ? '' : null"
+              >
+                {{ placeholder }}
+              </span>
+            </template>
           </template>
         </template>
       </div>
@@ -84,12 +137,12 @@
       </template>
 
       <div :class="['layout-inline-row', 'gap-sm']">
-        <template v-if="!multiple && proxyModelValue">
+        <template v-if="!isEmptyModelValue && popoverState === 'closed'">
           <OrIconButton
             :icon="'close'"
             :color="'inherit'"
             :disabled="readonly || disabled"
-            @click.stop="$emit('update:modelValue', undefined)"
+            @click.stop="$emit('update:modelValue', multiple ? [] : undefined)"
           />
         </template>
 
@@ -107,14 +160,15 @@
         :full-width="true"
         :custom-styles="dropdownStyles"
         :disable-default-styles="true"
+        @close="clearSearchControl()"
       >
-        <template v-if="enableSearch">
+        <template v-if="popoverState === 'open' && enableSearch && isMobile">
           <OrInput
+            ref="searchControl"
             v-model="searchText"
+            :class="searchControlStyles"
             :type="'search'"
-            :placeholder="'Search'"
-            :size="'s'"
-            :disable-default-styles="true"
+            :placeholder="placeholder"
           />
         </template>
 
@@ -129,6 +183,7 @@
                 <OrMenuItem
                   v-for="(option, i) in group"
                   :key="i"
+                  :selected="proxyModelValue && proxyModelValue.includes(option.value)"
                 >
                   <slot
                     name="optionTemplate"
@@ -139,7 +194,7 @@
                       v-model="proxyModelValue"
                       :value="option.value"
                       :label="option.label"
-                      :label-variant="'input'"
+                      :label-variant="'menu-item'"
                     />
                   </slot>
                 </OrMenuItem>
@@ -149,6 +204,8 @@
                 <OrMenuItem
                   v-for="(option, i) in group"
                   :key="i"
+                  :class="dropdownItemStyles"
+                  :selected="proxyModelValue === option.value"
                   @click.stop="proxyModelValue = option.value; close()"
                 >
                   <slot
@@ -168,12 +225,13 @@
               <OrMenuItem
                 v-for="(option, i) in resolvedSearchOptions"
                 :key="i"
+                :selected="proxyModelValue && proxyModelValue.includes(option.value)"
               >
                 <OrCheckbox
                   v-model="proxyModelValue"
                   :value="option.value"
                   :label="option.label"
-                  :label-variant="'input'"
+                  :label-variant="'menu-item'"
                 >
                   <slot
                     name="optionTemplate"
@@ -188,6 +246,8 @@
               <OrMenuItem
                 v-for="(option, i) in resolvedSearchOptions"
                 :key="i"
+                :class="dropdownItemStyles"
+                :selected="proxyModelValue === option.value"
                 @click.stop="proxyModelValue = option.value; close()"
               >
                 <slot
@@ -237,7 +297,7 @@
 <script lang="ts">
 import { computed, defineComponent, getCurrentInstance, onMounted, PropType, ref, toRef, watch } from 'vue-demi';
 import { DropdownClose, DropdownOpen } from '../../directives';
-import { useOverflow, useProxyModelValue } from '../../hooks';
+import { useOverflow, useProxyModelValue, useResponsive } from '../../hooks';
 import { isEmptyValue } from '../../utils/isEmptyValue';
 import { OrCheckboxV3 as OrCheckbox } from '../or-checkbox-v3';
 import { OrErrorV3 as OrError } from '../or-error-v3';
@@ -252,12 +312,10 @@ import { OrMenuItemV3 as OrMenuItem } from '../or-menu-item-v3';
 import { OrPopoverV3 as OrPopover } from '../or-popover-v3';
 import { OrTagV3 as OrTag } from '../or-tag-v3';
 import { SelectSize } from './props';
-import { SelectControl, SelectDropdown, SelectDropdownDefault, SelectDropdownFlipped, SelectNoSearchResults, SelectPlaceholder, SelectRoot } from './styles';
+import { Select, SelectControl, SelectDropdown, SelectDropdownDefault, SelectDropdownFlipped, SelectDropdownItem, SelectNoSearchResults, SelectPlaceholder, SelectSearchControl } from './styles';
 import { SelectGroupByFunction, SelectOption, SelectSearchFunction } from './types';
 
 export default defineComponent({
-  name: 'OrSelect',
-
   components: {
     OrCheckbox,
     OrError,
@@ -392,6 +450,8 @@ export default defineComponent({
 
     const control = ref<HTMLElement>();
 
+    const searchControl = ref<HTMLElement>();
+
     const popover = ref<InstanceType<typeof OrPopover>>();
     const popoverRoot = computed(() => popover.value?.root);
     const popoverState = computed(() => popover.value?.state);
@@ -399,13 +459,18 @@ export default defineComponent({
     // Styles
     const rootStyles = computed(() => [
       'or-select-v3',
-      ...SelectRoot,
+      ...Select,
     ]);
 
     const controlStyles = computed(() => [
       ...SelectControl,
     ]);
 
+    const searchControlStyles = computed(() => [
+      ...SelectSearchControl,
+      '!visible', // Search control is always visible despite `useOverflow` effects
+    ]);
+
     const placeholderStyles = computed(() => [
       ...SelectPlaceholder,
     ]);
@@ -415,6 +480,10 @@ export default defineComponent({
       ...popover.value?.isFlipped ? SelectDropdownFlipped : SelectDropdownDefault,
     ]);
 
+    const dropdownItemStyles = computed(() => [
+      ...SelectDropdownItem,
+    ]);
+
     const noSearchResultsStyles = computed(() => [
       ...SelectNoSearchResults,
     ]);
@@ -442,7 +511,9 @@ export default defineComponent({
       const modelValue = proxyModelValue.value;
 
       if (Array.isArray(modelValue)) {
-        return modelValue.map((value) => props.options.find((option) => option.value === value));
+        return modelValue
+          .map((value) => props.options.find((option) => option.value === value))
+          .filter((value) => !!value);
       }
 
       return props.options.find((option) => option.value === modelValue);
@@ -521,20 +592,37 @@ export default defineComponent({
       }
     }
 
+    function clearSearchControl(): void {
+      searchText.value = '';
+    }
+
     const { innerItems, outerItems } = useOverflow(control);
 
+    // Utils
+    const { isDesktop, isMobile } = useResponsive();
+
+    // Effects
+    watch(searchControl, (control) => {
+      setTimeout(() => {
+        control?.focus();
+      });
+    });
+
     return {
       root,
       inputBox,
       inputBoxRoot,
       control,
+      searchControl,
       popover,
       popoverRoot,
       popoverState,
       rootStyles,
       controlStyles,
+      searchControlStyles,
       placeholderStyles,
       dropdownStyles,
+      dropdownItemStyles,
       noSearchResultsStyles,
       controlId,
       proxyModelValue,
@@ -548,8 +636,11 @@ export default defineComponent({
       toggle,
       close,
       deselect,
+      clearSearchControl,
       innerItems,
       outerItems,
+      isDesktop,
+      isMobile,
     };
   },
 });

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

@@ -1,4 +1,4 @@
-export const SelectRoot: string[] = [
+export const Select: string[] = [
   // Layout
   'layout-column',
 
@@ -8,10 +8,7 @@ export const SelectRoot: string[] = [
 
 export const SelectControl: string[] = [
   // Layout
-  'layout-row',
-
-  // Box
-  'w-full',
+  'layout-row grow',
 
   // Overflow
   'overflow-hidden',
@@ -23,6 +20,15 @@ export const SelectControl: string[] = [
   'typography-inherit',
 ];
 
+export const SelectSearchControl: string[] = [
+  // Layout
+  'grow',
+
+  // Spacing
+  '!mx-lg md:!-mx-sm+',
+  '!my-sm md:!my-none',
+];
+
 export const SelectPlaceholder: string[] = [
   // Theme
   'theme-foreground-outline',
@@ -66,6 +72,14 @@ export const SelectDropdownFlipped: string[] = [
   '!border-b-0',
 ];
 
+export const SelectDropdownItem: string[] = [
+  // Typography
+  '!typography-body-2-regular',
+
+  // Typography (selected)
+  'selected:!typography-body-2-semibold',
+];
+
 export const SelectNoSearchResults: string[] = [
   // Layout
   'layout-row justify-center',

package/src/directives/dropdown-close.ts

@@ -2,9 +2,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

@@ -2,17 +2,14 @@ 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();
+    event.preventDefault();
 
     binding.value(event);
   });