Merge pull request #1516 from nextcloud/backport/1419/stable21

[stable21] Fix clicking links with color annotations
nextcloud · Mar 11, 2021 · 524ebe8 · 524ebe8
2 parents 8024d79 + 1d7f5ca
commit 524ebe8
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 13 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/files.js b/js/files.js
diff --git a/js/files.js.map b/js/files.js.map
diff --git a/js/public.js b/js/public.js
diff --git a/js/public.js.map b/js/public.js.map
diff --git a/js/text.js b/js/text.js
diff --git a/js/text.js.map b/js/text.js.map
diff --git a/js/viewer.js b/js/viewer.js
diff --git a/js/viewer.js.map b/js/viewer.js.map
diff --git a/src/marks/index.js b/src/marks/index.js
@@ -117,9 +117,11 @@ class Link extends TipTapLink {
 						const { schema } = view.state
 						const attrs = getMarkAttrs(view.state, schema.marks.link)
 
-						if (attrs.href && event.target instanceof HTMLAnchorElement) {
+						const isLink = event.target instanceof HTMLAnchorElement || event.target.parentElement instanceof HTMLAnchorElement
+						if (attrs.href && isLink) {
+							const linkElement = event.target.parentElement instanceof HTMLAnchorElement ? event.target.parentElement : event.target
 							event.stopPropagation()
-							const htmlHref = event.target.href
+							const htmlHref = linkElement.href
 							if (event.button === 0 && !event.ctrlKey && htmlHref.startsWith(window.location.origin)) {
 								const query = OC.parseQueryString(htmlHref)
 								const fragment = OC.parseQueryString(htmlHref.split('#').pop())