diff --git a/components/ConversionPanel.js b/components/ConversionPanel.js index 6988db5..45a8329 100644 --- a/components/ConversionPanel.js +++ b/components/ConversionPanel.js @@ -1,9 +1,7 @@ import React, { PureComponent } from 'react' -import PropTypes from 'prop-types' import Router from 'next/router' import isBrowser from 'is-in-browser' -import { js_beautify } from 'js-beautify' -import { beauty } from 'css-beauty' +import {js_beautify, html, css} from 'js-beautify' import copy from 'copy-text-to-clipboard' const theme = 'tomorrow' @@ -19,14 +17,23 @@ if (isBrowser) { require('brace/mode/json') require('brace/mode/typescript') require('brace/mode/css') + require('brace/mode/html') +} + +type Props = { + leftMode: ?string, + rightMode: ?string, + resultValue: string, + onCheckboxChange: Function, + checkboxText: ?string, + pathname: string, + initialCheckboxValue: boolean, + leftTitle: string, + rightTitle: string } export default class ConversionPanel extends PureComponent { - static propTypes = { - name: PropTypes.string.isRequired, - leftMode: PropTypes.string, - rightMode: PropTypes.string - } + props : Props static defaultProps = { leftMode: 'javascript', @@ -53,7 +60,7 @@ export default class ConversionPanel extends PureComponent { }) } - onChange = (newValue) => { + onChange = (newValue: string) => { try { const code = this.props.getTransformedValue(newValue) @@ -77,7 +84,6 @@ export default class ConversionPanel extends PureComponent { } setCodeInUrl = (code) => { - Router.replace({ pathname: this.props.url.pathname, query: { @@ -86,10 +92,10 @@ export default class ConversionPanel extends PureComponent { }) } - toggleRight = (e) => { + toggleCheckbox = (e: MouseEvent) => { const checked = e.currentTarget.checked - if (this.props.onRnToggle) { - this.props.onRnToggle(checked, () => { + if (this.props.onCheckboxChange) { + this.props.onCheckboxChange(checked, () => { this.setState({ resultValue: this.props.getTransformedValue(this.state.value) }) @@ -97,19 +103,40 @@ export default class ConversionPanel extends PureComponent { } } - prettifyCode = () => { - const value = this.props.leftMode === 'css' ? beauty(this.state.value) : js_beautify(this.state.value) + setResult = (result: string) => { this.setState({ - value + value: result }, () => { - this.props.url.push({ - query: { - code: value - } - }) + this.setCodeInUrl(result) }) } + prettifyCode = () => { + const { prettier } = window + const { leftMode } = this.props + const { value } = this.state + + if(leftMode === 'html' || leftMode === 'json' || leftMode === 'css') { + let prettified + if(leftMode === 'html') { + prettified = html(value, { + "indent_size": 2 + }) + } else if (leftMode === 'css') { + prettified = css(value, { + "indent_size": 2 + }) + } else if (leftMode === 'json') { + prettified = js_beautify(value, { + "indent_size": 2 + }) + } + this.setResult(prettified) + } else { + this.setResult(prettier.format(value)) + } + } + copyCode = () => { copy(this.state.resultValue) this.setState({ @@ -119,6 +146,9 @@ export default class ConversionPanel extends PureComponent { } render () { + const { leftMode, rightMode, onCheckboxChange, checkboxText, initialCheckboxValue, leftTitle, rightTitle } = this.props + const {infoType, resultValue, value, info} = this.state + return (
@@ -237,30 +273,31 @@ export default class ConversionPanel extends PureComponent { } label { - font-family: 'Lato'; - padding: 0 12px; - cursor: pointer; + font-family: 'Lato'; + padding: 0 12px; + cursor: pointer; } label input { margin-right: 4px; - font-size: 16px; + font-size: 16px; } `}
+
{leftTitle}
{isBrowser &&
- - {this.props.onRnToggle && -
{isBrowser &&
-
- {this.state.info} +
+ {info}
) diff --git a/components/Layout.js b/components/Layout.js index b0edc3f..6459277 100644 --- a/components/Layout.js +++ b/components/Layout.js @@ -47,9 +47,6 @@ export default function ({children, pathname}) { -