visual tweaks in code component

This commit is contained in:
August Skare 2018-11-07 12:39:47 +01:00
parent fdaffb67e8
commit c27a2b64ef

View File

@ -62,13 +62,12 @@ const Base =
display: flex; display: flex;
padding-top: 1.5rem; padding-top: 1.5rem;
padding-bottom: 1.5rem; padding-bottom: 1.5rem;
overflow-x: auto;
-webkit-overflow-scrolling: touch;
` `
: ` : ``}
padding: 1.5rem;
`}
overflow-x: auto;
-webkit-overflow-scrolling: touch;
`; `;
const StyledCodeDiff = styled(({ gutterLength, children, ...props }: any) => <code {...props}>{children}</code>)` const StyledCodeDiff = styled(({ gutterLength, children, ...props }: any) => <code {...props}>{children}</code>)`
@ -113,6 +112,14 @@ const StyledCodeDiff = styled(({ gutterLength, children, ...props }: any) => <co
const StyledPre = styled.pre` const StyledPre = styled.pre`
margin: 0; margin: 0;
${(props: { diff: boolean }) =>
!props.diff
? `
padding: 1.5rem;
overflow-x: auto;
-webkit-overflow-scrolling: touch;
`
: ``};
`; `;
const StyledCopyInput = styled.textarea` const StyledCopyInput = styled.textarea`
@ -141,7 +148,6 @@ class Code extends React.Component<CodeProps, CodeState> {
const code = children as string; const code = children as string;
if (language !== undefined) { if (language !== undefined) {
/* console.log(code); */
const { default: highlight } = await System.import(/* webpackChunkName: 'highlightjs' */ 'ts/highlight'); const { default: highlight } = await System.import(/* webpackChunkName: 'highlightjs' */ 'ts/highlight');
this.setState({ this.setState({
@ -182,7 +188,7 @@ class Code extends React.Component<CodeProps, CodeState> {
return ( return (
<Container> <Container>
<Base language={language} diff={diff} light={light}> <Base language={language} diff={diff} light={light}>
<StyledPre> <StyledPre diff={diff}>
<Code {...codeProps} dangerouslySetInnerHTML={hlCode ? { __html: this.state.hlCode } : null}> <Code {...codeProps} dangerouslySetInnerHTML={hlCode ? { __html: this.state.hlCode } : null}>
{hlCode === undefined ? children : null} {hlCode === undefined ? children : null}
</Code> </Code>