fix: Preserve anchors in links that rendered as widget

Signed-off-by: Kostiantyn Miakshyn <[email protected]> Signed-off-by: Jonas <[email protected]>
nextcloud · Nov 5, 2024 · 8745754 · 8745754
1 parent 9729f64
commit 8745754
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/lib/Reference/SearchablePageReferenceProvider.php b/lib/Reference/SearchablePageReferenceProvider.php
@@ -205,6 +205,9 @@ private function resolve(string $referenceText, bool $public = false, string $sh
 
 		$collectivesLink = $this->urlGenerator->linkToRouteAbsolute('collectives.start.index') . ($public ? 'p/' . $sharingToken . '/' : '');
 		$link = $collectivesLink . $this->pageService->getPageLink($collective->getName(), $page);
+		if (str_contains($referenceText, '#')) {
+			$link .= '#' . explode('#', $referenceText)[1];
+		}
 		$reference = new Reference($link);
 		$pageEmoji = $page->getEmoji();
 		$refTitle = $pageEmoji ? $pageEmoji . ' ' . $page->getTitle() : $page->getTitle();

diff --git a/src/components/Collective.vue b/src/components/Collective.vue
@@ -94,7 +94,7 @@ export default {
 		},
 		'notFound'(current) {
 			if (current && this.currentFileIdPage) {
-				this.$router.replace(this.pagePath(this.currentFileIdPage))
+				this.$router.replace(this.pagePath(this.currentFileIdPage) + document.location.hash)
 			}
 		},
 	},

diff --git a/src/components/Page/TextEditor.vue b/src/components/Page/TextEditor.vue
@@ -149,6 +149,12 @@ export default {
 				this.setTextEdit()
 				this.done('newPageContent')
 			}
+
+			if (document.location.hash) {
+				// scroll to the corresponding header if the page was loaded with a hash
+				const element = document.querySelector(`[href="${document.location.hash}"]`)
+				element?.click()
+			}
 		},
 
 		async stopEdit() {

diff --git a/src/mixins/editorMixin.js b/src/mixins/editorMixin.js
@@ -128,11 +128,6 @@ export default {
 				onLoaded: () => {
 					// TODO: remove check once we only support Nextcloud 30+
 					this.reader.setSearchQuery && this.reader.setSearchQuery(this.searchQuery, this.matchAll)
-					if (document.location.hash) {
-						// scroll to the corresponding header if the page was loaded with a hash
-						const element = document.querySelector(`[href="${document.location.hash}"]`)
-						element?.click()
-					}
 				},
 				onSearch: (results) => {
 					this.setSearchResults(results)