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

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

@@ -3,7 +3,6 @@ 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';
 
@@ -77,7 +76,6 @@ export default {
 const Template: StoryFn<typeof OrCardCollection> = (args) => ({
   components: {
     OrCardCollection,
-    OrCard,
     OrIcon,
   },
 
@@ -97,9 +95,8 @@ const Template: StoryFn<typeof OrCardCollection> = (args) => ({
       @sortChange="onSortChange"
       @searchChange="onSearchChange"
     >
-      <template #item="{item, mode}">
-        <OrCard>${args.item} ({{mode}}}</OrCard>
-      </template>
+      <template #gridItem="item">${args.gridItem}</template>
+      <template #listItem="item">${args.listItem}</template>
       <template #addon>${args.addon}</template>
     </OrCardCollection>
   `,
@@ -109,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
@@ -141,7 +139,7 @@ Default.args = {
     'Yankee',
     'Zulu',
   ], (item) => ({
-    key: item.toLowerCase(),
+    id: item.toLowerCase(),
     label: item,
   })),
 };
@@ -162,92 +160,3 @@ WithSorting.args = {
     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: `
-    <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>
-  `,
-});
-
-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: `
-    <OrCardCollection
-      v-bind="args"
-      @viewChange="onViewChange"
-      @sortChange="onSortChange"
-      @searchChange="onSearchChange"
-    >
-      <template #item="{item}">
-        <a href="#" @click.prevent><OrCard>${args.item}</OrCard></a>
-      </template>
-    </OrCardCollection>
-  `,
-});
-
-WithLink.args = {
-  ...Default.args,
-};

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

@@ -40,45 +40,50 @@
       </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 { 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 { CardCollectionContent, CardCollectionContentViews, CardCollectionRoot, CardCollectionToolbar, CardCollectionToolbarPanel } from './styles';
 import { CardCollectionItem, CardCollectionSortHeader } from './types';
-import OrCardCollectionView from './OrCardCollectionView.vue3.vue';
 
 export default defineComponent({
   name: 'OrCardCollection',
 
   components: {
-    OrCardCollectionView,
+    OrCard,
     OrIconButton,
     OrInput,
     OrSortHeader,
@@ -91,6 +96,7 @@ export default defineComponent({
       type: Array as PropType<CardCollectionItem[]>,
       default: [] as CardCollectionItem[],
     },
+
     view: {
       type: String as PropType<CardCollectionView>,
       default: CardCollectionView.Grid,
@@ -143,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);
@@ -187,6 +198,7 @@ export default defineComponent({
       rootStyles,
       toolbarStyles,
       toolbarPanelStyles,
+      contentStyles,
       proxyView,
       proxySort,
       proxySearch,

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/components/or-card-collection-v3/OrCardCollectionView.vue3.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/esm/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/esm/v3/components/or-card-collection-v3/OrCardCollectionView.vue3.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/src/components/or-card-collection-v3/OrCardCollectionView.vue2.vue

@@ -1,39 +0,0 @@
-<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

@@ -1,40 +0,0 @@
-<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>