made pdf buttons maintain scren size.

6 files changed, 49 insertions, 37 deletions

diff --git a/src/client/util/SearchUtil.ts b/src/client/util/SearchUtil.ts
index fc3bb99ab..17c4af9d1 100644
--- a/src/client/util/SearchUtil.ts
+++ b/src/client/util/SearchUtil.ts
@@ -8,6 +8,13 @@ import { DocOptions, FInfo } from '../documents/Documents';
 export namespace SearchUtil {
     export type HighlightingResult = { [id: string]: { [key: string]: string[] } };
 
+    /**
+     * Recursively search all Docs within the collection for the query string.
+     * @param {Doc} collectionDoc - The collection document to search within.
+     * @param {string} queryIn - The query string to search for.
+     * @param {boolean} matchKeyNames - Whether to match metadata field names in addition to field values
+     * @param {string[]} onlyKeys - Optional: restrict search to only look in the specified array of field names.
+     */
     export function SearchCollection(collectionDoc: Opt<Doc>, queryIn: string, matchKeyNames: boolean, onlyKeys?: string[]) {
         const blockedTypes = [DocumentType.PRESSLIDE, DocumentType.CONFIG, DocumentType.KVP, DocumentType.FONTICON, DocumentType.BUTTON, DocumentType.SCRIPTING];
         const blockedKeys = matchKeyNames
@@ -27,11 +34,13 @@ export namespace SearchUtil {
                 const dtype = StrCast(doc.type) as DocumentType;
                 if (dtype && !blockedTypes.includes(dtype) && !docIDs.includes(doc[Id]) && depth >= 0) {
                     const hlights = new Set<string>();
-                    (onlyKeys ?? SearchUtil.documentKeys(doc)).forEach(
-                        key =>
-                            (val => (exact ? val === query.toLowerCase() : val.includes(query.toLowerCase())))(
-                            matchKeyNames ? key : Field.toString(doc[key] as FieldType)) 
-                        && hlights.add(key)
+                    const fieldsToSearch = onlyKeys ?? SearchUtil.documentKeys(doc);
+                    fieldsToSearch.forEach(
+                        key => {
+                            const val = (matchKeyNames ? key : Field.toString(doc[key] as FieldType)).toLowerCase();
+                            const accept = (exact ? val === query.toLowerCase() : val.includes(query.toLowerCase()));
+                            accept && hlights.add(key);
+                        }
                     ); // prettier-ignore
                     blockedKeys.forEach(key => hlights.delete(key));
 
@@ -45,18 +54,17 @@ export namespace SearchUtil {
         return results;
     }
     /**
-     * @param {Doc} doc - doc for which keys are returned
+     * @param {Doc} doc - Doc to search for used field names
      *
-     * This method returns a list of a document doc's keys.
+     * An array of all field names used by the Doc or its prototypes.
      */
     export function documentKeys(doc: Doc) {
-        const keys: { [key: string]: boolean } = {};
-        Doc.GetAllPrototypes(doc).map(proto =>
-            Object.keys(proto).forEach(key => {
-                keys[key] = false;
-            })
-        );
-        return Array.from(Object.keys(keys));
+        return Object.keys(Doc.GetAllPrototypes(doc).reduce(
+            (keys, proto) => {
+                Object.keys(proto).forEach(keys.add);
+                return keys;
+            },
+            new Set<string>())); // prettier-ignore
     }
 
     /**
diff --git a/src/client/views/nodes/LinkDocPreview.tsx b/src/client/views/nodes/LinkDocPreview.tsx
index 5026f52fb..5b07b303a 100644
--- a/src/client/views/nodes/LinkDocPreview.tsx
+++ b/src/client/views/nodes/LinkDocPreview.tsx
@@ -40,7 +40,6 @@ export class LinkInfo {
         LinkInfo._instance = this;
         makeObservable(this);
     }
-    // eslint-disable-next-line no-use-before-define
     @observable public LinkInfo: Opt<LinkDocPreviewProps> = undefined;
 
     public static get Instance() {
diff --git a/src/client/views/nodes/PDFBox.scss b/src/client/views/nodes/PDFBox.scss
index eaea272dc..f09a2630a 100644
--- a/src/client/views/nodes/PDFBox.scss
+++ b/src/client/views/nodes/PDFBox.scss
@@ -198,7 +198,7 @@
             pointer-events: all;
 
             .pdfBox-searchBar {
-                width: 70%;
+                width: calc(100% - 120px); // less size of search buttons
                 font-size: 14px;
             }
         }
diff --git a/src/client/views/nodes/PDFBox.tsx b/src/client/views/nodes/PDFBox.tsx
index e4050a3c3..45fa5cc12 100644
--- a/src/client/views/nodes/PDFBox.tsx
+++ b/src/client/views/nodes/PDFBox.tsx
@@ -396,7 +396,15 @@ export class PDFBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
                 onKeyDown={e => ([KeyCodes.BACKSPACE, KeyCodes.DELETE].includes(e.keyCode) ? e.stopPropagation() : true)}
                 onPointerDown={e => e.stopPropagation()}
                 style={{ display: this._props.isContentActive() ? 'flex' : 'none' }}>
-                <div className="pdfBox-overlayCont" onPointerDown={e => e.stopPropagation()} style={{ left: `${this._searching ? 0 : 100}%` }}>
+                <div
+                    className="pdfBox-overlayCont"
+                    onPointerDown={e => e.stopPropagation()}
+                    style={{
+                        transformOrigin: 'bottom left',
+                        transform: `scale(${this._props.DocumentView?.().UIBtnScaling || 1})`,
+                        width: `${100 / (this._props.DocumentView?.().UIBtnScaling || 1)}%`,
+                        left: `${this._searching ? 0 : 100}%`,
+                    }}>
                     <button type="button" className="pdfBox-overlayButton" title={searchTitle} />
                     <input
                         className="pdfBox-searchBar"
@@ -422,17 +430,25 @@ export class PDFBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
                     type="button"
                     className="pdfBox-overlayButton"
                     title={searchTitle}
+                    style={{
+                        transformOrigin: 'bottom right',
+                        transform: `scale(${this._props.DocumentView?.().UIBtnScaling || 1})`,
+                    }}
                     onClick={action(() => {
                         this._searching = !this._searching;
                         this.search('', true, true);
                     })}>
-                    <div className="pdfBox-overlayButton-arrow" onPointerDown={e => e.stopPropagation()} />
                     <div className="pdfBox-overlayButton-iconCont" onPointerDown={e => e.stopPropagation()}>
                         <FontAwesomeIcon icon={this._searching ? 'times' : 'search'} size="lg" />
                     </div>
                 </button>
 
-                <div className="pdfBox-pageNums">
+                <div
+                    className="pdfBox-pageNums"
+                    style={{
+                        transformOrigin: 'top left',
+                        transform: `scale(${this._props.DocumentView?.().UIBtnScaling || 1})`,
+                    }}>
                     <input
                         value={curPage}
                         style={{ width: `${curPage > 99 ? 4 : 3}ch`, pointerEvents: 'all' }}
@@ -636,19 +652,11 @@ export class PDFBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
         const pdfView = !this._pdf ? null : this.renderPdfView;
         const href = this.pdfUrl?.url.href;
         if (!pdfView && href) {
-            if (PDFBox.pdfcache.get(href))
-                setTimeout(
-                    action(() => {
-                        this._pdf = PDFBox.pdfcache.get(href);
-                    })
-                );
+            if (PDFBox.pdfcache.get(href)) setTimeout(action(() => (this._pdf = PDFBox.pdfcache.get(href))));
             else {
-                if (!PDFBox.pdfpromise.get(href)) PDFBox.pdfpromise.set(href, Pdfjs.getDocument(href).promise);
-                PDFBox.pdfpromise.get(href)?.then(
-                    action(pdf => {
-                        PDFBox.pdfcache.set(href, (this._pdf = pdf));
-                    })
-                );
+                const pdfPromise = PDFBox.pdfpromise.get(href) ?? Pdfjs.getDocument(href).promise;
+                PDFBox.pdfpromise.set(href, pdfPromise);
+                pdfPromise.then(action(pdf => PDFBox.pdfcache.set(href, (this._pdf = pdf))));
             }
         }
         return pdfView ?? this.renderTitleBox;
diff --git a/src/client/views/pdf/PDFViewer.scss b/src/client/views/pdf/PDFViewer.scss
index 1aab2b853..a54505443 100644
--- a/src/client/views/pdf/PDFViewer.scss
+++ b/src/client/views/pdf/PDFViewer.scss
@@ -118,6 +118,9 @@
 
 .pdfViewerDash-interactive {
     pointer-events: all;
+    &::-webkit-scrollbar {
+        width: 40px;
+    }
 }
 
 .loading-spinner {
diff --git a/src/client/views/pdf/PDFViewer.tsx b/src/client/views/pdf/PDFViewer.tsx
index fc2567fbc..97fe183dd 100644
--- a/src/client/views/pdf/PDFViewer.tsx
+++ b/src/client/views/pdf/PDFViewer.tsx
@@ -359,12 +359,6 @@ export class PDFViewer extends ObservableReactComponent<IViewerProps> {
 
     @action
     onPointerDown = (e: React.PointerEvent): void => {
-        // const hit = document.elementFromPoint(e.clientX, e.clientY);
-        // bcz: Change. drag selecting requires that preventDefault is NOT called.  This used to happen in DocumentView,
-        //      but that's changed, so this shouldn't be needed.
-        // if (hit && hit.localName === "span" && this.annotationsActive(true)) {  // drag selecting text stops propagation
-        //     e.button === 0 && e.stopPropagation();
-        // }
         // if alt+left click, drag and annotate
         this._downX = e.clientX;
         this._downY = e.clientY;