@onereach/ui-components 2.69.1-beta.2095.0 → 2.69.1-beta.2097.0

package/src/components/or-card-collection-v3/OrCardCollection.vue

@@ -6,87 +6,110 @@
   >
     <div :class="toolbarStyles">
       <div :class="toolbarPanelStyles">
-        <template v-if="sortHeaders">
-          <OrSortHeader
-            v-for="header in sortHeaders"
-            :key="header.value"
-            v-model="proxySort"
-            :input-value="header.value"
+        <template v-if="sortOptions.length">
+          <OrButton
+            ref="sortButton"
+            variant="link"
+            color="inherit"
+            @click="sortMenu.toggle()"
           >
-            {{ header.label }}
-          </OrSortHeader>
+            {{ sortLabel }}
+            <OrIcon
+              v-if="sortMenu"
+              :icon="sortMenu.isOpen ? 'arrow_drop_up' : 'arrow_drop_down'"
+            />
+          </OrButton>
+          <OrMenu
+            ref="sortMenu"
+            :trigger="sortButton && sortButton.root"
+          >
+            <OrMenuItem
+              v-for="sortItem in sortOptions"
+              :key="sortItem"
+              @click="handleSort(sortItem.value)"
+            >
+              {{ sortItem.label }}
+            </OrMenuItem>
+          </OrMenu>
         </template>
       </div>
-
-      <div :class="toolbarPanelStyles">
-        <OrInput
-          v-model="proxySearch"
-          :type="'search'"
-          :placeholder="'Search'"
-          :size="'s'"
+      <div
+        :class="toolbarPanelStyles"
+      >
+        <OrSearch
+          class="md:w-[350px]"
+          size="s"
+          @search="handleSearch"
         />
-
-        <OrIconButton
-          :icon="'grid_view'"
-          @click="switchToGridView()"
-        />
-
-        <OrIconButton
-          :icon="'view_list'"
-          @click="switchToListView()"
-        />
-
-        <slot name="addon" />
+        <div class="layout-row gap-sm">
+          <template v-if="viewModes.length > 1">
+            <OrIconButton
+              v-for="viewOption in viewModes"
+              :key="viewOption.view"
+              :icon="{icon: viewOption.icon, variant: viewOption.view === proxyView ? 'filled' : 'outlined'}"
+              @click="switchView(viewOption.view)"
+            />
+          </template>
+          <slot name="addon" />
+        </div>
       </div>
     </div>
-
-    <div :class="contentStyles">
-      <template v-if="proxyView === 'grid'">
-        <OrCard
-          v-for="item in items"
-          :key="item.id"
-        >
-          <slot
-            name="gridItem"
-            v-bind="item"
-          />
-        </OrCard>
-      </template>
-
-      <template v-if="proxyView === 'list'">
-        <OrCard
-          v-for="item in items"
-          :key="item.id"
-        >
+    <slot
+      name="header"
+      v-bind="{
+        items,
+        mode: proxyView,
+      }"
+    />
+    <slot
+      :name="proxyView"
+      v-bind="{items}"
+    >
+      <OrCardCollectionView
+        :items="items"
+        :mode="proxyView"
+      >
+        <template v-slot:item="props">
           <slot
-            name="listItem"
-            v-bind="item"
+            name="item"
+            v-bind="props"
           />
-        </OrCard>
-      </template>
-    </div>
+        </template>
+      </OrCardCollectionView>
+    </slot>
   </div>
 </template>
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref, watch } from 'vue-demi';
 import { useClassAttribute } from '../../hooks';
-import { OrCardV3 as OrCard } from '../or-card-v3';
 import { OrIconButtonV3 as OrIconButton } from '../or-icon-button-v3';
-import { OrInputV3 as OrInput } from '../or-input-v3';
-import { OrSortHeaderV3 as OrSortHeader, SortHeaderModel } from '../or-sort-header-v3';
+import { OrMenuV3 as OrMenu } from '../or-menu-v3';
+import { OrMenuItemV3 as OrMenuItem } from '../or-menu-item-v3';
+import { OrIconV3 as OrIcon } from '../or-icon-v3';
 import { CardCollectionView } from './props';
