3 files changed, 33 insertions, 30 deletions
diff --git a/src/client/views/nodes/formattedText/FormattedTextBox.tsx b/src/client/views/nodes/formattedText/FormattedTextBox.tsx
index 7b24125e7..b84575389 100644
--- a/src/client/views/nodes/formattedText/FormattedTextBox.tsx
+++ b/src/client/views/nodes/formattedText/FormattedTextBox.tsx
@@ -1458,6 +1458,29 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<FormattedTextB
     }
     _didScroll = false;
     _scrollStopper: undefined | (() => void);
+    scrollToSelection = () => {
+        if (this.EditorView && this._ref.current) {
+            const editorView = this.EditorView;
+            const docPos = editorView.coordsAtPos(editorView.state.selection.to);
+            const viewRect = this._ref.current.getBoundingClientRect();
+            const scrollRef = this._scrollRef;
+            const topOff = docPos.top < viewRect.top ? docPos.top - viewRect.top : undefined;
+            const botOff = docPos.bottom > viewRect.bottom ? docPos.bottom - viewRect.bottom : undefined;
+            if (((topOff && Math.abs(Math.trunc(topOff)) > 0) || (botOff && Math.abs(Math.trunc(botOff)) > 0)) && scrollRef) {
+                const shift = Math.min(topOff ?? Number.MAX_VALUE, botOff ?? Number.MAX_VALUE);
+                const scrollPos = scrollRef.scrollTop + shift * this.ScreenToLocalBoxXf().Scale;
+                if (this._focusSpeed !== undefined) {
+                    setTimeout(() => {
+                        scrollPos && (this._scrollStopper = smoothScroll(this._focusSpeed || 0, scrollRef, scrollPos, 'ease', this._scrollStopper));
+                    });
+                } else {
+                    scrollRef.scrollTo({ top: scrollPos });
+                }
+                this._didScroll = true;
+            }
+        }
+        return true;
+    };
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     setupEditor(config: any, fieldKey: string) {
         const curText = Cast(this.dataDoc[this.fieldKey], RichTextField, null) || StrCast(this.dataDoc[this.fieldKey]);
@@ -1466,31 +1489,15 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<FormattedTextB
             this.EditorView?.destroy();
             this._editorView = new EditorView(this.ProseRef, {
                 state: rtfField?.Data ? EditorState.fromJSON(config, JSON.parse(rtfField.Data)) : EditorState.create(config),
-                handleScrollToSelection: editorView => {
-                    const docPos = editorView.coordsAtPos(editorView.state.selection.to);
-                    const viewRect = this._ref.current!.getBoundingClientRect();
-                    const scrollRef = this._scrollRef;
-                    const topOff = docPos.top < viewRect.top ? docPos.top - viewRect.top : undefined;
-                    const botOff = docPos.bottom > viewRect.bottom ? docPos.bottom - viewRect.bottom : undefined;
-                    if (((topOff && Math.abs(Math.trunc(topOff)) > 0) || (botOff && Math.abs(Math.trunc(botOff)) > 0)) && scrollRef) {
-                        const shift = Math.min(topOff ?? Number.MAX_VALUE, botOff ?? Number.MAX_VALUE);
-                        const scrollPos = scrollRef.scrollTop + shift * this.ScreenToLocalBoxXf().Scale;
-                        if (this._focusSpeed !== undefined) {
-                            setTimeout(() => {
-                                scrollPos && (this._scrollStopper = smoothScroll(this._focusSpeed || 0, scrollRef, scrollPos, 'ease', this._scrollStopper));
-                            });
-                        } else {
-                            scrollRef.scrollTo({ top: scrollPos });
-                        }
-                        this._didScroll = true;
-                    }
-                    return true;
-                },
+                handleScrollToSelection: this.scrollToSelection,
                 dispatchTransaction: this.dispatchTransaction,
                 nodeViews: FormattedTextBox._nodeViews(this),
                 clipboardTextSerializer: this.clipboardTextSerializer,
                 handlePaste: this.handlePaste,
             });
+            // bcz: major hack!   a patch to prosemirror broke scrolling to selection when the selection is not a dom selection
+            //   this replaces prosemirror's scrollToSelection function with Dash's
+            (this.EditorView as unknown as { scrollToSelection: unknown }).scrollToSelection = this.scrollToSelection;
             const { state } = this._editorView;
             if (!rtfField) {
                 const dataDoc = Doc.IsDelegateField(DocCast(this.layoutDoc.proto), this.fieldKey) ? DocCast(this.layoutDoc.proto) : this.dataDoc;
diff --git a/src/client/views/nodes/formattedText/marks_rts.ts b/src/client/views/nodes/formattedText/marks_rts.ts
index ba8e4faed..dc1e4772e 100644
--- a/src/client/views/nodes/formattedText/marks_rts.ts
+++ b/src/client/views/nodes/formattedText/marks_rts.ts
@@ -316,9 +316,9 @@ export const marks: { [index: string]: MarkSpec } = {
         attrs: {
             selected: { default: false },
         },
-        parseDOM: [{ style: 'background: yellow' }],
+        parseDOM: [{ style: 'background: lightGray' }],
         toDOM: node => {
-            return ['span', { style: `background: ${node.attrs.selected ? 'orange' : 'yellow'}` }];
+            return ['span', { style: `background: ${node.attrs.selected ? 'orange' : 'lightGray'}` }];
         },
     },
 
diff --git a/src/client/views/search/SearchBox.tsx b/src/client/views/search/SearchBox.tsx
index ae0838dd5..af98355d1 100644
--- a/src/client/views/search/SearchBox.tsx
+++ b/src/client/views/search/SearchBox.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable jsx-a11y/no-static-element-interactions */
-/* eslint-disable jsx-a11y/click-events-have-key-events */
 import { Tooltip } from '@mui/material';
 import { action, computed, makeObservable, observable } from 'mobx';
 import { observer } from 'mobx-react';
@@ -52,9 +50,7 @@ export class SearchBoxItem extends ObservableReactComponent<SearchBoxItemProps>
      * This method selects a doc by either jumping to it (centering/zooming in on it)
      * or opening it in a new tab.
      */
-    selectElement = async (doc: Doc, finishFunc: () => void) => {
-        await DocumentView.showDocument(doc, { willZoomCentered: true }, finishFunc);
-    };
+    selectElement = (doc: Doc, finishFunc: () => void) => DocumentView.showDocument(doc, { willPan: true }, finishFunc);
 
     /**
      * @param {Doc} doc - doc of the search result that has been clicked on
@@ -183,7 +179,7 @@ export class SearchBox extends ViewBoxBaseComponent<SearchBoxProps>() {
      * (Note: There is no longer a need to press enter to submit a search. Any update to the input
      * causes a search to be submitted automatically.)
      */
-    _timeout: any = undefined;
+    _timeout: NodeJS.Timeout | undefined = undefined;
     onInputChange = action((e: React.ChangeEvent<HTMLInputElement>) => {
         this._searchString = e.target.value;
         this._timeout && clearTimeout(this._timeout);
@@ -242,7 +238,7 @@ export class SearchBox extends ViewBoxBaseComponent<SearchBoxProps>() {
      * which the first letter is capitalized. This is used when displaying the type on the
      * right side of each search result.
      */
-    static formatType(type: string, colType: string): String {
+    static formatType(type: string, colType: string): string {
         switch (type) {
             case DocumentType.PDF : return 'PDF';
             case DocumentType.IMG : return 'Img';
@@ -437,7 +433,7 @@ export class SearchBox extends ViewBoxBaseComponent<SearchBoxProps>() {
     render() {
         const isLinkSearch: boolean = this._props.linkSearch;
         const sortedResults = Array.from(this._results.entries()).sort((a, b) => (this._pageRanks.get(b[0]) ?? 0) - (this._pageRanks.get(a[0]) ?? 0)); // sorted by page rank
-        const resultsJSX = [] as any[];
+        const resultsJSX = [] as JSX.Element[];
         const linkFrom = this._props.linkFrom?.();
 
         let validResults = 0;