Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(config): added RegisterActivityLoaderArgs interface #518

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/rotten-flowers-lie.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@stackflow/config": minor
---

Added RegisterActivityLoaderArgs interface
6 changes: 6 additions & 0 deletions .changeset/shy-insects-hear.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@stackflow/react": minor
"@stackflow/config": minor
---

Added activityLoaderArgs in config and pass args in loaderPlugin
5 changes: 3 additions & 2 deletions config/src/ActivityLoaderArgs.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import type { InferActivityParams } from "./InferActivityParams";
import type { RegisteredActivityParamTypes } from "./RegisteredActivityParamTypes";
import type { RegisterActivityLoaderArgs } from "./RegisterActivityLoaderArgs"

export type ActivityLoaderArgs<
export interface ActivityLoaderArgs<
ActivityName extends Extract<keyof RegisteredActivityParamTypes, string>,
> = {
> extends RegisterActivityLoaderArgs {
params: InferActivityParams<ActivityName>;
};
9 changes: 8 additions & 1 deletion config/src/Config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
import type { ActivityDefinition } from "./ActivityDefinition";
import type { RegisterActivityLoaderArgs } from "./RegisterActivityLoaderArgs";

interface ActivityLoaderArgsConfig {
activityLoaderArgs: RegisterActivityLoaderArgs;
}

export type Config<T extends ActivityDefinition<string>> = {
activities: T[];
transitionDuration: number;
initialActivity?: () => T["name"];
};
} & (keyof RegisterActivityLoaderArgs extends never
? {}
: ActivityLoaderArgsConfig);
2 changes: 2 additions & 0 deletions config/src/RegisterActivityLoaderArgs.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// biome-ignore lint/suspicious/noEmptyInterface: declaration merging
export interface RegisterActivityLoaderArgs {}
1 change: 1 addition & 0 deletions config/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ export * from "./ActivityLoaderArgs";
export * from "./Config";
export * from "./InferActivityParams";
export * from "./Register";
export * from "./RegisterActivityLoaderArgs"
export * from "./RegisteredActivityParamTypes";
18 changes: 18 additions & 0 deletions integrations/react/src/future/loader/loaderPlugin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,14 @@ export function loaderPlugin(
return event;
}

const activityLoaderArgs =
"activityLoaderArgs" in config
? (config.activityLoaderArgs as object)
: {};

const loaderData = loader({
params: activityParams,
...activityLoaderArgs,
});

return {
Expand All @@ -61,8 +67,14 @@ export function loaderPlugin(
return;
}

const activityLoaderArgs =
"activityLoaderArgs" in config
? (config.activityLoaderArgs as object)
: {};

const loaderData = loader({
params: activityParams,
...activityLoaderArgs,
});

overrideActionParams({
Expand All @@ -84,8 +96,14 @@ export function loaderPlugin(
return;
}

const activityLoaderArgs =
"activityLoaderArgs" in config
? (config.activityLoaderArgs as object)
: {};

const loaderData = loader({
params: activityParams,
...activityLoaderArgs,
});

overrideActionParams({
Expand Down
Loading