-import { CardCollectionContent, CardCollectionContentViews, CardCollectionRoot, CardCollectionToolbar, CardCollectionToolbarPanel } from './styles';
-import { CardCollectionItem, CardCollectionSortHeader } from './types';
+import {
+  CardCollectionRoot,
+  CardCollectionToolbar,
+  CardCollectionToolbarPanel,
+} from './styles';
+import { CardCollectionItem, SortOption, ViewMode } from './types';
+import OrCardCollectionView from './OrCardCollectionView.vue3.vue';
+import { OrButtonV3 as OrButton } from '../or-button-v3';
+import { OrSearchV3 as OrSearch } from '../or-search-v3';
+import { defaultViewModes } from './constatnts';
 
 export default defineComponent({
   name: 'OrCardCollection',
 
   components: {
-    OrCard,
+    OrCardCollectionView,
     OrIconButton,
-    OrInput,
-    OrSortHeader,
+    OrButton,
+    OrMenu,
+    OrMenuItem,
+    OrIcon,
+    OrSearch,
   },
 
   inheritAttrs: false,
@@ -98,18 +121,23 @@ export default defineComponent({
     },
 
     view: {
-      type: String as PropType<CardCollectionView>,
+      type: String as PropType<string>,
       default: CardCollectionView.Grid,
     },
 
+    viewModes: {
+      type: Array as PropType<ViewMode[]>,
+      default: () => defaultViewModes,
+    },
+
     sort: {
-      type: Object as PropType<SortHeaderModel>,
+      type: String,
       default: undefined,
     },
 
-    sortHeaders: {
-      type: Array as PropType<CardCollectionSortHeader[]>,
-      default: undefined,
+    sortOptions: {
+      type: Array as PropType<SortOption[]>,
+      default: () => [],
     },
 
     search: {
@@ -131,6 +159,8 @@ export default defineComponent({
   setup(props, context) {
     // Refs
     const root = ref<HTMLElement>();
+    const sortMenu = ref<typeof OrMenu>();
+    const sortButton = ref<typeof OrButton>();
 
     // Styles
     const classAttribute = useClassAttribute();
@@ -149,23 +179,24 @@ export default defineComponent({
       ...CardCollectionToolbarPanel,
     ]);
 
-    const contentStyles = computed(() => [
-      ...CardCollectionContent,
-      ...CardCollectionContentViews[proxyView.value],
-    ]);
-
+    const sortLabel = computed(() => {
+      return props.sortOptions.find(item => item.value === props.sort)?.label;
+    });
     // State
     const proxyView = ref(props.view);
     const proxySort = ref(props.sort);
     const proxySearch = ref(props.search);
 
     // Methods
-    function switchToGridView(): void {
-      proxyView.value = CardCollectionView.Grid;
+    function switchView(view: string): void {
+      proxyView.value = view;
+    }
+    function handleSort(sort: string) {
+      proxySort.value = sort;
     }
 
-    function switchToListView(): void {
-      proxyView.value = CardCollectionView.List;
+    function handleSearch(search: string) {
+      proxySearch.value = search;
     }
 
     // Effects
@@ -195,15 +226,18 @@ export default defineComponent({
 
     return {
       root,
+      sortMenu,
+      sortButton,
       rootStyles,
       toolbarStyles,
       toolbarPanelStyles,
-      contentStyles,
       proxyView,
       proxySort,
       proxySearch,
-      switchToGridView,
-      switchToListView,
+      sortLabel,
+      switchView,
+      handleSort,
+      handleSearch,
     };
   },
 });

package/src/components/or-card-collection-v3/OrCardCollectionView.vue2.vue

@@ -0,0 +1,41 @@
+<template>
+  <div :class="contentStyles">
+    <slot
+      v-for="(item) in items"
+      name="item"
+      v-bind="{
+        item,
+        mode,
+      }"
+    >
+      {{ item.key }}
+    </slot>
+  </div>
+</template>
+<script lang="ts">
+import { defineComponent, computed, PropType } from 'vue-demi';
+import { CardCollectionContent, CardCollectionContentViews } from './styles';
+import { CardCollectionItem } from './types';
+import { CardCollectionView } from './props';
+
+export default defineComponent({
+  name: 'OrCardCollectionView',
+  props: {
+    items: {
+      type: Array as PropType<CardCollectionItem[]>,
+      default: [] as CardCollectionItem[],
+    },
+    mode: {
+      type: String as PropType<CardCollectionView>,
+      required: true,
+    },
+  },
+  setup(props) {
+    const contentStyles = computed(() => [
+      ...CardCollectionContent,
+      ...CardCollectionContentViews[props.mode],
+    ]);
+    return { contentStyles };
+  },
+});
+</script>

package/src/components/or-card-collection-v3/OrCardCollectionView.vue3.vue

@@ -0,0 +1,42 @@
+<template>
+  <div :class="contentStyles">
+    <slot
+      v-for="(item, index) in items"
+      :key="item.key || index"
+      name="item"
+      v-bind="{
+        item,
+        mode,
+      }"
+    >
+      {{ item.key }}
+    </slot>
+  </div>
+</template>
+<script lang="ts">
+import { defineComponent, computed, PropType } from 'vue-demi';
+import { CardCollectionContent, CardCollectionContentViews } from './styles';
+import { CardCollectionItem } from './types';
+import { CardCollectionView } from './props';
+
+export default defineComponent({
+  name: 'OrCardCollectionView',
+  props: {
+    items: {
+      type: Array as PropType<CardCollectionItem[]>,
+      default: [] as CardCollectionItem[],
+    },
+    mode: {
+      type: String as PropType<CardCollectionView>,
+      required: true,
+    },
+  },
+  setup(props) {
+    const contentStyles = computed(() => [
+      ...CardCollectionContent,
+      ...CardCollectionContentViews[props.mode],
+    ]);
+    return { contentStyles };
+  },
+});
+</script>

package/src/components/or-card-collection-v3/constatnts.ts

@@ -0,0 +1,12 @@
+import { ViewMode } from './types';
+
+export const gridView: ViewMode = {
+  view: 'grid',
+  icon: 'grid_view',
+};
+export const listView: ViewMode = {
+  view: 'list',
+  icon: 'view_agenda',
+};
+
+export const defaultViewModes = [gridView, listView];

package/src/components/or-card-collection-v3/styles.ts

@@ -25,7 +25,7 @@ export const CardCollectionToolbarPanel: string[] = [
   'layout-row',
 
   // Spacing
-  'gap-sm+',
+  'gap-lg+',
 ];
 
 export const CardCollectionContent: string[] = [

package/src/components/or-card-collection-v3/types.ts

@@ -1,8 +1,14 @@
 export interface CardCollectionItem {
-  id: string;
+  key?: string;
+  [key: string|number]: any;
 }
 
-export interface CardCollectionSortHeader {
-  value: string;
+export interface ViewMode {
+  view: string;
+  icon: string;
+}
+
+export interface SortOption {
   label: string;
+  value: string;
 }

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

@@ -38,7 +38,7 @@
         @focus="$emit('focus', $event)"
         @blur="$emit('blur', $event)"
       >
-        <template v-if="proxyModelValue !== undefined">
+        <template v-if="proxyModelValue && proxyModelValue.length > 0">
           <template v-if="multiple">
             <slot
               name="valueTemplate"
@@ -265,12 +265,12 @@ export default defineComponent({
     },
 
     modelValue: {
-      type: [String, Number, Array] as PropType<string | number | (string | number)[]>,
+      type: [String, Array] as PropType<string | string[]>,
       default: undefined,
     },
 
     value: { // TODO: Remove Vue 2 fallback
-      type: [String, Number, Array] as PropType<string | number | (string | number)[]>,
+      type: [String, Array] as PropType<string | string[]>,
       default: undefined,
     },
 

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

@@ -1,3 +1,2 @@
 export { default as OrSelectV3 } from './OrSelect.vue';
 export * from './props';
-export * from './types';

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

@@ -1,5 +1,5 @@
 export interface SelectOption {
-  value: string | number;
+  value: string;
   label: string;
 }
 

package/dist/bundled/v2/OrCardCollection-a9a779ea.js

@@ -1,228 +0,0 @@
-import './index-fa6eb4ca.js';
-import { O as OrCard } from './OrCard-58a1ba3e.js';
-import { O as OrIconButton } from './OrIconButton-a215104c.js';
-import { O as OrInput } from './OrInput-8b90e08f.js';
-import { O as OrSortHeader } from './OrSortHeader-396e6a7c.js';
-import { u as useClassAttribute } from './useClassAttribute-9bf33346.js';
-import { defineComponent, ref, computed, watch } from '@vue/composition-api/dist/vue-composition-api.mjs';
-import { n as normalizeComponent } from './normalize-component-6e8e3d80.js';
-
-var CardCollectionView;
-(function (CardCollectionView) {
-  CardCollectionView["Grid"] = "grid";
-  CardCollectionView["List"] = "list";
-})(CardCollectionView || (CardCollectionView = {}));
-
-const CardCollectionRoot = [
-// Layout
-'layout-column',
-// Spacing
-'gap-md'];
-const CardCollectionToolbar = [
-// Layout
-'layout-row justify-between',
-// Typography
-'typography-body-2-regular',
-// Theme
-'theme-foreground-default', 'dark:theme-foreground-default-dark'];
-const CardCollectionToolbarPanel = [
-// Layout
-'layout-row',
-// Spacing
-'gap-sm+'];
-const CardCollectionContent = [
-// Layout
-'grid',
-// Spacing
-'gap-sm md:gap-md'];
-const CardCollectionContentViews = {
-  'grid': [
-  // Layout
-  'sm:grid-cols-1', 'md:grid-cols-2', 'lg:grid-cols-4', 'xl:grid-cols-6'],
-  'list': []
-};
-
-var script = defineComponent({
-  name: 'OrCardCollection',
-  components: {
-    OrCard,
-    OrIconButton,
-    OrInput,
-    OrSortHeader
-  },
-  inheritAttrs: false,
-  props: {
-    items: {
-      type: Array,
-      default: []
-    },
-    view: {
-      type: String,
-      default: CardCollectionView.Grid
-    },
-    sort: {
-      type: Object,
-      default: undefined
-    },
-    sortHeaders: {
-      type: Array,
-      default: undefined
-    },
-    search: {
-      type: String,
-      default: undefined
-    }
-  },
-  emits: ['viewChange', 'sortChange', 'searchChange'],
-  expose: ['root'],
-  setup(props, context) {
-    // Refs
-    const root = ref();
-    // Styles
-    const classAttribute = useClassAttribute();
-    const rootStyles = computed(() => ['or-card-collection', ...CardCollectionRoot, classAttribute.value]);
-    const toolbarStyles = computed(() => [...CardCollectionToolbar]);
-    const toolbarPanelStyles = computed(() => [...CardCollectionToolbarPanel]);
-    const contentStyles = computed(() => [...CardCollectionContent, ...CardCollectionContentViews[proxyView.value]]);
-    // State
-    const proxyView = ref(props.view);
-    const proxySort = ref(props.sort);
-    const proxySearch = ref(props.search);
-    // Methods
-    function switchToGridView() {
-      proxyView.value = CardCollectionView.Grid;
-    }
-    function switchToListView() {
-      proxyView.value = CardCollectionView.List;
-    }
-    // Effects
-    watch(() => props.view, value => {
-      proxyView.value = value;
-    });
-    watch(proxyView, value => {
-      context.emit('viewChange', value);
-    });
-    watch(() => props.sort, value => {
-      proxySort.value = value;
-    });
-    watch(proxySort, value => {
-      context.emit('sortChange', value);
-    });
-    watch(() => props.search, value => {
-      proxySearch.value = value;
-    });
-    watch(proxySearch, value => {
-      context.emit('searchChange', value);
-    });
-    return {
-      root,
-      rootStyles,
-      toolbarStyles,
-      toolbarPanelStyles,
-      contentStyles,
-      proxyView,
-      proxySort,
-      proxySearch,
-      switchToGridView,
-      switchToListView
-    };
-  }
-});
-
-/* script */
-const __vue_script__ = script;
-
-/* template */
-var __vue_render__ = function () {
-  var _vm = this;
-  var _h = _vm.$createElement;
-  var _c = _vm._self._c || _h;
-  return _c('div', _vm._b({
-    ref: "root",
-    class: _vm.rootStyles
-  }, 'div', _vm.$attrs, false), [_c('div', {
-    class: _vm.toolbarStyles
-  }, [_c('div', {
-    class: _vm.toolbarPanelStyles
-  }, [_vm.sortHeaders ? _vm._l(_vm.sortHeaders, function (header) {
-    return _c('OrSortHeader', {
-      key: header.value,
-      attrs: {
-        "input-value": header.value
-      },
-      model: {
-        value: _vm.proxySort,
-        callback: function ($$v) {
-          _vm.proxySort = $$v;
-        },
-        expression: "proxySort"
-      }
-    }, [_vm._v("\n          " + _vm._s(header.label) + "\n        ")]);
-  }) : _vm._e()], 2), _vm._v(" "), _c('div', {
-    class: _vm.toolbarPanelStyles
-  }, [_c('OrInput', {
-    attrs: {
-      "type": 'search',
-      "placeholder": 'Search',
-      "size": 's'
-    },
-    model: {
-      value: _vm.proxySearch,
-      callback: function ($$v) {
-        _vm.proxySearch = $$v;
-      },
-      expression: "proxySearch"
-    }
-  }), _vm._v(" "), _c('OrIconButton', {
-    attrs: {
-      "icon": 'grid_view'
-    },
-    on: {
-      "click": function ($event) {
-        return _vm.switchToGridView();
-      }
-    }
-  }), _vm._v(" "), _c('OrIconButton', {
-    attrs: {
-      "icon": 'view_list'
-    },
-    on: {
-      "click": function ($event) {
-        return _vm.switchToListView();
-      }
-    }
-  }), _vm._v(" "), _vm._t("addon")], 2)]), _vm._v(" "), _c('div', {
-    class: _vm.contentStyles
-  }, [_vm.proxyView === 'grid' ? _vm._l(_vm.items, function (item) {
-    return _c('OrCard', {
-      key: item.id
-    }, [_vm._t("gridItem", null, null, item)], 2);
-  }) : _vm._e(), _vm._v(" "), _vm.proxyView === 'list' ? _vm._l(_vm.items, function (item) {
-    return _c('OrCard', {
-      key: item.id
-    }, [_vm._t("listItem", null, null, item)], 2);
-  }) : _vm._e()], 2)]);
-};
-var __vue_staticRenderFns__ = [];
-
-/* style */
-const __vue_inject_styles__ = undefined;
-/* scoped */
-const __vue_scope_id__ = undefined;
-/* module identifier */
-const __vue_module_identifier__ = undefined;
-/* functional template */
-const __vue_is_functional_template__ = false;
-/* style inject */
-
-/* style inject SSR */
-
-/* style inject shadow dom */
-
-const __vue_component__ = /*#__PURE__*/normalizeComponent({
-  render: __vue_render__,
-  staticRenderFns: __vue_staticRenderFns__
-}, __vue_inject_styles__, __vue_script__, __vue_scope_id__, __vue_is_functional_template__, __vue_module_identifier__, false, undefined, undefined, undefined);
-var __vue_component__$1 = __vue_component__;
-
-export { CardCollectionView as C, __vue_component__$1 as _ };