feat: Add search next/previous methods

Signed-off-by: Elizabeth Danzberger <[email protected]>

src/components/SearchDialog.vue

@@ -116,16 +116,18 @@ export default {
 			'setSearchQuery',
 			'toggleMatchAll',
 			'showSearchDialog',
+			'searchNext',
+			'searchPrevious',
 		]),
 
 		previous() {
-			// this.previousSearch()
-			// this.scrollIntoView()
+			this.searchPrevious()
+			this.scrollIntoView()
 		},
 
 		next() {
-			// this.nextSearch()
-			// this.scrollIntoView()
+			this.searchNext()
+			this.scrollIntoView()
 		},
 
 		clearSearch() {

src/mixins/editorMixin.js

@@ -12,7 +12,7 @@ import { useSearchStore } from '../stores/search.js'
 import linkHandlerMixin from '../mixins/linkHandlerMixin.js'
 import PageInfoBar from '../components/Page/PageInfoBar.vue'
 import { editorApiReaderFileId } from '../constants.js'
-import { emit } from '@nextcloud/event-bus'
+import { subscribe } from '@nextcloud/event-bus'
 
 export default {
 	mixins: [
@@ -37,7 +37,7 @@ export default {
 			'shareTokenParam',
 			'showing',
 		]),
-		...mapState(useSearchStore, ['searchQuery']),
+		...mapState(useSearchStore, ['searchQuery', 'matchAll']),
 		...mapState(useCollectivesStore, ['currentCollectiveCanEdit']),
 		...mapState(usePagesStore, ['currentPage', 'pageFilePath']),
 
@@ -62,6 +62,18 @@ export default {
 		},
 	},
 
+	created() {
+		subscribe('collectives:next-search', () => {
+			this.editor?.searchNext()
+			this.reader?.searchNext()
+		})
+
+		subscribe('collectives:previous-search', () => {
+			this.editor?.searchPrevious()
+			this.reader?.searchPrevious()
+		})
+	},
+
 	watch: {
 		'showOutline'(value) {
 			this.editor?.setShowOutline(value)
@@ -71,6 +83,12 @@ export default {
 			this.editor?.setSearchQuery(value)
 			this.reader?.setSearchQuery(value)
 		},
+		'matchAll'(newValue, oldValue) {
+			if (newValue !== oldValue) {
+				this.editor?.setSearchQuery(this.searchQuery, newValue)
+				this.reader?.setSearchQuery(this.searchQuery, newValue)
+			}
+		},
 	},
 
 	beforeDestroy() {
@@ -112,10 +130,6 @@ export default {
 						const element = document.querySelector(`[href="${document.location.hash}"]`)
 						element?.click()
 					}
-
-					if (this.searchQuery && this.searchQuery !== '') {
-						emit('text:editor:search', { query: this.searchQuery })
-					}
 				},
 				onSearch: (results) => {
 					this.setSearchResults(results)

src/stores/search.js

@@ -4,6 +4,7 @@
  */
 
 import { defineStore } from 'pinia'
+import { emit } from '@nextcloud/event-bus'
 
 export const useSearchStore = defineStore('search', {
 	state: () => ({
@@ -26,5 +27,13 @@ export const useSearchStore = defineStore('search', {
 		setSearchResults(results) {
 			this.results = results
 		},
+		searchNext() {
+			emit('collectives:next-search')
+			this.matchAll = false
+		},
+		searchPrevious() {
+			emit('collectives:previous-search')
+			this.matchAll = false
+		},
 	},
 })