cleanup tests

huntabyte · Jul 22, 2024 · f196145 · f196145
1 parent 8d7b469
commit f196145
Show file tree

Hide file tree

Showing 43 changed files with 618 additions and 554 deletions.
diff --git a/packages/bits-ui/src/lib/bits/alert-dialog/components/alert-dialog-content.svelte b/packages/bits-ui/src/lib/bits/alert-dialog/components/alert-dialog-content.svelte
@@ -60,6 +60,7 @@
 					enabled={present.current}
 					onEscapeKeydown={(e) => {
 						onEscapeKeydown(e);
+						if (e.defaultPrevented) return;
 						contentState.root.closeDialog();
 					}}
 				>

diff --git a/packages/bits-ui/src/lib/bits/combobox/components/combobox-content.svelte b/packages/bits-ui/src/lib/bits/combobox/components/combobox-content.svelte
@@ -49,8 +49,8 @@
 		contentState.root.closeMenu();
 	}}
 	onEscapeKeydown={(e) => {
-		// TODO: users should be able to cancel this
 		onEscapeKeydown(e);
+		if (e.defaultPrevented) return
 		contentState.root.closeMenu();
 	}}
 	onMountAutoFocus={(e) => e.preventDefault()}

diff --git a/packages/bits-ui/src/lib/bits/context-menu/components/context-menu-content.svelte b/packages/bits-ui/src/lib/bits/context-menu/components/context-menu-content.svelte
@@ -68,8 +68,8 @@
 		contentState.parentMenu.onClose();
 	}}
 	onEscapeKeydown={(e) => {
-		// TODO: users should be able to cancel this
 		onEscapeKeydown(e);
+		if (e.defaultPrevented) return;
 		contentState.parentMenu.onClose();
 	}}
 	trapped

diff --git a/packages/bits-ui/src/lib/bits/dialog/components/dialog-content.svelte b/packages/bits-ui/src/lib/bits/dialog/components/dialog-content.svelte
@@ -54,6 +54,7 @@
 					enabled={present.current}
 					onEscapeKeydown={(e) => {
 						onEscapeKeydown(e);
+						if (e.defaultPrevented) return
 						contentState.root.closeDialog();
 					}}
 				>

diff --git a/packages/bits-ui/src/lib/bits/dropdown-menu/components/dropdown-menu-content.svelte b/packages/bits-ui/src/lib/bits/dropdown-menu/components/dropdown-menu-content.svelte
@@ -64,8 +64,8 @@
 		contentState.parentMenu.onClose();
 	}}
 	onEscapeKeydown={(e) => {
-		// TODO: users should be able to cancel this
 		onEscapeKeydown(e);
+		if (e.defaultPrevented) return;
 		contentState.parentMenu.onClose();
 	}}
 	trapped

diff --git a/packages/bits-ui/src/lib/bits/link-preview/components/link-preview-content.svelte b/packages/bits-ui/src/lib/bits/link-preview/components/link-preview-content.svelte
@@ -57,8 +57,8 @@
 		contentState.root.immediateClose();
 	}}
 	onEscapeKeydown={(e) => {
-		// TODO: users should be able to cancel this
 		onEscapeKeydown?.(e);
+		if (e.defaultPrevented) return;
 		contentState.root.immediateClose();
 	}}
 	onMountAutoFocus={(e) => e.preventDefault()}

diff --git a/packages/bits-ui/src/lib/bits/menu/components/menu-content.svelte b/packages/bits-ui/src/lib/bits/menu/components/menu-content.svelte
@@ -62,8 +62,8 @@
 		contentState.parentMenu.onClose();
 	}}
 	onEscapeKeydown={(e) => {
-		// TODO: users should be able to cancel this
 		onEscapeKeydown(e);
+		if (e.defaultPrevented) return;
 		contentState.parentMenu.onClose();
 	}}
 	trapped

