From a3153f1c9f9ea56134ceeb66e7c870defc514f18 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Sat, 6 Jun 2020 15:47:02 +0100 Subject: [PATCH] Desktop: Fixes #3331: Fixed note list context menu --- .eslintignore | 4 ++-- .gitignore | 4 ++-- ElectronClient/gui/NoteList.jsx | 2 ++ ElectronClient/gui/NoteListItem.tsx | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.eslintignore b/.eslintignore index f69757cdaf..a224583997 100644 --- a/.eslintignore +++ b/.eslintignore @@ -97,8 +97,6 @@ ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fence.js ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js ReactNativeClient/lib/JoplinServerApi.js -ReactNativeClient/lib/ShareExtension.js -ReactNativeClient/lib/shareHandler.js ReactNativeClient/lib/services/keychain/KeychainService.js ReactNativeClient/lib/services/keychain/KeychainServiceDriver.dummy.js ReactNativeClient/lib/services/keychain/KeychainServiceDriver.mobile.js @@ -106,6 +104,8 @@ ReactNativeClient/lib/services/keychain/KeychainServiceDriver.node.js ReactNativeClient/lib/services/keychain/KeychainServiceDriverBase.js ReactNativeClient/lib/services/ResourceEditWatcher.js ReactNativeClient/lib/services/SettingUtils.js +ReactNativeClient/lib/ShareExtension.js +ReactNativeClient/lib/shareHandler.js ReactNativeClient/PluginAssetsLoader.js ReactNativeClient/setUpQuickActions.js # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD diff --git a/.gitignore b/.gitignore index aeb34dde42..65f5387bf6 100644 --- a/.gitignore +++ b/.gitignore @@ -87,8 +87,6 @@ ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fence.js ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js ReactNativeClient/lib/JoplinServerApi.js -ReactNativeClient/lib/ShareExtension.js -ReactNativeClient/lib/shareHandler.js ReactNativeClient/lib/services/keychain/KeychainService.js ReactNativeClient/lib/services/keychain/KeychainServiceDriver.dummy.js ReactNativeClient/lib/services/keychain/KeychainServiceDriver.mobile.js @@ -96,6 +94,8 @@ ReactNativeClient/lib/services/keychain/KeychainServiceDriver.node.js ReactNativeClient/lib/services/keychain/KeychainServiceDriverBase.js ReactNativeClient/lib/services/ResourceEditWatcher.js ReactNativeClient/lib/services/SettingUtils.js +ReactNativeClient/lib/ShareExtension.js +ReactNativeClient/lib/shareHandler.js ReactNativeClient/PluginAssetsLoader.js ReactNativeClient/setUpQuickActions.js # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD diff --git a/ElectronClient/gui/NoteList.jsx b/ElectronClient/gui/NoteList.jsx index 4f99d5665b..c7df74addf 100644 --- a/ElectronClient/gui/NoteList.jsx +++ b/ElectronClient/gui/NoteList.jsx @@ -36,6 +36,7 @@ class NoteListComponent extends React.Component { this.onGlobalDrop_ = this.onGlobalDrop_.bind(this); this.registerGlobalDragEndEvent_ = this.registerGlobalDragEndEvent_.bind(this); this.unregisterGlobalDragEndEvent_ = this.unregisterGlobalDragEndEvent_.bind(this); + this.itemContextMenu = this.itemContextMenu.bind(this); } style() { @@ -250,6 +251,7 @@ class NoteListComponent extends React.Component { onNoteDragOver={this.noteItem_noteDragOver} onNoteDrop={this.noteItem_noteDrop} onTitleClick={this.noteItem_titleClick} + onContextMenu={this.itemContextMenu} />; } diff --git a/ElectronClient/gui/NoteListItem.tsx b/ElectronClient/gui/NoteListItem.tsx index 60a791aee3..fa5abeb36c 100644 --- a/ElectronClient/gui/NoteListItem.tsx +++ b/ElectronClient/gui/NoteListItem.tsx @@ -23,6 +23,7 @@ interface NoteListItemProps { onNoteDragOver: any, onNoteDrop: any, onTitleClick: any, + onContextMenu(event: React.MouseEvent): void, } function NoteListItem(props:NoteListItemProps, ref:any) { @@ -126,7 +127,7 @@ function NoteListItem(props:NoteListItemProps, ref:any) { {renderCheckbox()} this.itemContextMenu(event)} + onContextMenu={props.onContextMenu} href="#" draggable={true} style={listItemTitleStyle}