From 9f2186330eafe6dde437543df3e9f09beac3fabf Mon Sep 17 00:00:00 2001
From: Hunter Johnston <64506580+huntabyte@users.noreply.github.com>
Date: Mon, 21 Aug 2023 18:43:24 -0400
Subject: [PATCH] fix: select events (#71)

---
 .changeset/twelve-tables-kick.md              |  5 +++++
 .../components/ContextMenuSubTrigger.svelte   |  1 +
 src/lib/bits/context-menu/types.ts            | 22 +++++++------------
 src/lib/bits/dropdown-menu/types.ts           |  7 +++++-
 src/lib/bits/select/types.ts                  | 14 +++++++++---
 src/lib/helpers/event-handlers.ts             |  4 ++++
 6 files changed, 35 insertions(+), 18 deletions(-)
 create mode 100644 .changeset/twelve-tables-kick.md

diff --git a/.changeset/twelve-tables-kick.md b/.changeset/twelve-tables-kick.md
new file mode 100644
index 000000000..74afb3799
--- /dev/null
+++ b/.changeset/twelve-tables-kick.md
@@ -0,0 +1,5 @@
+---
+"bits-ui": patch
+---
+
+Fix: Select events
diff --git a/src/lib/bits/context-menu/components/ContextMenuSubTrigger.svelte b/src/lib/bits/context-menu/components/ContextMenuSubTrigger.svelte
index 3356cc277..8d1b3c934 100644
--- a/src/lib/bits/context-menu/components/ContextMenuSubTrigger.svelte
+++ b/src/lib/bits/context-menu/components/ContextMenuSubTrigger.svelte
@@ -30,6 +30,7 @@
 		on:m-keydown
 		on:m-pointerleave
 		on:m-pointermove
+		on:m-keydown
 		{...disabledAttrs(disabled)}
 	>
 		<slot {builder} />
diff --git a/src/lib/bits/context-menu/types.ts b/src/lib/bits/context-menu/types.ts
index 0749d34a4..5238f193d 100644
--- a/src/lib/bits/context-menu/types.ts
+++ b/src/lib/bits/context-menu/types.ts
@@ -92,25 +92,19 @@ type ArrowProps = Expand<
 > &
 	HTMLDivAttributes;
 
-type CheckboxItemEvents = {
-	"m-click": DivEventHandler<MouseEvent>;
-	"m-keydown": DivEventHandler<KeyboardEvent>;
-};
-
 type ItemEvents = {
 	"m-click": DivEventHandler<MouseEvent>;
 	"m-keydown": DivEventHandler<KeyboardEvent>;
+	"m-focusin": DivEventHandler<FocusEvent>;
+	"m-focusout": DivEventHandler<FocusEvent>;
+	"m-pointerdown": DivEventHandler<MouseEvent>;
+	"m-pointerleave": DivEventHandler<MouseEvent>;
+	"m-pointermove": DivEventHandler<MouseEvent>;
 };
 
-type RadioItemEvents = {
-	"m-click": DivEventHandler<MouseEvent>;
-	"m-keydown": DivEventHandler<KeyboardEvent>;
-};
-
-type SubTriggerEvents = {
-	"m-click": DivEventHandler<MouseEvent>;
-	"m-keydown": DivEventHandler<KeyboardEvent>;
-};
+type CheckboxItemEvents = ItemEvents;
+type RadioItemEvents = ItemEvents;
+type SubTriggerEvents = Omit<ItemEvents, "m-pointerdown">;
 
 type TriggerEvents = {
 	"m-pointerdown": DivEventHandler<MouseEvent>;
diff --git a/src/lib/bits/dropdown-menu/types.ts b/src/lib/bits/dropdown-menu/types.ts
index 0c089c9ed..db3bce391 100644
--- a/src/lib/bits/dropdown-menu/types.ts
+++ b/src/lib/bits/dropdown-menu/types.ts
@@ -102,11 +102,16 @@ type ArrowProps = Expand<
 type ItemEvents = {
 	"m-click": DivEventHandler<MouseEvent>;
 	"m-keydown": DivEventHandler<KeyboardEvent>;
+	"m-focusin": DivEventHandler<FocusEvent>;
+	"m-focusout": DivEventHandler<FocusEvent>;
+	"m-pointerdown": DivEventHandler<MouseEvent>;
+	"m-pointerleave": DivEventHandler<MouseEvent>;
+	"m-pointermove": DivEventHandler<MouseEvent>;
 };
 
 type CheckboxItemEvents = ItemEvents;
 type RadioItemEvents = ItemEvents;
-type SubTriggerEvents = ItemEvents;
+type SubTriggerEvents = Omit<ItemEvents, "m-pointerdown">;
 
 type TriggerEvents = {
 	"m-click": ButtonEventHandler<MouseEvent>;
diff --git a/src/lib/bits/select/types.ts b/src/lib/bits/select/types.ts
index 932d8f998..e1257ffd9 100644
--- a/src/lib/bits/select/types.ts
+++ b/src/lib/bits/select/types.ts
@@ -10,7 +10,7 @@ import type {
 	TransitionProps
 } from "$internal/index.js";
 import type { HTMLAttributes, HTMLButtonAttributes, HTMLInputAttributes } from "svelte/elements";
-import type { ButtonEventHandler, DivEventHandler } from "$lib/index.js";
+import type { ButtonEventHandler, DivEventHandler, MEventHandler } from "$lib/index.js";
 
 type Props = Expand<
 	OmitOpen<OmitValue<Omit<CreateSelectProps, "defaultValueLabel">>> & {
@@ -53,6 +53,10 @@ type ArrowProps = Expand<
 type ItemEvents = {
 	"m-click": DivEventHandler<MouseEvent>;
 	"m-keydown": DivEventHandler<KeyboardEvent>;
+	"m-focusin": DivEventHandler<FocusEvent>;
+	"m-focusout": DivEventHandler<FocusEvent>;
+	"m-pointerleave": DivEventHandler<MouseEvent>;
+	"m-pointermove": DivEventHandler<MouseEvent>;
 };
 
 type TriggerEvents = {
@@ -60,8 +64,12 @@ type TriggerEvents = {
 	"m-keydown": ButtonEventHandler<KeyboardEvent>;
 };
 
-type LabelEvents = SelectComponentEvents["label"];
-type ContentEvents = SelectComponentEvents["menu"];
+type LabelEvents = {
+	"m-click": MEventHandler<MouseEvent, HTMLSpanElement>;
+};
+type ContentEvents = {
+	"m-keydown": DivEventHandler<KeyboardEvent>;
+};
 
 export type {
 	Props,
diff --git a/src/lib/helpers/event-handlers.ts b/src/lib/helpers/event-handlers.ts
index 17366191a..ecc9ee006 100644
--- a/src/lib/helpers/event-handlers.ts
+++ b/src/lib/helpers/event-handlers.ts
@@ -9,3 +9,7 @@ export type DivEventHandler<T extends Event = Event> = T & {
 export type SpanEventHandler<T extends Event = Event> = T & {
 	currentTarget: EventTarget & HTMLSpanElement;
 };
+
+export type MEventHandler<T extends Event = Event, M extends Element = Element> = T & {
+	currentTarget: EventTarget & M;
+};