Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

editor: support scrolling to search result by match id

kashaf-ansari-dev6b7f30292255
diff --git a/packages/editor-mobile/src/components/editor.tsx b/packages/editor-mobile/src/components/editor.tsx
index 9f7469ca9..e25d88779 100644
--- a/packages/editor-mobile/src/components/editor.tsx
+++ b/packages/editor-mobile/src/components/editor.tsx
@@ -277,7 +277,7 @@ const Tiptap = ({
(
scrollTop?: number,
selection?: { to: number; from: number },
- searchResultIndex?: number
+ searchResultIndex?: number | string
) => {
setTick((tick) => tick + 1);
globalThis.editorControllers[tabRef.current.id]?.setTitlePlaceholder(
diff --git a/packages/editor-mobile/src/hooks/useEditorController.ts b/packages/editor-mobile/src/hooks/useEditorController.ts
index 67e864fde..9263f4b66 100644
--- a/packages/editor-mobile/src/hooks/useEditorController.ts
+++ b/packages/editor-mobile/src/hooks/useEditorController.ts
@@ -35,6 +35,7 @@ import {
import {
getRoot,
isReactNative,
+ logger,
post,
postAsyncWithTimeout,
saveTheme
@@ -101,7 +102,7 @@ export type EditorController = {
passwordInputRef: MutableRefObject<HTMLInputElement | null>;
focusPassInput: () => void;
blurPassInput: () => void;
- scrollToSearchResult: (index: number) => void;
+ scrollToSearchResult: (target: number | string) => void;
getContentDiv: () => HTMLElement | null;
};
export function useEditorController({
@@ -114,7 +115,7 @@ export function useEditorController({
update: (
scrollTop?: number,
selection?: { to: number; from: number },
- searchResultIndex?: number
+ searchResultIndex?: number | string
) => void;
getTableOfContents: () => any[];
scrollTo: (top: number) => void;
@@ -477,18 +478,22 @@ export function useEditorController({
});
};
- const scrollToSearchResult = useCallback((index: number) => {
- const marks = document.getElementsByTagName("nn-search-result");
- if (marks.length > index) {
- const mark = marks[index];
- if (mark) {
- mark.scrollIntoView({
- behavior: "instant",
- block: "start"
- });
- }
- }
- }, []);
+ const scrollToSearchResult = useCallback(
+ (target: number | string) => {
+ getContentDiv()?.classList.add("searching");
+ const mark =
+ typeof target === "string"
+ ? document.getElementById(target) ||
+ document.querySelector(`nn-search-result#${target}`)
+ : document.getElementsByTagName("nn-search-result")[target];
+
+ mark?.scrollIntoView({
+ behavior: "instant",
+ block: "start"
+ });
+ },
+ [getContentDiv]
+ );
return {
getTableOfContents: getTableOfContents,
diff --git a/packages/editor-mobile/src/utils/commands.ts b/packages/editor-mobile/src/utils/commands.ts
index c30cf4626..87074b760 100644
--- a/packages/editor-mobile/src/utils/commands.ts
+++ b/packages/editor-mobile/src/utils/commands.ts
@@ -197,7 +197,7 @@ globalThis.commands = {
scrollIntoViewById: (id: string, tabId: string) => {
return editorControllers[tabId]?.scrollIntoView(id) || [];
},
- scrollToSearchResult: (index: number, tabId: string) => {
+ scrollToSearchResult: (index: number | string, tabId: string) => {
editorControllers[tabId]?.getContentDiv()?.classList.add("searching");
editorControllers[tabId]?.scrollToSearchResult(index);
}