Handle cancellation for the scrambler name in the default handler.

cubing · Mar 28, 2024 · ab2990f · ab2990f
1 parent db599bd
commit ab2990f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/lib/elements/CompetitorScrambleDisplay.ts b/src/lib/elements/CompetitorScrambleDisplay.ts
@@ -196,7 +196,11 @@ export class CompetitorScrambleDisplay extends HTMLElement {
     const setScramblerButton = this.querySelector(".set-scrambler");
     setScramblerButton.textContent = "Please identify this scrambler…";
     const name = await this.sharedState.setScramblerCallback(this.displayIndex);
-    this.#setField("scrambler-name", `Scrambler: ${name}`);
+    if (name === null) {
+      this.#setField("scrambler-name", "Scrambler: (unassigned)");
+    } else {
+      this.#setField("scrambler-name", `Scrambler: ${name}`);
+    }
     setScramblerButton.textContent =
       setScramblerButton.getAttribute("data-original-text");
   }

diff --git a/src/lib/elements/SharedState.ts b/src/lib/elements/SharedState.ts
@@ -1,6 +1,8 @@
 import type { ScrambleJSONCache } from "../json/ScrambleJSONCache";
 
-export type SetScramblerCallback = (displayNumber: number) => Promise<string>;
+export type SetScramblerCallback = (
+  displayNumber: number,
+) => Promise<string | null>;
 
 export interface ScrambleTableInitializationOptions {
   numDisplays?: number;