From 9edd89c642637abd83ff19bb97d95bd6c22b896e Mon Sep 17 00:00:00 2001
From: Anas Boudih <metanas@pre-history.com>
Date: Mon, 16 May 2022 15:33:46 +0100
Subject: [PATCH] refactor(components): [collection] switch to script-setup
 syntax (#7710)

Co-authored-by: metanas <matanas@pre-history.com>
---
 .../components/collection/__tests__/collection-item.test.ts | 2 +-
 packages/components/collection/src/collection-item.vue      | 6 ++----
 packages/components/collection/src/collection.ts            | 6 +++---
 packages/components/collection/src/collection.vue           | 6 ++----
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/packages/components/collection/__tests__/collection-item.test.ts b/packages/components/collection/__tests__/collection-item.test.ts
index 1fbfb7be9a..e5949e9a6c 100644
--- a/packages/components/collection/__tests__/collection-item.test.ts
+++ b/packages/components/collection/__tests__/collection-item.test.ts
@@ -75,6 +75,6 @@ describe('<ElCollectionItem />', () => {
     expect(childVm.itemMap.size).toBe(3)
     const items = childVm.getItems()
     expect(childVm.getItems()).toHaveLength(3)
-    expect(items[0].ref).toBe(collectionItems.at(0).element)
+    expect(items[0].ref).toBe(collectionItems.at(0)?.element)
   })
 })
diff --git a/packages/components/collection/src/collection-item.vue b/packages/components/collection/src/collection-item.vue
index b538a133f3..765e50ba1a 100644
--- a/packages/components/collection/src/collection-item.vue
+++ b/packages/components/collection/src/collection-item.vue
@@ -2,10 +2,8 @@
   <slot />
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue'
-
-export default defineComponent({
+<script lang="ts" setup>
+defineOptions({
   name: 'ElCollectionItem',
   inheritAttrs: false,
 })
diff --git a/packages/components/collection/src/collection.ts b/packages/components/collection/src/collection.ts
index a6b4934918..51373b1f6b 100644
--- a/packages/components/collection/src/collection.ts
+++ b/packages/components/collection/src/collection.ts
@@ -3,6 +3,7 @@ import Collection from './collection.vue'
 import CollectionItem from './collection-item.vue'
 
 import type { InjectionKey } from 'vue'
+import type { SetupContext } from '@vue/runtime-core'
 import type {
   ElCollectionInjectionContext,
   ElCollectionItemInjectionContext,
@@ -35,10 +36,9 @@ export const createCollectionWithScope = (name: string) => {
 
         const items = [...itemMap.values()]
 
-        const orderedItems = items.sort(
+        return items.sort(
           (a, b) => orderedNodes.indexOf(a.ref!) - orderedNodes.indexOf(b.ref!)
         )
-        return orderedItems
       }
 
       provide(COLLECTION_INJECTION_KEY, {
@@ -52,7 +52,7 @@ export const createCollectionWithScope = (name: string) => {
   const ElCollectionItem = {
     ...CollectionItem,
     name: COLLECTION_ITEM_NAME,
-    setup(_, { attrs }) {
+    setup(_, { attrs }: SetupContext) {
       const collectionItemRef = ref<HTMLElement | null>(null)
       const collectionInjection = inject(COLLECTION_INJECTION_KEY, undefined)!
 
diff --git a/packages/components/collection/src/collection.vue b/packages/components/collection/src/collection.vue
index 3c9e706273..557b91a21d 100644
--- a/packages/components/collection/src/collection.vue
+++ b/packages/components/collection/src/collection.vue
@@ -2,10 +2,8 @@
   <slot />
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue'
-
-export default defineComponent({
+<script lang="ts" setup>
+defineOptions({
   inheritAttrs: false,
 })
 </script>