From 8e3316fb030d2637c693380432ae0af0726fc629 Mon Sep 17 00:00:00 2001
From: Hunter Johnston <johnstonhuntera@gmail.com>
Date: Thu, 26 Oct 2023 23:02:59 -0400
Subject: [PATCH 1/2] add controlled popover focus prop

---
 .../bits/popover/components/Popover.svelte    | 33 +++++++++++++++----
 src/lib/bits/popover/types.ts                 |  8 +++++
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/lib/bits/popover/components/Popover.svelte b/src/lib/bits/popover/components/Popover.svelte
index 2e1d2fef0..24a83ebad 100644
--- a/src/lib/bits/popover/components/Popover.svelte
+++ b/src/lib/bits/popover/components/Popover.svelte
@@ -1,6 +1,8 @@
 <script lang="ts">
 	import type { Props } from "../types.js";
 	import { setCtx } from "../ctx.js";
+	import { isBrowser } from "$lib/internal/is.js";
+	import { tick } from "svelte";
 
 	type $$Props = Props;
 	export let positioning: $$Props["positioning"] = undefined;
@@ -12,12 +14,14 @@
 	export let portal: $$Props["portal"] = undefined;
 	export let open: $$Props["open"] = undefined;
 	export let onOpenChange: $$Props["onOpenChange"] = undefined;
+	export let focusTriggerOnClose: $$Props["focusTriggerOnClose"] = false;
 	export let openFocus: $$Props["openFocus"] = undefined;
 	export let closeFocus: $$Props["closeFocus"] = undefined;
 
 	const {
 		updateOption,
-		states: { open: localOpen }
+		states: { open: localOpen },
+		ids: { trigger }
 	} = setCtx({
 		positioning,
 		arrowSize,
@@ -29,16 +33,31 @@
 		defaultOpen: open,
 		openFocus,
 		closeFocus,
-		onOpenChange: ({ next }) => {
-			if (open !== next) {
-				onOpenChange?.(next);
-				open = next;
-			}
-			return next;
+		onOpenChange: ({ next, curr }) => {
+			return customOnOpenChange({ next, curr });
 		}
 	});
 
+	type ChangeFn = ({ curr, next }: { curr: boolean; next: boolean }) => boolean;
+
+	const customOnOpenChange: ChangeFn = ({ next }) => {
+		if (open === next) return next;
+
+		if (next === false && focusTriggerOnClose && isBrowser) {
+			tick().then(() => {
+				const triggerEl = document.getElementById(trigger);
+				if (triggerEl) {
+					triggerEl.focus();
+				}
+			});
+		}
+		onOpenChange?.(next);
+		open = next;
+		return next;
+	};
+
 	$: open !== undefined && localOpen.set(open);
+
 	$: updateOption("positioning", positioning);
 	$: updateOption("arrowSize", arrowSize);
 	$: updateOption("disableFocusTrap", disableFocusTrap);
diff --git a/src/lib/bits/popover/types.ts b/src/lib/bits/popover/types.ts
index ee963c02e..a013a2171 100644
--- a/src/lib/bits/popover/types.ts
+++ b/src/lib/bits/popover/types.ts
@@ -15,6 +15,14 @@ type Props = Expand<
 	OmitOpen<CreatePopoverProps> & {
 		open?: boolean;
 		onOpenChange?: OnChangeFn<boolean>;
+		/**
+		 * Focus the trigger when `open` is programmatically set to false.
+		 * This is in addition to the automatic focus that occurs when you
+		 * don't programmatically set `open` to false.
+		 *
+		 * @default false;
+		 */
+		focusTriggerOnClose?: boolean;
 	}
 >;
 

From 7f8492d2c3ff67f7e287195eb3b4916e93b56346 Mon Sep 17 00:00:00 2001
From: Hunter Johnston <64506580+huntabyte@users.noreply.github.com>
Date: Thu, 26 Oct 2023 23:04:11 -0400
Subject: [PATCH 2/2] add changeset

---
 .changeset/dry-sheep-explode.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/dry-sheep-explode.md

diff --git a/.changeset/dry-sheep-explode.md b/.changeset/dry-sheep-explode.md
new file mode 100644
index 000000000..7b04aa5d0
--- /dev/null
+++ b/.changeset/dry-sheep-explode.md
@@ -0,0 +1,5 @@
+---
+"bits-ui": patch
+---
+
+add controlled popover focus prop