From 6fc0d3f28d6da0d21ebc46685c4fb2d24f30bdc0 Mon Sep 17 00:00:00 2001
From: Thomas Nordquist <xxnerowingerxx@gmail.com>
Date: Mon, 20 Apr 2020 14:03:03 +0200
Subject: [PATCH] Fix publish button

---
 .../components/Sidebar/Publish/Publish.tsx    | 52 ++++++++-----------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/app/src/components/Sidebar/Publish/Publish.tsx b/app/src/components/Sidebar/Publish/Publish.tsx
index f7b42fe..e8f5a27 100644
--- a/app/src/components/Sidebar/Publish/Publish.tsx
+++ b/app/src/components/Sidebar/Publish/Publish.tsx
@@ -102,7 +102,7 @@ function Publish(props: Props) {
   )
 }
 
-function EditorMode(props: {
+const EditorMode = memo(function EditorMode(props: {
   payload?: string
   editorMode: string
   focusEditor: () => void
@@ -127,21 +127,18 @@ function EditorMode(props: {
     }
   }, [props.payload])
 
-  return useMemo(
-    () => (
-      <div style={{ marginTop: '16px' }}>
-        <div style={{ width: '100%', lineHeight: '64px', textAlign: 'center' }}>
-          <EditorModeSelect value={props.editorMode} onChange={updateMode} focusEditor={props.focusEditor} />
-          <FormatJsonButton editorMode={props.editorMode} focusEditor={props.focusEditor} formatJson={formatJson} />
-          <div style={{ float: 'right' }}>
-            <PublishButton publish={props.publish} focusEditor={props.focusEditor} />
-          </div>
+  return (
+    <div style={{ marginTop: '16px' }}>
+      <div style={{ width: '100%', lineHeight: '64px', textAlign: 'center' }}>
+        <EditorModeSelect value={props.editorMode} onChange={updateMode} focusEditor={props.focusEditor} />
+        <FormatJsonButton editorMode={props.editorMode} focusEditor={props.focusEditor} formatJson={formatJson} />
+        <div style={{ float: 'right' }}>
+          <PublishButton publish={props.publish} focusEditor={props.focusEditor} />
         </div>
       </div>
-    ),
-    [props.editorMode]
+    </div>
   )
-}
+})
 
 const FormatJsonButton = React.memo(function FormatJsonButton(props: {
   editorMode: string
@@ -166,7 +163,7 @@ const FormatJsonButton = React.memo(function FormatJsonButton(props: {
   )
 })
 
-const PublishButton = (props: { publish: () => void; focusEditor: () => void }) => {
+const PublishButton = memo(function PublishButton(props: { publish: () => void; focusEditor: () => void }) {
   const handleClickPublish = useCallback(
     (e: React.MouseEvent) => {
       e.stopPropagation()
@@ -175,22 +172,19 @@ const PublishButton = (props: { publish: () => void; focusEditor: () => void })
     [props.publish]
   )
 
-  return useMemo(
-    () => (
-      <Button
-        variant="contained"
-        size="small"
-        color="primary"
-        onClick={handleClickPublish}
-        onFocus={props.focusEditor}
-        id="publish-button"
-      >
-        <Navigation style={{ marginRight: '8px' }} /> Publish
-      </Button>
-    ),
-    [handleClickPublish]
+  return (
+    <Button
+      variant="contained"
+      size="small"
+      color="primary"
+      onClick={handleClickPublish}
+      onFocus={props.focusEditor}
+      id="publish-button"
+    >
+      <Navigation style={{ marginRight: '8px' }} /> Publish
+    </Button>
   )
-}
+})
 
 const mapDispatchToProps = (dispatch: any) => {
   return {