fix(react): move <StackProvider /> up so that useStack() can be u…

…sed in `Plugin.wrapStack` (daangn#529)
contentstech-com · Oct 23, 2024 · a4a7366 · a4a7366
1 parent d7855c3
commit a4a7366
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/.changeset/perfect-donkeys-beam.md b/.changeset/perfect-donkeys-beam.md
@@ -0,0 +1,5 @@
+---
+"@stackflow/react": patch
+---
+
+move `<StackProvider />` up so that `useStack()` can be used in `Plugin.wrapStack`
diff --git a/integrations/react/src/__internal__/MainRenderer.tsx b/integrations/react/src/__internal__/MainRenderer.tsx
@@ -1,9 +1,8 @@
 import { useEffect } from "react";
-
-import type { ActivityComponentType } from "./ActivityComponentType";
 import PluginRenderer from "./PluginRenderer";
 import { useCoreState } from "./core";
 import { usePlugins } from "./plugins";
+import { StackProvider } from "./stack";
 import type { WithRequired } from "./utils";
 
 interface MainRendererProps {
@@ -61,7 +60,7 @@ const MainRenderer: React.FC<MainRendererProps> = ({
       }) ?? output;
   });
 
-  return output;
+  return <StackProvider value={coreState}>{output}</StackProvider>;
 };
 
 MainRenderer.displayName = "MainRenderer";

diff --git a/integrations/react/src/__internal__/PluginRenderer.tsx b/integrations/react/src/__internal__/PluginRenderer.tsx
@@ -3,7 +3,6 @@ import type { StackflowReactPlugin } from "./StackflowReactPlugin";
 import { ActivityProvider } from "./activity";
 import { useCoreState } from "./core";
 import { usePlugins } from "./plugins";
-import { StackProvider } from "./stack";
 import type { WithRequired } from "./utils";
 
 interface PluginRendererProps {
@@ -53,17 +52,15 @@ const PluginRenderer: React.FC<PluginRendererProps> = ({
               });
 
               return (
-                <StackProvider value={stack}>
-                  <ActivityProvider
-                    key={activity.id}
-                    value={{
-                      ...activity,
-                      ...overrideActivity,
-                    }}
-                  >
-                    {output}
-                  </ActivityProvider>
-                </StackProvider>
+                <ActivityProvider
+                  key={activity.id}
+                  value={{
+                    ...activity,
+                    ...overrideActivity,
+                  }}
+                >
+                  {output}
+                </ActivityProvider>
               );
             },
           })),