fix(Link): Don't open link bubble for anchor links, jump to anchor di…

…rectly Signed-off-by: Jonas <jonas@freesources.org>
nextcloud · Jan 25, 2024 · e64c629 · e64c629
1 parent dd36dbe
commit e64c629
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 18 deletions.
diff --git a/src/extensions/LinkBubblePluginView.js b/src/extensions/LinkBubblePluginView.js
@@ -145,25 +145,24 @@ class LinkBubblePluginView {
 		const nodeStart = resolved.pos - resolved.textOffset
 		const linkNode = this.linkNodeFromSelection(view)
 
-		const isLink = !!linkNode?.marks.some(m => m.type.name === 'link')
 		const hasBubbleFocus = this.#component.element.contains(document.activeElement)
 		const hasEditorFocus = view.hasFocus() || hasBubbleFocus
-		const shouldShow = isLink && hasEditorFocus
+
+		const shouldShow = !!linkNode && hasEditorFocus
 
 		this.updateTooltip(view, shouldShow, linkNode, nodeStart)
 	}
 
 	updateFromClick(view, clickedLinkPos) {
 		const nodeStart = clickedLinkPos.pos - clickedLinkPos.textOffset
-		const linkNode = clickedLinkPos.parent.maybeChild(clickedLinkPos.index())
-
-		const shouldShow = linkNode?.marks.some(m => m.type.name === 'link')
+		const clickedNode = clickedLinkPos.parent.maybeChild(clickedLinkPos.index())
+		const shouldShow = this.isLinkNode(clickedNode)
 
 		this.#hadUpdateFromClick = true
 		setTimeout(() => {
 			this.#hadUpdateFromClick = false
 		}, 200)
-		this.updateTooltip(this.editor.view, shouldShow, linkNode, nodeStart)
+		this.updateTooltip(this.editor.view, shouldShow, clickedNode, nodeStart)
 	}
 
 	updateTooltip = (view, shouldShow, linkNode, nodeStart) => {
@@ -229,12 +228,21 @@ class LinkBubblePluginView {
 			return
 		}
 
-		if (!node?.isText || !node.marks.some(m => m.type.name === 'link')) {
-			// Selected node is not a text node with link mark
-			return
+		return this.isLinkNode(node) ? node : null
+	}
+
+	isLinkNode(node) {
+		const linkMark = node?.marks.find(m => m.type.name === 'link')
+		if (!linkMark) {
+			return false
+		}
+
+		// Don't open link bubble for anchor links
+		if (linkMark.attrs.href.startsWith('#')) {
+			return false
 		}
 
-		return node
+		return true
 	}
 
 }

diff --git a/src/marks/Link.js b/src/marks/Link.js
@@ -107,16 +107,17 @@ const Link = TipTapLink.extend({
 								this.storage.nopaste = false
 							}
 						},
-						// Prevent open link on left click (required for read-only mode)
+						// Prevent open link (except anchor links) on left click (required for read-only mode)
 						// Open link in new tab on Ctrl/Cmd + left click
 						click: (view, event) => {
-							if (event.target.closest('a')) {
-								if (event.button === 0) {
-									event.preventDefault()
-									if (event.ctrlKey || event.metaKey) {
-										const linkElement = event.target.closest('a')
-										window.open(linkElement.href, '_blank')
-									}
+							const linkEl = event.target.closest('a')
+							if (event.button === 0 && linkEl) {
+								event.preventDefault()
+								if (linkEl.attributes.href?.value?.startsWith('#')) {
+									// Open anchor links directly
+									location.href = linkEl.attributes.href.value
+								} else if (event.ctrlKey || event.metaKey) {
+									window.open(linkEl.href, '_blank')
 								}
 							}
 						},