Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fix-projection-refresh-pending.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@solidjs/signals": patch
---

Fix projection pending state on first refresh after initial async resolution.
6 changes: 4 additions & 2 deletions packages/solid-signals/src/core/async.ts
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,10 @@ export function handleAsync<T>(
clearStatus(el);
const lane = resolveLane(el as any);
if (lane) lane._pendingAsync.delete(el);
if (setter) setter(value);
else if (el._overrideValue !== undefined) {
if (setter) {
setter(value);
if (wasUninitialized) clearStatus(el, true);
} else if (el._overrideValue !== undefined) {
if (el._overrideValue !== undefined && el._overrideValue !== NOT_PENDING)
el._pendingValue = value;
else {
Expand Down
39 changes: 39 additions & 0 deletions packages/solid-signals/tests/createLoadingBoundary.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
isPending,
latest,
NotReadyError,
type Refreshable,
type SourceAccessor,
refresh,
untrack
Expand Down Expand Up @@ -93,6 +94,44 @@ describe("createLoadingBoundary", () => {
expect(result).toBe(0); // Should show 0, not "loading"
});

it("reports pending on first refresh after an async projection resolves", async () => {
let result: any;
let projection!: Refreshable<{ value: number }>;
let current = deferred<{ value: number }>();

createRoot(() => {
projection = createProjection(async () => current.promise, {} as { value: number });

const boundary = createLoadingBoundary(
() => [projection.value, isPending(() => projection.value)],
() => "loading"
);

createRenderEffect(
() => (result = boundary()),
() => {}
);
});

flush();
expect(result).toBe("loading");

current.resolve({ value: 1 });
await new Promise(resolve => setTimeout(resolve, 0));
flush();
expect(result).toEqual([1, false]);

current = deferred<{ value: number }>();
refresh(projection);
flush();
expect(result).toEqual([1, true]);

current.resolve({ value: 2 });
await new Promise(resolve => setTimeout(resolve, 0));
flush();
expect(result).toEqual([2, false]);
});

it("clears loading for multiple effects in same boundary", async () => {
let result1: any, result2: any;

Expand Down
Loading