fix: LazyActivityComponent._stackflow.load() -> LazyActivityComponent…

…._load()
daangn · Jan 15, 2025 · 108b022 · 108b022
1 parent 0a20f4f
commit 108b022
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 24 deletions.
diff --git a/integrations/react/src/__internal__/LazyActivityComponentType.ts b/integrations/react/src/__internal__/LazyActivityComponentType.ts
@@ -2,8 +2,5 @@ import type { StaticActivityComponentType } from "./StaticActivityComponentType"
 
 export type LazyActivityComponentType<T extends { [K in keyof T]: any } = {}> =
   React.LazyExoticComponent<StaticActivityComponentType<T>> & {
-    _stackflow?: {
-      type: "lazy";
-      load: () => Promise<{ default: StaticActivityComponentType<T> }>;
-    };
+    _load?: () => Promise<{ default: StaticActivityComponentType<T> }>;
   };
diff --git a/integrations/react/src/future/lazy.ts b/integrations/react/src/future/lazy.ts
@@ -16,7 +16,7 @@ export function lazy<T extends { [K in keyof T]: any } = {}>(
   };
 
   const LazyComponent: LazyActivityComponentType<T> = React.lazy(cachedLoad);
-  LazyComponent._stackflow = { type: "lazy", load: cachedLoad };
+  LazyComponent._load = cachedLoad;
 
   return LazyComponent;
 }
diff --git a/integrations/react/src/future/loader/loaderPlugin.tsx b/integrations/react/src/future/loader/loaderPlugin.tsx
@@ -80,10 +80,7 @@ export function loaderPlugin<
         config: input.config,
       });
 
-      if (
-        loaderData instanceof Promise ||
-        "_stackflow" in matchActivityComponent
-      ) {
+      if (loaderData instanceof Promise || "_load" in matchActivityComponent) {
         pause();
       }
 
@@ -92,11 +89,8 @@ export function loaderPlugin<
       if (loaderData instanceof Promise) {
         promises.push(loaderData);
       }
-      if (
-        "_stackflow" in matchActivityComponent &&
-        matchActivityComponent._stackflow?.type === "lazy"
-      ) {
-        promises.push(matchActivityComponent._stackflow.load());
+      if ("_load" in matchActivityComponent && matchActivityComponent._load) {
+        promises.push(matchActivityComponent._load());
       }
 
       Promise.all(promises).finally(() => {
@@ -113,7 +107,7 @@ export function loaderPlugin<
     },
     onBeforeReplace({
       actionParams,
-      actions: { overrideActionParams, dispatchEvent, pause, resume },
+      actions: { overrideActionParams, pause, resume },
     }) {
       const { activityName, activityParams, activityContext } = actionParams;
 
@@ -134,10 +128,7 @@ export function loaderPlugin<
         config: input.config,
       });
 
-      if (
-        loaderData instanceof Promise ||
-        "_stackflow" in matchActivityComponent
-      ) {
+      if (loaderData instanceof Promise || "_load" in matchActivityComponent) {
         pause();
       }
 
@@ -146,11 +137,8 @@ export function loaderPlugin<
       if (loaderData instanceof Promise) {
         promises.push(loaderData);
       }
-      if (
-        "_stackflow" in matchActivityComponent &&
-        matchActivityComponent._stackflow?.type === "lazy"
-      ) {
-        promises.push(matchActivityComponent._stackflow.load());
+      if ("_load" in matchActivityComponent && matchActivityComponent._load) {
+        promises.push(matchActivityComponent._load());
       }
 
       Promise.all(promises).finally(() => {