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/five-games-burn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"solid-relay": patch
---

Fix updating the params of `createLazyLoadQuery` and `createFragment` not resetting the data store
19 changes: 11 additions & 8 deletions src/primitives/createFragment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,6 @@ export function createFragmentInternal<TKey extends KeyType>(
): DataStore<KeyTypeData<TKey> | null | undefined> {
const environment = useRelayEnvironment();

const initialResult: FragmentResult<TKey[" $data"]> = {
data: undefined,
error: undefined,
pending: false,
};

type FragmentObserver = Parameters<ReturnType<typeof observeFragment>["subscribe"]>[0];
const resultUpdateObserver = {
next(res) {
Expand Down Expand Up @@ -115,7 +109,9 @@ export function createFragmentInternal<TKey extends KeyType>(
batch(() => {
untrack(subscription)?.unsubscribe();
setSubscription(undefined);
setResult(initialResult);
setResult("data", undefined);
setResult("error", undefined);
setResult("pending", false);
});

void environment();
Expand Down Expand Up @@ -165,7 +161,14 @@ export function createFragmentInternal<TKey extends KeyType>(
},
);

const store = createDataStore<FragmentResult<TKey[" $data"]>>(initialResult, () => resource);
const store = createDataStore<FragmentResult<TKey[" $data"]>>(
{
data: undefined,
error: undefined,
pending: false,
},
() => resource,
);
for (const args of setResultQueue) {
store[1].apply(undefined, args as never);
}
Expand Down
17 changes: 10 additions & 7 deletions src/primitives/createLazyLoadQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -224,18 +224,21 @@ export function createLazyLoadQueryInternal<TQuery extends OperationType>(params
onCleanup(retention.dispose);
});

const initialResult: QueryResult<TQuery["response"]> = {
data: undefined,
error: undefined,
pending: true,
};
const [result, setResult] = createDataStore<QueryResult<TQuery["response"]>>(
initialResult,
{
data: undefined,
error: undefined,
pending: true,
},
() => cacheEntry()?.resource,
);

createComputed(() => {
setResult(initialResult);
batch(() => {
setResult("data", undefined);
setResult("error", undefined);
setResult("pending", true);
});

const operation = params.query();
const env = environment();
Expand Down
Loading