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

Merge pull request #16764 from storybookjs/fix/12364-channel-options-overridden-by-defaults

Browse Source 
Core: Fix channel options so that they are merged in correct order
This commit is contained in:
Michael Shilman 2021-11-25 01:18:19 +08:00 committed by GitHub
commit 9c9625ae97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/channel-postmessage/src/index.ts
View File

@ -19,6 +19,8 @@ interface BufferedEvent {
export const KEY = 'storybook-channel';
const defaultEventOptions = { allowFunction: true, maxDepth: 25 };
// TODO: we should export a method for opening child windows here and keep track of em.
// that way we can send postMessage to child windows as well, not just iframe
// https://stackoverflow.com/questions/6340160/how-to-get-the-references-of-all-already-opened-child-windows
@ -63,17 +65,17 @@ export class PostmsgTransport {
// telejson options
allowRegExp,
allowFunction = true,
allowFunction,
allowSymbol,
allowDate,
allowUndefined,
allowClass,
maxDepth = 25,
maxDepth,
space,
lazyEval,
} = options || {};
const c = Object.fromEntries(
const eventOptions = Object.fromEntries(
Object.entries({
allowRegExp,
allowFunction,
@ -87,7 +89,11 @@ export class PostmsgTransport {
}).filter(([k, v]) => typeof v !== 'undefined')
);
const stringifyOptions = { ...(global.CHANNEL_OPTIONS || {}), ...c };
const stringifyOptions = {
...defaultEventOptions,
...(global.CHANNEL_OPTIONS || {}),
...eventOptions,
};
// backwards compat: convert depth to maxDepth
if (options && Number.isInteger(options.depth)) {