@onereach/ui-components 2.69.1-beta.2099.0 → 2.69.1-beta.2101.0

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

@@ -1,13 +1,10 @@
 import { action } from '@storybook/addon-actions';
 import { Meta, StoryFn } from '@storybook/vue3';
-import { ref } from 'vue-demi';
 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 } from './types';
+import { CardCollectionItem, CardCollectionSortHeader } from './types';
 
 export default {
   title: 'Components/Card Collection',
@@ -15,7 +12,7 @@ export default {
 
   argTypes: {
     // Slots
-    item: {
+    gridItem: {
       type: {
         name: 'string',
         required: true,
@@ -24,9 +21,10 @@ export default {
       control: { type: 'text' },
     },
 
-    header: {
+    listItem: {
       type: {
         name: 'string',
+        required: true,
       },
 
       control: { type: 'text' },
@@ -46,7 +44,7 @@ export default {
       control: { type: 'object' },
     },
 
-    sortOptions: {
+    sortHeaders: {
       control: { type: 'object' },
     },
 
@@ -72,48 +70,35 @@ export default {
     docs: {
       page: OrCardCollectionDocs,
     },
-    layout: 'fullscreen',
   },
 } as Meta<typeof OrCardCollection>;
 
 const Template: StoryFn<typeof OrCardCollection> = (args) => ({
   components: {
     OrCardCollection,
-    OrCard,
     OrIcon,
   },
 
   setup() {
-    const sort = ref(args.sort);
-    const onSortChange = (newSort: string) => {
-      sort.value = newSort;
-      action('searchChange')(newSort);
-    };
-
     return {
       args,
-      sort,
-      onSortChange,
       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"
-        :sort="sort"
-        @viewChange="onViewChange"
-        @sortChange="onSortChange"
-        @searchChange="onSearchChange"
-      >
-        <template #item="{item, mode}">
-          <OrCard>${args.item} ({{mode}})</OrCard>
-        </template>
-        <template #addon>${args.addon}</template>
-      </OrCardCollection>
-    </div>
+    <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>
   `,
 });
 
@@ -121,7 +106,8 @@ export const Default = Template.bind({});
 
 Default.args = {
   // Slots
-  item: '{{ item.label }}',
+  gridItem: '{{ item.label }} (grid)',
+  listItem: '{{ item.label }} (list)',
   addon: '<OrIcon icon="info" />',
 
   // Props
@@ -153,7 +139,7 @@ Default.args = {
     'Yankee',
     'Zulu',
   ], (item) => ({
-    key: item.toLowerCase(),
+    id: item.toLowerCase(),
     label: item,
   })),
 };
@@ -164,200 +150,13 @@ WithSorting.args = {
   ...Default.args,
 
   // Props
-  sort: 'bar',
-  sortOptions: [
-    {
-      label: 'Foo',
-      value: 'foo',
-    },
-    {
-      label: 'Bar',
-      value: 'bar',
-    },
-    {
-      label: 'Baz',
-      value: 'baz',
-    },
-    {
-      label: 'Qux',
-      value: 'qux',
-    },
-  ],
-};
-
-
-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 #header="{mode}">
-        ${args.header}
-      </template>
-      <template #grid="{items}">
-        <div class="grid grid-cols-3">
-          <OrCard
-            v-for="item in items"
-            :key="item.key"
-          >
-            {{ item.label }}
-          </OrCard>
-        </div>
-      </template>
-        <template #list="{items}">
-          <ul>
-            <li
-              v-for="item in items"
-              :key="item.key"
-            >
-              - {{ item.label }}
-            </li>
-          </ul>
-        </template>
-      </OrCardCollection>
-    </div>
-  `,
-});
-
-OverrideViewContainer.args = {
-  ...Default.args,
-  header: '<div class="typography-headline-3">Custom {{ mode }}</div>',
-};
-
-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,
-};
-
-export const EmptySearchResults: 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 h-screen bg-surface-1 dark:bg-surface-1-dark">
-      <OrCardCollection
-        v-bind="args"
-        @viewChange="onViewChange"
-        @sortChange="onSortChange"
-        @searchChange="onSearchChange"
-      >
-        <template #noSearchResults="{search}">
-          <p class="text-center typography-headline-3">No results for "{{search}}"</p>
-        </template>
-      </OrCardCollection>
-    </div>
-  `,
-});
-
-EmptySearchResults.args = {
-  ...Default.args,
-  search: 'My favorite ..',
-  items: [],
+  sortHeaders: Array.from<string, CardCollectionSortHeader>([
+    'Foo',
+    'Bar',
+    'Baz',
+    'Qux',
+  ], (item) => ({
+    value: item.toLowerCase(),
+    label: item,
+  })),
 };

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

@@ -6,119 +6,87 @@
   >
     <div :class="toolbarStyles">
       <div :class="toolbarPanelStyles">
-        <template v-if="sortOptions.length">
-          <OrButton
-            ref="sortButton"
-            variant="link"
-            color="inherit"
-            @click="sortMenu.toggle()"
+        <template v-if="sortHeaders">
+          <OrSortHeader
+            v-for="header in sortHeaders"
+            :key="header.value"
+            v-model="proxySort"
+            :input-value="header.value"
           >
-            {{ 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>
+            {{ header.label }}
+          </OrSortHeader>
         </template>
       </div>
-      <div
-        :class="toolbarPanelStyles"
-      >
-        <OrSearch
+
+      <div :class="toolbarPanelStyles">
+        <OrInput
           v-model="proxySearch"
-          class="md:w-[350px]"
-          size="s"
-          @search="handleSearch"
+          :type="'search'"
+          :placeholder="'Search'"
+          :size="'s'"
+        />
+
+        <OrIconButton
+          :icon="'grid_view'"
+          @click="switchToGridView()"
+        />
+
+        <OrIconButton
+          :icon="'view_list'"
+          @click="switchToListView()"
         />
-        <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>
+
+        <slot name="addon" />
       </div>
     </div>
-    <slot
-      name="header"
-      v-bind="{
-        items,
-        mode: proxyView,
-      }"
-    />
-    <slot
-      v-if="items.length"
-      :name="proxyView"
-      v-bind="{items}"
-    >
-      <OrCardCollectionView
-        :items="items"
-        :mode="proxyView"
-      >
-        <template v-slot:item="props">
+
+    <div :class="contentStyles">
+      <template v-if="proxyView === 'grid'">
+        <OrCard
+          v-for="item in items"
+          :key="item.id"
+        >
           <slot
-            name="item"
-            v-bind="props"
+            name="gridItem"
+            v-bind="item"
           />
-        </template>
-      </OrCardCollectionView>
-    </slot>
-    <slot
-      v-else-if="items.length === 0 && proxySearch.length > 0"
-      name="noSearchResults"
-      v-bind="{search: proxySearch}"
-    >
-      No results
-    </slot>
+        </OrCard>
+      </template>
+
+      <template v-if="proxyView === 'list'">
+        <OrCard
+          v-for="item in items"
+          :key="item.id"
+        >
+          <slot
+            name="listItem"
+            v-bind="item"
+          />
+        </OrCard>
+      </template>
+    </div>
   </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 { 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 { OrInputV3 as OrInput } from '../or-input-v3';
+import { OrSortHeaderV3 as OrSortHeader, SortHeaderModel } from '../or-sort-header-v3';
 import { CardCollectionView } from './props';
-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';
+import { CardCollectionContent, CardCollectionContentViews, CardCollectionRoot, CardCollectionToolbar, CardCollectionToolbarPanel } from './styles';
+import { CardCollectionItem, CardCollectionSortHeader } from './types';
 
 export default defineComponent({
   name: 'OrCardCollection',
 
   components: {
-    OrCardCollectionView,
+    OrCard,
     OrIconButton,
-    OrButton,
-    OrMenu,
-    OrMenuItem,
-    OrIcon,
-    OrSearch,
+    OrInput,
+    OrSortHeader,
   },
 
   inheritAttrs: false,
@@ -130,28 +98,23 @@ export default defineComponent({
     },
 
     view: {
-      type: String,
+      type: String as PropType<CardCollectionView>,
       default: CardCollectionView.Grid,
     },
 
-    viewModes: {
-      type: Array as PropType<ViewMode[]>,
-      default: () => defaultViewModes,
-    },
-
     sort: {
-      type: String,
+      type: Object as PropType<SortHeaderModel>,
       default: undefined,
     },
 
-    sortOptions: {
-      type: Array as PropType<SortOption[]>,
-      default: () => [],
+    sortHeaders: {
+      type: Array as PropType<CardCollectionSortHeader[]>,
+      default: undefined,
     },
 
     search: {
       type: String,
-      default: '',
+      default: undefined,
     },
   },
 
@@ -168,8 +131,6 @@ 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();
@@ -188,24 +149,23 @@ export default defineComponent({
       ...CardCollectionToolbarPanel,
     ]);
 
-    const sortLabel = computed(() => {
-      return props.sortOptions.find(item => item.value === props.sort)?.label;
-    });
+    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 switchView(view: string): void {
-      proxyView.value = view;
-    }
-    function handleSort(sort: string) {
-      proxySort.value = sort;
+    function switchToGridView(): void {
+      proxyView.value = CardCollectionView.Grid;
     }
 
-    function handleSearch(search: string) {
-      proxySearch.value = search;
+    function switchToListView(): void {
+      proxyView.value = CardCollectionView.List;
     }
 
     // Effects
@@ -235,18 +195,15 @@ export default defineComponent({
 
     return {
       root,
-      sortMenu,
-      sortButton,
       rootStyles,
       toolbarStyles,
       toolbarPanelStyles,
+      contentStyles,
       proxyView,
       proxySort,
       proxySearch,
-      sortLabel,
-      switchView,
-      handleSort,
-      handleSearch,
+      switchToGridView,
+      switchToListView,
     };
   },
 });

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

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

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

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

package/src/components/or-search-v3/OrSearch.vue

@@ -35,12 +35,6 @@ export default defineComponent({
   inheritAttrs: false,
 
   props: {
-    modelValue: {
-      type: String,
-      default: '',
-      required: false,
-    },
-
     size: {
       type: String as PropType<SearchSize>,
       default: SearchSize.M,
@@ -96,7 +90,7 @@ export default defineComponent({
     ]);
 
     // State
-    const localModelValue = ref(props.modelValue ?? '');
+    const localModelValue = ref('');
 
     // Events
     debouncedWatch(