@onereach/ui-components 2.69.0 → 2.69.1-beta.2090.0

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

@@ -3,8 +3,10 @@ import { Meta, StoryFn } from '@storybook/vue3';
 import { OrIconV3 as OrIcon } from '../or-icon-v3';
 import OrCardCollectionDocs from './OrCardCollection.docs.mdx';
 import OrCardCollection from './OrCardCollection.vue';
+import { defaultViewModes } from './constatnts';
+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',
@@ -70,12 +72,14 @@ export default {
     docs: {
       page: OrCardCollectionDocs,
     },
+    layout: 'fullscreen',
   },
 } as Meta<typeof OrCardCollection>;
 
 const Template: StoryFn<typeof OrCardCollection> = (args) => ({
   components: {
     OrCardCollection,
+    OrCard,
     OrIcon,
   },
 
@@ -89,16 +93,19 @@ const Template: StoryFn<typeof OrCardCollection> = (args) => ({
   },
 
   template: `
-    <OrCardCollection
-      v-bind="args"
-      @viewChange="onViewChange"
-      @sortChange="onSortChange"
-      @searchChange="onSearchChange"
-    >
-      <template #gridItem="item">${args.gridItem}</template>
-      <template #listItem="item">${args.listItem}</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>
   `,
 });
 
@@ -106,8 +113,7 @@ export const Default = Template.bind({});
 
 Default.args = {
   // Slots
-  gridItem: '{{ item.label }} (grid)',
-  listItem: '{{ item.label }} (list)',
+  item: '{{ item.label }}',
   addon: '<OrIcon icon="info" />',
 
   // Props
@@ -139,7 +145,7 @@ Default.args = {
     'Yankee',
     'Zulu',
   ], (item) => ({
-    id: item.toLowerCase(),
+    key: item.toLowerCase(),
     label: item,
   })),
 };
@@ -150,13 +156,148 @@ WithSorting.args = {
   ...Default.args,
 
   // Props
-  sortHeaders: Array.from<string, CardCollectionSortHeader>([
+  sort: 'Bar',
+  sortOptions: [
     'Foo',
     'Bar',
     'Baz',
     'Qux',
-  ], (item) => ({
-    value: item.toLowerCase(),
-    label: item,
-  })),
+  ],
+};
+
+
+export const OverrideViewContainer: StoryFn<typeof OrCardCollection> = (args) => ({
+  components: {
+    OrCardCollection,
+    OrCard,
+  },
+
+  setup() {
+    return {
+      args,
+      onViewChange: action('viewChange'),
+      onSortChange: action('sortChange'),
+      onSearchChange: action('searchChange'),
+    };
+  },
+
+  template: `
+    <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.key"
+          >
+            {{ item.label }}
+          </OrCard>
+        </div>
+      </template>
+        <template #list="{items}">
+          <div class="typography-headline-3">Custom list</div>
+          <ul>
+            <li
+              v-for="item in items"
+              :key="item.key"
+            >
+              - {{ item.label }}
+            </li>
+          </ul>
+        </template>
+      </OrCardCollection>
+    </div>
+  `,
+});
+
+OverrideViewContainer.args = {
+  ...Default.args,
+};
+
+export const ExtraViewMode: StoryFn<typeof OrCardCollection> = (args) => ({
+  components: {
+    OrCardCollection,
+    OrCard,
+  },
+
+  setup() {
+    return {
+      args,
+      defaultViewModes,
+      onViewChange: action('viewChange'),
+      onSearchChange: action('searchChange'),
+    };
+  },
+
+  template: `
+    <div class="p-md bg-surface-1 dark:bg-surface-1-dark">
+      <OrCardCollection
+        v-bind="args"
+        :view-modes="[...defaultViewModes, {view: 'mymode', icon: 'timeline'}]"
+        @viewChange="onViewChange"
+        @searchChange="onSearchChange"
+      >
+        <template #item="{item, mode}">
+          <OrCard>${args.item} ({{mode}})</OrCard>
+        </template>
+        <template #mymode="{items}">
+          <div class="typography-headline-3">My view mode</div>
+          <div class="grid grid-cols-3">
+            <OrCard
+              v-for="item in items"
+              :key="item.key"
+            >
+              {{ item.label }} (timeline)
+            </OrCard>
+          </div>
+        </template>
+      </OrCardCollection>
+    </div>
+  `,
+});
+
+ExtraViewMode.args = {
+  ...Default.args,
+};
+
+export const WithLink: StoryFn<typeof OrCardCollection> = (args) => ({
+  components: {
+    OrCardCollection,
+    OrCard,
+    OrIcon,
+  },
+
+  setup() {
+    return {
+      args,
+      onViewChange: action('viewChange'),
+      onSortChange: action('sortChange'),
+      onSearchChange: action('searchChange'),
+    };
+  },
+
+  template: `
+    <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>
+  `,
+});
+
+WithLink.args = {
+  ...Default.args,
 };

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

@@ -6,87 +6,105 @@
   >
     <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'"
+      <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="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, 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 +116,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<string[]>,
+      default: () => [],
     },
 
     search: {
@@ -131,6 +154,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 +174,21 @@ export default defineComponent({
       ...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(): 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 +218,17 @@ export default defineComponent({
 
     return {
       root,
+      sortMenu,
+      sortButton,
       rootStyles,
       toolbarStyles,
       toolbarPanelStyles,
-      contentStyles,
       proxyView,
       proxySort,
       proxySearch,
-      switchToGridView,
-      switchToListView,
+      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,9 @@
 export interface CardCollectionItem {
-  id: string;
+  key?: string;
+  [key: string|number]: any;
 }
 
-export interface CardCollectionSortHeader {
-  value: string;
-  label: string;
+export interface ViewMode {
+  view: string;
+  icon: string;
 }