@fluid-topics/ft-reader-search-in-document 1.3.5 → 1.3.7

package/build/ft-reader-search-in-document.d.ts

@@ -1,6 +1,7 @@
 import { nothing, PropertyValues, TemplateResult } from "lit";
 import { ElementDefinitionsMap } from "@fluid-topics/ft-wc-utils";
 import { FtReaderSearchInDocumentProperties } from "./ft-reader-search-in-document.properties";
+import { FtSearchContext } from "@fluid-topics/ft-search-context";
 import { FtReaderComponent } from "@fluid-topics/ft-reader-context/build/registration";
 import { FtMap, FtSearchResultClusterEntry } from "@fluid-topics/public-api";
 declare const FtReaderSearchInDocument_base: typeof FtReaderComponent & import("@fluid-topics/ft-wc-utils").Constructor<import("@fluid-topics/ft-i18n").FtLitElementWithI18nInterface>;
@@ -16,14 +17,15 @@ export declare class FtReaderSearchInDocument extends FtReaderSearchInDocument_b
     private hideResultAbstract;
     private hideResultsNumber;
     private emptyResultOnClear;
-    private userHasDoneManualAction;
+    searchContext?: FtSearchContext;
     private uniqueId;
     private get filters();
     private renderResult;
     onAuxClick(e: MouseEvent, result: FtSearchResultClusterEntry, rank: number): void;
     onContextMenu(result: FtSearchResultClusterEntry, rank: number): void;
     protected render(): typeof nothing | TemplateResult<1>;
-    protected update(props: PropertyValues): void;
+    protected willUpdate(props: PropertyValues): void;
+    private initEventManager;
     private onLinkClick;
     importDynamicDependencies(): void;
 }

package/build/ft-reader-search-in-document.js

@@ -5,13 +5,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { html, nothing } from "lit";
-import { randomId, redux } from "@fluid-topics/ft-wc-utils";
+import { randomId, redux, waitFor } from "@fluid-topics/ft-wc-utils";
 import { resultStyles, styles } from "./ft-reader-search-in-document.styles";
 import { withI18n } from "@fluid-topics/ft-i18n";
 import { FtReaderComponent } from "@fluid-topics/ft-reader-context/build/registration";
 import { property, query } from "lit/decorators.js";
 import { getResultUrl } from "@fluid-topics/ft-search-result-context/build/utils";
-import { SearchInDocumentEvent } from "./events";
 import { readerSearchInDocumentContext } from "./ReaderSearchInDocumentMessages";
 import { FtCard } from "@fluid-topics/ft-card";
 import { SearchResultClickEvent, SearchResultOpenContextMenuEvent } from "@fluid-topics/ft-search-context/build/utils";
@@ -24,7 +23,6 @@ class FtReaderSearchInDocument extends withI18n(FtReaderComponent) {
         this.hideResultAbstract = false;
         this.hideResultsNumber = false;
         this.emptyResultOnClear = false;
-        this.userHasDoneManualAction = false;
         this.uniqueId = randomId(6, "search-in-document-");
         this.addI18nContext(readerSearchInDocumentContext);
     }
@@ -35,17 +33,17 @@ class FtReaderSearchInDocument extends withI18n(FtReaderComponent) {
                 valueFilter: {
                     negative: false,
                     values: [this.map.id],
-                }
-            }
+                },
+            },
         ];
     }
     renderResult(result, rank) {
         var _a;
         return html `
             <style> ${resultStyles}</style>
-            <a href="${getResultUrl(result)}" @click="${() => this.onLinkClick(result, rank)}"
-               @auxclick="${(e) => this.onAuxClick(e, result, rank)}"
-               @contextmenu="${() => this.onContextMenu(result, rank)}">
+            <a href="${getResultUrl(result)}" @click=${() => this.onLinkClick(result, rank)}
+               @auxclick=${(e) => this.onAuxClick(e, result, rank)}
+               @contextmenu=${() => this.onContextMenu(result, rank)}>
                 <ft-card clickable noheader>
                     <div class="result-container">
                         ${this.hideResultTitle ? nothing : html `
@@ -75,32 +73,19 @@ class FtReaderSearchInDocument extends withI18n(FtReaderComponent) {
         }
         return html `
             <ft-search-context id="${this.uniqueId}"
+                               part="search-context"
                                contentLocale="${this.map.lang}"
                                query="${this.searchInDocumentQuery}"
                                .filters=${this.filters}
                                scope="ALL_TOPICS"
-                               ignoreEmptyQuery
-                               @ft-search-results-change=${(e) => {
-            var _a, _b;
-            if (this.userHasDoneManualAction) {
-                this.dispatchEvent(new SearchInDocumentEvent({
-                    mapId: this.map.id,
-                    mapTitle: this.map.title,
-                    metadata: (_b = (_a = this.map) === null || _a === void 0 ? void 0 : _a.metadata) !== null && _b !== void 0 ? _b : [],
-                    query: e.detail.request.query,
-                    searchResultsCount: e.detail.paging.totalResultsCount
-                }));
-                this.userHasDoneManualAction = false;
-            }
-        }}>
+                               ignoreEmptyQuery>
                 <div class="ft-search-in-doc--container">
-                    <ft-search-input placeholder=${readerSearchInDocumentContext.messages.placeholder()}
+                    <ft-search-input placeholder="${readerSearchInDocumentContext.messages.placeholder()}"
                                      ?triggerSearchOnClear=${this.emptyResultOnClear}
-                                     @change="${(e) => {
+                                     @change=${(e) => {
             var _a;
-            this.userHasDoneManualAction = true;
             (_a = this.stateManager) === null || _a === void 0 ? void 0 : _a.setSearchInDocumentQuery(e.detail);
-        }}"></ft-search-input>
+        }}></ft-search-input>
                     ${this.hideResultsNumber ? nothing : html `
                         <ft-search-results-number></ft-search-results-number>
                     `}
@@ -115,12 +100,21 @@ class FtReaderSearchInDocument extends withI18n(FtReaderComponent) {
             </ft-search-context>
         `;
     }
-    update(props) {
-        super.update(props);
+    willUpdate(props) {
+        super.willUpdate(props);
+        if (props.has("map") && this.map) {
+            this.initEventManager();
+        }
         if (["hideResultTitle", "hideResultBreadcrumb", "hideResultAbstract"].some(p => props.has(p)) && this.searchResults) {
             this.searchResults.requestUpdate();
         }
     }
+    initEventManager() {
+        waitFor(() => { var _a; return (_a = this.searchContext) === null || _a === void 0 ? void 0 : _a.eventManager; }).then(eventManager => {
+            eventManager.setDocumentSearchFromMap(this.map);
+            eventManager.initAppInfo();
+        });
+    }
     onLinkClick(result, rank) {
         this.dispatchEvent(new SearchResultClickEvent(result, rank));
     }
@@ -137,7 +131,7 @@ class FtReaderSearchInDocument extends withI18n(FtReaderComponent) {
     }
 }
 FtReaderSearchInDocument.elementDefinitions = {
-    "ft-card": FtCard
+    "ft-card": FtCard,
 };
 FtReaderSearchInDocument.styles = styles;
 __decorate([
@@ -164,4 +158,7 @@ __decorate([
 __decorate([
     property({ type: Boolean })
 ], FtReaderSearchInDocument.prototype, "emptyResultOnClear", void 0);
+__decorate([
+    query(`[part="search-context"]`)
+], FtReaderSearchInDocument.prototype, "searchContext", void 0);
 export { FtReaderSearchInDocument };