Skip to content

Commit 1659f8a

Browse files
committed
Fix width of codeEditor in live editor page
1 parent 1e0234c commit 1659f8a

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

packages/react-renderer-demo/src/components/code-editor/index.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import Highlight, { defaultProps } from 'prism-react-renderer/';
55
import ghTheme from 'prism-react-renderer/themes/github';
66
import vsTheme from 'prism-react-renderer/themes/vsDark';
77
import tranformImports from './transform-imports';
8+
import clsx from 'clsx';
89

910
const useStyles = makeStyles({
1011
pre: {
@@ -43,7 +44,7 @@ const useStylesCode = makeStyles((theme) => ({
4344
}
4445
}));
4546

46-
const CodeEditor = ({ value, children, className, inExample }) => {
47+
const CodeEditor = ({ value, children, className, inExample, editorClassname, keepLastLine }) => {
4748
const classes = useStylesCode({ inExample });
4849

4950
const lang = className ? className.toLowerCase().replace('language-', '') : undefined;
@@ -60,10 +61,10 @@ const CodeEditor = ({ value, children, className, inExample }) => {
6061
content = tranformImports(content);
6162
}
6263

63-
content = content.substring(0, content.length - 1);
64+
content = keepLastLine ? content : content.substring(0, content.length - 1);
6465

6566
return (
66-
<div className={classes.wrapper}>
67+
<div className={clsx(classes.wrapper, editorClassname)}>
6768
<Highlight {...defaultProps} theme={lang === 'bash' ? ghTheme : vsTheme} code={content} language={lang || 'jsx'}>
6869
{({ className, style, tokens, getLineProps, getTokenProps }) => (
6970
<Pre className={className} style={style}>
@@ -87,7 +88,9 @@ CodeEditor.propTypes = {
8788
value: PropTypes.string,
8889
children: PropTypes.string,
8990
className: PropTypes.string,
90-
inExample: PropTypes.bool
91+
inExample: PropTypes.bool,
92+
editorClassname: PropTypes.string,
93+
keepLastLine: PropTypes.bool
9194
};
9295

9396
export default CodeEditor;

packages/react-renderer-demo/src/pages/live-editor.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ const useStyles = makeStyles((theme) => ({
5656
},
5757
emptyTarget: {
5858
height: '100%'
59+
},
60+
editor: {
61+
width: '100%'
5962
}
6063
}));
6164

@@ -204,7 +207,7 @@ const LiveEditor = () => {
204207
</Box>
205208
</ExpansionPanelSummary>
206209
<ExpansionPanelDetails>
207-
<CodeEditor value={JSON.stringify(getSchema(), null, 2)} />
210+
<CodeEditor keepLastLine editorClassname={classes.editor} value={JSON.stringify(getSchema(), null, 2)} />
208211
</ExpansionPanelDetails>
209212
</ExpansionPanel>
210213
<CopySnackbar open={openTooltip} handleClose={() => setOpenTooltip(false)} />

0 commit comments

Comments
 (0)