stage0を選択できてしまうのを修正

Author: na-trium-144

routes/stage-select/+page.svelte

@@ -34,47 +34,14 @@ function handleKey(e: KeyboardEvent): void {
   }
 
   if (e.key === "ArrowRight") {
-    if (search.selected === blocks.length - 1) {
-      if (search.world !== 4) {
-        search.nextWorld();
-        search.selected = 1;
-      }
-    } else {
-      search.selected += 1;
-    }
+    search.selected += 1;
   } else if (e.key === "ArrowLeft") {
-    if (search.selected === 0) {
-      if (search.world !== 1) {
-        search.prevWorld();
-        search.selected = blocks.length - 1;
-      }
-    } else {
-      search.selected -= 1;
-    }
+    search.selected -= 1;
   } else if (e.key === "Enter" || e.key === " ") {
     goto(`/game?stage=${search.world}-${search.selected}`);
   } else if (e.key === "Escape") {
     goto("/");
     e.preventDefault();
-    if (search.selected === blocks.length - 1) {
-      if (search.world !== 4) {
-        search.nextWorld();
-        search.selected = 1;
-      }
-    } else {
-      search.selected += 1;
-    }
-  } else if (e.key === "ArrowLeft") {
-    if (search.selected === 0) {
-      if (search.world !== 1) {
-        search.prevWorld();
-        search.selected = blocks.length - 1;
-      }
-    } else {
-      search.selected -= 1;
-    }
-  } else if (e.key === "Enter" || e.key === " ") {
-    goto(blocks[search.selected].link);
   }
 }
 function handleKeyUp() {

routes/stage-select/params.svelte.ts

@@ -10,8 +10,8 @@ const WORLD_STAGES_MAP = new Map([
 ]);
 
 export class SearchParamState {
-  #world: number = $state(1);
-  #selected: number | null = $state(null);
+  #world: number = $state(1); // starts from 1
+  #selected: number | null = $state(null); // starts from 1
   maxStage: number = $derived(WORLD_STAGES_MAP.get(this.#world) ?? 0);
   constructor(private defaultWorld: number) {
     if (!browser) {
@@ -49,21 +49,29 @@ export class SearchParamState {
   }
 
   set selected(val: number | null) {
-    this.#selected = val;
     if (!browser) return;
     if (val === null) return;
 
     if (val > (WORLD_STAGES_MAP.get(this.#world) ?? 0)) {
-      this.#selected = 1;
-      this.nextWorld();
-    }
-    if (val < 1) {
-      this.prevWorld();
-      this.#selected = WORLD_STAGES_MAP.get(this.#world) ?? 0;
+      if (this.#world === MAX_WORLD) {
+        // do not change
+      } else {
+        this.#selected = 1;
+        this.nextWorld();
+      }
+    } else if (val < 1) {
+      if (this.#world === 1) {
+        // do not change
+      } else {
+        this.prevWorld();
+        this.#selected = WORLD_STAGES_MAP.get(this.#world) ?? 0;
+      }
+    } else {
+      this.#selected = val;
     }
 
     const url = new URL(window.location.href);
-    url.searchParams.set("selected", String(val));
+    url.searchParams.set("selected", String(this.#selected));
     replaceState(url.toString(), {});
   }