Use spread operator (#95)

* Use spread operator replace Object.assign() * Fix tag name
7 years ago · 3985e35b52
parent 1f9c81df9e
commit 3985e35b52
4 changed files with 9 additions and 11 deletions
--- a/components/Button.js
+++ b/components/Button.js
@ -4,14 +4,12 @@ import { COLORS } from '../lib/constants'
 export default props => (
  <button
    onClick={props.onClick}
-    style={Object.assign(
+    style={{
-      {
+      ...props.style,
-        background: COLORS.BLACK,
+      background: COLORS.BLACK,
-        color: props.color,
+      color: props.color,
-        border: `0.5px solid ${props.color}`
+      border: `0.5px solid ${props.color}`
-      },
+    }}
      props.style
    )}
  >
    <span>{props.title}</span>
    <style jsx>{`
--- a/components/Carbon.js
+++ b/components/Carbon.js
@ -69,7 +69,7 @@ class Carbon extends React.Component {
  }
  render() {
-    const config = Object.assign(DEFAULT_SETTINGS, this.props.config)
+    const config = { ...DEFAULT_SETTINGS, ...this.props.config }
    const options = {
      lineNumbers: false,
--- a/components/Meta.js
+++ b/components/Meta.js
@ -7,7 +7,7 @@ export default () => (
  <div className="meta">
    <Head>
      <meta charSet="utf-8" />
-      <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+      <meta httpEquiv="X-UA-Compatible" content="IE=edge" />
      <meta name="viewport" content="width=device-width, initial-scale=1" />
      <meta
        name="description"
--- a/pages/editor.js
+++ b/pages/editor.js
@ -67,7 +67,7 @@ class Editor extends React.Component {
  }
  componentDidUpdate() {
-    const s = Object.assign({}, this.state)
+    const s = { ...this.state }
    delete s.code
    saveState(localStorage, s)
  }