🐛 (#2345): fix missing help modal

Signed-off-by: Vinicius Reis <vinicius.reis@nextcloud.com>

3 files changed, 17 insertions, 16 deletions

diff --git a/src/components/EditorWrapper.vue b/src/components/EditorWrapper.vue
index b764e283c..d28007de3 100644
--- a/src/components/EditorWrapper.vue
+++ b/src/components/EditorWrapper.vue
@@ -83,7 +83,6 @@
 		<CollisionResolveDialog v-if="hasSyncCollission && !readOnly"
 			@resolve-use-this-version="resolveUseThisVersion"
 			@resolve-use-server-version="resolveUseServerVersion" />
-		<HelpModal v-if="displayHelp" @close="hideHelp" />
 	</div>
 </template>
 
@@ -133,7 +132,6 @@ export default {
 		CollisionResolveDialog: () => import(/* webpackChunkName: "editor" */'./CollisionResolveDialog.vue'),
 		GuestNameDialog: () => import(/* webpackChunkName: "editor-guest" */'./GuestNameDialog.vue'),
 		SessionList: () => import(/* webpackChunkName: "editor-collab" */'./SessionList.vue'),
-		HelpModal: () => import(/* webpackChunkName: "editor-collab" */'./HelpModal.vue'),
 		Lock,
 	},
 	directives: {
@@ -241,7 +239,6 @@ export default {
 			draggedOver: false,
 
 			saveStatusPolling: null,
-			displayHelp: false,
 			contentWrapper: null,
 		}
 	},
@@ -605,14 +602,6 @@ export default {
 				}
 			}
 		},
-
-		showHelp() {
-			this.displayHelp = true
-		},
-
-		hideHelp() {
-			this.displayHelp = false
-		},
 	},
 }
 </script>
diff --git a/src/components/Menu/MenuBar.vue b/src/components/Menu/MenuBar.vue
index 92e96adc5..e2b660361 100644
--- a/src/components/Menu/MenuBar.vue
+++ b/src/components/Menu/MenuBar.vue
@@ -30,10 +30,13 @@
 			'text-menubar--autohide': autohide,
 			'text-menubar--is-workspace': $isRichWorkspace
 		}">
+		<HelpModal v-if="displayHelp" @close="hideHelp" />
+
 		<div v-if="$isRichEditor" ref="menubar" class="text-menubar__entries">
 			<ActionEntry v-for="actionEntry of visibleEntries"
 				v-bind="{ actionEntry }"
-				:key="`text-action--${actionEntry.key}`" />
+				:key="`text-action--${actionEntry.key}`"
+				@call:help="showHelp" />
 		</div>
 		<div class="text-menubar__slot">
 			<slot />
@@ -43,7 +46,9 @@
 
 <script>
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
+import debounce from 'debounce'
 
+import HelpModal from '../HelpModal.vue'
 import actionsFullEntries from './entries.js'
 import ActionEntry from './ActionEntry.js'
 import { DotsHorizontal } from '../icons.js'
@@ -52,11 +57,10 @@ import {
 	useIsRichEditorMixin,
 	useIsRichWorkspaceMixin,
 } from '../EditorWrapper.provider.js'
-import debounce from 'debounce'
 
 export default {
 	name: 'MenuBar',
-	components: { ActionEntry },
+	components: { ActionEntry, HelpModal },
 	mixins: [
 		useEditorMixin,
 		useIsRichEditorMixin,
@@ -70,8 +74,9 @@ export default {
 	},
 	data() {
 		return {
-			isReady: false,
+			displayHelp: false,
 			forceRecompute: 0,
+			isReady: false,
 			isVisible: this.$editor.isFocused,
 			windowWidth: 0,
 		}
@@ -193,6 +198,13 @@ export default {
 				this.forceRecompute++
 			})
 		},
+		showHelp() {
+			this.displayHelp = true
+		},
+
+		hideHelp() {
+			this.displayHelp = false
+		},
 	},
 }
 </script>
diff --git a/src/components/Menu/entries.js b/src/components/Menu/entries.js
index efbc5efcd..40f4ccce2 100644
--- a/src/components/Menu/entries.js
+++ b/src/components/Menu/entries.js
@@ -314,7 +314,7 @@ export default [
 		key: 'formatting-help',
 		label: t('text', 'Formatting help'),
 		icon: Help,
-		click: (view) => view.$emit('show-help'),
+		click: (view) => view.$emit('call:help'),
 		priority: 17,
 	},
 ]