From e1d0b6102b21b7c12ad12351d7cec9bee1113f96 Mon Sep 17 00:00:00 2001
From: davy-c <d.castel33@gmail.com>
Date: Thu, 19 Dec 2019 10:18:01 +0900
Subject: [PATCH 1/2] fix toolbar export icon

---
 src/components/ContextMenu/ContextMenu.tsx        | 2 +-
 src/components/NotePage/NoteDetail/NoteDetail.tsx | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/ContextMenu/ContextMenu.tsx b/src/components/ContextMenu/ContextMenu.tsx
index bdbefd662e..9f71337c4b 100644
--- a/src/components/ContextMenu/ContextMenu.tsx
+++ b/src/components/ContextMenu/ContextMenu.tsx
@@ -46,7 +46,7 @@ class ContextMenu extends React.Component<ContextMenuProps> {
         ref={this.menuRef}
         onBlur={this.closeContextMenuIfMenuBlurred}
         style={{
-          left: position.x,
+          left: position.x + 130 < innerWidth ? position.x : innerWidth - 150,
           top: position.y
         }}
       >
diff --git a/src/components/NotePage/NoteDetail/NoteDetail.tsx b/src/components/NotePage/NoteDetail/NoteDetail.tsx
index 7e64e3aaa0..f3b99de281 100644
--- a/src/components/NotePage/NoteDetail/NoteDetail.tsx
+++ b/src/components/NotePage/NoteDetail/NoteDetail.tsx
@@ -13,7 +13,6 @@ import {
   mdiTrashCan,
   mdiEyeOutline,
   mdiArrowSplitVertical,
-  mdiFormatText,
   mdiDeleteEmpty,
   mdiRestore,
   mdiPencil
@@ -507,8 +506,6 @@ export default class NoteDetail extends React.Component<
                 onKeyDown={this.handleNewTagNameInputKeyDown}
               />
               <ToolbarSeparator />
-              <ToolbarExportButton note={this.props.note} />
-              <ToolbarIconButton onClick={() => {}} path={mdiFormatText} />
               <ToolbarIconButton
                 className={viewMode === 'edit' ? 'active' : ''}
                 onClick={() => toggleViewMode('edit')}
@@ -541,6 +538,7 @@ export default class NoteDetail extends React.Component<
                   path={mdiTrashCan}
                 />
               )}
+              <ToolbarExportButton note={this.props.note} />
             </Toolbar>
           </>
         )}

From 0bd0ac4bbe6a601ca72d4abb4e1c31de6b8c74ee Mon Sep 17 00:00:00 2001
From: davy-c <d.castel33@gmail.com>
Date: Thu, 19 Dec 2019 11:15:23 +0900
Subject: [PATCH 2/2] fix

---
 src/components/ContextMenu/ContextMenu.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/ContextMenu/ContextMenu.tsx b/src/components/ContextMenu/ContextMenu.tsx
index 9f71337c4b..aff928c93b 100644
--- a/src/components/ContextMenu/ContextMenu.tsx
+++ b/src/components/ContextMenu/ContextMenu.tsx
@@ -39,6 +39,12 @@ class ContextMenu extends React.Component<ContextMenuProps> {
 
   render() {
     const { closed, menuItems, position, id } = this.props.contextMenu
+    const windowWith =
+      window.innerWidth ||
+      innerWidth ||
+      document.documentElement.clientWidth ||
+      document.body.clientWidth
+
     if (closed) return null
     return (
       <StyledContextMenu
@@ -46,7 +52,7 @@ class ContextMenu extends React.Component<ContextMenuProps> {
         ref={this.menuRef}
         onBlur={this.closeContextMenuIfMenuBlurred}
         style={{
-          left: position.x + 130 < innerWidth ? position.x : innerWidth - 150,
+          left: position.x + 130 < windowWith ? position.x : windowWith - 150,
           top: position.y
         }}
       >