Types

pixiebrix · Mar 29, 2024 · d7846bf · d7846bf
1 parent ad8961a
commit d7846bf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/contentScript/focusCaptureDialog.ts b/src/contentScript/focusCaptureDialog.ts
@@ -39,12 +39,18 @@ async function rawFocusCaptureDialog(
 
   dialog.showModal();
 
-  await Promise.race([
+  const anyPromiseWillCloseTheDialog = [
     oneEvent(button, "click"),
     oneEvent(dialog, "cancel"),
-    oneEvent(signal, "abort"),
     onContextInvalidated.promise,
-  ]);
+  ];
+
+  if (signal) {
+    anyPromiseWillCloseTheDialog.push(oneEvent(signal, "abort"));
+  }
+
+  await Promise.race(anyPromiseWillCloseTheDialog);
+
   dialog.remove();
 }
 

diff --git a/src/utils/postMessage.ts b/src/utils/postMessage.ts
@@ -35,6 +35,7 @@ import { deserializeError, serializeError } from "serialize-error";
 import { type SerializedError } from "@/types/messengerTypes";
 import { assertNotNullish } from "./nullishUtils";
 import { type JsonValue } from "type-fest";
+import { AbortSignalAsOptions } from "./promiseUtils";
 
 const TIMEOUT_MS = 3000;
 
@@ -100,7 +101,7 @@ export default async function postMessage<TReturn extends Payload = Payload>({
 export function addPostMessageListener(
   type: string,
   listener: PostMessageListener,
-  { signal }: { signal?: AbortSignal } = {},
+  { signal }: AbortSignalAsOptions = {},
 ): void {
   const rawListener = async ({
     data,