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

Fix merge issues that stopped stories rendering

Browse Source
This commit is contained in:
Tom Coleman 2020-03-02 23:25:33 +11:00
parent a104c3367d
commit c64b99d6b8
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/client-api/src/story_store.ts
View File

@ -1,5 +1,4 @@
/* eslint no-underscore-dangle: 0 */
import EventEmitter from 'eventemitter3';
import memoize from 'memoizerific';
import dedent from 'ts-dedent';
import stable from 'stable';
@ -69,7 +68,7 @@ const toExtracted = <T>(obj: T) =>
return Object.assign(acc, { [key]: value });
}, {});
export default class StoryStore extends EventEmitter {
export default class StoryStore {
_error?: ErrorLike;
_channel: Channel;
@ -91,8 +90,6 @@ export default class StoryStore extends EventEmitter {
_selection: Selection;
constructor(params: { channel: Channel }) {
super();
// Assume we are configuring until we hear otherwise
this._configuring = true;
this._globalMetadata = { parameters: {}, decorators: [] };
@ -442,10 +439,7 @@ export default class StoryStore extends EventEmitter {
const { args } = this._stories[id];
this._stories[id].args = { ...args, ...newArgs };
// TODO: Sort out what is going on with both the store and the channel being event emitters.
// It has something to do with React Native, but need to get to the bottom of it
this._channel.emit(Events.STORY_ARGS_CHANGED, id, this._stories[id].args);
this.emit(Events.STORY_ARGS_CHANGED, id, this._stories[id].args);
}
// This API is a reimplementation of Storybook's original getStorybook() API.

3
lib/core/src/client/preview/StoryRenderer.tsx
View File

@ -68,8 +68,9 @@ export class StoryRenderer {
setupListeners() {
// Channel can be null in StoryShots
if (this.channel) {
this.channel.on(Events.FORCE_RE_RENDER, () => this.forceReRender());
this.channel.on(Events.RENDER_CURRENT_STORY, () => this.renderCurrentStory(false));
this.channel.on(Events.STORY_ARGS_CHANGED, () => this.forceReRender());
this.channel.on(Events.FORCE_RE_RENDER, () => this.forceReRender());
}
}