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

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

@@ -40,50 +40,45 @@
       </div>
     </div>
 
-    <div :class="contentStyles">
-      <template v-if="proxyView === 'grid'">
-        <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="gridItem"
-            v-bind="item"
+            name="item"
+            v-bind="props"
           />
-        </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>
+        </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 { CardCollectionView } from './props';
-import { CardCollectionContent, CardCollectionContentViews, CardCollectionRoot, CardCollectionToolbar, CardCollectionToolbarPanel } from './styles';
+import {
+  CardCollectionRoot,
+  CardCollectionToolbar,
+  CardCollectionToolbarPanel,
+} from './styles';
 import { CardCollectionItem, CardCollectionSortHeader } from './types';
+import OrCardCollectionView from './OrCardCollectionView.vue3.vue';
 
 export default defineComponent({
   name: 'OrCardCollection',
 
   components: {
-    OrCard,
+    OrCardCollectionView,
     OrIconButton,
     OrInput,
     OrSortHeader,
@@ -96,7 +91,6 @@ export default defineComponent({
       type: Array as PropType<CardCollectionItem[]>,
       default: [] as CardCollectionItem[],
     },
-
     view: {
       type: String as PropType<CardCollectionView>,
       default: CardCollectionView.Grid,
@@ -149,11 +143,6 @@ export default defineComponent({
       ...CardCollectionToolbarPanel,
     ]);
 
-    const contentStyles = computed(() => [
-      ...CardCollectionContent,
-      ...CardCollectionContentViews[proxyView.value],
-    ]);
-
     // State
     const proxyView = ref(props.view);
     const proxySort = ref(props.sort);
@@ -198,7 +187,6 @@ export default defineComponent({
       rootStyles,
       toolbarStyles,
       toolbarPanelStyles,
-      contentStyles,
       proxyView,
       proxySort,
       proxySearch,

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/types.ts

@@ -1,5 +1,5 @@
 export interface CardCollectionItem {
-  id: string;
+  key?: string;
 }
 
 export interface CardCollectionSortHeader {