Stubs and refactoring (#72)

* added stubs

* lazy load codemirror

* remove-unused-code

* fixes

* fixes
This commit is contained in:
Ritesh Kumar authored and GitHub committed 2018-03-28 00:38:18 +05:30
1 parent 7ab8b321c7
commit d1a9a9ae85
7 files changed
+1165 -244

No files matched your search

+139
View File
@@ -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 (
<React.Fragment>
<style>{`
.top-right {
position: absolute;
right: 10px;
top: 9px;
}
`}</style>
{allowPrettify &&
prettierParsers[mode] && (
<button
onClick={() => this.prettifyCode(this.props)}
className={buttonClass}
>
Prettify
</button>
)}
<Controlled
value={value}
options={options}
onChange={onChange}
onBeforeChange={onBeforeChange}
/>
</React.Fragment>
);
}
}
+72 -155
View File
@@ -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 (
<div style={{ padding: 30 }}>
{[...new Array(numberOfStubs)].map((x, i) => <List key={i} />)}
</div>
);
}
const CodeMirror = dynamic(import("./CodeMirror"), {
ssr: false,
loading: () => <Stubs />
});
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 (
<div className="wrapper">
<script
async
src="https://unpkg.com/json-ts@1.6.4/dist/json-ts.min.js"
/>
<style jsx>{`
.wrapper {
display: flex;
@@ -381,30 +313,6 @@ export default class ConversionPanel extends PureComponent {
"source-code-pro", monospace;
}
.btn {
background-color: #2196f3;
font-size: 14px;
padding: 7px 14px;
z-index: 9;
border: 0;
border-radius: 2px;
cursor: pointer;
outline: none;
color: #fff;
line-height: 20px;
}
.btn.disabled {
background-color: #e0e0e0;
pointer-events: none;
color: #7b7b7b;
cursor: not-allowed;
}
.btn:hover {
background-color: #0490ff;
}
.header {
height: 50px;
background-color: white;
@@ -556,6 +464,30 @@ export default class ConversionPanel extends PureComponent {
margin-right: 4px;
font-size: 16px;
}
.btn {
background-color: #2196f3;
font-size: 14px;
padding: 7px 14px;
z-index: 9;
border: 0;
border-radius: 2px;
cursor: pointer;
outline: none;
color: #fff;
line-height: 20px;
}
.btn.disabled {
background-color: #e0e0e0;
pointer-events: none;
color: #7b7b7b;
cursor: not-allowed;
}
.btn:hover {
background-color: #0490ff;
}
`}</style>
<div className="content-wrapper">
@@ -571,33 +503,25 @@ export default class ConversionPanel extends PureComponent {
</button>
)}
{prettierParsers[leftMode] && (
<button
className={this.getPrettifyClass()}
onClick={this.prettifyCode}
>
Prettify
</button>
)}
<div />
</div>
<div className="clear" onClick={this.clearText}>
{" "}
<ClearIcon />
</div>
{isBrowser && (
<CodeMirror
onBeforeChange={(editor, metadata, value) =>
this.onChange(value)
}
value={value}
options={{
mode: modeMapping[leftMode] || leftMode,
...codeMirrorOptions
}}
/>
)}
<CodeMirror
onBeforeChange={(editor, metadata, value) =>
this.onChange(value)
}
value={value}
options={{
mode: modeMapping[leftMode] || leftMode,
...codeMirrorOptions
}}
mode={leftMode}
autoPrettify={false}
/>
{extensions &&
extensions.length > 0 && (
@@ -617,14 +541,6 @@ export default class ConversionPanel extends PureComponent {
<div className="panel">
<div className="header">
<h4 className="title">{splitTitle}</h4>
{prettierParsers[splitMode] && (
<button
className={this.getPrettifyClass()}
onClick={this.prettifySplitCode}
>
Prettify
</button>
)}
</div>
<CodeMirror
onBeforeChange={(editor, metadata, value) =>
@@ -635,6 +551,7 @@ export default class ConversionPanel extends PureComponent {
mode: modeMapping[splitMode] || splitMode,
...codeMirrorOptions
}}
mode={splitMode}
/>
</div>
)}
@@ -658,18 +575,18 @@ export default class ConversionPanel extends PureComponent {
Copy
</button>
</div>
{isBrowser && (
<CodeMirror
value={resultValue}
options={{
readOnly: true,
mode: modeMapping[rightMode] || rightMode,
...codeMirrorOptions,
lineNumbers: false
}}
onChange={() => {}}
/>
)}
<CodeMirror
value={resultValue}
options={{
readOnly: true,
mode: modeMapping[rightMode] || rightMode,
...codeMirrorOptions,
lineNumbers: false
}}
mode={rightMode}
autoPrettify={prettifyRightPanel}
allowPrettify={false}
/>
</div>
</div>
</div>
+4 -4
View File
@@ -242,7 +242,7 @@ export default class Layout extends PureComponent {
padding: 8px;
margin: 0 15px 15px;
border-radius: 2px;
font-size: 13px;
font-size: 14px;
text-align: center;
}
@@ -260,7 +260,7 @@ export default class Layout extends PureComponent {
.Collapsible__trigger {
color: whitesmoke;
font-family: "Lato", sans-serif;
line-height: 44px;
line-height: 34px;
cursor: pointer;
}
@@ -293,10 +293,10 @@ export default class Layout extends PureComponent {
display: block;
color: #fff;
font-family: "Lato";
line-height: 44px;
line-height: 34px;
padding-left: 20px;
background-color: #3c3c3c;
font-size: 14px;
font-size: 13px;
text-decoration: none;
}
`}</style>
+8 -6
View File
@@ -43,26 +43,28 @@
"css-in-js-generator": "^0.3.0-alpha.2",
"generate-schema": "^2.5.1",
"gofmt.js": "^0.0.2",
"greenlet": "^0.1.2",
"is-in-browser": "^1.1.3",
"is-svg": "^2.1.0",
"is-svg": "^3.0.0",
"json-schema-faker": "^0.5.0-rc11",
"json-schema-to-typescript": "^4.6.5",
"json-schema-to-typescript": "4.6.5",
"json-ts": "^1.6.4",
"lodash": "^4.17.4",
"next": "5.0.1-canary.17",
"next": "5.1.0",
"nprogress": "^0.2.0",
"promise-worker": "^1.1.1",
"prop-types": "^15.6.0",
"rc-collapse": "^1.7.7",
"react": "16.2.0",
"react-codemirror2": "4.2.1",
"react-content-loader": "^3.1.1",
"react-dom": "16.2.0",
"react-fuzzy-picker": "0.6.0",
"react-github-corner": "^2.1.0",
"stringify-object": "^3.2.1",
"transform-css-to-js": "^0.1.1",
"transform-graphql-type-annotations": "^0.1.1",
"transform-json-types": "^0.3.0",
"transform-json-types": "^0.4.0",
"transform-svg-to-native": "^0.1.3",
"unfetch": "^3.0.0",
"xml-js": "^1.6.2"
@@ -76,10 +78,10 @@
"css-loader": "^0.28.7",
"glob": "^7.1.2",
"husky": "^0.14.3",
"lint-staged": "^6.0.0",
"lint-staged": "^7.0.0",
"lodash-webpack-plugin": "^0.11.4",
"prettier": "^1.9.2",
"style-loader": "^0.19.1",
"style-loader": "^0.20.3",
"sw-precache-webpack-plugin": "^0.11.4",
"webpack-bundle-analyzer": "^2.9.0",
"worker-loader": "^1.0.0"
+1 -1
View File
@@ -1,5 +1,5 @@
import React, { PureComponent } from "react";
import HTMLtoJSX from "@tsuyoshiwada/htmltojsx";
import HTMLtoJSX from "htmltojsx";
import Layout from "../components/Layout";
import ConversionPanel from "../components/ConversionPanel";
import isSvg from "is-svg";
+2 -3
View File
@@ -9,8 +9,8 @@
}
.rc-collapse > .rc-collapse-item > .rc-collapse-header {
height: 38px;
line-height: 38px;
height: 34px;
line-height: 34px;
cursor: pointer;
}
.rc-collapse > .rc-collapse-item > .rc-collapse-header .arrow {
@@ -34,7 +34,6 @@
.rc-collapse-content {
overflow: hidden;
overflow-y: scroll;
max-height: 200px;
}
.rc-collapse-content-inactive {
+939 -75
View File
File diff suppressed because it is too large. Load diff