@onereach/ui-components 2.68.1-beta.2065.0 → 2.68.1-beta.2067.0

package/dist/esm/v3/components/or-card-collection-v3/OrCardCollection.vue.d.ts

@@ -1,20 +1,28 @@
 import { PropType } from 'vue-demi';
-import { SortHeaderModel } from '../or-sort-header-v3';
 import { CardCollectionView } from './props';
-import { CardCollectionItem, CardCollectionSortHeader } from './types';
+import { CardCollectionItem } from './types';
 declare const _default: import("vue").ComponentOptions<import("vue").default, import("@vue/composition-api").ShallowUnwrapRef<{
     root: import("@vue/composition-api").Ref<HTMLElement | undefined>;
+    sortMenu: import("@vue/composition-api").Ref<(import("vue").ComponentOptions<import("vue").default, import("@vue/composition-api").ShallowUnwrapRef<unknown>, import("@vue/composition-api").MethodOptions, import("@vue/composition-api").ComputedOptions, import("@vue/composition-api").ComponentPropsOptions<import("@vue/composition-api").Data>, import("@vue/composition-api").ExtractPropTypes<import("@vue/composition-api").ComponentPropsOptions<import("@vue/composition-api").Data>>> & Omit<import("vue").VueConstructor<import("vue").default>, never> & (new (...args: any[]) => import("@vue/composition-api").ComponentRenderProxy<{} & {}, import("@vue/composition-api").ShallowUnwrapRef<unknown>, unknown, import("@vue/composition-api").ComputedOptions, import("@vue/composition-api").MethodOptions, unknown, unknown, {
+        [x: string]: ((...args: any[]) => any) | null;
+    } | string[], {} & {}, {
+        [x: number]: string;
+    } | {}, true>)) | undefined>;
+    sortButton: import("@vue/composition-api").Ref<(import("vue").ComponentOptions<import("vue").default, import("@vue/composition-api").ShallowUnwrapRef<unknown>, import("@vue/composition-api").MethodOptions, import("@vue/composition-api").ComputedOptions, import("@vue/composition-api").ComponentPropsOptions<import("@vue/composition-api").Data>, import("@vue/composition-api").ExtractPropTypes<import("@vue/composition-api").ComponentPropsOptions<import("@vue/composition-api").Data>>> & Omit<import("vue").VueConstructor<import("vue").default>, never> & (new (...args: any[]) => import("@vue/composition-api").ComponentRenderProxy<{} & {}, import("@vue/composition-api").ShallowUnwrapRef<unknown>, unknown, import("@vue/composition-api").ComputedOptions, import("@vue/composition-api").MethodOptions, unknown, unknown, {
+        [x: string]: ((...args: any[]) => any) | null;
+    } | string[], {} & {}, {
+        [x: number]: string;
+    } | {}, true>)) | undefined>;
     rootStyles: import("@vue/composition-api").ComputedRef<(string | undefined)[]>;
     toolbarStyles: import("@vue/composition-api").ComputedRef<string[]>;
     toolbarPanelStyles: import("@vue/composition-api").ComputedRef<string[]>;
     proxyView: import("@vue/composition-api").Ref<CardCollectionView>;
-    proxySort: import("@vue/composition-api").Ref<{
-        column: string;
-        direction: "asc" | "desc";
-    }>;
+    proxySort: import("@vue/composition-api").Ref<string>;
     proxySearch: import("@vue/composition-api").Ref<string>;
     switchToGridView: () => void;
     switchToListView: () => void;
+    handleSort: (sort: string) => void;
+    handleSearch: (search: string) => void;
 }> & import("@vue/composition-api").Data, {}, {}, {
     items: {
         type: PropType<CardCollectionItem[]>;
@@ -25,12 +33,12 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
         default: CardCollectionView;
     };
     sort: {
-        type: PropType<SortHeaderModel>;
-        default: undefined;
+        type: StringConstructor;
+        required: true;
     };
-    sortHeaders: {
-        type: PropType<CardCollectionSortHeader[]>;
-        default: undefined;
+    sortOptions: {
+        type: PropType<string[]>;
+        default: () => never[];
     };
     search: {
         type: StringConstructor;
@@ -46,12 +54,12 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
         default: CardCollectionView;
     };
     sort: {
-        type: PropType<SortHeaderModel>;
-        default: undefined;
+        type: StringConstructor;
+        required: true;
     };
-    sortHeaders: {
-        type: PropType<CardCollectionSortHeader[]>;
-        default: undefined;
+    sortOptions: {
+        type: PropType<string[]>;
+        default: () => never[];
     };
     search: {
         type: StringConstructor;
@@ -59,38 +67,46 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
     };
 }>> & Omit<import("vue").VueConstructor<import("vue").default>, never> & (new (...args: any[]) => import("@vue/composition-api").ComponentRenderProxy<{
     search: string;
-    sort: SortHeaderModel;
+    sort: string;
     items: CardCollectionItem[];
     view: CardCollectionView;
-    sortHeaders: CardCollectionSortHeader[];
+    sortOptions: string[];
 } & {} & {
     [x: string & `on${string}`]: ((...args: any[]) => any) | undefined;
 }, import("@vue/composition-api").ShallowUnwrapRef<{
     root: import("@vue/composition-api").Ref<HTMLElement | undefined>;
+    sortMenu: import("@vue/composition-api").Ref<(import("vue").ComponentOptions<import("vue").default, import("@vue/composition-api").ShallowUnwrapRef<unknown>, import("@vue/composition-api").MethodOptions, import("@vue/composition-api").ComputedOptions, import("@vue/composition-api").ComponentPropsOptions<import("@vue/composition-api").Data>, import("@vue/composition-api").ExtractPropTypes<import("@vue/composition-api").ComponentPropsOptions<import("@vue/composition-api").Data>>> & Omit<import("vue").VueConstructor<import("vue").default>, never> & (new (...args: any[]) => import("@vue/composition-api").ComponentRenderProxy<{} & {}, import("@vue/composition-api").ShallowUnwrapRef<unknown>, unknown, import("@vue/composition-api").ComputedOptions, import("@vue/composition-api").MethodOptions, unknown, unknown, {
+        [x: string]: ((...args: any[]) => any) | null;
+    } | string[], {} & {}, {
+        [x: number]: string;
+    } | {}, true>)) | undefined>;
+    sortButton: import("@vue/composition-api").Ref<(import("vue").ComponentOptions<import("vue").default, import("@vue/composition-api").ShallowUnwrapRef<unknown>, import("@vue/composition-api").MethodOptions, import("@vue/composition-api").ComputedOptions, import("@vue/composition-api").ComponentPropsOptions<import("@vue/composition-api").Data>, import("@vue/composition-api").ExtractPropTypes<import("@vue/composition-api").ComponentPropsOptions<import("@vue/composition-api").Data>>> & Omit<import("vue").VueConstructor<import("vue").default>, never> & (new (...args: any[]) => import("@vue/composition-api").ComponentRenderProxy<{} & {}, import("@vue/composition-api").ShallowUnwrapRef<unknown>, unknown, import("@vue/composition-api").ComputedOptions, import("@vue/composition-api").MethodOptions, unknown, unknown, {
+        [x: string]: ((...args: any[]) => any) | null;
+    } | string[], {} & {}, {
+        [x: number]: string;
+    } | {}, true>)) | undefined>;
     rootStyles: import("@vue/composition-api").ComputedRef<(string | undefined)[]>;
     toolbarStyles: import("@vue/composition-api").ComputedRef<string[]>;
     toolbarPanelStyles: import("@vue/composition-api").ComputedRef<string[]>;
     proxyView: import("@vue/composition-api").Ref<CardCollectionView>;
-    proxySort: import("@vue/composition-api").Ref<{
-        column: string;
-        direction: "asc" | "desc";
-    }>;
+    proxySort: import("@vue/composition-api").Ref<string>;
     proxySearch: import("@vue/composition-api").Ref<string>;
     switchToGridView: () => void;
     switchToListView: () => void;
+    handleSort: (sort: string) => void;
+    handleSearch: (search: string) => void;
 }>, import("@vue/composition-api").Data, {}, {}, {}, {}, string[], {
     search: string;
-    sort: SortHeaderModel;
+    sort: string;
     items: CardCollectionItem[];
     view: CardCollectionView;
-    sortHeaders: CardCollectionSortHeader[];
+    sortOptions: string[];
 } & {} & {
     [x: string & `on${string}`]: ((...args: any[]) => any) | undefined;
 }, {
     search: string;
-    sort: SortHeaderModel;
     items: CardCollectionItem[];
     view: CardCollectionView;
-    sortHeaders: CardCollectionSortHeader[];
+    sortOptions: string[];
 }, true>);
 export default _default;

package/dist/esm/v3/components/or-card-collection-v3/index.js

@@ -1,4 +1,4 @@
-export { C as CardCollectionView, s as OrCardCollectionV3 } from '../../OrCardCollection-9682c6ef.js';
+export { C as CardCollectionView, s as OrCardCollectionV3 } from '../../OrCardCollection-9d0036fa.js';
 import 'vue-demi';
 import '../../useClassAttribute-47fdb016.js';
 import '@vueuse/core';
@@ -13,10 +13,14 @@ import '../../useResponsive-a02e95b7.js';
 import '../../OrBottomSheet-62817aec.js';
 import '../../OrOverlay-738a44d5.js';
 import '../../OrTeleport.vue3-8099178c.js';
+import '../../OrMenu-840038cd.js';
+import '../../OrMenuItem-9da279f6.js';
+import '../../OrButton-f4b9ee51.js';
+import '../../OrLoader-b3cf4231.js';
+import '../../OrSearch-01225d82.js';
 import '../../OrInput-e2ac1182.js';
 import '../../OrError-ec8c709d.js';
 import '../../OrHint-74bb732d.js';
 import '../../OrInputBox-5247ab25.js';
 import '../../OrLabel-bdaec602.js';
 import '../../style-inject.es-4c6f2515.js';
-import '../../OrSortHeader-fe1a9cf8.js';

package/dist/esm/v3/index.js

@@ -6,7 +6,7 @@ export { b as BUTTON_COLOR, d as BUTTON_LOADER_TYPE, c as BUTTON_SIZE, B as BUTT
 export { a as ButtonColor, b as ButtonType, B as ButtonVariant, s as OrButtonV3 } from './OrButton-f4b9ee51.js';
 export { s as OrCard } from './OrCard-e3a5aea4.js';
 export { C as CARD_COLLECTION_LAYOUT, s as OrCardCollection } from './OrCardCollection-a5e326ef.js';
-export { C as CardCollectionView, s as OrCardCollectionV3 } from './OrCardCollection-9682c6ef.js';
+export { C as CardCollectionView, s as OrCardCollectionV3 } from './OrCardCollection-9d0036fa.js';
 export { s as OrCardV3 } from './OrCard-fd92f7c8.js';
 export { a as OrCarousel, s as OrCarouselItem } from './OrCarouselItem-636d99a1.js';
 export { s as OrCheckbox } from './OrCheckbox-ed4a19cf.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onereach/ui-components",
-  "version": "2.68.1-beta.2065.0",
+  "version": "2.68.1-beta.2067.0",
   "description": "Vue components library for v2/3",
   "sideEffects": false,
   "main": "./dist/auto/index.js",

package/src/components/or-card-collection-v3/OrCardCollection.stories3.ts

@@ -5,7 +5,7 @@ import OrCardCollectionDocs from './OrCardCollection.docs.mdx';
 import OrCardCollection from './OrCardCollection.vue';
 import { OrCardV3 as OrCard } from '../or-card-v3';
 import { CardCollectionView } from './props';
-import { CardCollectionItem, CardCollectionSortHeader } from './types';
+import { CardCollectionItem } from './types';
 
 export default {
   title: 'Components/Card Collection',
@@ -71,6 +71,7 @@ export default {
     docs: {
       page: OrCardCollectionDocs,
     },
+    layout: 'fullscreen',
   },
 } as Meta<typeof OrCardCollection>;
 
@@ -91,17 +92,19 @@ const Template: StoryFn<typeof OrCardCollection> = (args) => ({
   },
 
   template: `
-    <OrCardCollection
-      v-bind="args"
-      @viewChange="onViewChange"
-      @sortChange="onSortChange"
-      @searchChange="onSearchChange"
-    >
-      <template #item="{item, mode}">
-        <OrCard>${args.item} ({{mode}}}</OrCard>
-      </template>
-      <template #addon>${args.addon}</template>
-    </OrCardCollection>
+    <div class="p-md bg-surface-1 dark:bg-surface-1-dark">
+      <OrCardCollection
+        v-bind="args"
+        @viewChange="onViewChange"
+        @sortChange="onSortChange"
+        @searchChange="onSearchChange"
+      >
+        <template #item="{item, mode}">
+          <OrCard>${args.item} ({{mode}}}</OrCard>
+        </template>
+        <template #addon>${args.addon}</template>
+      </OrCardCollection>
+    </div>
   `,
 });
 
@@ -152,15 +155,13 @@ WithSorting.args = {
   ...Default.args,
 
   // Props
-  sortHeaders: Array.from<string, CardCollectionSortHeader>([
+  sort: 'Bar',
+  sortOptions: [
     'Foo',
     'Bar',
     'Baz',
     'Qux',
-  ], (item) => ({
-    value: item.toLowerCase(),
-    label: item,
-  })),
+  ],
 };
 
 
@@ -181,35 +182,37 @@ export const OverrideViewContainer: StoryFn<typeof OrCardCollection> = (args) =>
   },
 
   template: `
-    <OrCardCollection
-      v-bind="args"
-      @viewChange="onViewChange"
-      @sortChange="onSortChange"
-      @searchChange="onSearchChange"
-    >
-    <template #grid="{items}">
-      <div class="typography-headline-3">Custom grid</div>
-      <div class="grid grid-cols-3">
-        <OrCard
-          v-for="item in items"
-          :key="item.id"
-        >
-          {{ item.label }}
-        </OrCard>
-      </div>
-    </template>
-      <template #list="{items}">
-        <div class="typography-headline-3">Custom list</div>
-        <ul>
-          <li
+    <div class="p-md bg-surface-1 dark:bg-surface-1-dark">
+      <OrCardCollection
+        v-bind="args"
+        @viewChange="onViewChange"
+        @sortChange="onSortChange"
+        @searchChange="onSearchChange"
+      >
+      <template #grid="{items}">
+        <div class="typography-headline-3">Custom grid</div>
+        <div class="grid grid-cols-3">
+          <OrCard
             v-for="item in items"
             :key="item.id"
           >
-            - {{ item.label }}
-          </li>
-        </ul>
+            {{ item.label }}
+          </OrCard>
+        </div>
       </template>
-    </OrCardCollection>
+        <template #list="{items}">
+          <div class="typography-headline-3">Custom list</div>
+          <ul>
+            <li
+              v-for="item in items"
+              :key="item.id"
+            >
+              - {{ item.label }}
+            </li>
+          </ul>
+        </template>
+      </OrCardCollection>
+    </div>
   `,
 });
 
