Merge branch 'main' into fix/missing-props

huntabyte · Sep 12, 2024 · 81a81f6 · 81a81f6
2 parents 8d405e2 + d3521e1
commit 81a81f6
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 1 deletion.
diff --git a/.changeset/healthy-mangos-hang.md b/.changeset/healthy-mangos-hang.md
@@ -0,0 +1,5 @@
+---
+"bits-ui": patch
+---
+
+fix(Date Pickers): expose `portal` prop
diff --git a/.changeset/plenty-pears-add.md b/.changeset/plenty-pears-add.md
@@ -0,0 +1,5 @@
+---
+"bits-ui": patch
+---
+
+fix(Pagination): call `onPageChange` _after_ setting the `page`
diff --git a/packages/bits-ui/src/lib/bits/date-picker/components/date-picker.svelte b/packages/bits-ui/src/lib/bits/date-picker/components/date-picker.svelte
@@ -5,6 +5,7 @@
 
 	type $$Props = Props;
 
+	export let portal: $$Props["portal"] = undefined;
 	export let open: $$Props["open"] = undefined;
 	export let onOpenChange: $$Props["onOpenChange"] = undefined;
 	export let value: $$Props["value"] = undefined;
@@ -167,6 +168,7 @@
 	$: updateOption("weekdayFormat", weekdayFormat);
 	$: updateOption("numberOfMonths", numberOfMonths);
 	$: updateOption("onOutsideClick", onOutsideClick);
+	$: updateOption("portal", portal);
 </script>
 
 <slot ids={$idValues} isInvalid={$localIsInvalid} />
diff --git a/packages/bits-ui/src/lib/bits/date-range-picker/components/date-range-picker.svelte b/packages/bits-ui/src/lib/bits/date-range-picker/components/date-range-picker.svelte
@@ -7,6 +7,7 @@
 
 	export let open: $$Props["open"] = undefined;
 	export let onOpenChange: $$Props["onOpenChange"] = undefined;
+	export let portal: $$Props["portal"] = undefined;
 	export let value: $$Props["value"] = undefined;
 	export let onValueChange: $$Props["onValueChange"] = undefined;
 	export let placeholder: $$Props["placeholder"] = undefined;
@@ -54,6 +55,7 @@
 		isDateDisabled,
 		fixedWeeks,
 		calendarLabel,
+		portal,
 		disabled,
 		granularity,
 		hideTimeZone,
@@ -228,6 +230,7 @@
 	$: updateOption("weekdayFormat", weekdayFormat);
 	$: updateOption("numberOfMonths", numberOfMonths);
 	$: updateOption("onOutsideClick", onOutsideClick);
+	$: updateOption("portal", portal);
 </script>
 
 <slot

diff --git a/packages/bits-ui/src/lib/bits/pagination/components/pagination.svelte b/packages/bits-ui/src/lib/bits/pagination/components/pagination.svelte
@@ -25,8 +25,8 @@
 		defaultPage: page,
 		onPageChange: ({ next }) => {
 			if (page !== next) {
-				onPageChange?.(next);
 				page = next;
+				onPageChange?.(next);
 			}
 
 			return next;