diff --git a/components/CodeMirror.js b/components/CodeMirror.js new file mode 100644 index 0000000..ff4d5ed --- /dev/null +++ b/components/CodeMirror.js @@ -0,0 +1,139 @@ +import React, { PureComponent } from "react"; +import { Controlled } from "react-codemirror2"; +import greenlet from "greenlet"; +import cn from "classnames"; + +require("codemirror-graphql/mode"); +require("codemirror/mode/javascript/javascript"); +require("codemirror/mode/xml/xml"); +require("codemirror/mode/jsx/jsx"); +require("codemirror/mode/css/css"); +require("codemirror/mode/rust/rust"); +require("codemirror/mode/sql/sql"); +require("codemirror/mode/clike/clike"); +require("codemirror/mode/go/go"); + +function noop() {} + +const prettierParsers = { + css: "postcss", + javascript: "babylon", + jsx: "babylon", + graphql: "graphql", + json: "json", + typescript: "typescript", + flow: "flow" +}; + +function prettify(code, mode = "json", parsers) { + let prettier; + + try { + importScripts("https://bundle.run/prettier@1.6.1"); + prettier = self.prettier; + } catch (e) { + throw new Error("prettier not available"); + } + return prettier + ? prettier.format(code, { + parser: parsers[mode], + printWidth: 70, + semi: false + }) + : code; +} + +const worker = greenlet(prettify); + +export default class extends PureComponent { + static defaultProps = { + onChange: noop, + onBeforeChange: noop, + autoPrettify: true, + allowPrettify: true + }; + + state = { + value: "", + isPrettierAvailable: true + }; + + prettifyCode = async (props = this.props) => { + try { + const prettified = props.value + ? await worker(props.value, props.mode, prettierParsers) + : props.value; + + this.setState({ + value: prettified + }); + } catch (e) { + this.setState({ + value: props.value, + isPrettierAvailable: false + }); + } + }; + + autoPrettify = props => { + if (!props.autoPrettify) { + this.setState({ + value: props.value + }); + return; + } + this.prettifyCode(props); + }; + + componentDidMount() { + this.autoPrettify(this.props); + } + + componentWillReceiveProps(nextProps) { + if (nextProps.value !== this.props.value) { + this.autoPrettify(nextProps); + } + } + + render() { + const { + options, + onChange, + onBeforeChange, + mode, + allowPrettify + } = this.props; + const { value } = this.state; + + const buttonClass = cn("btn top-right", { + disabled: !this.state.isPrettierAvailable + }); + + return ( + + + {allowPrettify && + prettierParsers[mode] && ( + + )} + + + ); + } +} diff --git a/components/ConversionPanel.js b/components/ConversionPanel.js index f34c17d..08eba54 100644 --- a/components/ConversionPanel.js +++ b/components/ConversionPanel.js @@ -3,32 +3,8 @@ import cn from "classnames"; import isBrowser from "is-in-browser"; import copy from "copy-text-to-clipboard"; import unfetch from "unfetch"; -import loadWorker from "../utils/loadWorker"; - -let CodeMirror; -if (isBrowser) { - CodeMirror = require("react-codemirror2").Controlled; - - require("codemirror-graphql/mode"); - require("codemirror/mode/javascript/javascript"); - require("codemirror/mode/xml/xml"); - require("codemirror/mode/jsx/jsx"); - require("codemirror/mode/css/css"); - require("codemirror/mode/rust/rust"); - require("codemirror/mode/sql/sql"); - require("codemirror/mode/clike/clike"); - require("codemirror/mode/go/go"); -} - -const prettierParsers = { - css: "postcss", - javascript: "babylon", - jsx: "babylon", - graphql: "graphql", - json: "json", - typescript: "typescript", - flow: "flow" -}; +import { List } from "react-content-loader"; +import dynamic from "next/dynamic"; const modeMapping = { javascript: { @@ -112,6 +88,19 @@ function ClearIcon() { ); } +function Stubs({ numberOfStubs = 3 }) { + return ( +
+ {[...new Array(numberOfStubs)].map((x, i) => )} +
+ ); +} + +const CodeMirror = dynamic(import("./CodeMirror"), { + ssr: false, + loading: () => +}); + export default class ConversionPanel extends PureComponent { props: Props; @@ -123,8 +112,7 @@ export default class ConversionPanel extends PureComponent { value: props.defaultText, splitValue: "", info: "", - infoType: "", - isPrettierAvailable: true + infoType: "" }; } @@ -143,33 +131,8 @@ export default class ConversionPanel extends PureComponent { const { defaultText, splitValue } = this.props; this.onChange(defaultText, splitValue); - - const { worker, promiseWorker } = loadWorker("prettier.js"); - this.worker = worker; - this.promiseWorker = promiseWorker; - - this.worker.onmessage = this.setPrettierAvailability; } - setPrettierAvailability = ({ data }) => { - if (!data.available || this.state.isPrettierAvailable === data.available) { - return; - } - this.setState({ - isPrettierAvailable: data.available - }); - }; - - passCodeToWorker = (code, mode, section) => { - this.promiseWorker.postMessage({ code, mode, section }).then(response => { - const { available, prettyCode, section } = response; - this.setState({ - isPrettierAvailable: available, - [section]: prettyCode - }); - }); - }; - clearText = () => { this.setState({ value: "" @@ -192,7 +155,7 @@ export default class ConversionPanel extends PureComponent { }; onChange = async (newValue, leftSplitValue) => { - const { prettifyRightPanel, rightMode, leftMode } = this.props; + const { leftMode } = this.props; const nValue = newValue || this.state.value; const splitValue = @@ -208,14 +171,9 @@ export default class ConversionPanel extends PureComponent { : nValue; let code = await this.props.getTransformedValue(json, splitValue); code = code.prettyCode || code; - if (prettifyRightPanel) { - this.passCodeToWorker(code, rightMode, "resultValue"); - } else { - this.setState({ - resultValue: code - }); - } + this.setState({ + resultValue: code, info: "", infoType: "" }); @@ -241,25 +199,8 @@ export default class ConversionPanel extends PureComponent { } }; - prettifyCode = () => { - if (!this.state.isPrettierAvailable) return; - const { leftMode } = this.props; - const { value } = this.state; - - this.passCodeToWorker(value, leftMode, "value"); - }; - - prettifySplitCode = () => { - if (!this.state.isPrettierAvailable) return; - const { splitMode } = this.props; - const { splitValue } = this.state; - - this.passCodeToWorker(splitValue, splitMode, "splitValue"); - }; - copyCode = () => { const { resultValue } = this.state; - copy(resultValue); this.setState({ @@ -268,12 +209,6 @@ export default class ConversionPanel extends PureComponent { }); }; - getPrettifyClass = () => { - return cn("btn", { - disabled: !this.state.isPrettierAvailable - }); - }; - loadFile = e => { const file = e.target.files[0]; const reader = new FileReader(); @@ -297,7 +232,8 @@ export default class ConversionPanel extends PureComponent { splitMode, showFetchButton, fetchButtonText, - extensions + extensions, + prettifyRightPanel } = this.props; const { infoType, resultValue, value, info, splitValue } = this.state; @@ -305,7 +241,7 @@ export default class ConversionPanel extends PureComponent { split: splitLeft }); - // hide success footer bannner after 2 seconds. Let other types be visible until fixed. + // hide success footer banner after 2 seconds. Let other types be visible until fixed. clearTimeout(this.footerTimeout); if (infoType === "success") { this.footerTimeout = setTimeout( @@ -320,10 +256,6 @@ export default class ConversionPanel extends PureComponent { return (
-