From 4777caa3f5db36b544490c53c164a711be196bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Thu, 16 Jan 2025 19:04:43 +0100 Subject: [PATCH] Fix --- packages/reffuse/src/ReffuseContext.tsx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/reffuse/src/ReffuseContext.tsx b/packages/reffuse/src/ReffuseContext.tsx index 6f29cfd..c6b19a1 100644 --- a/packages/reffuse/src/ReffuseContext.tsx +++ b/packages/reffuse/src/ReffuseContext.tsx @@ -51,11 +51,9 @@ export function make() { return new ReffuseContext() } -export function useMergeAll< - const Contexts extends readonly ReffuseContext[] ->( - ...contexts: Contexts -): Context.Context<{ [K in keyof Contexts]: R }[number]> { +export function useMergeAll>( + ...contexts: [...{ [K in keyof T]: ReffuseContext }] +): Context.Context { const values = contexts.map(v => React.use(v.Context)) return React.useMemo(() => Context.mergeAll(...values), values) } @@ -71,3 +69,7 @@ export function useMergeAllLayers< ...Array.map(values, context => Layer.effectContext(Effect.succeed(context))) ) as Layer.Layer, values) } + +declare const context1: ReffuseContext +declare const context2: ReffuseContext<"prout"> +const res = useMergeAll(context1, context2)