Skip to content
This repository has been archived by the owner on Jul 12, 2019. It is now read-only.

feat(demo): pass navigation to demo render function #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/components/atoms/demo-renderer/demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,19 @@ export default {
demos: [
{
title: 'Normal mode',
render: () => <DemoRenderer render={() => <Text>Content</Text>} />,
render: () =>
<DemoRenderer
render={() => <Text>Content</Text>}
navigation={{}}
/>,
},
{
title: 'Full screen mode',
render: () =>
<DemoRenderer
isFullScreen
render={() => <Text>Content</Text>}
navigation={{}}
/>,
},
],
Expand Down
4 changes: 3 additions & 1 deletion src/components/atoms/demo-renderer/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,20 @@ import { colors } from '../../../themes';
export type DemoRendererProps = {
isFullScreen?: boolean,
render: () => React.Element<*>,
navigation: Object,
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be stronger typed than Object

};

export default function DemoRenderer({
isFullScreen,
render,
navigation,
}: DemoRendererProps) {
return (
<ScrollView
style={isFullScreen && styles.fullScreen}
contentContainerStyle={!isFullScreen && styles.tile}
>
{render()}
{render({ navigation })}
</ScrollView>
);
}
Expand Down
8 changes: 7 additions & 1 deletion src/components/organisms/demo-tile/demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ export default {
{
title: 'Normal mode',
render: () =>
<DemoTile title="title" render={() => <Text>Content</Text>} />,
<DemoTile
title="title"
render={() => <Text>Content</Text>}
navigation={{}}
/>,
},
{
title: 'Full screen mode',
Expand All @@ -26,6 +30,7 @@ export default {
isFullScreen
style={{ height: 50 }}
render={() => <Text>Content</Text>}
navigation={{}}
/>,
},
{
Expand All @@ -47,6 +52,7 @@ export default {
>
<Text>Large content</Text>
</View>}
navigation={{}}
/>,
renderHeader: (props: HeaderProps) =>
<ExitFullScreenFAB
Expand Down
7 changes: 6 additions & 1 deletion src/components/organisms/demo-tile/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export default function DemoTile({
onEnterFullScreen,
style,
title,
navigation,
}: DemoTileProps) {
return (
<View style={[isFullScreen ? null : styles.container, style]}>
Expand All @@ -28,7 +29,11 @@ export default function DemoTile({
onEnterFullScreen={onEnterFullScreen}
title={title}
/>}
<DemoRenderer render={render} isFullScreen={isFullScreen} />
<DemoRenderer
render={render}
isFullScreen={isFullScreen}
navigation={navigation}
/>
</View>
);
}
Expand Down
1 change: 1 addition & 0 deletions src/components/scenes/demo/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export default class Demo extends Component {
style={styles.demo}
title={props.title}
render={props.render}
navigation={this.props.navigation}
onEnterFullScreen={() =>
this.props.navigation.navigate('fullScreen', props)}
/>;
Expand Down
1 change: 1 addition & 0 deletions src/components/scenes/full-screen-demo/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export default function FullScreenDemo({ navigation }: Props) {
style={styles.demo}
title={props.title}
render={props.render}
navigation={navigation}
isFullScreen
/>
);
Expand Down