@internetarchive/collection-browser 4.3.2-alpha-webdev7939.2 → 4.3.2-alpha-webdev7939.3

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,2BAA2B,EAAE,MAAM,kDAAkD,CAAC;AAG/F,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAEL,SAAS,EACT,SAAS,EAGT,wBAAwB,GACzB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAC3F,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAO7D,cAAc,uDAAuD,CAAC;AACtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,6DAA6D,CAAC","sourcesContent":["export { CollectionBrowser } from './src/collection-browser';\r\nexport { CollectionBrowserDataSource } from './src/data-source/collection-browser-data-source';\r\nexport { CollectionBrowserDataSourceInterface } from './src/data-source/collection-browser-data-source-interface';\r\nexport { CollectionBrowserQueryState } from './src/data-source/collection-browser-query-state';\r\nexport { SortFilterBar } from './src/sort-filter-bar/sort-filter-bar';\r\nexport {\r\n  CollectionDisplayMode,\r\n  SortField,\r\n  TileModel,\r\n  FacetOption,\r\n  SelectedFacets,\r\n  getDefaultSelectedFacets,\r\n} from './src/models';\r\nexport { CollectionBrowserLoadingTile } from './src/tiles/collection-browser-loading-tile';\r\nexport { CollectionTile } from './src/tiles/grid/collection-tile';\r\nexport { AccountTile } from './src/tiles/grid/account-tile';\r\nexport { ItemTile } from './src/tiles/grid/item-tile';\r\nexport { TileList } from './src/tiles/list/tile-list';\r\nexport { TileListCompact } from './src/tiles/list/tile-list-compact';\r\nexport { TileDispatcher } from './src/tiles/tile-dispatcher';\r\nexport { LayoutType } from './src/tiles/models';\r\nexport {\r\n  SmartQueryHeuristic,\r\n  KeywordFacetMap,\r\n  SmartFacet,\r\n} from './src/collection-facets/smart-facets/models';\r\nexport * from './src/collection-facets/smart-facets/heuristics/index';\r\nexport { SmartQueryHeuristicGroup } from './src/collection-facets/smart-facets/smart-facet-heuristics';\r\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,2BAA2B,EAAE,MAAM,kDAAkD,CAAC;AAG/F,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAEL,SAAS,EACT,SAAS,EAGT,wBAAwB,GACzB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAC3F,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAO7D,cAAc,uDAAuD,CAAC;AACtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,6DAA6D,CAAC","sourcesContent":["export { CollectionBrowser } from './src/collection-browser';\nexport { CollectionBrowserDataSource } from './src/data-source/collection-browser-data-source';\nexport { CollectionBrowserDataSourceInterface } from './src/data-source/collection-browser-data-source-interface';\nexport { CollectionBrowserQueryState } from './src/data-source/collection-browser-query-state';\nexport { SortFilterBar } from './src/sort-filter-bar/sort-filter-bar';\nexport {\n  CollectionDisplayMode,\n  SortField,\n  TileModel,\n  FacetOption,\n  SelectedFacets,\n  getDefaultSelectedFacets,\n} from './src/models';\nexport { CollectionBrowserLoadingTile } from './src/tiles/collection-browser-loading-tile';\nexport { CollectionTile } from './src/tiles/grid/collection-tile';\nexport { AccountTile } from './src/tiles/grid/account-tile';\nexport { ItemTile } from './src/tiles/grid/item-tile';\nexport { TileList } from './src/tiles/list/tile-list';\nexport { TileListCompact } from './src/tiles/list/tile-list-compact';\nexport { TileDispatcher } from './src/tiles/tile-dispatcher';\nexport { LayoutType } from './src/tiles/models';\nexport {\n  SmartQueryHeuristic,\n  KeywordFacetMap,\n  SmartFacet,\n} from './src/collection-facets/smart-facets/models';\nexport * from './src/collection-facets/smart-facets/heuristics/index';\nexport { SmartQueryHeuristicGroup } from './src/collection-facets/smart-facets/smart-facet-heuristics';\n"]}

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

@@ -634,6 +634,16 @@ export declare class CollectionBrowser extends LitElement implements InfiniteScr
      * @returns
      */
     private visibleCellsChanged;
+    /**
+     * Recomputes the current page from the given set of visible cell indices
+     * and emits `visiblePageChanged` if the page actually changed.
+     */
+    private updateVisiblePage;
+    /**
+     * Sets the current page number and emits a `visiblePageChanged`
+     * event if the new page differs from the previous one.
+     */
+    private setCurrentPage;
     private initialQueryChangeHappened;
     private historyPopOccurred;
     private previousQueryKey?;

package/dist/src/collection-browser.js

@@ -879,7 +879,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         if ((this.currentPage ?? 1) > 1) {
             this.goToPage(1);
         }
