Skip to content

Commit 4cd1275

Browse files
committed
fix(signals): unwrap retained projection draft rows
1 parent b0bad02 commit 4cd1275

4 files changed

Lines changed: 53 additions & 0 deletions

File tree

‎packages/signals/src/store/projection.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import { reconcileState } from "./reconcile.js";
3535
import { nameStore, runDirect, storeSetter, wrap } from "./store.js";
3636
import type { StoreFamily, StoreTarget } from "./target.js";
3737
import {
38+
$DRAFT_INNER,
3839
$TARGET,
3940
markRawIngest,
4041
setWriteOverride,
@@ -91,6 +92,7 @@ function wrapDraft(
9192
};
9293
const traps: ProxyHandler<any> = {
9394
get(_, prop) {
95+
if (prop === $DRAFT_INNER) return inner;
9496
const value = read(() => inner[prop]);
9597
return !shallow && typeof value === "object" && value !== null && prop !== $TARGET
9698
? wrapDraft(value, isActive, aroundWrite, false, afterWrite, asking)

‎packages/signals/src/store/store.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ export function installAffectsHooks(hooks: AffectsHooks): void {
145145
affectsHooks = hooks;
146146
}
147147
import {
148+
$DRAFT_INNER,
148149
$PROXY,
149150
$RECORD,
150151
$TARGET,
@@ -265,6 +266,8 @@ export function wrap<T extends Record<PropertyKey, any>>(
265266
if (fam === null || t.fam === fam) return value;
266267
return createTarget(value as any, parent, parentKey, fam).px;
267268
}
269+
if (t !== undefined && (value as any)[$DRAFT_INNER] === t.px)
270+
return wrap(t.px, parent, parentKey, fam);
268271
return createTarget(value, parent, parentKey, fam).px;
269272
}
270273

@@ -279,6 +282,7 @@ export function unwrapValue(v: any): any {
279282
if (t.ovl) materializePB(t);
280283
return t.pb ?? t.v;
281284
}
285+
if (t !== undefined && v[$DRAFT_INNER] === t.px) return unwrapValue(t.px);
282286
return v;
283287
}
284288

‎packages/signals/src/store/types.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ export const $TRACK = Symbol(__DEV__ ? "STORE_TRACK" : 0),
7474
$PROXY = Symbol(__DEV__ ? "STORE_PROXY" : 0),
7575
$RECORD = Symbol(__DEV__ ? "VIEW_RECORD" : 0);
7676

77+
/** The store proxy behind a projection draft wrapper (internal only). */
78+
export const $DRAFT_INNER = Symbol(__DEV__ ? "STORE_DRAFT_INNER" : 0);
79+
7780
export namespace SolidStore {
7881
export interface Unwrappable {}
7982
}
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
import { createRoot, createSignal, createStore, flush, snapshot } from "../../src/index.js";
2+
3+
type Row = { id: string; failed?: boolean };
4+
5+
it("retains a draft row after a derived store adopts an equivalent source", () => {
6+
const { rows, setRows, setSource, dispose } = createRoot(dispose => {
7+
const [source, setSource] = createSignal<Row[]>([{ id: "remote" }]);
8+
const [rows, setRows] = createStore<Row[]>(
9+
draft => [...source(), ...draft.filter(row => row.failed)],
10+
[]
11+
);
12+
return { rows, setRows, setSource, dispose };
13+
});
14+
15+
expect(rows.map(row => row.id)).toEqual(["remote"]);
16+
17+
setRows(draft => {
18+
draft.push({ id: "local", failed: true });
19+
});
20+
flush();
21+
expect(rows.map(row => row.id)).toEqual(["remote", "local"]);
22+
const local = rows[1];
23+
24+
setSource([{ id: "remote" }]);
25+
flush();
26+
27+
expect(rows.map(row => row.id)).toEqual(["remote", "local"]);
28+
expect(rows[1]).toBe(local);
29+
expect(Object.keys(rows[1])).toEqual(["id", "failed"]);
30+
expect(rows[1].failed).toBe(true);
31+
expect(snapshot(rows)).toEqual([{ id: "remote" }, { id: "local", failed: true }]);
32+
33+
setRows(draft => {
34+
draft[1].failed = false;
35+
});
36+
flush();
37+
expect(rows[1].failed).toBe(false);
38+
39+
setSource([{ id: "remote" }]);
40+
flush();
41+
expect(rows.map(row => row.id)).toEqual(["remote"]);
42+
43+
dispose();
44+
});

0 commit comments

Comments
 (0)