Skip to content

Fix ComponentPlayground invalid props and key events #391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 3, 2017
Merged

Fix ComponentPlayground invalid props and key events #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e2a07f
Fix ComponentPlayground invalid props and key events
kitten Nov 1, 2017
3b3a9ca
Update ComponentPlayground snapshots
kitten Nov 1, 2017
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
2 changes: 0 additions & 2 deletions src/components/__snapshots__/component-playground.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1069,7 +1069,6 @@ exports[`<ComponentPlayground /> Should render with a custom background color 1`
>
<div
class="react-live-preview css-cv4xj2"
previewbackgroundcolor="#ff0"
>
<div>
<h1
Expand Down Expand Up @@ -1591,7 +1590,6 @@ exports[`<ComponentPlayground /> Should render with a custom code block 1`] = `
>
<div
class="react-live-preview css-cv4xj2"
previewbackgroundcolor="#ff0"
>

</div>
Expand Down
105 changes: 60 additions & 45 deletions src/components/component-playground.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ export const PlaygroundProvider = styled(LiveProvider)`
overflow: hidden;
`;

const PlaygroundPreview = styled(LivePreview)`
const PlaygroundPreview = styled(({ className }) => (
<LivePreview className={className} />
))`
padding: 0.5rem;
min-height: 100%;

background: ${(props) => (
props.previewBackgroundColor || '#fff'
)};
background: ${p => p.previewBackgroundColor || '#fff'};
`;

const PlaygroundEditor = styled(LiveEditor)`
Expand Down Expand Up @@ -86,48 +86,63 @@ const PlaygroundError = styled(LiveError)`
padding: 0.5rem;
`;

const ComponentPlayground = ({
code,
previewBackgroundColor,
scope = {},
theme = 'dark'
}) => {
const useDarkTheme = theme === 'dark';

if (useDarkTheme) {
require('../themes/default/prism.dark.css');
} else {
require('../themes/default/prism.light.css');
class ComponentPlayground extends Component {
onKeyUp = evt => {
evt.stopPropagation();
};

onKeyDown = evt => {
evt.stopPropagation();
};

render() {
const {
code,
previewBackgroundColor,
scope = {},
theme = 'dark'
} = this.props;

const useDarkTheme = theme === 'dark';

if (useDarkTheme) {
require('../themes/default/prism.dark.css');
} else {
require('../themes/default/prism.light.css');
}

return (
<PlaygroundProvider
className={`react-live-${useDarkTheme ? 'dark' : 'light'}`}
mountStylesheet={false}
code={(code || defaultCode).trim()}
scope={{ Component, ...scope }}
noInline
>
<PlaygroundRow>
<Title>Live Preview</Title>
<Title useDarkTheme={useDarkTheme}>Source Code</Title>
</PlaygroundRow>

<PlaygroundRow>
<PlaygroundColumn>
<PlaygroundPreview
previewBackgroundColor={previewBackgroundColor}
/>
<PlaygroundError />
</PlaygroundColumn>

<PlaygroundColumn>
<PlaygroundEditor
onKeyUp={this.onKeyUp}
onKeyDown={this.onKeyDown}
/>
</PlaygroundColumn>
</PlaygroundRow>
</PlaygroundProvider>
);
}

return (
<PlaygroundProvider
className={`react-live-${useDarkTheme ? 'dark' : 'light'}`}
mountStylesheet={false}
code={(code || defaultCode).trim()}
scope={{ Component, ...scope }}
noInline
>
<PlaygroundRow>
<Title>Live Preview</Title>
<Title useDarkTheme={useDarkTheme}>Source Code</Title>
</PlaygroundRow>

<PlaygroundRow>
<PlaygroundColumn>
<PlaygroundPreview
previewBackgroundColor={previewBackgroundColor}
/>
<PlaygroundError />
</PlaygroundColumn>

<PlaygroundColumn>
<PlaygroundEditor useDarkTheme={useDarkTheme} />
</PlaygroundColumn>
</PlaygroundRow>
</PlaygroundProvider>
);
};
}

ComponentPlayground.propTypes = {
code: PropTypes.string,
Expand Down