refactor: extract logic into computedbackport/2226/stable23

Also rename `initialLoading` in `EditorWrapper` to `contentLoaded`.
This flag is set during the `initialLoading` state change.
It does indicates that the loading happened
Use the past tense to indicate that.

The editor wrapper is now loading in different steps.
The menus will load after the content.
So `content` seems more fitting then `initial`.

Signed-off-by: Max <max@nextcloud.com>

1 files changed, 15 insertions, 9 deletions

diff --git a/src/components/EditorWrapper.vue b/src/components/EditorWrapper.vue
index 314b1d534..61ceb0769 100644
--- a/src/components/EditorWrapper.vue
+++ b/src/components/EditorWrapper.vue
@@ -33,9 +33,9 @@
 				{{ t('text', 'File could not be loaded. Please check your internet connection.') }} <a class="button primary" @click="reconnect">{{ t('text', 'Reconnect') }}</a>
 			</p>
 		</div>
-		<div v-if="displayed" id="editor-wrapper" :class="{'has-conflicts': hasSyncCollission, 'icon-loading': !initialLoading && !hasConnectionIssue, 'richEditor': isRichEditor, 'show-color-annotations': showAuthorAnnotations}">
+		<div v-if="displayed" id="editor-wrapper" :class="{'has-conflicts': hasSyncCollission, 'icon-loading': !contentLoaded && !hasConnectionIssue, 'richEditor': isRichEditor, 'show-color-annotations': showAuthorAnnotations}">
 			<div v-if="tiptap" id="editor">
-				<MenuBar v-if="initialLoading && !syncError && !readOnly"
+				<MenuBar v-if="renderMenus"
 					ref="menubar"
 					:editor="tiptap"
 					:file-path="relativePath"
@@ -55,11 +55,11 @@
 				</MenuBar>
 				<div v-if="!menubarLoaded" class="menubar placeholder" />
 				<div ref="contentWrapper" class="content-wrapper">
-					<MenuBubble v-if="initialLoading && !readOnly && isRichEditor"
+					<MenuBubble v-if="renderMenus"
 						:editor="tiptap"
 						:content-wrapper="contentWrapper"
 						:file-path="relativePath" />
-					<EditorContent v-show="initialLoading"
+					<EditorContent v-show="contentLoaded"
 						class="editor__content"
 						:editor="tiptap" />
 				</div>
@@ -166,7 +166,7 @@ export default {
 
 			idle: false,
 			dirty: false,
-			initialLoading: false,
+			contentLoaded: false,
 			lastSavedString: '',
 			syncError: null,
 			hasConnectionIssue: false,
@@ -235,6 +235,12 @@ export default {
 		displayed() {
 			return this.currentSession && this.active
 		},
+		renderMenus() {
+			return this.contentLoaded
+				&& this.isRichEditor
+				&& !this.syncError
+				&& !this.readOnly
+		},
 	},
 	watch: {
 		lastSavedStatus() {
@@ -407,7 +413,7 @@ export default {
 				.on('error', (error, data) => {
 					this.tiptap.setOptions({ editable: false })
 					if (error === ERROR_TYPE.SAVE_COLLISSION && (!this.syncError || this.syncError.type !== ERROR_TYPE.SAVE_COLLISSION)) {
-						this.initialLoading = true
+						this.contentLoaded = true
 						this.syncError = {
 							type: error,
 							data,
@@ -427,8 +433,8 @@ export default {
 					this.$emit('ready')
 				})
 				.on('stateChange', (state) => {
-					if (state.initialLoading && !this.initialLoading) {
-						this.initialLoading = true
+					if (state.initialLoading && !this.contentLoaded) {
+						this.contentLoaded = true
 						if (this.autofocus) {
 							this.tiptap.focus(1, 1)
 						}
@@ -473,7 +479,7 @@ export default {
 		},
 
 		reconnect() {
-			this.initialLoading = false
+			this.contentLoaded = false
 			this.hasConnectionIssue = false
 			if (this.syncService) {
 				this.syncService.close().then(() => {