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

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

@@ -3,9 +3,8 @@ 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 } from './types';
+import { CardCollectionItem, CardCollectionSortHeader } from './types';
 
 export default {
   title: 'Components/Card Collection',
@@ -71,14 +70,12 @@ export default {
     docs: {
       page: OrCardCollectionDocs,
     },
-    layout: 'fullscreen',
   },
 } as Meta<typeof OrCardCollection>;
 
 const Template: StoryFn<typeof OrCardCollection> = (args) => ({
   components: {
     OrCardCollection,
-    OrCard,
     OrIcon,
   },
 
@@ -92,19 +89,16 @@ const Template: StoryFn<typeof OrCardCollection> = (args) => ({
   },
 
   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, 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>
   `,
 });
 
@@ -112,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
@@ -144,7 +139,7 @@ Default.args = {
     'Yankee',
     'Zulu',
   ], (item) => ({
-    key: item.toLowerCase(),
+    id: item.toLowerCase(),
     label: item,
   })),
 };
@@ -155,104 +150,13 @@ WithSorting.args = {
   ...Default.args,
 
   // Props
-  sort: 'Bar',
-  sortOptions: [
+  sortHeaders: Array.from<string, CardCollectionSortHeader>([
     'Foo',
     'Bar',
     'Baz',
     'Qux',
-  ],
-};
-
-
-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,
+  ], (item) => ({
+    value: item.toLowerCase(),
+    label: item,
+  })),
 };

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

@@ -6,106 +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"
           >
-            {{ 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>
+            {{ header.label }}
+          </OrSortHeader>
         </template>
       </div>
 
-      <div
-        :class="toolbarPanelStyles"
-      >
-        <OrSearch
-          class="md:w-[350px]"
-          size="s"
-          @search="handleSearch"
+      <div :class="toolbarPanelStyles">
+        <OrInput
+          v-model="proxySearch"
+          :type="'search'"
+          :placeholder="'Search'"
+          :size="'s'"
         />
-        <div class="layout-row gap-sm">
-          <OrIconButton
-            :icon="'grid_view'"
-            @click="switchToGridView()"
-          />
 
-          <OrIconButton
-            :icon="'view_agenda'"
-            @click="switchToListView()"
-          />
+        <OrIconButton
+          :icon="'grid_view'"
+          @click="switchToGridView()"
+        />
 
-          <slot name="addon" />
-        </div>
+        <OrIconButton
+          :icon="'view_list'"
+          @click="switchToListView()"
+        />
+
+        <slot name="addon" />
       </div>
     </div>
 
-    <slot
-      :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>
+        </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 } 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 { 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,
@@ -115,19 +96,20 @@ export default defineComponent({
       type: Array as PropType<CardCollectionItem[]>,
       default: [] as CardCollectionItem[],
     },
+
     view: {
       type: String as PropType<CardCollectionView>,
       default: CardCollectionView.Grid,
     },
 
     sort: {
-      type: String,
-      required: true,
+      type: Object as PropType<SortHeaderModel>,
+      default: undefined,
     },
 
-    sortOptions: {
-      type: Array as PropType<string[]>,
-      default: () => [],
+    sortHeaders: {
+      type: Array as PropType<CardCollectionSortHeader[]>,
+      default: undefined,
     },
 
     search: {
@@ -149,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();
@@ -169,6 +149,11 @@ export default defineComponent({
       ...CardCollectionToolbarPanel,
     ]);
 
+    const contentStyles = computed(() => [
+      ...CardCollectionContent,
+      ...CardCollectionContentViews[proxyView.value],
+    ]);
+
     // State
     const proxyView = ref(props.view);
     const proxySort = ref(props.sort);
@@ -183,14 +168,6 @@ 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;
@@ -218,18 +195,15 @@ 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/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,5 +1,5 @@
 export interface CardCollectionItem {
-  key?: string;
+  id: string;
 }
 
 export interface CardCollectionSortHeader {

package/src/components/or-tag-v3/OrTag.stories3.ts

@@ -1,8 +1,13 @@
 import { action } from '@storybook/addon-actions';
 import { Meta, StoryFn } from '@storybook/vue3';
+import Faker from 'faker';
 import OrTagDocs from './OrTag.docs.mdx';
 import OrTag from './OrTag.vue';
 import { TagColor, TagVariant } from './props';
+import { OrButtonV3 as OrButton } from '../or-button-v3';
+import { OrPopoverV3 as OrPopover } from '../or-popover-v3';
+import { useOverflow } from '../../hooks';
+import { ref } from 'vue-demi';
 
 export default {
   title: 'Components/Tag',
@@ -77,6 +82,97 @@ const Template: StoryFn<typeof OrTag> = (args) => ({
   `,
 });
 
+const ContainerTemplate: StoryFn<typeof OrTag> = (args) => ({
+  components: {
+    OrTag,
+    OrButton,
+    OrPopover,
+  },
+
+  setup() {
+    const container = ref<HTMLElement>();
+    const button = ref<InstanceType<typeof OrButton>>();
+    const popover = ref<InstanceType<typeof OrPopover>>();
+
+    const { innerItems, outerItems } = useOverflow(container);
+
+    return {
+      args,
+      container,
+      button,
+      popover,
+      innerItems,
+      outerItems,
+      handleClick: action('click'),
+      handleFocus: action('focus'),
+      handleBlur: action('blur'),
+      handleReset: action('reset'),
+    };
+  },
+
+  computed: {
+    tagsArr(): string[] {
+      return [
+        args.default,
+        ...(typeof args.tags === 'string' ? args.tags.split(' ') : []),
+      ];
+    },
+    hiddenTagsArr(): string[] {
+      return this.tagsArr.slice(this.innerItems?.length);
+    },
+  },
+
+  template: `
+    <div class="w-[512px] flex flex-row items-center overflow-hidden gap-xs">
+      <div
+        ref="container"
+        class="relative flex flex-row grow items-center overflow-hidden gap-xs"
+      >
+        <OrTag
+          v-for="tag in tagsArr"
+          v-bind="args"
+          @click="handleClick"
+          @focus="handleFocus"
+          @blur="handleBlur"
+          @reset="handleReset"
+        >
+          {{ tag }}
+        </OrTag>
+      </div>
+      <template v-if="outerItems?.length">
+        <OrButton
+          ref="button"
+          class="typography-caption-regular text-on-background dark:text-on-background-dark"
+          color="inherit"
+          variant="link"
+          @click="popover.open()"
+        >
+          +{{outerItems.length}}
+        </OrButton>
+        <OrPopover
+          ref="popover"
+          :trigger="button?.root"
+        >
+          <div
+            class="max-w-[192px] p-[16px] flex flex-row flex-wrap items-center overflow-hidden gap-xs"
+          >
+            <OrTag
+              v-for="tag in hiddenTagsArr"
+              v-bind="args"
+              @click="handleClick"
+              @focus="handleFocus"
+              @blur="handleBlur"
+              @reset="handleReset"
+            >
+              {{ tag }}
+            </OrTag>
+          </div>
+        </OrPopover>
+      </template>
+    </div>
+  `,
+});
+
 export const Default = Template.bind({});
 
 Default.args = {
@@ -99,3 +195,19 @@ WithCustomColor.args = {
   // Props
   color: '#0000ff',
 };
+
+export const InsideContainer = ContainerTemplate.bind({});
+
+InsideContainer.argTypes = {
+  tags: {
+    control: { type: 'text' },
+  },
+};
+
+InsideContainer.args = {
+  // Slots
+  default: 'First tag',
+
+  // Args
+  tags: Faker.lorem.words(32),
+};

package/src/hooks/useOverflow.ts

@@ -20,10 +20,11 @@ export function useOverflow(
     const container = containerRef.value;
 
     if (container) {
+      const { x: containerOffset, width: containerWidth } = container.getBoundingClientRect();
       const update = [...container.children].reduce(({ innerItems, outerItems }, child) => {
-        const item = child as HTMLElement, { x: offset, width } = child.getBoundingClientRect();
+        const item = child as HTMLElement, { x: itemOffset, width: itemWidth } = child.getBoundingClientRect();
 
-        if (offset + width >= container.clientWidth) {
+        if (itemOffset + itemWidth >= containerOffset + containerWidth) {
           item.style.setProperty('visibility', 'hidden');
 
           return {

package/dist/bundled/v2/components/or-card-collection-v3/OrCardCollectionView.vue2.vue.d.ts

@@ -1,35 +0,0 @@
-import { PropType } from 'vue-demi';
-import { CardCollectionItem } from './types';
-import { CardCollectionView } from './props';
-declare const _default: import("vue").ComponentOptions<import("vue").default, import("@vue/composition-api").ShallowUnwrapRef<{
-    contentStyles: import("@vue/composition-api").ComputedRef<string[]>;
-}> & import("@vue/composition-api").Data, {}, {}, {
-    items: {
-        type: PropType<CardCollectionItem[]>;
-        default: CardCollectionItem[];
-    };
-    mode: {
-        type: PropType<CardCollectionView>;
-        required: true;
-    };
-}, import("@vue/composition-api").ExtractPropTypes<{
-    items: {
-        type: PropType<CardCollectionItem[]>;
-        default: CardCollectionItem[];
-    };
-    mode: {
-        type: PropType<CardCollectionView>;
-        required: true;
-    };
-}>> & Omit<import("vue").VueConstructor<import("vue").default>, never> & (new (...args: any[]) => import("@vue/composition-api").ComponentRenderProxy<{
-    items: CardCollectionItem[];
-    mode: CardCollectionView;
-} & {}, import("@vue/composition-api").ShallowUnwrapRef<{
-    contentStyles: import("@vue/composition-api").ComputedRef<string[]>;
-}>, import("@vue/composition-api").Data, {}, {}, {}, {}, {}, {
-    items: CardCollectionItem[];
-    mode: CardCollectionView;
-} & {}, {
-    items: CardCollectionItem[];
-}, true>);
-export default _default;

package/dist/bundled/v3/OrButton-8ab33d9d.js

@@ -1,33 +0,0 @@
-import { s as script } from './OrButton.vue_vue_type_script_lang-3718b300.js';
-import { resolveComponent, openBlock, createElementBlock, mergeProps, createElementVNode, normalizeClass, renderSlot, createBlock, Fragment, createTextVNode, toDisplayString, createCommentVNode } from 'vue';
-
-const _hoisted_1 = ["type", "disabled"];
-const _hoisted_2 = {
-  key: 0,
-  class: /*#__PURE__*/normalizeClass(['absolute'])
-};
-function render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_OrLoader = resolveComponent("OrLoader");
-  return openBlock(), createElementBlock("button", mergeProps({
-    ref: "root"
-  }, _ctx.$attrs, {
-    class: _ctx.rootStyles,
-    type: _ctx.type,
-    disabled: _ctx.disabled,
-    onClick: _cache[0] || (_cache[0] = $event => _ctx.$emit('click', $event)),
-    onFocus: _cache[1] || (_cache[1] = $event => _ctx.$emit('focus', $event)),
-    onBlur: _cache[2] || (_cache[2] = $event => _ctx.$emit('blur', $event))
-  }), [createElementVNode("div", {
-    class: normalizeClass(['contents', _ctx.loading && 'invisible'])
-  }, [renderSlot(_ctx.$slots, "default")], 2 /* CLASS */), _ctx.loading ? (openBlock(), createElementBlock("div", _hoisted_2, [_ctx.variant !== 'link' ? (openBlock(), createBlock(_component_OrLoader, {
-    key: 0,
-    variant: 'circular',
-    color: 'inherit',
-    size: 's'
-  })) : (openBlock(), createElementBlock(Fragment, {
-    key: 1
-  }, [createTextVNode(toDisplayString(_ctx.loadingText) + "… ", 1 /* TEXT */)], 64 /* STABLE_FRAGMENT */))])) : createCommentVNode("v-if", true)], 16 /* FULL_PROPS */, _hoisted_1);
-}
-
-script.render = render;
-script.__file = "src/components/or-button-v3/OrButton.vue";

package/dist/bundled/v3/OrMenu-f26e8e55.js

@@ -1,29 +0,0 @@
-import { s as script } from './OrMenu.vue_vue_type_script_lang-2446a69a.js';
-import { resolveComponent, openBlock, createElementBlock, mergeProps, createVNode, withCtx, createElementVNode, normalizeClass, withModifiers, renderSlot } from 'vue';
-
-function render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_OrPopover = resolveComponent("OrPopover");
-  return openBlock(), createElementBlock("div", mergeProps({
-    ref: "root"
-  }, _ctx.$attrs, {
-    class: _ctx.rootStyles
-  }), [createVNode(_component_OrPopover, {
-    ref: "popover",
-    variant: 'auto',
-    trigger: _ctx.trigger,
-    placement: _ctx.placement,
-    "full-width": false,
-    "disable-default-styles": false,
-    "onUpdate:state": _cache[1] || (_cache[1] = $event => _ctx.$emit('update:state', $event))
-  }, {
-    default: withCtx(() => [createElementVNode("div", {
-      class: normalizeClass(_ctx.bodyStyles),
-      onClick: _cache[0] || (_cache[0] = withModifiers((...args) => _ctx.onClick && _ctx.onClick(...args), ["stop"]))
-    }, [renderSlot(_ctx.$slots, "default")], 2 /* CLASS */)]),
-
-    _: 3 /* FORWARDED */
-  }, 8 /* PROPS */, ["trigger", "placement"])], 16 /* FULL_PROPS */);
-}
-
-script.render = render;
-script.__file = "src/components/or-menu-v3/OrMenu.vue";