From cabd5117e3e63fac923fd7622dc0221823494cd8 Mon Sep 17 00:00:00 2001 From: David Son Date: Wed, 15 Jun 2016 18:58:52 -0700 Subject: [PATCH] use composeAllWithStub defined in PR kadirahq/react-storybook#85 instead of disable(). This enables proper rendering of the nested container components. Specifically: - story comments.CommentList now shows the CreateComment properly - story core.Post now shows the CommentList properly --- .storybook/config.js | 4 ++-- .../comments/containers/comment_list.js | 17 ++++++++++++--- .../comments/containers/create_comment.js | 21 ++++++++++++++++--- 3 files changed, 34 insertions(+), 8 deletions(-) diff --git a/.storybook/config.js b/.storybook/config.js index eb412ce..fbb4229 100644 --- a/.storybook/config.js +++ b/.storybook/config.js @@ -1,7 +1,7 @@ import { configure } from '@kadira/storybook'; -import { disable } from 'react-komposer'; +import { setTestMode } from 'react-komposer'; -disable(); +setTestMode(); function loadStories() { require('../client/modules/core/components/.stories'); diff --git a/client/modules/comments/containers/comment_list.js b/client/modules/comments/containers/comment_list.js index 8748f96..a8c813f 100644 --- a/client/modules/comments/containers/comment_list.js +++ b/client/modules/comments/containers/comment_list.js @@ -1,7 +1,8 @@ import { - useDeps, composeWithTracker, composeAll + useDeps, composeWithTracker, compose, composeAll } from 'mantra-core'; import Component from '../components/comment_list'; +import { composeAllWithStub } from 'react-komposer'; export const composer = ({context, clearErrors, postId}, onData) => { const {Meteor, Collections} = context(); @@ -16,7 +17,17 @@ export const composer = ({context, clearErrors, postId}, onData) => { } }; -export default composeAll( +export const composerStub = ({context, clearErrors}, onData) => { + const comments = [ + {_id: 'one', text: 'This is cool.', author: 'arunoda'}, + {_id: 'two', text: 'Yeah! I agree.', author: 'sacha'}, + ]; + + onData(null, {comments}); +}; +export default composeAllWithStub([ composeWithTracker(composer), useDeps() -)(Component); +],[ + compose(composerStub), +])(Component); diff --git a/client/modules/comments/containers/create_comment.js b/client/modules/comments/containers/create_comment.js index 464a241..5370266 100644 --- a/client/modules/comments/containers/create_comment.js +++ b/client/modules/comments/containers/create_comment.js @@ -1,7 +1,8 @@ import { - useDeps, composeWithTracker, composeAll + useDeps, composeWithTracker, compose, composeAll } from 'mantra-core'; import Component from '../components/create_comment'; +import { composeAllWithStub } from 'react-komposer'; export const composer = ({context, clearErrors}, onData) => { const {LocalState} = context(); @@ -17,7 +18,21 @@ export const depsMapper = (context, actions) => ({ context: () => context }); -export default composeAll( +export const composerStub = ({context, clearErrors}, onData) => { + onData(null, 'data`'); + return clearErrors; +}; + +export const depsMapperStub = (context, actions) => ({ + create: (x)=>console.log('create',x), + clearErrors: (x)=>console.log('clearErrors',x), + context: () => context +}); + +export default composeAllWithStub([ composeWithTracker(composer), useDeps(depsMapper) -)(Component); +],[ + compose(composerStub), + useDeps(depsMapperStub) +])(Component);