-        this.currentPage = 1;
+        this.setCurrentPage(1);
     }
     /**
      * Fires an analytics event for sorting changes.
@@ -1696,38 +1696,39 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
      * @returns
      */
     visibleCellsChanged(e) {
-        if (this.isScrollingToCell) {
-            // eslint-disable-next-line no-console
-            console.log(`[CB visibleCellsChanged] BAIL isScrollingToCell=true visible=[${e.detail.visibleCellIndices.join(',')}]`);
+        this.updateVisiblePage(e.detail.visibleCellIndices);
+    }
+    /**
+     * Recomputes the current page from the given set of visible cell indices
+     * and emits `visiblePageChanged` if the page actually changed.
+     */
+    updateVisiblePage(visibleCellIndices) {
+        if (this.isScrollingToCell)
             return;
-        }
-        const { visibleCellIndices } = e.detail;
         if (visibleCellIndices.length === 0)
             return;
+        // The indices aren't necessarily sorted, so sort them here to ensure our
+        // calculations below find the right cell/page.
+        const sorted = [...visibleCellIndices].sort((a, b) => a - b);
         // For page determination, do not count more than a single page of visible cells,
         // since otherwise patrons using very tall screens will be treated as one page
         // further than they actually are.
-        const lastIndexWithinCurrentPage = Math.min(this.pageSize, visibleCellIndices.length) - 1;
-        const lastVisibleCellIndex = visibleCellIndices[lastIndexWithinCurrentPage];
+        const lastIndexWithinCurrentPage = Math.min(this.pageSize, sorted.length) - 1;
+        const lastVisibleCellIndex = sorted[lastIndexWithinCurrentPage];
         const lastVisibleCellPage = Math.floor(lastVisibleCellIndex / this.pageSize) + 1;
-        // Detect out-of-order Set: compare the indices we got to a sorted copy.
-        const sorted = [...visibleCellIndices].sort((a, b) => a - b);
-        const isSorted = sorted.every((v, i) => v === visibleCellIndices[i]);
-        const minIdx = sorted[0];
-        const maxIdx = sorted[sorted.length - 1];
-        const first10 = visibleCellIndices.slice(0, 10).join(',');
-        const last10 = visibleCellIndices.slice(-10).join(',');
-        // eslint-disable-next-line no-console
-        console.log(`[CB visibleCellsChanged] computedPage=${lastVisibleCellPage} lastIdx=${lastVisibleCellIndex} sampledAt=${lastIndexWithinCurrentPage} len=${visibleCellIndices.length} sorted=${isSorted} min=${minIdx} max=${maxIdx} scrollY=${window.scrollY} first10=[${first10}] last10=[${last10}]`);
-        if (this.currentPage !== lastVisibleCellPage) {
-            this.currentPage = lastVisibleCellPage;
-        }
-        const event = new CustomEvent('visiblePageChanged', {
-            detail: {
-                pageNumber: lastVisibleCellPage,
-            },
-        });
-        this.dispatchEvent(event);
+        this.setCurrentPage(lastVisibleCellPage);
+    }
+    /**
+     * Sets the current page number and emits a `visiblePageChanged`
+     * event if the new page differs from the previous one.
+     */
+    setCurrentPage(pageNumber) {
+        if (this.currentPage === pageNumber)
+            return;
+        this.currentPage = pageNumber;
+        this.dispatchEvent(new CustomEvent('visiblePageChanged', {
+            detail: { pageNumber },
+        }));
     }
     /**
      * A Promise which, after each query change, resolves once the fetches for the initial
@@ -1803,10 +1804,10 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         this.selectedFacets = restorationState.selectedFacets;
         if (!this.suppressURLQuery)
             this.baseQuery = restorationState.baseQuery;
-        this.currentPage = restorationState.currentPage ?? 1;
+        this.setCurrentPage(restorationState.currentPage ?? 1);
         this.minSelectedDate = restorationState.minSelectedDate;
         this.maxSelectedDate = restorationState.maxSelectedDate;
-        if (this.currentPage > 1) {
+        if (this.currentPage && this.currentPage > 1) {
             this.goToPage(this.currentPage);
         }
     }
@@ -1876,19 +1877,14 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
     }
     async scrollToPage(pageNumber) {
         const cellIndexToScrollTo = this.pageSize * (pageNumber - 1);
-        // eslint-disable-next-line no-console
-        console.log(`[CB scrollToPage] ENTRY page=${pageNumber} targetCell=${cellIndexToScrollTo} pagesToRender=${this.pagesToRender} estimatedTileCount=${this.estimatedTileCount} itemCount=${this.infiniteScroller?.itemCount} scrollY=${window.scrollY}`);
         // Wait for the infinite scroller be rendered before proceeding
         let waitAttempts = 0;
         while (!this.infiniteScroller && waitAttempts < 20) {
             await this.updateComplete;
             waitAttempts++;
         }
-        if (!this.infiniteScroller) {
-            // eslint-disable-next-line no-console
-            console.log(`[CB scrollToPage] NO_SCROLLER after wait waitAttempts=${waitAttempts}`);
+        if (!this.infiniteScroller)
             return;
-        }
         // The scroller have its default `itemCount=0`, so propagate our estimated
         // tile count before jumping to the desired page.
         if (this.infiniteScroller.itemCount < this.estimatedTileCount) {
@@ -1903,9 +1899,12 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         this.isScrollingToCell = true;
         const scrolled = await this.infiniteScroller.scrollToCell(cellIndexToScrollTo, true);
         this.isScrollingToCell = false;
-        // eslint-disable-next-line no-console
-        console.log(`[CB scrollToPage] DONE page=${pageNumber} targetCell=${cellIndexToScrollTo} scrolled=${scrolled} scrollY=${window.scrollY}`);
         this.infiniteScroller.refreshAllVisibleCells();
+        // After we finish scrolling, recompute the visible page from the new state
+        // so that it doesn't fall out of sync.
+        if (scrolled) {
+            this.updateVisiblePage(this.infiniteScroller.getVisibleCellIndices());
+        }
     }
     /**
      * Whether sorting by relevance makes sense for the current state.