GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-05 08:01:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11627 from storybookjs/fix/11548-initial-state

Browse Source 
Addon-viewports: Fix initial load state
This commit is contained in:
Michael Shilman 2020-10-15 22:19:01 +08:00 committed by GitHub
commit cd53096b85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/viewport/src/Tool.tsx
View File

@ -133,6 +133,7 @@ export const ViewportTool: FunctionComponent = memo(
selected: defaultViewport,
isRotated: false,
});
const list = toList(viewports);
if (!list.find((i) => i.id === defaultViewport)) {

14
lib/api/src/index.tsx
View File

@ -393,12 +393,16 @@ export function useSharedState<S>(stateId: string, defaultState?: S) {
};
const stateInitializationHandlers = {
[SET_STORIES]: () => {
if (addonStateCache[stateId]) {
const currentState = api.getAddonState(stateId);
if (currentState) {
addonStateCache[stateId] = currentState;
api.emit(`${SHARED_STATE_SET}-manager-${stateId}`, currentState);
} else if (addonStateCache[stateId]) {
// this happens when HMR
setState(addonStateCache[stateId]);
api.emit(`${SHARED_STATE_SET}-manager-${stateId}`, addonStateCache[stateId]);
} else if (defaultState !== undefined) {
// if not HMR, yet the defaults are form the manager
// if not HMR, yet the defaults are from the manager
setState(defaultState);
// initialize addonStateCache after first load, so its available for subsequent HMR
addonStateCache[stateId] = defaultState;
@ -406,8 +410,10 @@ export function useSharedState<S>(stateId: string, defaultState?: S) {
}
},
[STORY_CHANGED]: () => {
if (api.getAddonState(stateId) !== undefined) {
api.emit(`${SHARED_STATE_SET}-manager-${stateId}`, api.getAddonState(stateId));
const currentState = api.getAddonState(stateId);
if (currentState !== undefined) {
api.emit(`${SHARED_STATE_SET}-manager-${stateId}`, currentState);
}
},
};