@@ -235,16 +238,18 @@ export const WithLink: StoryFn<typeof OrCardCollection> = (args) => ({
   },
 
   template: `
-    <OrCardCollection
-      v-bind="args"
-      @viewChange="onViewChange"
-      @sortChange="onSortChange"
-      @searchChange="onSearchChange"
-    >
-      <template #item="{item}">
-        <a href="#" @click.prevent><OrCard>${args.item}</OrCard></a>
-      </template>
-    </OrCardCollection>
+    <div class="p-md bg-surface-1 dark:bg-surface-1-dark">
+      <OrCardCollection
+        v-bind="args"
+        @viewChange="onViewChange"
+        @sortChange="onSortChange"
+        @searchChange="onSearchChange"
+      >
+        <template #item="{item}">
+          <a href="#" @click.prevent><OrCard>${args.item}</OrCard></a>
+        </template>
+      </OrCardCollection>
+    </div>
   `,
 });
 

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

@@ -6,37 +6,55 @@
   >
     <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>
+            {{ proxySort }}
+            <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)"
+            >
+              {{ sortItem }}
+            </OrMenuItem>
+          </OrMenu>
         </template>
       </div>
 
-      <div :class="toolbarPanelStyles">
-        <OrInput
-          v-model="proxySearch"
-          :type="'search'"
-          :placeholder="'Search'"
-          :size="'s'"
-        />
-
-        <OrIconButton
-          :icon="'grid_view'"
-          @click="switchToGridView()"
+      <div
+        :class="toolbarPanelStyles"
+      >
+        <OrSearch
+          class="md:w-[350px]"
+          size="s"
+          @search="handleSearch"
         />
