From b9656a6b5adfc27510be66e3bfe9b018e5de2cdd Mon Sep 17 00:00:00 2001
From: mm <25961416+mlmoravek@users.noreply.github.com>
Date: Tue, 16 Apr 2024 08:24:58 +0200
Subject: [PATCH] fix(menu): fix `useProviderParent` composable `childItems`
 type problem (#897)

---
 packages/oruga/src/components/menu/Menu.vue         |  5 +++--
 packages/oruga/src/composables/useParentProvider.ts | 13 ++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/oruga/src/components/menu/Menu.vue b/packages/oruga/src/components/menu/Menu.vue
index f8a76ed30..dbfaa85da 100644
--- a/packages/oruga/src/components/menu/Menu.vue
+++ b/packages/oruga/src/components/menu/Menu.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, computed, toRaw, type PropType } from "vue";
+import { ref, computed, type PropType } from "vue";
 
 import { getOption } from "@/utils/config";
 import {
@@ -95,7 +95,8 @@ const { childItems } = useProviderParent<MenuItemComponent>(rootRef, {
 
 function resetMenu(excludedItems: ProviderItem[] = []): void {
     childItems.value.forEach((item) => {
-        if (!excludedItems.includes(toRaw(item))) item.data.value.reset();
+        if (!excludedItems.map((i) => i?.identifier).includes(item.identifier))
+            item.data.reset();
     });
 }
 
diff --git a/packages/oruga/src/composables/useParentProvider.ts b/packages/oruga/src/composables/useParentProvider.ts
index fcd83bea0..1783628e0 100644
--- a/packages/oruga/src/composables/useParentProvider.ts
+++ b/packages/oruga/src/composables/useParentProvider.ts
@@ -9,6 +9,7 @@ import {
     type Component,
     type ComputedRef,
     type Ref,
+    type UnwrapNestedRefs,
 } from "vue";
 import { unrefElement } from "./unrefElement";
 
@@ -46,8 +47,8 @@ export function useProviderParent<ItemData = unknown, ParentData = unknown>(
     rootRef?: Ref<HTMLElement | Component>,
     options?: ProviderParentOptions<ParentData>,
 ): {
-    childItems: Ref<ProviderItem<ItemData>[]>;
-    sortedItems: Ref<ProviderItem<ItemData>[]>;
+    childItems: Ref<UnwrapNestedRefs<ProviderItem<ItemData>[]>>;
+    sortedItems: ComputedRef<UnwrapNestedRefs<ProviderItem<ItemData>[]>>;
 } {
     // getting a hold of the internal instance in setup()
     const vm = getCurrentInstance();
@@ -59,9 +60,7 @@ export function useProviderParent<ItemData = unknown, ParentData = unknown>(
     const configField = vm.proxy?.$options.configField;
     const key = options?.key ? options.key : configField;
 
-    const childItems = ref<ProviderItem<ItemData>[]>([]) as Ref<
-        ProviderItem<ItemData>[]
-    >;
+    const childItems = ref<ProviderItem<ItemData>[]>([]);
     const sequence = ref(1);
 
     /**
@@ -77,7 +76,7 @@ export function useProviderParent<ItemData = unknown, ParentData = unknown>(
         const index = childItems.value.length;
         const identifier = nextSequence();
         const item = { index, data, identifier };
-        childItems.value.push(item);
+        childItems.value.push(item as UnwrapNestedRefs<typeof item>);
         if (rootRef?.value) {
             nextTick(() => {
                 const ids = childItems.value
@@ -85,7 +84,7 @@ export function useProviderParent<ItemData = unknown, ParentData = unknown>(
                     .join(",");
                 const parent = unrefElement(rootRef);
                 const children = parent.querySelectorAll(ids);
-                const sortedIds = Array.from(children).map((el: any) =>
+                const sortedIds = Array.from(children).map((el) =>
                     el.getAttribute("data-id").replace(`${key}-`, ""),
                 );