@internetarchive/collection-browser 4.2.0-alpha-webdev8164.3 → 4.2.1-alpha-webdev7004.0

package/package.json

@@ -1,121 +1,120 @@
-{
-  "name": "@internetarchive/collection-browser",
-  "description": "The Internet Archive Collection Browser.",
-  "license": "AGPL-3.0-only",
-  "author": "Internet Archive",
-  "version": "4.2.0-alpha-webdev8164.3",
-  "main": "dist/index.js",
-  "module": "dist/index.js",
-  "scripts": {
-    "start": "vite",
-    "prepare:ghpages": "rimraf ghpages && yarn run prepare && vite build",
-    "prepare": "rimraf dist && tsc && husky install",
-    "lint": "eslint . && prettier \"**/*.ts\" --check",
-    "format": "eslint . --fix && prettier \"**/*.ts\" --write",
-    "circular": "madge --circular --extensions ts .",
-    "test": "tsc && yarn run lint && yarn run circular && wtr --coverage",
-    "test:fast": "tsc && wtr --coverage",
-    "test:watch": "tsc && concurrently -k -r \"tsc --watch --preserveWatchOutput\" \"wtr --watch\"",
-    "deploy": "yarn run deploy:run -e $(git branch --show-current)",
-    "deploy:run": "yarn run prepare:ghpages && touch ghpages/.nojekyll && yarn run deploy:gh",
-    "deploy:gh": "gh-pages -t -d ghpages -m \"Build for $(git log --pretty=format:\"%h %an %ai %s\" -n1) [skip ci]\"",
-    "typecheck": "yarn tsc --noEmit"
-  },
-  "types": "dist/index.d.ts",
-  "dependencies": {
-    "@a11y/focus-trap": "^1.0.5",
-    "@internetarchive/analytics-manager": "^0.1.4",
-    "@internetarchive/elements": "^0.2.2",
-    "@internetarchive/feature-feedback": "^1.0.0",
-    "@internetarchive/field-parsers": "^1.0.0",
-    "@internetarchive/histogram-date-range": "^1.4.1",
-    "@internetarchive/ia-clearable-text-input": "^1.1.1",
-    "@internetarchive/ia-dropdown": "^2.0.0",
-    "@internetarchive/iaux-item-metadata": "^1.0.5",
-    "@internetarchive/infinite-scroller": "^1.0.1",
-    "@internetarchive/modal-manager": "^2.0.5",
-    "@internetarchive/search-service": "^2.7.0",
-    "@internetarchive/shared-resize-observer": "^0.2.0",
-    "@lit/localize": "^0.12.2",
-    "dompurify": "^3.2.4",
-    "lit": "^2.8.0 || ^3.3.2",
-    "typescript-cookie": "^1.0.6"
-  },
-  "devDependencies": {
-    "@internetarchive/result-type": "^0.0.1",
-    "@open-wc/eslint-config": "^12.0.3",
-    "@open-wc/testing": "^4.0.0",
-    "@rollup/plugin-image": "^3.0.3",
-    "@types/dompurify": "^3.2.0",
-    "@types/mocha": "^10.0.10",
-    "@typescript-eslint/eslint-plugin": "^8.27.0",
-    "@typescript-eslint/parser": "^8.27.0",
-    "@vitejs/plugin-basic-ssl": "^2.1.4",
-    "@web/dev-server": "^0.4.6",
-    "@web/dev-server-rollup": "^0.6.4",
-    "@web/test-runner": "^0.20.0",
-    "concurrently": "^9.1.2",
-    "eslint": "^9.22.0",
-    "eslint-config-prettier": "^10.1.1",
-    "eslint-plugin-html": "^8.1.2",
-    "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-lit": "^2.0.0",
-    "eslint-plugin-lit-a11y": "^4.1.4",
-    "eslint-plugin-no-only-tests": "^3.3.0",
-    "eslint-plugin-wc": "^3.0.0",
-    "gh-pages": "^6.3.0",
-    "husky": "^9.1.7",
-    "madge": "^8.0.0",
-    "prettier": "^3.5.3",
-    "rimraf": "^6.0.1",
-    "sinon": "^19.0.4",
-    "tslib": "^2.8.1",
-    "typescript": "^5.8.2",
-    "vite": "^6.2.2"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "eslintConfig": {
-    "parser": "@typescript-eslint/parser",
-    "extends": [
-      "@open-wc",
-      "prettier"
-    ],
-    "plugins": [
-      "@typescript-eslint"
-    ],
-    "rules": {
-      "no-unused-vars": "off",
-      "@typescript-eslint/no-unused-vars": [
-        "error"
-      ],
-      "no-shadow": "off",
-      "@typescript-eslint/no-shadow": [
-        "error"
-      ],
-      "class-methods-use-this": "off",
-      "import/no-unresolved": "off",
-      "import/extensions": [
-        "off",
-        "ignorePackages",
-        {
-          "js": "never",
-          "ts": "never"
-        }
-      ],
-      "no-unsafe-optional-chaining": "warn",
-      "default-param-last": "warn"
-    }
-  },
-  "prettier": {
-    "singleQuote": true,
-    "arrowParens": "avoid"
-  },
-  "lint-staged": {
-    "*.ts": [
-      "eslint --fix",
-      "prettier --write"
-    ]
-  }
-}
+{
+  "name": "@internetarchive/collection-browser",
+  "description": "The Internet Archive Collection Browser.",
+  "license": "AGPL-3.0-only",
+  "author": "Internet Archive",
+  "version": "4.2.1-alpha-webdev7004.0",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
+  "scripts": {
+    "start": "vite",
+    "prepare:ghpages": "rimraf ghpages && yarn run prepare && vite build",
+    "prepare": "rimraf dist && tsc && husky install",
+    "lint": "eslint . && prettier \"**/*.ts\" --check",
+    "format": "eslint . --fix && prettier \"**/*.ts\" --write",
+    "circular": "madge --circular --extensions ts .",
+    "test": "tsc && yarn run lint && yarn run circular && wtr --coverage",
+    "test:fast": "tsc && wtr --coverage",
+    "test:watch": "tsc && concurrently -k -r \"tsc --watch --preserveWatchOutput\" \"wtr --watch\"",
+    "deploy": "yarn run deploy:run -e $(git branch --show-current)",
+    "deploy:run": "yarn run prepare:ghpages && touch ghpages/.nojekyll && yarn run deploy:gh",
+    "deploy:gh": "gh-pages -t -d ghpages -m \"Build for $(git log --pretty=format:\"%h %an %ai %s\" -n1) [skip ci]\"",
+    "typecheck": "yarn tsc --noEmit"
+  },
+  "types": "dist/index.d.ts",
+  "dependencies": {
+    "@a11y/focus-trap": "^1.0.5",
+    "@internetarchive/analytics-manager": "^0.1.4",
+    "@internetarchive/elements": "^0.2.2",
+    "@internetarchive/feature-feedback": "^1.0.0",
+    "@internetarchive/field-parsers": "^1.0.0",
+    "@internetarchive/histogram-date-range": "^1.4.1",
+    "@internetarchive/ia-dropdown": "^2.0.0",
+    "@internetarchive/iaux-item-metadata": "^1.0.5",
+    "@internetarchive/infinite-scroller": "^1.0.1",
+    "@internetarchive/modal-manager": "^2.0.5",
+    "@internetarchive/search-service": "^2.7.1",
+    "@internetarchive/shared-resize-observer": "^0.2.0",
+    "@lit/localize": "^0.12.2",
+    "dompurify": "^3.2.4",
+    "lit": "^2.8.0 || ^3.3.2",
+    "typescript-cookie": "^1.0.6"
+  },
+  "devDependencies": {
+    "@internetarchive/result-type": "^0.0.1",
+    "@open-wc/eslint-config": "^13.0.0",
+    "@open-wc/testing": "^4.0.0",
+    "@rollup/plugin-image": "^3.0.3",
+    "@types/dompurify": "^3.2.0",
+    "@types/mocha": "^10.0.10",
+    "@typescript-eslint/eslint-plugin": "^8.27.0",
+    "@typescript-eslint/parser": "^8.27.0",
+    "@vitejs/plugin-basic-ssl": "^2.1.4",
+    "@web/dev-server": "^0.4.6",
+    "@web/dev-server-rollup": "^0.6.4",
+    "@web/test-runner": "^0.20.0",
+    "concurrently": "^9.1.2",
+    "eslint": "^9.22.0",
+    "eslint-config-prettier": "^10.1.1",
+    "eslint-plugin-html": "^8.1.2",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-lit": "^2.0.0",
+    "eslint-plugin-lit-a11y": "^5.0.0",
+    "eslint-plugin-no-only-tests": "^3.3.0",
+    "eslint-plugin-wc": "^3.0.0",
+    "gh-pages": "^6.3.0",
+    "husky": "^9.1.7",
+    "madge": "^8.0.0",
+    "prettier": "^3.5.3",
+    "rimraf": "^6.0.1",
+    "sinon": "^19.0.4",
+    "tslib": "^2.8.1",
+    "typescript": "^5.8.2",
+    "vite": "^8.0.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "eslintConfig": {
+    "parser": "@typescript-eslint/parser",
+    "extends": [
+      "@open-wc",
+      "prettier"
+    ],
+    "plugins": [
+      "@typescript-eslint"
+    ],
+    "rules": {
+      "no-unused-vars": "off",
+      "@typescript-eslint/no-unused-vars": [
+        "error"
+      ],
+      "no-shadow": "off",
+      "@typescript-eslint/no-shadow": [
+        "error"
+      ],
+      "class-methods-use-this": "off",
+      "import/no-unresolved": "off",
+      "import/extensions": [
+        "off",
+        "ignorePackages",
+        {
+          "js": "never",
+          "ts": "never"
+        }
+      ],
+      "no-unsafe-optional-chaining": "warn",
+      "default-param-last": "warn"
+    }
+  },
+  "prettier": {
+    "singleQuote": true,
+    "arrowParens": "avoid"
+  },
+  "lint-staged": {
+    "*.ts": [
+      "eslint --fix",
+      "prettier --write"
+    ]
+  }
+}

package/renovate.json

@@ -1,6 +1,6 @@
-{
-  "extends": [
-    "config:base",
-    ":preserveSemverRanges"
-  ]
-}
+{
+  "extends": [
+    "config:base",
+    ":preserveSemverRanges"
+  ]
+}

package/src/app-root.ts

@@ -950,6 +950,10 @@ export class AppRoot extends LitElement {
       --modalBorder: 2px solid var(--primaryButtonBGColor, #194880);
       --modalTitleLineHeight: 4rem;
       --modalTitleFontSize: 1.8rem;
+      --modalCornerRadius: 0;
+      --modalBottomPadding: 0;
+      --modalBottomMargin: 0;
+      --modalScrollOffset: 0;
       --modalCornerRadius: 0.5rem;
     }
     modal-manager.expanded-date-picker {

package/src/collection-browser.ts

@@ -605,6 +605,43 @@ export class CollectionBrowser
     if (changed.has('searchType') && this.searchType === SearchType.TV) {
       this.applyDefaultTVSearchSort();
     }
+
+    // If we need to clear filters due to a query change or other reset, we do so *before* any
+    // updates happen, to prevent unnecessary update cycles and ensure there's a clean slate
+    // for any search requests that fire.
+    if (
+      changed.has('baseQuery') ||
+      changed.has('identifiers') ||
+      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) {
+        // 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') ||
+            changed.has('selectedCreatorFilter')
+          ),
+        });
+      }
+    }
   }
 
   render() {
@@ -860,8 +897,12 @@ export class CollectionBrowser
     let sortFieldAvailability = defaultSortAvailability;
 
     // We adjust the available sort options for a couple of special cases...
-    if (this.withinCollection?.startsWith('fav-')) {
-      // When viewing a fav- collection, we include the Date Favorited option as the default
+    if (
+      this.withinCollection?.startsWith('fav-') ||
+      this.profileElement === 'favorites'
+    ) {
+      // When viewing a fav- collection or the favorites profile tab,
+      // we include the Date Favorited option as the default
       sortFieldAvailability = favoritesSortAvailability;
     } else if (!this.withinCollection && this.searchType === SearchType.TV) {
       // When viewing TV search results, we exclude several of the usual date sort options.
@@ -1722,40 +1763,6 @@ export class CollectionBrowser
       this.infiniteScroller?.reload();
     }
 
-    if (
-      changed.has('baseQuery') ||
-      changed.has('identifiers') ||
-      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) {
-        // 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') ||
-            changed.has('selectedCreatorFilter')
-          ),
-        });
-      }
-    }
-
     if (changed.has('profileElement')) {
       this.applyDefaultProfileSort();
     }

package/src/collection-facets/facets-template.ts

@@ -63,16 +63,11 @@ export class FacetsTemplate extends LitElement {
   static get styles(): CSSResultGroup {
     const columnCount = css`var(--facetsColumnCount, 1)`;
     const columnGap = css`var(--facetsColumnGap, 15px)`;
-    const columnWidth = css`var(--facetsColumnWidth, auto)`;
-    const maxHeight = css`var(--facetsMaxHeight, none)`;
 
     return css`
       .facet-rows {
         column-count: ${columnCount};
         column-gap: ${columnGap};
-        column-width: ${columnWidth};
-        max-height: ${maxHeight};
-        column-fill: auto;
       }
 
       a:link,