Merge pull request #3886 from nextcloud/backport/3873/stable26

[stable26] Use the href of links for link previews, not `node.textContent`
nextcloud · Mar 8, 2023 · 98326b1 · 98326b1
2 parents f143baf + 8a4975b
commit 98326b1
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 24 deletions.
diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/text-editors.js b/js/text-editors.js
diff --git a/js/text-editors.js.map b/js/text-editors.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/src/nodes/ParagraphView.vue b/src/nodes/ParagraphView.vue
@@ -47,7 +47,7 @@ export default {
 	data() {
 		return {
 			text: null,
-			isLoggedIn: getCurrentUser()
+			isLoggedIn: getCurrentUser(),
 		}
 	},
 	watch: {
@@ -63,20 +63,51 @@ export default {
 	},
 	beforeCreate() {
 		this.debouncedUpdateText = debounce((newNode) => {
-			this.text = this.getTextReference(this.node?.textContent)
+			this.text = this.getTextReference(this.node)
 		}, 500)
 	},
 	created() {
-		this.text = this.getTextReference(this.node?.textContent)
+		this.text = this.getTextReference(this.node)
 	},
 	beforeUnmount() {
 		this.debouncedUpdateText?.cancel()
 	},
 	methods: {
-		getTextReference(text) {
+		getTextReference(node) {
+			if (!node?.childCount) {
+				return null
+			}
+
+			// Only regard paragraphs with exactly one text node (ignoring whitespace-only nodes)
+			let textNode
+			for (let i = 0; i < node.childCount; i++) {
+				const childNode = node.child(i)
+
+				// Disregard paragraphs with non-text nodes
+				if (childNode.type.name !== 'text') {
+					return null
+				}
+
+				// Ignore children with empty text
+				if (!childNode.textContent.trim()) {
+					continue
+				}
+
+				// Disregard paragraphs with more than one text nodes
+				if (textNode) {
+					return null
+				}
+
+				textNode = childNode
+			}
+
+			// Check if the text node is a link
+			const linkMark = textNode?.marks.find((m) => m.type.name === 'link')
+			const href = linkMark?.attrs?.href
+
 			const PATTERN = /(^)(https?:\/\/)((?:[-A-Z0-9+_]+\.)+[-A-Z]+(?:\/[-A-Z0-9+&@#%?=~_|!:,.;()]*)*)($)/ig
-			if ((new RegExp(PATTERN)).test(text.trim())) {
-				return text.trim()
+			if ((new RegExp(PATTERN)).test(href)) {
+				return href
 			}
 
 			return null