@fluid-topics/ft-reader-context 2.2.20 → 2.2.24

package/build/ft-reader-context.d.ts

@@ -27,7 +27,7 @@ export declare class FtReaderContext extends FtLitElementRedux implements FtRead
     readerServiceProvider?: () => Promise<FtReaderService>;
     tocFilteringContext?: FtSearchContext;
     constructor();
-    protected render(): import("lit-html").TemplateResult<1>;
+    protected render(): import("lit").TemplateResult<1>;
     private importStyleIfNeeded;
     private _stateManager?;
     get stateManager(): FtReaderStateManager;

package/build/ft-reader-context.js

@@ -41,10 +41,13 @@ export class FtReaderContext extends FtLitElementRedux {
                 .filters=${this.filters}
                 @ft-search-request-change=${(e) => {
             var _a;
+            e.stopPropagation();
             if (e.target === this.tocFilteringContext) {
                 this.stateManager.setFilters((_a = e.detail.metadataFilters.filter((m) => m.key != "ft:publicationId")) !== null && _a !== void 0 ? _a : []);
             }
-        }} }
+        }}
+                @ft-search-results-change=${(e) => e.stopPropagation()}
+                @search-context-clear-all-filters=${(e) => e.stopPropagation()}
             >
                 <slot @register-ft-reader-component=${this.registerComponent}></slot>
             </ft-toc-filtering-search-context>
@@ -108,6 +111,14 @@ export class FtReaderContext extends FtLitElementRedux {
         if (props.has("readerServiceProvider") && this.readerServiceProvider) {
             this.stateManager.initService(this.readerServiceProvider);
         }
+        // metadataFilters is never set to undefined, props.get("metadatFilters") is only undefined at the 1st lit lifecycle, for the [] default value init - we do not want to take it as a filter change
+        const filtersChanged = props.has("metadataFilters") && props.get("metadataFilters") != undefined;
+        if (filtersChanged) {
+            // Must run before setMapId: setMapId's reload()/clear() synchronously dispatches store actions
+            // that re-sync this.metadataFilters from the store; running this after would re-read the
+            // stale pre-change value mid-update() and silently drop the change.
+            this.stateManager.setFilters((_a = this.metadataFilters) !== null && _a !== void 0 ? _a : []);
+        }
         if (props.has("mapId") && this.mapId) {
             this.stateManager.setMapId(this.mapId);
             this.lastNotifiedNotFoundRelative = undefined;
@@ -115,11 +126,6 @@ export class FtReaderContext extends FtLitElementRedux {
         if (props.has("searchInDocumentQuery") && this.searchInDocumentQuery != null) {
             this.stateManager.setSearchInDocumentQuery(this.searchInDocumentQuery);
         }
-        // metadataFilters is never set to undefined, props.get("metadatFilters") is only undefined at the 1st lit lifecycle, for the [] default value init - we do not want to take it as a filter change
-        const filtersChanged = props.has("metadataFilters") && props.get("metadataFilters") != undefined;
-        if (filtersChanged) {
-            this.stateManager.setFilters((_a = this.metadataFilters) !== null && _a !== void 0 ? _a : []);
-        }
         // reload() re-navigates to the current target once the filtered data is loaded,
         // so it must not race with a direct navigateToTarget() call from this same update.
         if (props.has("session")) {