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

Merge branch 'next' into core/ingestion

Browse Source 
# Conflicts:
#	lib/api/src/modules/layout.ts
This commit is contained in:
Norbert de Langen 2020-03-18 19:34:39 +01:00
commit 66b7fe8401
No known key found for this signature in database
GPG Key ID: 976651DA156C2825
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/api/src/modules/layout.ts
View File

@ -137,7 +137,7 @@ const checkDeprecatedLayoutOptions = (options: Partial<UIOptions>) => {
return {};
};
const initial: SubState = {
const defaultState: SubState = {
ui: {
enableShortcuts: true,
sidebarAnimations: true,
@ -161,7 +161,6 @@ export const focusableUIElements = {
storyPanelRoot: 'storybook-panel-root',
};
let hasSetOptions = false;
export const init: ModuleFn = ({ store, provider }) => {
const api = {
toggleFullscreen(toggled?: boolean) {
@ -282,31 +281,23 @@ export const init: ModuleFn = ({ store, provider }) => {
const { theme, selectedPanel, ...options } = provider.getConfig();
return {
...initial,
...defaultState,
layout: {
...initial.layout,
...pick(options, Object.keys(initial.layout)),
...defaultState.layout,
...pick(options, Object.keys(defaultState.layout)),
...checkDeprecatedLayoutOptions(options),
},
ui: {
...initial.ui,
...pick(options, Object.keys(initial.ui)),
...defaultState.ui,
...pick(options, Object.keys(defaultState.ui)),
},
selectedPanel: selectedPanel || initial.selectedPanel,
theme: theme || initial.theme,
selectedPanel: selectedPanel || defaultState.selectedPanel,
theme: theme || defaultState.theme,
};
},
setOptions: (options: any) => {
// The very first time the user sets their options, we don't consider what is in the store.
// At this point in time, what is in the store is what we *persisted*. We did that in order
// to avoid a FOUC (e.g. initial rendering the wrong theme while we waited for the stories to load)
// However, we don't want to have a memory about these things, otherwise we see bugs like the
// user setting a name for their storybook, persisting it, then never being able to unset it
// without clearing localstorage. See https://github.com/storybookjs/storybook/issues/5857
const { layout, ui, selectedPanel, theme } = hasSetOptions
? store.getState()
: api.getInitialOptions();
const { layout, ui, selectedPanel, theme } = store.getState();
if (options) {
const updatedLayout = {
@ -334,9 +325,6 @@ export const init: ModuleFn = ({ store, provider }) => {
if (!deepEqual(layout, updatedLayout)) {
modification.layout = updatedLayout;
}
if (!deepEqual(theme, updatedTheme)) {
modification.theme = updatedTheme;
}
if (options.selectedPanel && !deepEqual(selectedPanel, options.selectedPanel)) {
modification.selectedPanel = options.selectedPanel;
}
@ -344,13 +332,14 @@ export const init: ModuleFn = ({ store, provider }) => {
if (Object.keys(modification).length) {
store.setState(modification, { persistence: 'permanent' });
}
hasSetOptions = true;
if (!deepEqual(theme, updatedTheme)) {
store.setState({ theme: updatedTheme });
}
}
},
};
const persisted = pick(store.getState(), 'layout', 'ui', 'selectedPanel', 'theme');
const persisted = pick(store.getState(), 'layout', 'ui', 'selectedPanel');
return { api, state: merge(api.getInitialOptions(), persisted) };
};