From 48987a58549bed23f51682b1be5e926e92ebe701 Mon Sep 17 00:00:00 2001
From: mlmoravek <marcel.moravek@yahoo.de>
Date: Fri, 31 Jan 2025 11:34:41 +0100
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into
 dropdown/combobox

---
 .../src/components/autocomplete/examples/options.vue      | 6 +++---
 packages/oruga/src/components/dropdown/DropdownItem.vue   | 6 ------
 .../oruga/src/components/dropdown/examples/options.vue    | 6 +++---
 packages/oruga/src/components/dropdown/types.ts           | 3 ---
 packages/oruga/src/composables/useInfiniteScroll.ts       | 8 ++++----
 5 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/packages/oruga/src/components/autocomplete/examples/options.vue b/packages/oruga/src/components/autocomplete/examples/options.vue
index cac4632c4..06344a048 100644
--- a/packages/oruga/src/components/autocomplete/examples/options.vue
+++ b/packages/oruga/src/components/autocomplete/examples/options.vue
@@ -198,7 +198,7 @@ const selected = ref(options[3].value);
 
 const groupOptions: OptionsPropWithGroups<string> = [
     {
-        group: "Black Sails",
+        label: "Black Sails",
         attrs: { disabled: true },
         options: [
             { label: "Flint", value: "flint" },
@@ -209,7 +209,7 @@ const groupOptions: OptionsPropWithGroups<string> = [
         ],
     },
     {
-        group: "Breaking Bad",
+        label: "Breaking Bad",
         attrs: { disabled: true },
         options: {
             heisenberg: "Heisenberg",
@@ -219,7 +219,7 @@ const groupOptions: OptionsPropWithGroups<string> = [
         },
     },
     {
-        group: "Game of Thrones",
+        label: "Game of Thrones",
         attrs: { disabled: true },
         options: [
             "Tyrion Lannister",
diff --git a/packages/oruga/src/components/dropdown/DropdownItem.vue b/packages/oruga/src/components/dropdown/DropdownItem.vue
index 4c57fe1b0..27d0f0250 100644
--- a/packages/oruga/src/components/dropdown/DropdownItem.vue
+++ b/packages/oruga/src/components/dropdown/DropdownItem.vue
@@ -113,9 +113,3 @@ const rootClasses = defineClasses(
         <slot>{{ label }}</slot>
     </component>
 </template>
-
-<style>
-.o-drop__item--focused {
-    background-color: gray;
-}
-</style>
diff --git a/packages/oruga/src/components/dropdown/examples/options.vue b/packages/oruga/src/components/dropdown/examples/options.vue
index daa8f9c5b..0d82bf3ff 100644
--- a/packages/oruga/src/components/dropdown/examples/options.vue
+++ b/packages/oruga/src/components/dropdown/examples/options.vue
@@ -13,7 +13,7 @@ const selected = ref<string>();
 
 const groupOptions: OptionsPropWithGroups<string> = [
     {
-        group: "Black Sails",
+        label: "Black Sails",
         attrs: { disabled: true },
         options: [
             { label: "Flint", value: "flint" },
@@ -24,7 +24,7 @@ const groupOptions: OptionsPropWithGroups<string> = [
         ],
     },
     {
-        group: "Breaking Bad",
+        label: "Breaking Bad",
         attrs: { disabled: true },
         options: {
             heisenberg: "Heisenberg",
@@ -34,7 +34,7 @@ const groupOptions: OptionsPropWithGroups<string> = [
         },
     },
     {
-        group: "Game of Thrones",
+        label: "Game of Thrones",
         attrs: { disabled: true },
         options: [
             "Tyrion Lannister",
diff --git a/packages/oruga/src/components/dropdown/types.ts b/packages/oruga/src/components/dropdown/types.ts
index f4b0a3cbc..e17799924 100644
--- a/packages/oruga/src/components/dropdown/types.ts
+++ b/packages/oruga/src/components/dropdown/types.ts
@@ -17,6 +17,3 @@ export type DropdownItemComponent<T> = DropdownItemProps<T> & {
 };
 
 export type DropdownChildItem<T> = ProviderItem<DropdownItemComponent<T>>;
-
-// export type DropdownItem<T> = Omit<ProviderItem, "data"> &
-//     DropdownItemComponent<T>;
diff --git a/packages/oruga/src/composables/useInfiniteScroll.ts b/packages/oruga/src/composables/useInfiniteScroll.ts
index 3a0eba310..93d45fc79 100644
--- a/packages/oruga/src/composables/useInfiniteScroll.ts
+++ b/packages/oruga/src/composables/useInfiniteScroll.ts
@@ -1,14 +1,14 @@
 import { isClient } from "@/utils/ssr";
-import type { Component, MaybeRefOrGetter } from "vue";
-import { useEventListener } from "./useEventListener";
+import type { MaybeRefOrGetter } from "vue";
+import { useEventListener, type EventTarget } from "./useEventListener";
 import { unrefElement } from "./unrefElement";
 
 export function useInfiniteScroll(
-    elementRef: MaybeRefOrGetter<HTMLElement | Component | undefined>,
+    elementRef: MaybeRefOrGetter<EventTarget>,
     onEnd: () => void,
     onStart: () => void,
 ): { checkScroll: () => void } {
-    if (isClient) useEventListener("scroll", checkScroll, elementRef);
+    if (isClient) useEventListener(elementRef, "scroll", checkScroll);
 
     /** Check if the scroll list inside the dropdown reached the top or it's end. */
     function checkScroll(): void {