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

package/dist/esm/v3/components/or-search-v3/index.js

@@ -1,9 +1,9 @@
-export { s as OrSearchV3 } from '../../OrSearch-cdde55ce.js';
+export { s as OrSearchV3 } from '../../OrSearch-01225d82.js';
 export { a as SearchSize } from '../../OrInputBox-5247ab25.js';
 import 'vue-demi';
 import '@vueuse/core';
 import '../../useClassAttribute-47fdb016.js';
-import '../../OrInput-41691fb3.js';
+import '../../OrInput-e2ac1182.js';
 import '../../OrError-ec8c709d.js';
 import 'vue';
 import '../../OrHint-74bb732d.js';

package/dist/esm/v3/components/or-select-v3/index.js

@@ -1,4 +1,4 @@
-export { s as OrSelectV3 } from '../../OrSelect-d9c76482.js';
+export { s as OrSelectV3 } from '../../OrSelect-2e00d4c8.js';
 export { a as SelectSize } from '../../OrInputBox-5247ab25.js';
 import 'vue-demi';
 import '../../dropdown-open-0d314aa4.js';
@@ -13,7 +13,7 @@ import '../../OrError-ec8c709d.js';
 import '../../OrExpansionPanel-311e64cf.js';
 import '../../OrIcon-b195169c.js';
 import '../../OrHint-74bb732d.js';
-import '../../OrInput-41691fb3.js';
+import '../../OrInput-e2ac1182.js';
 import '../../OrIconButton-1eebcafc.js';
 import '../../OrTooltip-50d27b4f.js';
 import '../../OrPopover-1075dd38.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-5a0febaf.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';
@@ -16,7 +16,7 @@ export { s as OrCode, O as OrCodeLanguages } from './OrCode-ee19a5e6.js';
 export { s as OrCollapse } from './OrCollapse-445141ab.js';
 export { s as OrColorPicker, h as amber, n as black, b as blue, m as blueGrey, k as brown, c as cyan, j as deepOrange, d as deepPurple, g as green, i as indigo, l as lightBlue, e as lightGreen, f as lime, o as orange, p as pink, a as purple, r as red, t as teal, w as white, y as yellow } from './OrColorPicker-189cb097.js';
 export { s as OrConfirm } from './OrConfirm-f39bd784.js';
-export { C as ConfirmType, s as OrConfirmV3 } from './OrConfirm-906427ef.js';
+export { C as ConfirmType, s as OrConfirmV3 } from './OrConfirm-a3f312a6.js';
 export { D as DEFAULT_TEXT, s as OrDateTimePicker, a as OrDateTimePickerItemTypes, O as OrDateTimePickerTypes } from './OrDateTimePicker-f2e08564.js';
 export { s as OrError } from './OrError-f90296db.js';
 export { s as OrErrorTagV3 } from './OrErrorTag-98252eef.js';
@@ -34,7 +34,7 @@ export { I as InlineInputType, s as OrInlineInputV3 } from './OrInlineInput-3102
 export { a as InlineTextEditTrimmingTypes, I as InlineTextEditTypes, s as OrInlineTextEdit } from './OrInlineTextEdit-1aa477b5.js';
 export { s as OrInlineTextareaV3 } from './OrInlineTextarea-b28c3d8c.js';
 export { a as InputBoxSize, I as InputBoxVariant, a as InputSize, s as OrInputBoxV3, a as SearchSize, a as SelectSize, a as TextareaSize } from './OrInputBox-5247ab25.js';
-export { I as InputType, s as OrInputV3 } from './OrInput-41691fb3.js';
+export { I as InputType, s as OrInputV3 } from './OrInput-e2ac1182.js';
 export { a as OrInput, b as OrNumberInput, c as OrPassword, d as OrSearch, s as OrTextarea } from './OrSearch-7cb2c91c.js';
 export { s as OrLabel } from './OrLabel-876f8729.js';
 export { L as LabelVariant, s as OrLabelV3 } from './OrLabel-bdaec602.js';
@@ -58,10 +58,10 @@ export { s as OrProgressV3, P as ProgressColor, a as ProgressType } from './OrPr
 export { s as OrRadio } from './OrRadio-c3ab11f2.js';
 export { s as OrRadioGroup } from './OrRadioGroup-00785e41.js';
 export { s as OrRadioV3 } from './OrRadio-54b6d0de.js';
-export { s as OrSearchV3 } from './OrSearch-cdde55ce.js';
+export { s as OrSearchV3 } from './OrSearch-01225d82.js';
 export { s as OrSegmentedControlV3, S as SegmentedControlSize } from './OrSegmentedControl-171cad78.js';
 export { s as OrSelect } from './OrSelect-0821b907.js';
