@internetarchive/bookreader 5.0.0-5-multiple-files → 5.0.0-50

package/CHANGELOG.md

@@ -1,3 +1,208 @@
+# 5.0.0-50
+Fix: Search results display @latonv
+
+# 5.0.0-49
+- Dev: remove class shims, v5 deprecations @cdrini
+- Dev: update dependency (@open-wc/testing-helpers) @renovate
+- Dev: e2e - remove ia test + export DesktopNav for external usage @iisa
+
+# 5.0.0-48
+- Fix: move analytics to sample bucket @iisa
+- Dev: update dependencies (concurrently, jest) @renovate
+
+# 5.0.0-47
+- Fix: XSS vulnerability in search results @latonv
+- Dev: Update jQuery to v3 **BREAKING** @cdrini
+    - If you were importing `BookReader/jquery-1.10.1.js` you will need to change it to `BookReader/jquery-3.js`
+    - Also ensure if other code was using this jquery that it works with jQuery 3!
+- Dev: Update testing dependencies (jest, testcafe) @renovate
+
+# 5.0.0-46
+Fix: Leaf positioning during RTL fliip animation @latonv
+Dev: dependency updates @renovate
+Fix: Disable contextmenu for restricted books @iisa
+
+# 5.0.0-45
+# 5.0.0-44
+Fix: dynamic `q=<term>` url parameter @iisa
+Dev: dependency updates @renovate
+
+# 5.0.0-43
+Fix: search results panel display asserted page numbers @cdrini
+Dev: dependency updates @renovate
+Dev: node-fetch update @cdrini
+
+# 5.0.0-42
+Dev: update testing dependencies @renovate
+Dev: update `<ia-item-navigator>` @iisa
+
+# 5.0.0-40
+Fix: Better search highlights @cdrini
+Dev: update lit 2 components @iisa
+Dev: update lit @renovate
+
+# 5.0.0-39
+Fix: Performance improvements to scroll/zooming when text layer is larger @cdrini
+Fix: Update zoom in/out icons to match iconochive glyphs @pezvi
+Dev: update dependencies @renovate
+
+# 5.0.0-38
+Dev: Add Renovate Bot @cdrini
+Dev: Update node-fetch @cdrini
+Fix: Search request promise err & fix tests @cdrini
+Dev: Split node workflow into different jobs @cdrini
+Dev: Give cache steps better names in GHA @cdrini
+Dev: Update concurrently + Small speedup to build & test @cdrini
+Dev: Renovate - Auto-update dev dependencies for minor/patch @cdrini
+Fix: Better MS Edge voice selection @cdrini
+Dev: Allow small drops in codecov coverage (< 0.5%) @cdrini
+Dev: Renovate - add `^@internetarchive/icon-` @cdrini
+
+# 5.0.0-37
+Fix: Update all `.then()` to async/await @sancodes
+Fix: Upgrade to Lit 2 @Aadilhassan
+Dev: Update to Node v16.x @duggiefresh
+Dev: Remove unused demo bundle @cdrini
+Dev: Fix README broken link for plugin directory @duggiefresh
+Dev: Update sharing options menu to lit2 @iisa
+Dev: Remove package publishing from GHA @cdrini
+
+# 5.0.0-36
+Fix: Readaloud scrolls along with dext @cdrini
+Dev: ES6 var to let/const updates @sancodes
+Dev: ES6 async/await updates @sancodes
+Dev: Re-enable testcafe tests in GH action @iisa
+Fix: Search results bar clears and closes properly @iisa
+
+# 5.0.0-35
+Fix: global style leak specify colorbox styles @iisa
+Fix: br menu reinits with shared ro load @iisa
+Fix: url plugin does not rewrite with multiple slashes @iisa
+
+# 5.0.0-34
+Dev: update test dependencies @cdrini
+Fix: Update hyphen stitching regex to include dangling "¬" @cdrini
+Fix: pop open multiple files menu at proper width @iisa
+
+# 5.0.0-33
+Fix: restricted books get cover image @iisa
+
+# 5.0.0-32
+Fix: fetch bookmarks from service when logged in @iisa
+Fix: adjust css to help shadydom render properly @iisa
+# 5.0.0-31
+Fix: modal loads into dom from `<ia-bookreader>` @iisa
+
+# 5.0.0-30
+- `<ia-bookreader>` is top-most web component @iisa
+
+# 5.0.0-29
+- import ia-item-navigator for menu management @iisa
+- url plugin: suppress default state on load @dualcnhq
+
+# 5.0.0-28
+Dev: Refactor URLPlugin + sync volumes sorting state to URL @dualcnhq @cdrini
+
+# 5.0.0-27
+Dev: eslint fix for $.browser @homewardgamer
+Fix: cache search inside requests @iisa
+# 5.0.0-26
+Fix: read aloud play/pause button @nsharma123
+Dev: strict keyboard shortcuts @mc2
+Dev: update IA demo page @iisa
+
+# 5.0.0-24
+Fix: book-nav side panel zoom out @mc2
+Dev: refactor zoom code @mc2
+
+# 5.0.0-23
+Fix: Darken scrollbars in Safari @pezvi
+Fix: Bookmarks service calls when reader is logged in @mc2
+Dev: Move jest tests into separate directory @cdrini
+
+# 5.0.0-22
+- Dev: remove deprecated embed nav view, use standard default @iisa
+
+# 5.0.0-21
+- Dev: Toggle view=theater in fullscreen @mc2
+
+# 5.0.0-20
+- Feature: Add voice selection dropdown to ReadAloud! @mekarpeles
+- Dev: Make jest support root-level imports with "@" @cdrini
+- Dev: Make it easy to run e2e tests on archive.org/browserstack @cdrini
+
+# 5.0.0-19
+- Dev: Refactor dragscrollable from a jquery plugin to a JS class @cdrini
+- Dev: Fix jquery eslint errors @cdrini
+- Dev: Replace deprecated babel-eslint with successor @cdrini
+- Fix: BR not working on iOS 9 / iOS 10! @cdrini, @iisa
+    - Added webcomponents, ResizeObserver polyfill
+    - ES5-ify lit node_modules
+
+# 5.0.0-18
+- Dev: Update a number of dependencies @cdrini
+- Dev: Added eslint-plugin-no-jquery @soham4abc
+- Feature: Add continuous pinch zooming for touch screens and trackpads! @cdrini
+    - This is a _big_ change to the codebase. It involved rewriting 1 up mode in LitElement. This means that BookReader now need webcomponents to function.
+    - Breaking changes (unlikely to be used by anyone):
+        - Most Mode1Up Bookreader global functions removed (unlikely to be used): `drawLeafsOnePage`, `onePageGetAutofitWidth`, `onePageGetAutofitHeight`, `onePageGetPageTop`, `onePageCalculateReductionFactors`, `centerX1up`, `centerY1up`
+        - Some Mode2Up cleanups: Removed `setClickHandler2UP`, `setMouseHandlers2UP`
+        - [Web components](https://caniuse.com/custom-elementsv1) now must be supported
+        - Reduction factors options no longer applies to 1up
+
+# 5.0.0-17
+- Fix: focus in a textarea disables keyboard shortcuts @cdrini
+
+# 5.0.0-16
+- Dev: remove unused menu toggle plugin @iisa
+- Fix: Book nav loader safari update @iisa
+
+# 5.0.0-15
+- Fix: Typing -/+ in search box no longer zooms @cdrini
+- Dev: Add script for updating dev deps @cdrini
+- Refactor/Fix: Convert search/TTS highlights to use SVG layer @cdrini
+    - Fix TTS highlights not positioned correctly in Mode1Up
+- Breaking changes (unlikely these are used by anyone):
+    - Remove public method `BookReader.prototype.keyboardNavigationIsDisabled`
+    - Remove public method `BookReader.util.sleep`
+    - Remove public method `BookReader.prototype.updateSearchHilites1UP`
+    - Remove public method `BookReader.prototype.updateSearchHilites2UP`
+    - Remove public attribute `BookReader.prototype.ttsHilites`
+
+# 5.0.0-14
+- Fix: Url search param `q=` updates dynamically @nsharma123
+- Fix: Downloads menu text updates @dualcnhq
+- Fix: Volumes updates - icons, labelling, open menu onload @iisa
+
+# 5.0.0-13
+- Enhancement: Add neutral state for sorting volumes @dualcnhq
+- Enhancement: Update subfiles/volumes title sorting logic by filename -> title_asc -> title_desc order then back to filename @dualcnhq
+- Fix: Volume item index count display @dualcnhq
+
+
+# 5.0.0-12
+- Fix: new side panel: sortable multiple volumes @dualcnhq @iisa
+- Fix: sharing side panel can share subfile/volume @iisa
+
+# 5.0.0-11
+- Fix: standardize button style for download panel @nsharma123
+# 5.0.0-10
+- Fix: Make 1up default to full width (up to real world size) @cdrini
+- Fix: Remove "page" from toolbar @cdrini
+- Dev: Update menu slider @iisa
+- Dev: Add semi-colons eslint rule @iisa
+
+# 5.0.0-9
+- Fix: search-inside results check for page's index via `leafNum` @nsharma123
+# 5.0.0-8
+- Fix: cancel search fix naming var @iisa
+
+# 5.0.0-7
+- Fix: cancel search @iisa
+- Dev: remove dead css @cdrini
+- Dev: GHA node_modules caching @cdrini
+# 5.0.0-6
+- Fix: Fullscreen toggle sets/unsets animating flag @iisa
 # 5.0.0-5
 - Fix: Book Nav: resize only when bookreader is not animating @iisa
 - Fix: Web components register themselves at EOF @iisa

package/README.md

@@ -123,7 +123,7 @@ A peek in how to use/extend core functionality:
     - plugin.url.js - automatically updates the browser url
     - plugin.resume.js - uses cookies to remember the current page
     - plugin.vendor-fullscreen.js - replaces fullscreen mode with vendor native fullscreen
-    - see plugin directory for current plugin files ()[https://github.com/internetarchive/bookreader/tree/master/src/plugins]
+    - see [plugin directory for current plugin files](https://github.com/internetarchive/bookreader/tree/master/src/plugins)
 
 ### Embedding BookReader in an iFrame
 
@@ -149,6 +149,19 @@ The source JavaScript is written in ES6 (located in the `src/js` directory) and
 
 Until the next major version bump, we have to store the build files inside the repo to maintain backwards compatibility. Please _DO NOT_ include these files in your PR. Anything in the `BookReader/` directory should not be committed.
 
+### Developing icons
+To see local icon package changes in bookreader, you'll need to install core-js into the icon package and link into bookreader.
+
+Let's use `icon-share` as an example.
+1.  Confirm your icon package is working properly in the iaux-icons demo
+2.  Navigate to your icon package (`iaux-icons/packages/icon-share`) and run command: `npm install core-js`
+    -  You shouldn't need to commit any of these core-js changes
+3.  From within your icon package directory run command: `npm link`
+    -  You can use the command `npm ls -g` to confirm your local package now appears in the registry
+4.  Navigate to `/bookreader` and run command: `npm link @internetarchive/icon-share`
+    -  You can use the command `npm ls |grep icon-share` to confirm icon-share is now a link to your local directory
+5. You may now start a local server to see your changes by running command: `npm run serve-dev`
+
 ## Releases
 
 To version bump the repo and prepare a release, run `npm version major|minor|patch` (following [semver](https://semver.org/)), then (something like) `git push origin HEAD --tags`. It'll automatically update the version number where it appears, build the files, and ask you to update the CHANGELOG.

package/babel.config.js

@@ -0,0 +1,18 @@
+module.exports = {
+  presets: [
+    [
+      "@babel/preset-env",
+      process.env.NODE_ENV == 'test' ? { targets: {esmodules: true} } : {
+        targets: "> 2%, ie 11, edge 14, samsung > 9, OperaMini all, UCAndroid > 12, Safari >= 9",
+        useBuiltIns: "usage",
+        corejs: 3
+      }
+    ]
+  ],
+  plugins: [
+    ["@babel/plugin-proposal-decorators", {decoratorsBeforeExport: true}],
+    ["@babel/plugin-proposal-class-properties", {loose: true}],
+    ["@babel/plugin-proposal-private-property-in-object", { loose: true }],
+    ["@babel/plugin-proposal-private-methods", { loose: true }],
+  ]
+};

package/codecov.yml

@@ -1,6 +1,12 @@
 codecov:
   notify:
     require_ci_to_pass: yes
+  status:
+    project:
+      default:
+        # Allow small drops in coverage
+        threshold: 0.005  # .5 %
+        if_not_found: failure
 
 coverage:
   precision: 2

package/index.html

@@ -18,12 +18,15 @@
       <li><a href="BookReaderDemo/demo-preview-pages.html">Preview Pages</a></li>
       <li><a href="BookReaderDemo/demo-embed.html">Embed</a></li>
       <li><a href="BookReaderDemo/demo-multiple.html">Multiple on same page</a></li>
+      <!-- plugin.search.js -->
       <li><a href="BookReaderDemo/demo-internetarchive.html?ocaid=theworksofplato01platiala">From Internet Archive</a></li>
+      <!-- plugin.search.js -->
       <li><a href="BookReaderDemo/demo-internetarchive.html?ocaid=adventuresofoli00dick">From Internet Archive - a book with CHAPTERS</a></li>
       <li><a href="BookReaderDemo/demo-iiif.html">IIIF</a></li>
       <li><a href="BookReaderDemo/demo-autoplay.html">Autoplay (kiosk mode)</a></li>
       <li><a href="BookReaderDemo/demo-plugin-menu-toggle.html">Plugin: Full screen menu toggle</a></li>
       <li><a href="BookReaderDemo/immersion-mode.html">Start in immersion (fullscreen) mode</a></li>
+      <!-- plugin.search.js -->
       <li><a href="BookReaderDemo/immersion-1up.html">Start in immersion mode on 1up default item</a></li>
       <li><a href="BookReaderDemo/viewmode-cycle.html">Replace view mode buttons with view mode cycler</a></li>
      </ul>

package/jsconfig.json

@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "target": "es6",
+    "moduleResolution": "node",
+    "experimentalDecorators": true,
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["./*"]
+    }
+  },
+  "include": [
+    "src/**/*.js",
+    "tests/**/*.js",
+  ],
+  "exclude": [
+    "node_modules",
+    "BookReader"
+  ]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/bookreader",
-  "version": "5.0.0-5-multiple-files",
+  "version": "5.0.0-50",
   "description": "The Internet Archive BookReader.",
   "repository": {
     "type": "git",
@@ -9,7 +9,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "module": "src/BookNavigator/BookNavigator.js",
+  "module": "src/ia-bookreader/ia-bookreader.js",
   "keywords": [
     "online",
     "bookreader",
@@ -25,73 +25,82 @@
   "homepage": "https://github.com/internetarchive/bookreader#readme",
   "private": false,
   "dependencies": {
-    "@internetarchive/ia-activity-indicator": "^0.0.1",
-    "@internetarchive/ia-icons": "^1.2.3",
-    "@internetarchive/ia-menu-slider": "0.2.0-alpha3",
-    "@internetarchive/ia-sharing-options": "^0.1.2",
-    "@internetarchive/icon-bookmark": "^1.1.3",
-    "@internetarchive/icon-collapse-sidebar": "^1.1.0",
-    "@internetarchive/icon-edit-pencil": "1.1.5",
-    "@internetarchive/icon-magnify-minus": "^1.2.3",
-    "@internetarchive/icon-magnify-plus": "^1.2.3",
-    "@internetarchive/icon-search": "^1.2.3",
-    "@internetarchive/modal-manager": "^0.1.0",
-    "lit-element": "^2.4.0",
-    "lit-html": "^1.3.0"
+    "@internetarchive/ia-activity-indicator": "^0.0.3",
+    "@internetarchive/ia-item-navigator": "^1.0.1",
+    "@internetarchive/ia-sharing-options": "^1.0.1",
+    "@internetarchive/icon-bookmark": "^1.3.2",
+    "@internetarchive/icon-dl": "^1.3.3",
+    "@internetarchive/icon-edit-pencil": "1.3.2",
+    "@internetarchive/icon-magnify-minus": "^1.3.3",
+    "@internetarchive/icon-magnify-plus": "^1.3.3",
+    "@internetarchive/icon-search": "^1.3.3",
+    "@internetarchive/icon-share": "^1.3.3",
+    "@internetarchive/icon-visual-adjustment": "^1.3.2",
+    "@internetarchive/modal-manager": "^0.2.3",
+    "@internetarchive/shared-resize-observer": "^0.2.0",
+    "lit": "^2.2.2"
   },
   "devDependencies": {
-    "@babel/core": "7.13.16",
-    "@babel/preset-env": "7.13.15",
-    "@open-wc/testing": "^2.5.33",
-    "@open-wc/testing-karma": "^4.0.9",
-    "@types/jest": "26.0.23",
-    "babel-loader": "8.2.2",
-    "codecov": "3.8.1",
-    "concurrently": "6.0.2",
-    "core-js": "3.11.0",
-    "cpx2": "3.0.0",
-    "eslint": "7.25.0",
-    "eslint-plugin-testcafe": "0.2.1",
-    "http-server": "0.12.3",
-    "iso-language-codes": "1.0.8",
-    "jest": "26.6.3",
-    "jquery": "1.11.3",
+    "@babel/core": "7.17.9",
+    "@babel/eslint-parser": "7.17.0",
+    "@babel/plugin-proposal-class-properties": "7.16.7",
+    "@babel/plugin-proposal-decorators": "7.17.9",
+    "@babel/preset-env": "7.16.11",
+    "@open-wc/testing-helpers": "^2.1.4",
+    "@types/jest": "^29.1.1",
+    "@webcomponents/webcomponentsjs": "^2.6.0",
+    "babel-loader": "8.2.5",
+    "codecov": "^3.8.3",
+    "concurrently": "7.4.0",
+    "core-js": "3.22.3",
+    "cpx2": "4.2.0",
+    "eslint": "^7.32.0",
+    "eslint-plugin-no-jquery": "^2.7.0",
+    "eslint-plugin-testcafe": "^0.2.1",
+    "hammerjs": "^2.0.8",
+    "http-server": "14.1.1",
+    "iso-language-codes": "1.1.0",
+    "jest": "^29.1.2",
+    "jest-environment-jsdom": "^29.1.2",
+    "jquery": "3.6.1",
     "jquery-colorbox": "1.6.4",
     "jquery-ui": "1.12.1",
     "jquery-ui-touch-punch": "0.2.3",
     "jquery.browser": "0.1.0",
     "jquery.mmenu": "5.6.5",
-    "karma-coverage": "^2.0.3",
-    "live-server": "1.2.1",
-    "node-fetch": "2.6.1",
-    "regenerator-runtime": "0.13.7",
-    "sass": "1.32.11",
-    "sinon": "10.0.0",
+    "live-server": "1.2.2",
+    "node-fetch": "3.2.10",
+    "regenerator-runtime": "0.13.9",
+    "sass": "1.52.1",
+    "sinon": "^14.0.0",
     "soundmanager2": "2.97.20170602",
-    "svgo": "2.3.0",
-    "testcafe": "1.14.0",
-    "webpack": "5.35.0",
-    "webpack-cli": "4.6.0"
+    "svgo": "2.8.0",
+    "testcafe": "^2.0.1",
+    "testcafe-browser-provider-browserstack": "^1.13.2-alpha.1",
+    "webpack": "5.51.1",
+    "webpack-cli": "4.9.2"
   },
   "jest": {
+    "testEnvironment": "jsdom",
+    "transformIgnorePatterns": [
+      "node_modules/(?!(lit-html|lit-element|lit|@lit|@internetarchive|@open-wc)/)"
+    ],
+    "moduleNameMapper": {
+      "^@/(.*)$": "<rootDir>/$1"
+    },
     "setupFiles": [
       "./src/jquery-wrapper.js"
     ],
     "roots": [
       "<rootDir>/src/",
-      "<rootDir>/tests/"
-    ],
-    "testPathIgnorePatterns": [
-      "<rootDir>/tests/e2e/",
-      "<rootDir>/tests/karma/"
-    ],
-    "coverageDirectory": "<rootDir>/coverage-jest"
+      "<rootDir>/tests/jest/"
+    ]
   },
   "scripts": {
     "preversion": "npm run test && node scripts/preversion.js",
     "version": "node scripts/version.js",
     "postversion": "node scripts/postversion.js",
-    "build": "npm run clean && npm run build-js && npm run build-css && npm run build-assets",
+    "build": "npm run clean && npx concurrently --group npm:build-js npm:build-css npm:build-assets",
     "build-assets": "npx cpx \"src/assets/**/*\" BookReader && npx svgo -f BookReader/icons && npx svgo -f BookReader/images",
     "build-assets:watch": "npx cpx --watch --verbose \"src/assets/**/*\" BookReader",
     "build-js": "npx webpack",
@@ -104,13 +113,14 @@
     "serve": "npx http-server . --port 8000",
     "serve-live": "npx live-server . --port 8000 --watch=index.html,BookReader,BookReaderDemo",
     "serve-dev": "npm run build-css && npx concurrently --kill-others npm:serve-live npm:build-*:watch",
-    "test": "npm run test-jest && npm run test-karma",
-    "test:e2e": "npm run build && env BASE_URL=http://127.0.0.1:8000/BookReaderDemo/ npx testcafe",
-    "test:e2e:dev": "env BASE_URL=http://127.0.0.1:8000/BookReaderDemo/ npx testcafe --live --dev",
-    "test-jest:watch": "npx jest --watch",
-    "test-jest": "npx jest --coverage --colors",
-    "test-karma": "npx karma start --coverage",
-    "test-karma:watch": "npx karma start --auto-watch=true --single-run=false",
+    "test": "npx jest --coverage --colors",
+    "test:watch": "npx jest --watch",
+    "test:e2e": "npm run build && npx testcafe",
+    "test:e2e:dev": "npx testcafe --live --dev",
+    "DOCS:update:test-deps": "If CI succeeds, these should be good to update",
+    "update:test-deps": "npm i @babel/eslint-parser@latest @open-wc/testing-helpers@latest @types/jest@latest codecov@latest eslint@latest eslint-plugin-testcafe@latest jest@latest sinon@latest testcafe@latest",
+    "DOCS:update:build-deps": "These can cause strange changes, so do an npm run build + check file size (git diff --stat), and check the site is as expected",
+    "update:build-deps": "npm i @babel/core@latest @babel/preset-env@latest babel-loader@latest core-js@latest regenerator-runtime@latest sass@latest svgo@latest webpack@latest webpack-cli@latest",
     "codecov": "npx codecov"
   }
 }

package/renovate.json

@@ -0,0 +1,52 @@
+{
+  "extends": [
+    "config:base",
+    "schedule:monthly"
+  ],
+  "packageRules": [
+    {
+      "matchPackageNames": [
+        "@babel/eslint-parser",
+        "@open-wc/testing-helpers",
+        "@types/jest",
+        "codecov",
+        "eslint",
+        "eslint-plugin-no-jquery",
+        "eslint-plugin-testcafe",
+        "jest",
+        "jest-environment-jsdom",
+        "sinon",
+        "testcafe"
+      ],
+      "automerge": true
+    },
+    {
+      "matchPackageNames": [
+        "concurrently",
+        "http-server",
+        "live-server",
+        "node-fetch"
+      ],
+      "matchUpdateTypes": ["minor", "patch"],
+      "automerge": true
+    },
+    {
+      "matchPackagePatterns": ["^@internetarchive/icon-"],
+      "groupName": "@internetarchive icons",
+      "rangeStrategy": "bump"
+    },
+    {
+      "matchPackagePatterns": ["*"],
+      "rangeStrategy": "bump"
+    },
+    {
+      "matchPackagePatterns": ["^actions/"],
+      "groupName": "GitHub Actions",
+      "automerge": true
+    },
+    {
+      "matchPackagePatterns": ["^@internetarchive"],
+      "schedule": ["at any time"]
+    }
+  ]
+}

package/scripts/preversion.js

@@ -1,8 +1,11 @@
 const { version: OLD_VERSION } = require('../package.json');
-const fetch = require('node-fetch');
 const OLD_RELEASE_URL = `https://api.github.com/repos/internetarchive/bookreader/releases/tags/v${OLD_VERSION}`;
 
 async function main() {
+    // Need this because fetch is ESM-only, and we're on Node 16. Someday we should
+    // be able to move this up to the top without renaming this file to a .mjs or whatever
+    const {default: fetch} = await import('node-fetch');
+
     const {created_at} = await fetch(OLD_RELEASE_URL).then(r => r.json());
     const today = new Date().toISOString().slice(0, -5);
     const searchUrl = 'https://github.com/internetarchive/bookreader/pulls?' + new URLSearchParams({

package/src/BookNavigator/assets/bookmark-colors.js

@@ -1,4 +1,4 @@
-import { css } from 'lit-element';
+import { css } from 'lit';
 
 export default css`
   .blue {

package/src/BookNavigator/assets/button-base.js

@@ -1,4 +1,4 @@
-import { css } from 'lit-element';
+import { css } from 'lit';
 
 export default css`
   .ia-button {
@@ -24,8 +24,10 @@ export default css`
     user-select: none;
   }
 
-  .ia-button.link {
+  .ia-button.link,
+  .ia-button.external {
     min-height: unset;
+    text-decoration: none;
   }
 
   .ia-button:disabled,
@@ -51,4 +53,9 @@ export default css`
     background-color: var(--primaryErrorCTAFill);
     border-color: var(--primaryErrorCTABorder);
   }
+
+  .ia-button.external {
+    background: var(--secondaryCTAFill);
+    border-color: var(--secondaryCTABorder);
+  }
 `;

package/src/BookNavigator/assets/ia-logo.js

@@ -0,0 +1,17 @@
+import { svg } from 'lit';
+
+export default svg`
+  <svg class="ia-logo" width="27" height="30" viewBox="0 0 27 30" xmlns="http://www.w3.org/2000/svg" aria-labelledby="logoTitleID logoDescID">
+    <title id="logoTitleID">Internet Archive logo</title>
+    <desc id="logoDescID">A line drawing of the Internet Archive headquarters building façade.</desc>
+    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+      <mask id="mask-2" fill="white">
+        <path d="M26.6666667,28.6046512 L26.6666667,30 L0,30 L0.000283687943,28.6046512 L26.6666667,28.6046512 Z M25.6140351,26.5116279 L25.6140351,28.255814 L1.05263158,28.255814 L1.05263158,26.5116279 L25.6140351,26.5116279 Z M3.62469203,7.6744186 L3.91746909,7.82153285 L4.0639977,10.1739544 L4.21052632,13.9963932 L4.21052632,17.6725617 L4.0639977,22.255044 L4.03962296,25.3421929 L3.62469203,25.4651163 L2.16024641,25.4651163 L1.72094074,25.3421929 L1.55031755,22.255044 L1.40350877,17.6970339 L1.40350877,14.0211467 L1.55031755,10.1739544 L1.68423854,7.80887484 L1.98962322,7.6744186 L3.62469203,7.6744186 Z M24.6774869,7.6744186 L24.9706026,7.82153285 L25.1168803,10.1739544 L25.2631579,13.9963932 L25.2631579,17.6725617 L25.1168803,22.255044 L25.0927809,25.3421929 L24.6774869,25.4651163 L23.2130291,25.4651163 L22.7736357,25.3421929 L22.602418,22.255044 L22.4561404,17.6970339 L22.4561404,14.0211467 L22.602418,10.1739544 L22.7369262,7.80887484 L23.0420916,7.6744186 L24.6774869,7.6744186 Z M9.94042303,7.6744186 L10.2332293,7.82153285 L10.3797725,10.1739544 L10.5263158,13.9963932 L10.5263158,17.6725617 L10.3797725,22.255044 L10.3556756,25.3421929 L9.94042303,25.4651163 L8.47583122,25.4651163 L8.0362015,25.3421929 L7.86556129,22.255044 L7.71929825,17.6970339 L7.71929825,14.0211467 L7.86556129,10.1739544 L8.00005604,7.80887484 L8.30491081,7.6744186 L9.94042303,7.6744186 Z M18.0105985,7.6744186 L18.3034047,7.82153285 L18.449948,10.1739544 L18.5964912,13.9963932 L18.5964912,17.6725617 L18.449948,22.255044 L18.425851,25.3421929 L18.0105985,25.4651163 L16.5460067,25.4651163 L16.1066571,25.3421929 L15.9357367,22.255044 L15.7894737,17.6970339 L15.7894737,14.0211467 L15.9357367,10.1739544 L16.0702315,7.80887484 L16.3753664,7.6744186 L18.0105985,7.6744186 Z M25.6140351,4.53488372 L25.6140351,6.97674419 L1.05263158,6.97674419 L1.05263158,4.53488372 L25.6140351,4.53488372 Z M13.0806755,0 L25.9649123,2.93331338 L25.4484139,3.8372093 L0.771925248,3.8372093 L0,3.1041615 L13.0806755,0 Z" id="path-1"></path>
+      </mask>
+      <use fill="#FFFFFF" xlink:href="#path-1"></use>
+      <g mask="url(#mask-2)" fill="#FFFFFF">
+        <path d="M0,0 L26.6666667,0 L26.6666667,30 L0,30 L0,0 Z" id="swatch"></path>
+      </g>
+    </g>
+  </svg>
+`;

package/src/BookNavigator/assets/icon_checkmark.js

@@ -1,4 +1,4 @@
-import { css } from 'lit-element';
+import { css } from 'lit';
 
 // Original SVG object for reference
 // <svg height="10" viewBox="0 0 13 10" width="13" xmlns="http://www.w3.org/2000/svg"><path d="m4.33333333 10-4.33333333-4.16666667 1.73333333-1.66666666 2.6 2.5 6.93333337-6.66666667 1.7333333 1.66666667z" fill="#fff" fill-rule="evenodd"/></svg>

package/src/BookNavigator/assets/icon_close.js

@@ -1,3 +1,3 @@
-import { css } from 'lit-element';
+import { css } from 'lit';
 
 export default css`data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgNDAgNDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgYXJpYS1sYWJlbGxlZGJ5PSJjbG9zZVRpdGxlSUQgY2xvc2VEZXNjSUQiPjxwYXRoIGQ9Ik0yOS4xOTIgMTAuODA4YTEuNSAxLjUgMCAwMTAgMi4xMkwyMi4xMjIgMjBsNy4wNyA3LjA3MmExLjUgMS41IDAgMDEtMi4xMiAyLjEyMWwtNy4wNzMtNy4wNy03LjA3IDcuMDdhMS41IDEuNSAwIDAxLTIuMTIxLTIuMTJsNy4wNy03LjA3My03LjA3LTcuMDdhMS41IDEuNSAwIDAxMi4xMi0yLjEyMUwyMCAxNy44NzhsNy4wNzItNy4wN2ExLjUgMS41IDAgMDEyLjEyMSAweiIgY2xhc3M9ImZpbGwtY29sb3IiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvc3ZnPg==`;

package/src/BookNavigator/assets/icon_sort_asc.js

@@ -0,0 +1,5 @@
+import { html } from 'lit';
+
+export default html`
+<svg name="sort-asc" height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="m2.32514544 8.30769231.7756949-2.08468003h2.92824822l.75630252 2.08468003h1.01809955l-2.70523594-6.92307693h-1.01809955l-2.69553976 6.92307693zm3.41305753-2.86037492h-2.34647705l1.17323853-3.22883h.01939237z" fill="#fff" fill-rule="nonzero"/><path d="m7.1689722 16.6153846v-.7756949h-4.4117647l4.29541047-5.3716871v-.77569491h-5.06140918v.77569491h3.97543633l-4.30510666 5.3716871v.7756949z" fill="#fff" fill-rule="nonzero"/><path d="m10.3846154 11.0769231 2.7692308 5.5384615 2.7692307-5.5384615m-2.7692307 4.1538461v-13.15384612" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.661538" transform="matrix(1 0 0 -1 0 18.692308)"/></g></svg>
+`;

package/src/BookNavigator/assets/{icon_sort_ascending.js → icon_sort_desc.js}

@@ -1,5 +1,5 @@
-import { html } from 'lit-html';
+import { html } from 'lit';
 
 export default html`
-<svg name="ascending" height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="m2.32514544 8.30769231.7756949-2.08468003h2.92824822l.75630252 2.08468003h1.01809955l-2.70523594-6.92307693h-1.01809955l-2.69553976 6.92307693zm3.41305753-2.86037492h-2.34647705l1.17323853-3.22883h.01939237z" fill="#fff" fill-rule="nonzero"/><path d="m7.1689722 16.6153846v-.7756949h-4.4117647l4.29541047-5.3716871v-.77569491h-5.06140918v.77569491h3.97543633l-4.30510666 5.3716871v.7756949z" fill="#fff" fill-rule="nonzero"/><path d="m10.3846154 11.0769231 2.7692308 5.5384615 2.7692307-5.5384615m-2.7692307 4.1538461v-13.15384612" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.661538"/></g></svg>
+<svg name="sort-desc" height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="m2.32514544 8.30769231.7756949-2.08468003h2.92824822l.75630252 2.08468003h1.01809955l-2.70523594-6.92307693h-1.01809955l-2.69553976 6.92307693zm3.41305753-2.86037492h-2.34647705l1.17323853-3.22883h.01939237z" fill="#fff" fill-rule="nonzero"/><path d="m7.1689722 16.6153846v-.7756949h-4.4117647l4.29541047-5.3716871v-.77569491h-5.06140918v.77569491h3.97543633l-4.30510666 5.3716871v.7756949z" fill="#fff" fill-rule="nonzero"/><path d="m10.3846154 11.0769231 2.7692308 5.5384615 2.7692307-5.5384615m-2.7692307 4.1538461v-13.15384612" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.661538"/></g></svg>
 `;

package/src/BookNavigator/assets/icon_sort_neutral.js

@@ -0,0 +1,5 @@
+import { html } from 'lit';
+
+export default html`
+<svg name="sort-neutral" height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="#fff" fill-rule="evenodd"><path d="m2.32514544 8.30769231.7756949-2.08468003h2.92824822l.75630252 2.08468003h1.01809955l-2.70523594-6.92307693h-1.01809955l-2.69553976 6.92307693zm3.41305753-2.86037492h-2.34647705l1.17323853-3.22883h.01939237z" fill-rule="nonzero"/><path d="m7.1689722 16.6153846v-.7756949h-4.4117647l4.29541047-5.3716871v-.77569491h-5.06140918v.77569491h3.97543633l-4.30510666 5.3716871v.7756949z" fill-rule="nonzero"/><circle cx="13" cy="9" r="2"/></g></svg>
+`;