Skip to content

Commit 3d3207d

Browse files
committed
fix #2491 no key on merge false
1 parent 90ba028 commit 3d3207d

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

.changeset/modern-poems-develop.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"solid-js": patch
3+
---
4+
5+
fix #2491 no key on merge false

packages/solid/store/src/modifiers.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@ function applyState(
4040
start = 0, end = Math.min(previous.length, target.length);
4141
start < end &&
4242
(previous[start] === target[start] ||
43-
(key && previous[start] && target[start] && previous[start][key] === target[start][key]));
43+
(key &&
44+
previous[start] &&
45+
target[start] &&
46+
previous[start][key] &&
47+
previous[start][key] === target[start][key]));
4448
start++
4549
) {
4650
applyState(target[start], previous, start, merge, key);
@@ -54,7 +58,11 @@ function applyState(
5458
end >= start &&
5559
newEnd >= start &&
5660
(previous[end] === target[newEnd] ||
57-
(key && previous[end] && target[newEnd] && previous[end][key] === target[newEnd][key]));
61+
(key &&
62+
previous[end] &&
63+
target[newEnd] &&
64+
previous[end][key] &&
65+
previous[end][key] === target[newEnd][key]));
5866
end--, newEnd--
5967
) {
6068
temp[newEnd] = previous[end];

0 commit comments

Comments
 (0)