future

daangn · Feb 4, 2025 · d2c1b6d · d2c1b6d
1 parent e7f1af2
commit d2c1b6d
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 9 deletions.
diff --git a/integrations/react/src/future/StepActions.ts b/integrations/react/src/future/StepActions.ts
@@ -1,12 +1,12 @@
 export type StepActions<ActivityParams> = {
   pushStep: (
-    params: ActivityParams,
+    params: ActivityParams | ((prevParams: ActivityParams) => ActivityParams),
     options?: {
       targetActivityId?: string;
     },
   ) => void;
   replaceStep: (
-    params: ActivityParams,
+    params: ActivityParams | ((prevParams: ActivityParams) => ActivityParams),
     options?: {
       targetActivityId?: string;
     },

diff --git a/integrations/react/src/future/makeStepActions.ts b/integrations/react/src/future/makeStepActions.ts
@@ -1,27 +1,72 @@
 import type { ActivityBaseParams } from "@stackflow/config";
-import type { CoreStore } from "@stackflow/core";
+import type { Activity, CoreStore } from "@stackflow/core";
 import { makeStepId } from "../__internal__/activity";
 import type { StepActions } from "./StepActions";
 
 export function makeStepActions(
   getCoreActions: () => CoreStore["actions"] | undefined,
+  findTargetActivity: (activity: Activity[]) => Activity | undefined,
 ): StepActions<ActivityBaseParams> {
   return {
     pushStep(stepParams, options) {
+      const coreActions = getCoreActions();
+
+      if (!coreActions) {
+        throw new Error(
+          "Cannot perform any action since no implementation is available.",
+        );
+      }
+
+      const targetActivity = findTargetActivity(
+        coreActions.getStack().activities,
+      );
+
+      if (!targetActivity) {
+        throw new Error(
+          "Cannot push a step. The target activity is not found.",
+        );
+      }
+
+      const nextParams =
+        typeof stepParams === "function"
+          ? stepParams(targetActivity.params)
+          : stepParams;
       const stepId = makeStepId();
 
-      getCoreActions()?.stepPush({
+      coreActions.stepPush({
         stepId,
-        stepParams,
+        stepParams: nextParams,
         targetActivityId: options?.targetActivityId,
       });
     },
     replaceStep(stepParams, options) {
+      const coreActions = getCoreActions();
+
+      if (!coreActions) {
+        throw new Error(
+          "Cannot perform any action since no implementation is available.",
+        );
+      }
+
+      const targetActivity = findTargetActivity(
+        coreActions.getStack().activities,
+      );
+
+      if (!targetActivity) {
+        throw new Error(
+          "Cannot push a step. The target activity is not found.",
+        );
+      }
+
+      const nextParams =
+        typeof stepParams === "function"
+          ? stepParams(targetActivity.params)
+          : stepParams;
       const stepId = makeStepId();
 
-      getCoreActions()?.stepReplace({
+      coreActions.stepReplace({
         stepId,
-        stepParams,
+        stepParams: nextParams,
         targetActivityId: options?.targetActivityId,
       });
     },

diff --git a/integrations/react/src/future/stackflow.tsx b/integrations/react/src/future/stackflow.tsx
@@ -10,6 +10,7 @@ import {
   makeCoreStore,
   makeEvent,
 } from "@stackflow/core";
+import { findLatestActiveActivity } from "__internal__/activity/findLatestActiveActivity";
 import React, { useMemo } from "react";
 import MainRenderer from "../__internal__/MainRenderer";
 import { makeActivityId } from "../__internal__/activity";
@@ -174,6 +175,9 @@ export function stackflow<
   return {
     Stack,
     actions: makeActions(() => getCoreStore()?.actions),
-    stepActions: makeStepActions(() => getCoreStore()?.actions),
+    stepActions: makeStepActions(
+      () => getCoreStore()?.actions,
+      findLatestActiveActivity,
+    ),
   };
 }
diff --git a/integrations/react/src/future/useStepFlow.ts b/integrations/react/src/future/useStepFlow.ts
@@ -2,6 +2,8 @@ import type {
   InferActivityParams,
   RegisteredActivityName,
 } from "@stackflow/config";
+import { ActivityContext } from "__internal__/activity";
+import { useContext } from "react";
 import { useCoreActions } from "../__internal__/core";
 import type { StepActions } from "./StepActions";
 import { makeStepActions } from "./makeStepActions";
@@ -10,5 +12,10 @@ export function useStepFlow<ActivityName extends RegisteredActivityName>(
   activityName: ActivityName,
 ): StepActions<InferActivityParams<ActivityName>> {
   const coreActions = useCoreActions();
-  return makeStepActions(() => coreActions);
+  const { id } = useContext(ActivityContext);
+
+  return makeStepActions(
+    () => coreActions,
+    (activities) => activities.find((activity) => activity.id === id),
+  );
 }