Merge pull request #8465 from nextcloud-libraries/backport/8449/stable8

Author: Antreesy

package-lock.json

@@ -133,7 +133,7 @@
     "tributejs": "^5.1.3",
     "unified": "^11.0.1",
     "unist-builder": "^4.0.0",
-    "unist-util-visit": "^5.1.0",
+    "unist-util-visit-parents": "^6.0.2",
     "vue": "^2.7.16",
     "vue-color": "^2.8.1",
     "vue-frag": "^1.4.3",

package.json

@@ -5,7 +5,7 @@
 
 import { getBaseUrl, getRootUrl } from '@nextcloud/router'
 import { u } from 'unist-builder'
-import { SKIP, visit } from 'unist-util-visit'
+import { SKIP, visitParents } from 'unist-util-visit-parents'
 import { logger } from '../../utils/logger.ts'
 import { URL_PATTERN_AUTOLINK } from './helpers.js'
 
@@ -45,7 +45,15 @@ export function remarkAutolink({ autolink, useMarkdown, useExtendedMarkdown }) {
 			return
 		}
 
-		visit(tree, (node) => node.type === 'text', (node, index, parent) => {
+		visitParents(tree, (node) => node.type === 'text', (node, ancestors) => {
+			// Do not autolink text already inside a link node
+			if (ancestors.some((ancestor) => ancestor.type === 'link' || ancestor.type === 'linkReference')) {
+				return
+			}
+
+			const parent = ancestors.at(-1)
+			const index = parent.children.indexOf(node) ?? 0
+
 			let parsed = parseUrl(node.value)
 			parsed = parsed.map((n) => {
 				if (typeof n === 'string') {

src/components/NcRichText/autolink.js

@@ -4,23 +4,25 @@
  */
 
 import { u } from 'unist-builder'
-import { visit } from 'unist-util-visit'
+import { visitParents } from 'unist-util-visit-parents'
 import { parseUrl } from './autolink.js'
 
 /**
  * Remark plugin for handling placeholders
  */
 export function remarkPlaceholder() {
 	return function(ast) {
-		visit(ast, (node) => node.type === 'text', visitor)
+		visitParents(ast, (node) => node.type === 'text', visitor)
 
 		/**
 		 *
 		 * @param {object} node The node
-		 * @param {number} index The index of the node
-		 * @param {object} parent The parent node
+		 * @param {array} ancestors The parent nodes
 		 */
-		function visitor(node, index, parent) {
+		function visitor(node, ancestors) {
+			const parent = ancestors.at(-1)
+			const index = parent.children.indexOf(node)
+
 			const placeholders = node.value.split(/(\{[a-z\-_.0-9]+\})/ig)
 				.map((entry) => {
 					const matches = entry.match(/^\{([a-z\-_.0-9]+)\}$/i)

src/components/NcRichText/placeholder.js

@@ -7,7 +7,7 @@ import type { Plugin } from 'unified'
 import type { Node, Parent } from 'unist'
 import type { TextNode } from './helpers.ts'
 
-import { SKIP, visit } from 'unist-util-visit'
+import { SKIP, visitParents } from 'unist-util-visit-parents'
 
 /**
  * Check if the given node is a literal and specifically a fenced node (inline code or code block)
@@ -20,7 +20,10 @@ function isCodeNode(node: Node): node is TextNode {
 
 export const remarkStripCode: Plugin = function() {
 	return function(tree: Node) {
-		visit(tree, isCodeNode, (node: TextNode, index?: number, parent?: Parent) => {
+		visitParents(tree, isCodeNode, (node: TextNode, ancestors: Parent[]) => {
+			const parent = ancestors.at(-1)
+			const index = parent!.children.indexOf(node)
+
 			parent!.children.splice(index!, 1, {
 				...node,
 				value: '',

src/components/NcRichText/remarkStripCode.ts

@@ -3,14 +3,17 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { SKIP, visit } from 'unist-util-visit'
+import { SKIP, visitParents } from 'unist-util-visit-parents'
 
 /**
  *
  */
 export function remarkUnescape() {
 	return function(tree) {
-		visit(tree, (node) => ['text', 'code', 'inlineCode'].includes(node.type), (node, index, parent) => {
+		visitParents(tree, (node) => ['text', 'code', 'inlineCode'].includes(node.type), (node, ancestors) => {
+			const parent = ancestors.at(-1)
+			const index = parent.children.indexOf(node)
+
 			parent.children.splice(index, 1, {
 				...node,
 				value: node.value.replace(/&lt;/gmi, '<').replace(/&gt;/gmi, '>'),

src/components/NcRichText/remarkUnescape.js

@@ -193,6 +193,37 @@ describe('NcRichText', () => {
 		expect(wrapper.find('em').text()).toEqual('to')
 	})
 
+	it('does not autolink markdown link text that is already inside a link', async () => {
+		const wrapper = mount(NcRichText, {
+			propsData: {
+				text: '[https://example-nested.org](https://example.com)',
+				autolink: true,
+				useMarkdown: true,
+			},
+		})
+
+		const links = wrapper.findAll('a')
+		expect(links).toHaveLength(1)
+		expect(links.at(0).attributes('href')).toEqual('https://example.com')
+		expect(links.at(0).text()).toEqual('https://example-nested.org')
+	})
+
+	it('does not autolink deeply nested markdown link text that is already inside a link', async () => {
+		const wrapper = mount(NcRichText, {
+			propsData: {
+				text: '[**https://example-nested.org**](https://example.com)',
+				autolink: true,
+				useMarkdown: true,
+			},
+		})
+
+		const links = wrapper.findAll('a')
+		expect(links).toHaveLength(1)
+		expect(links.at(0).attributes('href')).toEqual('https://example.com')
+		expect(links.at(0).text()).toEqual('https://example-nested.org')
+		expect(wrapper.find('strong').text()).toEqual('https://example-nested.org')
+	})
+
 	it('formats markdown is disabled', async () => {
 		const wrapper = mount(NcRichText, {
 			propsData: {