리뷰 반영

daangn · Jan 15, 2025 · 0a20f4f · 0a20f4f
1 parent 761b26d
commit 0a20f4f
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 27 deletions.
diff --git a/integrations/react/src/__internal__/ActivityComponentType.ts b/integrations/react/src/__internal__/ActivityComponentType.ts
@@ -1,4 +1,6 @@
-import type React from "react";
+import type { LazyActivityComponentType } from "./LazyActivityComponentType";
+import type { StaticActivityComponentType } from "./StaticActivityComponentType";
 
 export type ActivityComponentType<T extends { [K in keyof T]: any } = {}> =
-  React.ComponentType<{ params: T }>;
+  | StaticActivityComponentType<T>
+  | LazyActivityComponentType<T>;
diff --git a/integrations/react/src/__internal__/LazyActivityComponentType.ts b/integrations/react/src/__internal__/LazyActivityComponentType.ts
@@ -1,9 +1,9 @@
-import type { ActivityComponentType } from "./ActivityComponentType";
+import type { StaticActivityComponentType } from "./StaticActivityComponentType";
 
 export type LazyActivityComponentType<T extends { [K in keyof T]: any } = {}> =
-  React.LazyExoticComponent<ActivityComponentType<T>> & {
+  React.LazyExoticComponent<StaticActivityComponentType<T>> & {
     _stackflow?: {
       type: "lazy";
-      load: () => Promise<{ default: ActivityComponentType<T> }>;
+      load: () => Promise<{ default: StaticActivityComponentType<T> }>;
     };
   };
diff --git a/integrations/react/src/__internal__/MainRenderer.tsx b/integrations/react/src/__internal__/MainRenderer.tsx
@@ -1,6 +1,5 @@
 import { useEffect } from "react";
 import type { ActivityComponentType } from "./ActivityComponentType";
-import type { LazyActivityComponentType } from "./LazyActivityComponentType";
 import PluginRenderer from "./PluginRenderer";
 import { useCoreState } from "./core";
 import { usePlugins } from "./plugins";
@@ -9,7 +8,7 @@ import type { WithRequired } from "./utils";
 
 interface MainRendererProps {
   activityComponentMap: {
-    [key: string]: ActivityComponentType | LazyActivityComponentType;
+    [key: string]: ActivityComponentType;
   };
   initialContext: any;
 }

diff --git a/integrations/react/src/__internal__/PluginRenderer.tsx b/integrations/react/src/__internal__/PluginRenderer.tsx
@@ -1,6 +1,5 @@
 import type React from "react";
 import type { ActivityComponentType } from "./ActivityComponentType";
-import type { LazyActivityComponentType } from "./LazyActivityComponentType";
 import type { StackflowReactPlugin } from "./StackflowReactPlugin";
 import { ActivityProvider } from "./activity";
 import { useCoreState } from "./core";
@@ -9,7 +8,7 @@ import type { WithRequired } from "./utils";
 
 interface PluginRendererProps {
   activityComponentMap: {
-    [key: string]: ActivityComponentType | LazyActivityComponentType;
+    [key: string]: ActivityComponentType;
   };
   plugin: WithRequired<ReturnType<StackflowReactPlugin>, "render">;
   initialContext: any;

diff --git a/integrations/react/src/__internal__/StaticActivityComponentType.ts b/integrations/react/src/__internal__/StaticActivityComponentType.ts
@@ -0,0 +1,5 @@
+import type React from "react";
+
+export type StaticActivityComponentType<
+  T extends { [K in keyof T]: any } = {},
+> = React.ComponentType<{ params: T }>;
diff --git a/integrations/react/src/future/lazy.ts b/integrations/react/src/future/lazy.ts
@@ -1,11 +1,11 @@
 import React from "react";
-import type { ActivityComponentType } from "../__internal__/ActivityComponentType";
 import type { LazyActivityComponentType } from "../__internal__/LazyActivityComponentType";
+import type { StaticActivityComponentType } from "../__internal__/StaticActivityComponentType";
 
 export function lazy<T extends { [K in keyof T]: any } = {}>(
-  load: () => Promise<{ default: ActivityComponentType<T> }>,
+  load: () => Promise<{ default: StaticActivityComponentType<T> }>,
 ): LazyActivityComponentType<T> {
-  let cachedValue: { default: ActivityComponentType<T> } | null = null;
+  let cachedValue: { default: StaticActivityComponentType<T> } | null = null;
 
   const cachedLoad = async () => {
     if (!cachedValue) {
@@ -15,8 +15,8 @@ export function lazy<T extends { [K in keyof T]: any } = {}>(
     return cachedValue;
   };
 
-  const DynamicComponent: LazyActivityComponentType<T> = React.lazy(cachedLoad);
-  DynamicComponent._stackflow = { type: "lazy", load: cachedLoad };
+  const LazyComponent: LazyActivityComponentType<T> = React.lazy(cachedLoad);
+  LazyComponent._stackflow = { type: "lazy", load: cachedLoad };
 
-  return DynamicComponent;
+  return LazyComponent;
 }
diff --git a/integrations/react/src/future/loader/loaderPlugin.tsx b/integrations/react/src/future/loader/loaderPlugin.tsx
@@ -1,15 +1,12 @@
 import type { ActivityDefinition } from "@stackflow/config";
 import type { ActivityComponentType } from "../../__internal__/ActivityComponentType";
-import type { LazyActivityComponentType } from "../../__internal__/LazyActivityComponentType";
 import type { StackflowReactPlugin } from "../../__internal__/StackflowReactPlugin";
 import type { StackflowInput } from "../stackflow";
 
 export function loaderPlugin<
   T extends ActivityDefinition<string>,
   R extends {
-    [activityName in T["name"]]:
-      | ActivityComponentType<any>
-      | LazyActivityComponentType<any>;
+    [activityName in T["name"]]: ActivityComponentType<any>;
   },
 >(input: StackflowInput<T, R>): StackflowReactPlugin {
   return () => ({
@@ -62,7 +59,7 @@ export function loaderPlugin<
     },
     onBeforePush({
       actionParams,
-      actions: { overrideActionParams, dispatchEvent, pause, resume },
+      actions: { overrideActionParams, pause, resume },
     }) {
       const { activityName, activityParams, activityContext } = actionParams;
 

diff --git a/integrations/react/src/future/stackflow.tsx b/integrations/react/src/future/stackflow.tsx
@@ -11,7 +11,6 @@ import {
 } from "@stackflow/core";
 import React, { useMemo } from "react";
 import type { ActivityComponentType } from "../__internal__/ActivityComponentType";
-import type { LazyActivityComponentType } from "../__internal__/LazyActivityComponentType";
 import MainRenderer from "../__internal__/MainRenderer";
 import { makeActivityId } from "../__internal__/activity";
 import { CoreProvider } from "../__internal__/core";
@@ -33,9 +32,7 @@ export type StackflowPluginsEntry =
 export type StackflowInput<
   T extends ActivityDefinition<string>,
   R extends {
-    [activityName in T["name"]]:
-      | ActivityComponentType<any>
-      | LazyActivityComponentType<any>;
+    [activityName in T["name"]]: ActivityComponentType<any>;
   },
 > = {
   config: Config<T>;
@@ -52,9 +49,7 @@ export type StackflowOutput = {
 export function stackflow<
   T extends ActivityDefinition<string>,
   R extends {
-    [activityName in T["name"]]:
-      | ActivityComponentType<any>
-      | LazyActivityComponentType<any>;
+    [activityName in T["name"]]: ActivityComponentType<any>;
   },
 >(input: StackflowInput<T, R>): StackflowOutput {
   const plugins = [