Merge pull request #5439 from nextcloud/fix/handle-is-embedded

nextcloud · Mar 7, 2024 · 885810e · 885810e
2 parents b5e9ce2 + a4a572f
commit 885810e
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 4 deletions.
diff --git a/src/EditorFactory.js b/src/EditorFactory.js
@@ -49,12 +49,13 @@ const loadSyntaxHighlight = async (language) => {
 	}
 }
 
-const createEditor = ({ language, onCreate, onUpdate = () => {}, extensions, enableRichEditing, session, relativePath }) => {
+const createEditor = ({ language, onCreate, onUpdate = () => {}, extensions, enableRichEditing, session, relativePath, isEmbedded = false }) => {
 	let defaultExtensions
 	if (enableRichEditing) {
 		defaultExtensions = [
 			RichText.configure({
 				relativePath,
+				isEmbedded,
 				component: this,
 				extensions: [
 					Mention.configure({

diff --git a/src/components/Editor.vue b/src/components/Editor.vue
@@ -181,6 +181,7 @@ export default {
 
 		return val
 	},
+	inject: ['isEmbedded'],
 	props: {
 		richWorkspace: {
 			type: Boolean,
@@ -542,6 +543,7 @@ export default {
 								}),
 							],
 							enableRichEditing: this.isRichEditor,
+							isEmbedded: this.isEmbedded,
 						})
 						this.hasEditor = true
 						if (!documentState && documentSource) {

diff --git a/src/components/Link/LinkBubbleView.vue b/src/components/Link/LinkBubbleView.vue
@@ -73,6 +73,7 @@
 			ref="referencelist"
 			:text="sanitizedHref"
 			:limit="1"
+			:interactive="false"
 			:display-fallback="true"
 			class="link-view-bubble__reference-list"
 			@loaded="onReferenceListLoaded" />

diff --git a/src/components/ViewerComponent.vue b/src/components/ViewerComponent.vue
@@ -24,7 +24,7 @@
 	<Editor v-if="!useSourceView"
 		:file-id="fileid"
 		:relative-path="filename"
-		:active="active"
+		:active="active || isEmbedded"
 		:autofocus="autofocus"
 		:share-token="shareToken"
 		:mime="mime"
@@ -54,6 +54,11 @@ export default {
 		PlainTextReader,
 		Editor: getEditorInstance,
 	},
+	provide() {
+		return {
+			isEmbedded: this.isEmbedded,
+		}
+	},
 	props: {
 		filename: {
 			type: String,
@@ -91,6 +96,10 @@ export default {
 			type: String,
 			default: undefined,
 		},
+		isEmbedded: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	data() {
 		return {

diff --git a/src/extensions/RichText.js b/src/extensions/RichText.js
@@ -73,6 +73,7 @@ export default Extension.create({
 			extensions: [],
 			component: null,
 			relativePath: null,
+			isEmbedded: false,
 		}
 	},
 
@@ -102,7 +103,9 @@ export default Extension.create({
 			TaskList,
 			TaskItem,
 			Callouts,
-			Preview,
+			Preview.configure({
+				isEmbedded: this.options.isEmbedded,
+			}),
 			Underline,
 			Image,
 			ImageInline,

diff --git a/src/nodes/Preview.js b/src/nodes/Preview.js
@@ -38,6 +38,7 @@ export default Node.create({
 
 	addOptions() {
 		return {
+			isEmbedded: false,
 			relativePath: null,
 		}
 	},

diff --git a/src/nodes/Preview.vue b/src/nodes/Preview.vue
@@ -29,7 +29,8 @@
 			:value.sync="value"
 			@update:value="convertToParagraph" />
 		<NcReferenceList :text="node.attrs.href"
-			:limit="1" />
+			:limit="1"
+			:interactive="!extension.options.isEmbedded" />
 	</NodeViewWrapper>
 </template>