@fluid-topics/ft-reader-context 2.2.37 → 2.2.39

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

@@ -17,6 +17,7 @@ export declare class FtReaderContext extends FtLitElementRedux implements FtRead
     section?: string;
     topicPivot?: string;
     searchInDocumentQuery?: string;
+    applyStickyFilters: boolean;
     metadataFilters: Array<FtMetadataFilter>;
     page?: number;
     map?: FtMap;

package/build/ft-reader-context.js

@@ -23,6 +23,7 @@ class FluidTopicsReaderServiceImpl {
 export class FtReaderContext extends FtLitElementRedux {
     constructor() {
         super();
+        this.applyStickyFilters = false;
         this.metadataFilters = [];
         this.visibleTopics = [];
         this.updateConfiguration = () => {
@@ -39,12 +40,15 @@ export class FtReaderContext extends FtLitElementRedux {
             <ft-toc-filtering-search-context
                 disableAnalyticsEvents
                 registrationId="reader-toc-filtering"
+                ?applyStickyFilters=${this.applyStickyFilters}
                 .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 : []);
+            const metadataFilter = e.detail.metadataFilters;
+            // Empty metadataFilter means the request was built before the mapId was set, and it must not overwrite filters
+            if (e.target === this.tocFilteringContext && metadataFilter.length > 0) {
+                this.stateManager.setFilters((_a = metadataFilter.filter((m) => m.key != "ft:publicationId")) !== null && _a !== void 0 ? _a : []);
             }
         }}
                 @ft-search-results-change=${(e) => e.stopPropagation()}
@@ -76,7 +80,7 @@ export class FtReaderContext extends FtLitElementRedux {
         return this._stateManager;
     }
     get filters() {
-        return [
+        return this.mapId ? [
             {
                 key: "ft:publicationId",
                 valueFilter: {
@@ -85,7 +89,7 @@ export class FtReaderContext extends FtLitElementRedux {
                 },
             },
             ...this.metadataFilters,
-        ];
+        ] : [];
     }
     connectedCallback() {
         super.connectedCallback();
@@ -107,6 +111,7 @@ export class FtReaderContext extends FtLitElementRedux {
         super.disconnectedCallback();
         ftAppStateManager.knownContexts.unregister(this);
         ftAppInfoStore.addEventListener(AuthenticationChangeEvent.eventName, this.updateConfiguration);
+        this.stateManager.removeListeners();
     }
     update(props) {
         var _a;
@@ -114,14 +119,16 @@ 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.
+        // Give the new values to the state manager, including at the 1st lit lifecycle (initialization)
+        if (props.has("metadataFilters")) {
+            // Must run before any store dispatch (setStickyFilters, setMapId...): when metadataFilters is set as a property,
+            // a dispatch synchronously re-syncs it from the store, which would overwrite it with the stale
+            // store value mid-update() and silently drop the change.
             this.stateManager.setFilters((_a = this.metadataFilters) !== null && _a !== void 0 ? _a : []);
         }
+        if (props.has("applyStickyFilters")) {
+            this.stateManager.setApplyStickyFilters(this.applyStickyFilters);
+        }
         if (props.has("mapId") && this.mapId) {
             this.stateManager.setMapId(this.mapId);
             this.lastNotifiedNotFoundRelative = undefined;
@@ -129,6 +136,8 @@ export class FtReaderContext extends FtLitElementRedux {
         if (props.has("searchInDocumentQuery") && this.searchInDocumentQuery != null) {
             this.stateManager.setSearchInDocumentQuery(this.searchInDocumentQuery);
         }
+        // The 1st lit lifecycle is not a filter change
+        const filtersChanged = this.hasUpdated && props.has("metadataFilters");
         // 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")) {
@@ -268,6 +277,9 @@ __decorate([
 __decorate([
     property()
 ], FtReaderContext.prototype, "searchInDocumentQuery", void 0);
+__decorate([
+    property({ type: Boolean })
+], FtReaderContext.prototype, "applyStickyFilters", void 0);
 __decorate([
     redux({ store: "reader", converter: jsonPropertyConverter([]), attribute: true })
 ], FtReaderContext.prototype, "metadataFilters", void 0);