@internetarchive/collection-browser 1.10.1-alpha.3 → 1.10.1-alpha.5

package/dist/src/collection-browser.d.ts

@@ -241,7 +241,6 @@ export declare class CollectionBrowser extends LitElement implements InfiniteScr
     private get listHeaderTemplate();
     private histogramDateRangeUpdated;
     private get dateRangeQueryClause();
-    private restoringInitialState;
     firstUpdated(): void;
     updated(changed: PropertyValues): void;
     disconnectedCallback(): void;

package/dist/src/collection-browser.js

@@ -90,7 +90,6 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
          * for the previous/next page, we'll fetch the next/previous page to populate it
          */
         this.dataSource = {};
-        this.restoringInitialState = false;
         /**
          * Updates the height of the left column according to its position on the page.
          * Arrow function ensures proper `this` binding.
@@ -203,7 +202,6 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
      * in the options object.
      */
     clearFilters({ facets = true, dateRange = true, letterFilters = true, sort = false, } = {}) {
-        console.log('clearFilters', facets);
         // Don't bother clearing facets if none are checked, so that we don't
         // trigger unnecessary update cycles.
         if (facets && this.hasCheckedFacets) {
@@ -669,12 +667,9 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
     firstUpdated() {
         this.setupStateRestorationObserver();
         this.restoreState();
-        this.restoringInitialState = true;
     }
     updated(changed) {
         var _a;
-        console.log('--- UPDATED ---');
-        [...changed.entries()].forEach(([k, v]) => console.log(k, ':', v, '->', this[k]));
         if (changed.has('placeholderType') && this.placeholderType === null) {
             if (!this.leftColIntersectionObserver) {
                 this.setupLeftColumnScrollListeners();
@@ -690,15 +685,23 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             changed.has('loggedIn')) {
             (_a = this.infiniteScroller) === null || _a === void 0 ? void 0 : _a.reload();
         }
-        if (changed.has('baseQuery') || changed.has('searchType')) {
+        if (changed.has('baseQuery') ||
+            changed.has('searchType') ||
+            changed.has('withinCollection')) {
             // Unless this query/search type update is from the initial page load or the
             // result of hitting the back button,
             // we need to clear any existing filters since they may no longer be valid for
             // the new set of search results.
-            if (!this.historyPopOccurred && this.initialQueryChangeHappened && !this.restoringInitialState) {
-                // Only clear filters that haven't been simultaneously applied in this update
-                console.log('clearing filters from update');
+            if (!this.historyPopOccurred && this.initialQueryChangeHappened) {
+                // Ordinarily, we leave the sort param unchanged between searches.
+                // However, if we are changing the target collection itself, we want the sort cleared too,
+                // since different collections may have different sorting options available.
+                const shouldClearSort = changed.has('withinCollection') &&
+                    !changed.has('selectedSort') &&
+                    !changed.has('sortDirection');
+                // Otherwise, only clear filters that haven't been simultaneously applied in this update
                 this.clearFilters({
+                    sort: shouldClearSort,
                     facets: !changed.has('selectedFacets'),
                     dateRange: !(changed.has('minSelectedDate') || changed.has('maxSelectedDate')),
                     letterFilters: !(changed.has('selectedTitleFilter') ||
@@ -706,7 +709,6 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
                 });
             }
         }
-        this.restoringInitialState = false;
         if (changed.has('baseQuery')) {
             this.emitBaseQueryChanged();
         }
@@ -735,9 +737,6 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         if (changed.has('selectedCreatorFilter')) {
             this.sendFilterByCreatorAnalytics(changed.get('selectedCreatorFilter'));
         }
-        if (changed.has('withinCollection')) {
-            this.clearFilters({ sort: true });
-        }
         if (changed.has('baseQuery') ||
             changed.has('searchType') ||
             changed.has('selectedTitleFilter') ||
@@ -893,7 +892,6 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
     }
     async handleQueryChange() {
         var _a;
-        console.log('handling query change');
         // only reset if the query has actually changed
         if (!this.searchService || this.pageFetchQueryKey === this.previousQueryKey)
             return;