From f43eda1214fcd4b5a13e59d43e1abbe995d38039 Mon Sep 17 00:00:00 2001
From: Mike Fix <mrfix84@gmail.com>
Date: Sun, 26 Jan 2020 14:19:03 -0800
Subject: [PATCH] improve usability of selection styling

---
 components/Editor.js          |   5 ++
 components/SelectionEditor.js | 135 +++++++++++++++-------------------
 2 files changed, 64 insertions(+), 76 deletions(-)

diff --git a/components/Editor.js b/components/Editor.js
index 8e9b2e5..aff1259 100644
--- a/components/Editor.js
+++ b/components/Editor.js
@@ -454,6 +454,11 @@ class Editor extends React.Component {
             .toolbar-second-row > :global(div:not(:last-of-type)) {
               margin-right: 0.5rem;
             }
+
+            #style-editor-button {
+              display: flex;
+              align-items: center;
+            }
           `}
         </style>
       </div>
diff --git a/components/SelectionEditor.js b/components/SelectionEditor.js
index 3c161b6..6a13f4e 100644
--- a/components/SelectionEditor.js
+++ b/components/SelectionEditor.js
@@ -3,11 +3,8 @@ import { useKeyboardListener } from 'actionsack'
 import Popout from './Popout'
 import Button from './Button'
 import ColorPicker from './ColorPicker'
-import ThemeIcon from './svg/Theme'
 import { COLORS } from '../lib/constants'
 
-const styleEditorButtonStyle = { width: 28, maxWidth: 28, height: 28, borderRadius: '50%' }
-
 function ModifierButton(props) {
   return (
     <Button
@@ -54,10 +51,9 @@ function reducer(state, action) {
 }
 
 function SelectionEditor({ onChange }) {
-  const [visible, setVisible] = React.useState(false)
-  const [open, setOpen] = React.useState(true)
+  const [open, setOpen] = React.useState(false)
 
-  useKeyboardListener('Escape', () => setVisible(false))
+  useKeyboardListener('Escape', () => setOpen(false))
 
   const [state, dispatch] = React.useReducer(reducer, {
     bold: false,
@@ -72,77 +68,64 @@ function SelectionEditor({ onChange }) {
 
   return (
     <div style={{ position: 'relative' }}>
-      <Button
-        title="Style Menu"
-        border
-        center
-        selected={visible}
-        style={styleEditorButtonStyle}
-        margin="6px 0 0"
-        onClick={() => setVisible(v => !v)}
-      >
-        <ThemeIcon />
-      </Button>
-      <Popout hidden={!visible} pointerLeft="9px">
-        <div className="colorizer">
-          <div className="modifier">
-            <ModifierButton selected={state.bold} onClick={() => dispatch({ type: 'BOLD' })}>
-              <b>B</b>
-            </ModifierButton>
-            <ModifierButton selected={state.italics} onClick={() => dispatch({ type: 'ITALICS' })}>
-              <i>I</i>
-            </ModifierButton>
-            <ModifierButton
-              selected={state.underline}
-              onClick={() => dispatch({ type: 'UNDERLINE' })}
-            >
-              <u>U</u>
-            </ModifierButton>
-            <button className="color-square" onClick={() => setOpen(o => !o)} />
-          </div>
-          {open && (
-            <div className="color-picker-container">
-              <ColorPicker
-                color={state.color || COLORS.PRIMARY}
-                disableAlpha={true}
-                onChange={d => dispatch({ type: 'COLOR', color: d.hex })}
-              />
-            </div>
-          )}
+      <div className="colorizer">
+        <div className="modifier">
+          <ModifierButton selected={state.bold} onClick={() => dispatch({ type: 'BOLD' })}>
+            <b>B</b>
+          </ModifierButton>
+          <ModifierButton selected={state.italics} onClick={() => dispatch({ type: 'ITALICS' })}>
+            <i>I</i>
+          </ModifierButton>
+          <ModifierButton
+            selected={state.underline}
+            onClick={() => dispatch({ type: 'UNDERLINE' })}
+          >
+            <u>U</u>
+          </ModifierButton>
+          <button className="color-square" onClick={() => setOpen(o => !o)} />
         </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: ${state.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>
+        <Popout hidden={!open} pointerLeft="16px" style={{ left: 82 }}>
+          <div className="color-picker-container">
+            <ColorPicker
+              color={state.color || COLORS.PRIMARY}
+              disableAlpha={true}
+              onChange={d => dispatch({ type: 'COLOR', color: d.hex })}
+            />
+          </div>
+        </Popout>
+      </div>
+      <style jsx>
+        {`
+          .modifier {
+            padding: 0px 8px;
+            display: flex;
+          }
+          .colorizer b {
+            font-weight: bold;
+          }
+          .colorizer i {
+            font-style: italic;
+          }
+          .colorizer :global(button) {
+            min-width: 20px;
+          }
+          .color-square {
+            cursor: pointer;
+            appearance: none;
+            outline: none;
+            border: none;
+            border-radius: 3px;
+            padding: 12px;
+            margin: 4px 0 4px auto;
+            background: ${state.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>
     </div>
   )
 }