fix #1998 Switch relying on order

solidjs · Jan 3, 2024 · 7e5667a · 7e5667a
1 parent 8d2de12
commit 7e5667a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.changeset/neat-drinks-complain.md b/.changeset/neat-drinks-complain.md
@@ -0,0 +1,5 @@
+---
+"solid-js": patch
+---
+
+fix #1998 Switch relying on order
diff --git a/packages/solid/src/render/flow.ts b/packages/solid/src/render/flow.ts
@@ -160,7 +160,7 @@ type EvalConditions = readonly [number, unknown?, MatchProps<unknown>?];
 export function Switch(props: { fallback?: JSX.Element; children: JSX.Element }): JSX.Element {
   let keyed = false;
   const equals: MemoOptions<EvalConditions>["equals"] = (a, b) =>
-    a[0] === b[0] && (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
+    (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
   const conditions = children(() => props.children) as unknown as () => MatchProps<unknown>[],
     evalConditions = createMemo(
       (): EvalConditions => {