refactor SelectionEditor into own file

components/Carbon.js

@@ -7,9 +7,6 @@ import { Controlled as CodeMirror } from 'react-codemirror2'
 
 import SpinnerWrapper from './SpinnerWrapper'
 import WindowControls from './WindowControls'
-import Popout from './Popout'
-import Button from './Button'
-import ColorPicker from './ColorPicker'
 
 import {
   COLORS,
@@ -21,108 +18,9 @@ import {
   THEMES_HASH
 } from '../lib/constants'
 
-function ModifierButton(props) {
+const SelectionEditor = dynamic(() => import('./SelectionEditor'), {
-  return (
+  loading: () => null
-    <Button
+})
-      flex={0}
-      padding="0"
-      center
-      margin="0 8px 0 0"
-      style={{ borderBottom: `1px solid ${props.selected ? 'white' : 'transparent'}` }}
-      onClick={() => props.onChange(s => !s)}
-    >
-      {props.children}
-    </Button>
-  )
-}
-
-function SeletionEditor({ pos, onChange }) {
-  const [open, setOpen] = React.useState(false)
-
-  const [bold, setBold] = React.useState(false)
-  const [italics, setItalics] = React.useState(false)
-  const [underline, setUnderline] = React.useState(false)
-
-  const [color, setColor] = React.useState(null)
-
-  React.useEffect(() => {
-    onChange({
-      bold,
-      italics,
-      underline,
-      color
-    })
-  }, [onChange, bold, color, italics, underline])
-
-  return (
-    <Popout
-      hidden={false}
-      pointerLeft="62px"
-      style={{
-        zIndex: 100,
-        top: pos.top,
-        left: pos.left
-      }}
-    >
-      <div className="colorizer">
-        <div className="modifier">
-          <ModifierButton selected={bold} onChange={setBold}>
-            <b>B</b>
-          </ModifierButton>
-          <ModifierButton selected={italics} onChange={setItalics}>
-            <i>I</i>
-          </ModifierButton>
-          <ModifierButton selected={underline} onChange={setUnderline}>
-            <u>U</u>
-          </ModifierButton>
-          <button className="color-square" onClick={() => setOpen(o => !o)} />
-        </div>
-        {open && (
-          <div className="color-picker-container">
-            <ColorPicker
-              color={color || COLORS.PRIMARY}
-              disableAlpha={true}
-              onChange={d => setColor(d.hex)}
-            />
-          </div>
-        )}
-      </div>
-      <style jsx>
-        {`
-          .modifier {
-            padding: 0px 8px;
-            display: flex;
-          }
-          .colorizer b {
-            font-weight: bold;
-          }
-          .colorizer i {
-            font-style: italic;
-          }
-          .colorizer :global(button) {
-            min-width: 24px;
-          }
-          .color-square {
-            cursor: pointer;
-            appearance: none;
-            outline: none;
-            border: none;
-            border-radius: 3px;
-            padding: 12px;
-            margin: 4px 0 4px auto;
-            background: ${color || COLORS.PRIMARY};
-            box-shadow: ${`inset 0px 0px 0px ${open ? 2 : 1}px ${COLORS.SECONDARY}`};
-          }
-          .color-picker-container {
-            width: 218px;
-            border-top: 2px solid ${COLORS.SECONDARY};
-          }
-        `}
-      </style>
-    </Popout>
-  )
-}
-
 const Watermark = dynamic(() => import('./svg/Watermark'), {
   loading: () => null
 })
@@ -207,23 +105,13 @@ class Carbon extends React.PureComponent {
         className="container"
         onMouseUp={() => {
           if (this.currentSelection) {
-            const startPos = this.props.editorRef.current.editor.charCoords(
+            const { editor } = this.props.editorRef.current
-              this.currentSelection.from,
+
-              'local'
+            const startPos = editor.charCoords(this.currentSelection.from, 'local')
-            )
+            const endPos = editor.charCoords(this.currentSelection.to, 'local')
-            const endPos = this.props.editorRef.current.editor.charCoords(
+
-              this.currentSelection.to,
+            const startWindowPos = editor.charCoords(this.currentSelection.from, 'window')
-              'local'
+            const endWindowPos = editor.charCoords(this.currentSelection.to, 'window')
-            )
-
-            const startWindowPos = this.props.editorRef.current.editor.charCoords(
-              this.currentSelection.from,
-              'window'
-            )
-            const endWindowPos = this.props.editorRef.current.editor.charCoords(
-              this.currentSelection.to,
-              'window'
-            )
 
             const top =
               Math.max(startWindowPos.bottom, endWindowPos.bottom) -
@@ -402,7 +290,7 @@ class Carbon extends React.PureComponent {
           <div className="twitter-png-fix" />
         </div>
         {this.state.modifierOpenAt && (
-          <SeletionEditor
+          <SelectionEditor
             pos={this.state.modifierOpenAt}
             onChange={changes => {
               if (this.currentSelection) {

components/SelectionEditor.js

@@ -0,0 +1,105 @@
+import React from 'react'
+import Popout from './Popout'
+import Button from './Button'
+import ColorPicker from './ColorPicker'
+import { COLORS } from '../lib/constants'
+
+function ModifierButton(props) {
+  return (
+    <Button
+      flex={0}
+      padding="0"
+      center
+      margin="0 8px 0 0"
+      style={{ borderBottom: `1px solid ${props.selected ? 'white' : 'transparent'}` }}
+      onClick={() => props.onChange(s => !s)}
+    >
+      {props.children}
+    </Button>
+  )
+}
+
+function SelectionEditor({ pos, onChange }) {
+  const [open, setOpen] = React.useState(false)
+  const [bold, setBold] = React.useState(false)
+  const [italics, setItalics] = React.useState(false)
+  const [underline, setUnderline] = React.useState(false)
+  const [color, setColor] = React.useState(null)
+  React.useEffect(() => {
+    onChange({
+      bold,
+      italics,
+      underline,
+      color
+    })
+  }, [onChange, bold, color, italics, underline])
+  return (
+    <Popout
+      hidden={false}
+      pointerLeft="62px"
+      style={{
+        zIndex: 100,
+        top: pos.top,
+        left: pos.left
+      }}
+    >
+      <div className="colorizer">
+        <div className="modifier">
+          <ModifierButton selected={bold} onChange={setBold}>
+            <b>B</b>
+          </ModifierButton>
+          <ModifierButton selected={italics} onChange={setItalics}>
+            <i>I</i>
+          </ModifierButton>
+          <ModifierButton selected={underline} onChange={setUnderline}>
+            <u>U</u>
+          </ModifierButton>
+          <button className="color-square" onClick={() => setOpen(o => !o)} />
+        </div>
+        {open && (
+          <div className="color-picker-container">
+            <ColorPicker
+              color={color || COLORS.PRIMARY}
+              disableAlpha={true}
+              onChange={d => setColor(d.hex)}
+            />
+          </div>
+        )}
+      </div>
+      <style jsx>
+        {`
+          .modifier {
+            padding: 0px 8px;
+            display: flex;
+          }
+          .colorizer b {
+            font-weight: bold;
+          }
+          .colorizer i {
+            font-style: italic;
+          }
+          .colorizer :global(button) {
+            min-width: 24px;
+          }
+          .color-square {
+            cursor: pointer;
+            appearance: none;
+            outline: none;
+            border: none;
+            border-radius: 3px;
+            padding: 12px;
+            margin: 4px 0 4px auto;
+            background: ${color || COLORS.PRIMARY};
+            box-shadow: ${`inset 0px 0px 0px ${open ? 2 : 1}px ${COLORS.SECONDARY}`};
+          }
+          .color-picker-container {
+            width: 218px;
+            border-top: 2px solid ${COLORS.SECONDARY};
+          }
+        `}
+      </style>
+    </Popout>
+  )
+}
+
+export default SelectionEditor