diff --git a/components/ConversionPanel.js b/components/ConversionPanel.js index 34f50ec..7da8a2b 100644 --- a/components/ConversionPanel.js +++ b/components/ConversionPanel.js @@ -77,7 +77,7 @@ export default class ConversionPanel extends PureComponent { prettifyRightPanel: true, splitLeft: false, showFetchButton: true, - fetchButtonText: 'Fetch JSON from URL' + fetchButtonText: "Fetch JSON from URL" }; state = { @@ -91,23 +91,23 @@ export default class ConversionPanel extends PureComponent { componentDidMount() { const { defaultText, splitValue } = this.props; - this.onChange(defaultText, splitValue) + this.onChange(defaultText, splitValue); } fetchJSON = async () => { - const url = window.prompt('Enter URL to fetch JSON from a remote server.') - if (!url) return + const url = window.prompt("Enter URL to fetch JSON from a remote server."); + if (!url) return; try { - const res = await unfetch(url) - const json = await res.json() - this.onChange(JSON.stringify(json, null, 2)) + const res = await unfetch(url); + const json = await res.json(); + this.onChange(JSON.stringify(json, null, 2)); } catch (e) { this.setState({ info: e.message, infoType: "error" }); } - } + }; onChange = async (newValue, leftSplitValue) => { const nValue = newValue || this.state.value; @@ -140,7 +140,7 @@ export default class ConversionPanel extends PureComponent { const checked = e.currentTarget.checked; if (this.props.onCheckboxChange) { this.props.onCheckboxChange(checked, () => { - this.onChange() + this.onChange(); }); } }; @@ -238,13 +238,14 @@ export default class ConversionPanel extends PureComponent { flex: 1; display: flex; flex-direction: row; + overflow: hidden; } .section { flex: 1; position: relative; - display: flex; - flex-direction: column; + display: flex; + flex-direction: column; } .right { @@ -314,7 +315,7 @@ export default class ConversionPanel extends PureComponent { } .react-codemirror2 { - overflow: scroll + overflow: scroll; } .react-codemirror2, @@ -338,7 +339,7 @@ export default class ConversionPanel extends PureComponent { .split .CodeMirror { } .right .react-codemirror2 { - background-color: #fafafa; + background-color: #fafafa; } .right .CodeMirror { @@ -371,7 +372,12 @@ export default class ConversionPanel extends PureComponent {

{leftTitle}

- {leftMode === 'json' && showFetchButton && } + {leftMode === "json" && + showFetchButton && ( + + )} @@ -407,41 +413,41 @@ export default class ConversionPanel extends PureComponent {
-
-

{rightTitle}

- {onCheckboxChange && ( - +
+

{rightTitle}

+ {onCheckboxChange && ( + + )} + +
+ {isBrowser && ( + )} -
- {isBrowser && ( - - )} -
diff --git a/components/Layout.js b/components/Layout.js index 7aa90ab..3381ee4 100644 --- a/components/Layout.js +++ b/components/Layout.js @@ -88,8 +88,8 @@ export default class Layout extends PureComponent { this.setKey(this.props.pathname); } - componentDidMount () { - routes.forEach(({path}) => Router.prefetch(path)) + componentDidMount() { + routes.forEach(({ path }) => Router.prefetch(path)); } componentWillReceiveProps({ pathname }) { @@ -131,19 +131,24 @@ export default class Layout extends PureComponent { href="https://cdnjs.cloudflare.com/ajax/libs/font-mfizz/2.4.1/font-mfizz.min.css" /> - - - - - - - - - - - - - + + + + + + + + + + + +