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.

Sign up for GitHub

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

Jump to bottom

Manager API: Fix api.getAddonStatedefault value #23804

Merged
merged 4 commits into from
Aug 23, 2023
Merged

Manager API: Fix api.getAddonStatedefault value #23804

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ca8263
fix undefined addon state
sookmax Aug 11, 2023
63f2dbe
remove S extends object
sookmax Aug 11, 2023
64ad0c2
Make sure that state is set when defined as default state
kasperpeulen Aug 22, 2023
503b18c
Merge branch 'next' into fix-undefined-addon-state
kasperpeulen Aug 22, 2023
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
12 changes: 9 additions & 3 deletions code/lib/manager-api/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ const addonStateCache: {
} = {};

// shared state
export function useSharedState<S>(stateId: string, defaultState?: S) {
export function useSharedState<S extends object>(stateId: string, defaultState?: S) {
ndelangen marked this conversation as resolved.
Show resolved Hide resolved
const api = useStorybookApi();
const existingState = api.getAddonState<S>(stateId) || addonStateCache[stateId];
const state = orDefault<S>(
Expand All @@ -431,7 +431,13 @@ export function useSharedState<S>(stateId: string, defaultState?: S) {
}

const setState = (s: S | API_StateMerger<S>, options?: Options) => {
const result = api.setAddonState<S>(stateId, s, options);
let sFinal = s;
if (typeof s === 'function') {
sFinal = (_state) => {
return s(_state || defaultState);
};
}
const result = api.setAddonState<S>(stateId, sFinal, options);
addonStateCache[stateId] = result;
return result;
};
Expand Down Expand Up @@ -483,7 +489,7 @@ export function useSharedState<S>(stateId: string, defaultState?: S) {
] as [S, (newStateOrMerger: S | API_StateMerger<S>, options?: Options) => void];
}

export function useAddonState<S>(addonId: string, defaultState?: S) {
export function useAddonState<S extends object>(addonId: string, defaultState?: S) {
return useSharedState<S>(addonId, defaultState);
}

Expand Down