diff --git a/packages/bits-ui/src/lib/bits/menu/components/menu-sub-content.svelte b/packages/bits-ui/src/lib/bits/menu/components/menu-sub-content.svelte
@@ -90,6 +90,7 @@
 	onEscapeKeydown={(e) => {
 		// TODO: users should be able to cancel this
 		onEscapeKeydown(e);
+		if (e.defaultPrevented) return;
 		subContentState.parentMenu.onClose();
 	}}
 	onFocusOutside={(e) => {

diff --git a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-content.svelte b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-content.svelte
@@ -16,6 +16,9 @@
 		ref = $bindable(null),
 		id = useId(),
 		forceMount = false,
+		onEscapeKeydown,
+		onInteractOutside,
+		onFocusOutside,
 		...restProps
 	}: ContentProps = $props();
 
@@ -42,13 +45,25 @@
 		{#snippet presence()}
 			<EscapeLayer
 				enabled={contentState.isPresent}
-				onEscapeKeydown={(e) => contentState.onEscapeKeydown(e)}
+				onEscapeKeydown={(e) => {
+					onEscapeKeydown?.(e);
+					if (e.defaultPrevented) return;
+					contentState.onEscapeKeydown(e);
+				}}
 			>
 				<DismissableLayer
 					enabled={contentState.isPresent}
 					{id}
-					onInteractOutside={contentState.onInteractOutside}
-					onFocusOutside={contentState.onFocusOutside}
+					onInteractOutside={(e) => {
+						onInteractOutside?.(e);
+						if (e.defaultPrevented) return;
+						contentState.onInteractOutside(e);
+					}}
+					onFocusOutside={(e) => {
+						onFocusOutside?.(e);
+						if (e.defaultPrevented) return;
+						contentState.onFocusOutside(e);
+					}}
 				>
 					{#snippet children({ props: dismissableProps })}
 						{#if child}

diff --git a/packages/bits-ui/src/lib/bits/popover/components/popover-content.svelte b/packages/bits-ui/src/lib/bits/popover/components/popover-content.svelte
@@ -39,8 +39,8 @@
 		contentState.root.close();
 	}}
 	onEscapeKeydown={(e) => {
-		// TODO: users should be able to cancel this
 		onEscapeKeydown(e);
+		if (e.defaultPrevented) return
 		contentState.root.close();
 	}}
 	onDestroyAutoFocus={(e) => {

diff --git a/packages/bits-ui/src/lib/bits/select/components/select-content-impl.svelte b/packages/bits-ui/src/lib/bits/select/components/select-content-impl.svelte
@@ -26,8 +26,7 @@
 
 	const contentState = context;
 
-	// eslint-disable-next-line unused-imports/no-unused-vars, ts/no-unused-vars
-	const { children, child, ...restWithoutChildren } = restProps;
+	const { children: _c, child: _ch, ...restWithoutChildren } = restProps;
 </script>
 
 <FocusScope
@@ -46,8 +45,8 @@
 			{...restWithoutChildren}
 			enabled={present}
 			onEscapeKeydown={(e) => {
-				// TODO: users should be able to cancel this
 				onEscapeKeydown(e);
+				if (e.defaultPrevented) return;
 				contentState.root.handleClose();
 			}}
 		>

diff --git a/packages/bits-ui/src/lib/bits/tooltip/components/tooltip-content.svelte b/packages/bits-ui/src/lib/bits/tooltip/components/tooltip-content.svelte
@@ -57,8 +57,8 @@
 		contentState.root.handleClose();
 	}}
 	onEscapeKeydown={(e) => {
-		// TODO: users should be able to cancel this
 		onEscapeKeydown?.(e);
+		if (e.defaultPrevented) return;
 		contentState.root.handleClose();
 	}}
 	onMountAutoFocus={(e) => e.preventDefault()}

diff --git a/packages/bits-ui/src/lib/bits/utilities/escape-layer/useEscapeLayer.svelte.ts b/packages/bits-ui/src/lib/bits/utilities/escape-layer/useEscapeLayer.svelte.ts
@@ -44,10 +44,11 @@ export class EscapeLayerState {
 
 	#onkeydown = (e: KeyboardEvent) => {
 		if (e.key !== kbd.ESCAPE || !isResponsibleEscapeLayer(this)) return;
+		const clonedEvent = new KeyboardEvent(e.type, e);
 		e.preventDefault();
 		const behaviorType = this.#behaviorType.current;
 		if (behaviorType !== "close" && behaviorType !== "defer-otherwise-close") return;
-		this.#onEscapeProp.current(e);
+		this.#onEscapeProp.current(clonedEvent);
 	};
 }