+        <div class="layout-row gap-sm">
+          <OrIconButton
+            :icon="'grid_view'"
+            @click="switchToGridView()"
+          />
 
-        <OrIconButton
-          :icon="'view_list'"
-          @click="switchToListView()"
-        />
+          <OrIconButton
+            :icon="'view_agenda'"
+            @click="switchToListView()"
+          />
 
-        <slot name="addon" />
+          <slot name="addon" />
+        </div>
       </div>
     </div>
 
@@ -63,16 +81,19 @@
 import { computed, defineComponent, PropType, ref, watch } from 'vue-demi';
 import { useClassAttribute } from '../../hooks';
 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 {
   CardCollectionRoot,
   CardCollectionToolbar,
   CardCollectionToolbarPanel,
 } from './styles';
-import { CardCollectionItem, CardCollectionSortHeader } from './types';
+import { CardCollectionItem } from './types';
 import OrCardCollectionView from './OrCardCollectionView.vue3.vue';
+import { OrButtonV3 as OrButton } from '../or-button-v3';
+import { OrSearchV3 as OrSearch } from '../or-search-v3';
 
 export default defineComponent({
   name: 'OrCardCollection',
@@ -80,8 +101,11 @@ export default defineComponent({
   components: {
     OrCardCollectionView,
     OrIconButton,
-    OrInput,
-    OrSortHeader,
+    OrButton,
+    OrMenu,
+    OrMenuItem,
+    OrIcon,
+    OrSearch,
   },
 
   inheritAttrs: false,
@@ -97,13 +121,13 @@ export default defineComponent({
     },
 
     sort: {
-      type: Object as PropType<SortHeaderModel>,
-      default: undefined,
+      type: String,
+      required: true,
     },
 
-    sortHeaders: {
-      type: Array as PropType<CardCollectionSortHeader[]>,
-      default: undefined,
+    sortOptions: {
+      type: Array as PropType<string[]>,
+      default: () => [],
     },
 
     search: {
@@ -125,6 +149,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();
@@ -157,6 +183,14 @@ export default defineComponent({
       proxyView.value = CardCollectionView.List;
     }
 
+    function handleSort(sort: string) {
+      proxySort.value = sort;
+    }
+
+    function handleSearch(search: string) {
+      proxySearch.value = search;
+    }
+
     // Effects
     watch(() => props.view, (value) => {
       proxyView.value = value;
@@ -184,6 +218,8 @@ export default defineComponent({
 
     return {
       root,
+      sortMenu,
+      sortButton,
       rootStyles,
       toolbarStyles,
       toolbarPanelStyles,
@@ -192,6 +228,8 @@ export default defineComponent({
       proxySearch,
       switchToGridView,
       switchToListView,
+      handleSort,
+      handleSearch,
     };
   },
 });

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[] = [