Merge pull request #5521 from nextcloud/fix/link_bubble_hash_to_same_…

…page fix(LinkBubble): Treat links to hashes in same page directly
nextcloud · Apr 4, 2024 · 7915402 · 7915402
2 parents 2d2dfee + c89a0aa
commit 7915402
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/src/helpers/links.js b/src/helpers/links.js
@@ -68,7 +68,13 @@ const parseHref = function(dom) {
 	return ref
 }
 
+const isLinkToSelfWithHash = function(href) {
+	const locationNoHash = window.location.origin + window.location.pathname + window.location.search
+	return href?.startsWith('#') || href?.startsWith(locationNoHash + '#')
+}
+
 export {
 	domHref,
 	parseHref,
+	isLinkToSelfWithHash,
 }
diff --git a/src/nodes/Preview.js b/src/nodes/Preview.js
@@ -21,7 +21,7 @@
  */
 
 import { Node, isNodeActive, getNodeType } from '@tiptap/core'
-import { domHref, parseHref } from './../helpers/links.js'
+import { domHref, parseHref, isLinkToSelfWithHash } from './../helpers/links.js'
 import { VueNodeViewRenderer } from '@tiptap/vue-2'
 
 import Preview from './Preview.vue'
@@ -149,7 +149,7 @@ function previewPossible({ selection }) {
 		return false
 	}
 	const href = extractHref($from.parent.firstChild)
-	if (!href || href.startsWith('#')) {
+	if (!href || isLinkToSelfWithHash(href)) {
 		return false
 	}
 	return true

diff --git a/src/plugins/linkHelpers.js b/src/plugins/linkHelpers.js
@@ -20,6 +20,8 @@
  *
  */
 
+import { isLinkToSelfWithHash } from '../helpers/links.js'
+
 /**
  * Get the link mark applied at the current selection or next to it.
  *
@@ -78,7 +80,7 @@ function linkMark(node) {
 		return undefined
 	}
 	// Don't open link bubble for anchor links
-	if (linkMark.attrs.href.startsWith('#')) {
+	if (isLinkToSelfWithHash(linkMark.attrs.href)) {
 		return undefined
 	} else {
 		return linkMark

diff --git a/src/plugins/links.js b/src/plugins/links.js
@@ -23,6 +23,7 @@
 import { Plugin, PluginKey } from '@tiptap/pm/state'
 import LinkBubblePluginView from './LinkBubblePluginView.js'
 import { activeLinkFromSelection } from './linkHelpers.js'
+import { isLinkToSelfWithHash } from '../helpers/links.js'
 
 // Commands
 
@@ -167,7 +168,7 @@ export function linkClicking() {
 					const linkEl = event.target.closest('a')
 					if (event.button === 0 && linkEl) {
 						event.preventDefault()
-						if (linkEl.attributes.href?.value?.startsWith('#')) {
+						if (isLinkToSelfWithHash(linkEl.attributes.href?.value)) {
 							// Open anchor links directly
 							location.href = linkEl.attributes.href.value
 						} else if (event.ctrlKey || event.metaKey) {