-export { s as OrSelectV3 } from './OrSelect-d9c76482.js';
+export { s as OrSelectV3 } from './OrSelect-2e00d4c8.js';
 export { s as OrSidebar, O as OrSidebarSide } from './OrSidebar-375c85a3.js';
 export { O as OrSidebarPlacement, s as OrSidebarV3 } from './OrSidebar-a62972f5.js';
 export { s as OrSkeletonCircle, a as OrSkeletonRect, b as OrSkeletonText, O as OrSkeletonTextSizes } from './OrSkeletonText-2b1610ce.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onereach/ui-components",
-  "version": "2.68.1-beta.2061.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

@@ -3,8 +3,9 @@ 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 { 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 +71,14 @@ export default {
     docs: {
       page: OrCardCollectionDocs,
     },
+    layout: 'fullscreen',
   },
 } as Meta<typeof OrCardCollection>;
 
 const Template: StoryFn<typeof OrCardCollection> = (args) => ({
   components: {
     OrCardCollection,
+    OrCard,
     OrIcon,
   },
 
@@ -89,16 +92,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 +112,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 +144,7 @@ Default.args = {
     'Yankee',
     'Zulu',
   ], (item) => ({
-    id: item.toLowerCase(),
+    key: item.toLowerCase(),
     label: item,
   })),
 };
@@ -150,13 +155,104 @@ 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,
+    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 #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
+              v-for="item in items"
+              :key="item.id"
+            >
+              - {{ item.label }}
+            </li>
+          </ul>
+        </template>
+      </OrCardCollection>
+    </div>
+  `,
+});
+
+OverrideViewContainer.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,106 @@
   >
     <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>
 
-    <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 } 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',
 
   components: {
-    OrCard,
+    OrCardCollectionView,
     OrIconButton,
-    OrInput,
-    OrSortHeader,
+    OrButton,
+    OrMenu,
+    OrMenuItem,
+    OrIcon,
+    OrSearch,
   },
 
   inheritAttrs: false,
@@ -96,20 +115,19 @@ export default defineComponent({
       type: Array as PropType<CardCollectionItem[]>,
       default: [] as CardCollectionItem[],
     },
-
     view: {
       type: String as PropType<CardCollectionView>,
       default: CardCollectionView.Grid,
     },
 
     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: {
@@ -131,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();
@@ -149,11 +169,6 @@ export default defineComponent({
       ...CardCollectionToolbarPanel,
     ]);
 
-    const contentStyles = computed(() => [
-      ...CardCollectionContent,
-      ...CardCollectionContentViews[proxyView.value],
-    ]);
-
     // State
     const proxyView = ref(props.view);
     const proxySort = ref(props.sort);
@@ -168,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;
@@ -195,15 +218,18 @@ export default defineComponent({
 
     return {
       root,
+      sortMenu,
+      sortButton,
       rootStyles,
       toolbarStyles,
       toolbarPanelStyles,
-      contentStyles,
       proxyView,
       proxySort,
       proxySearch,
       switchToGridView,
       switchToListView,
+      handleSort,
+      handleSearch,
     };
   },
 });

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

@@ -0,0 +1,39 @@
+<template>
+  <div :class="contentStyles">
+    <slot
+      v-for="(item) in items"
+      name="item"
+      v-bind="{
+        item,
+        mode,
+      }"
+    />
+  </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,40 @@
+<template>
+  <div :class="contentStyles">
+    <slot
+      v-for="(item, index) in items"
+      :key="item.key || index"
+      name="item"
+      v-bind="{
+        item,
+        mode,
+      }"
+    />
+  </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/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,5 +1,5 @@
 export interface CardCollectionItem {
-  id: string;
+  key?: string;
 }
 
 export interface CardCollectionSortHeader {

package/src/components/or-input-v3/OrInput.vue

@@ -41,7 +41,7 @@
         @blur="$emit('blur', $event)"
       >
 
-      <div :class="['layout-row']">
+      <div :class="['layout-row', 'm-[-4px] md:m-[-2px]']">
         <template v-if="type === 'password'">
           <OrIconButton
             :icon="{ icon: disclosed ? 'visibility_off' : 'visibility', variant: 'filled' }"

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

@@ -74,7 +74,7 @@
         +{{ outerItems.length }}
       </template>
 
-      <div :class="['layout-row']">
+      <div :class="['layout-row', 'm-[-4px] md:m-[-2px]']">
         <OrIcon
           :icon="popoverState === 'open' ? 'arrow_drop_up' : 'arrow_drop_down'"
           :variant="'outlined'"