From 7bebc39a87f6d4dd1e4174fe7deaf42e48faeab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Thu, 6 Mar 2025 17:22:27 +0100 Subject: [PATCH] Fix --- packages/extension-query/src/QueryExtension.ts | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/extension-query/src/QueryExtension.ts b/packages/extension-query/src/QueryExtension.ts index 1aa807d..9675327 100644 --- a/packages/extension-query/src/QueryExtension.ts +++ b/packages/extension-query/src/QueryExtension.ts @@ -1,5 +1,5 @@ import * as AsyncData from "@typed/async-data" -import { Effect, Fiber, Ref, SubscriptionRef } from "effect" +import { Effect, ExecutionStrategy, Fiber, Ref, SubscriptionRef } from "effect" import * as React from "react" import { ReffuseExtension, type ReffuseHelpers } from "reffuse" import * as QueryRunner from "./QueryRunner.js" @@ -27,14 +27,10 @@ export const QueryExtension = ReffuseExtension.make(() => ({ query: props.query() }), []) - React.useEffect(() => { - Ref.set(runner.queryRef, props.query()).pipe( - Effect.andThen(runner.forkFetch), - runSync, - ) - - return () => { runSync(runner.forkInterrupt) } - }, [runner, ...props.key]) + this.useEffect(() => Effect.addFinalizer(() => runner.forkInterrupt).pipe( + Effect.andThen(Ref.set(runner.queryRef, props.query())), + Effect.andThen(runner.forkFetch), + ), [runner, ...props.key], { finalizerExecutionStrategy: ExecutionStrategy.parallel }) this.useFork(() => runner.refreshOnWindowFocus, [runner])