@internetarchive/bookreader 5.0.0-3 → 5.0.0-30-d

package/.eslintrc.js

@@ -1,4 +1,5 @@
 module.exports = {
+  "parser": "@babel/eslint-parser",
   "env": {
     "browser": true,
     "jquery": true,
@@ -7,11 +8,13 @@ module.exports = {
     "jest": true
   },
   "plugins": [
-    "testcafe"
+    "testcafe",
+    "no-jquery"
   ],
   "extends": [
     "eslint:recommended",
-    "plugin:testcafe/recommended"
+    "plugin:testcafe/recommended",
+    "plugin:no-jquery/deprecated"
   ],
   "globals": {
     // Browser API
@@ -19,15 +22,25 @@ module.exports = {
   },
   "parserOptions": {
     "ecmaVersion": 2020,
+    "ecmaFeatures": { "legacyDecorators": true },
     "sourceType": "module"
   },
   "rules": {
     "comma-dangle": ["error", "only-multiline"],
+    "semi": ["error", "always"],
     "space-before-blocks": ["error"],
     "keyword-spacing": [2, {"before": true, "after": true}],
-    "indent": ["error", 2],
+    "indent": ["error", 2, {
+      // This for some reason causing errors after switch to parser: babel-eslint.
+      // See https://github.com/babel/babel-eslint/issues/681
+      "ignoredNodes": ["TemplateLiteral"]
+    }],
     "no-console": "off", // Used too often behind `debug` options; not dealing with this now
     "no-empty": ["error", { "allowEmptyCatch": true }],
+    "no-jquery/no-bind": ["error"],
+    "no-jquery/no-event-shorthand": ["error"],
+    "no-jquery/no-sizzle": ["error"],
+    "no-jquery/no-trim": ["error"],
     "no-trailing-spaces": ["error"],
     "no-unused-vars": ["error", { "vars": "all", "args": "none", "ignoreRestSiblings": false }], // set args:none; this is generally more annoying than useful
     "no-var": ["error"],
@@ -38,8 +51,7 @@ module.exports = {
   "overrides": [
     { // TODO; these should be cleaned up as well
       "files": [
-        "src/BookReader.js",
-        "src/dragscrollable-br.js"
+        "src/BookReader.js"
       ],
       "rules": {
         "no-var": ["off"],

package/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: monthly
+    time: "13:00"
+  open-pull-requests-limit: 10

package/.github/workflows/node.js.yml

@@ -18,6 +18,15 @@ jobs:
     - uses: actions/setup-node@v1
       with:
         node-version: 14.x
+    - uses: actions/cache@v2
+      with:
+        # Caching node_modules isn't recommended because it can break across
+        # Node versions and won't work with npm ci (See https://github.com/actions/cache/blob/main/examples.md#node---npm )
+        # But we pin the node version, and we don't update it that often anyways. And 
+        # we don't use `npm ci` specifically to try to get faster CI flows. So caching
+        # `node_modules` directly.
+        path: 'node_modules'
+        key: ${{ runner.os }}-node-${{ hashFiles('package*.json') }}
     - run: npm install
     - run: npm run build
     - run: npm run lint
@@ -25,4 +34,4 @@ jobs:
     - run: npm run codecov
     # Travis machines usually have 2 cores (see https://docs.travis-ci.com/user/reference/overview/#virtualisation-environment-vs-operating-system )
     # Quarantine mode (sigh) to catch unstable tests (see https://devexpress.github.io/testcafe/documentation/guides/basic-guides/run-tests.html#quarantine-mode )
-    - run: BASE_URL=http://127.0.0.1:8000/BookReaderDemo/ npx testcafe --concurrency 2 --quarantine-mode
+    - run: npx testcafe --concurrency 2 --quarantine-mode

package/.husky/_/husky.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+if [ -z "$husky_skip_init" ]; then
+  debug () {
+    [ "$HUSKY_DEBUG" = "1" ] && echo "husky (debug) - $1"
+  }
+
+  readonly hook_name="$(basename "$0")"
+  debug "starting $hook_name..."
+
+  if [ "$HUSKY" = "0" ]; then
+    debug "HUSKY env variable is set to 0, skipping hook"
+    exit 0
+  fi
+
+  if [ -f ~/.huskyrc ]; then
+    debug "sourcing ~/.huskyrc"
+    . ~/.huskyrc
+  fi
+
+  export readonly husky_skip_init=1
+  sh -e "$0" "$@"
+  exitCode="$?"
+
+  if [ $exitCode != 0 ]; then
+    echo "husky - $hook_name hook exited with code $exitCode (error)"
+    exit $exitCode
+  fi
+
+  exit 0
+fi

package/.testcaferc.js

@@ -0,0 +1,10 @@
+// @ts-check
+/** @type {TestCafeConfigurationOptions} */
+module.exports = {
+  appCommand: "npm run serve",
+  browsers: [
+    "chrome:headless",
+    "firefox:headless",
+  ],
+  src: ["tests/e2e/**/*test.js"]
+};

package/BookReader/BookReader.css

@@ -91,70 +91,15 @@
   /* Desktop-only */
   /* Element-level rules */
 }
-.BookReader .tl, .BRmobileMenu .tl, .BRfloat .tl {
-  text-align: left;
-}
-.BookReader .tc, .BookReader .BRtc, .BRmobileMenu .tc, .BRmobileMenu .BRtc, .BRfloat .tc, .BRfloat .BRtc {
-  text-align: center;
-}
-.BookReader .tr, .BRmobileMenu .tr, .BRfloat .tr {
-  text-align: right;
-}
-.BookReader .ph10, .BRmobileMenu .ph10, .BRfloat .ph10 {
-  padding-left: 10px;
-  padding-right: 10px;
-}
-.BookReader .mv20, .BRmobileMenu .mv20, .BRfloat .mv20 {
-  margin-top: 20px;
-  margin-bottom: 20px;
-}
-.BookReader .mt20, .BRmobileMenu .mt20, .BRfloat .mt20 {
-  margin-top: 20px;
-}
-.BookReader .b, .BRmobileMenu .b, .BRfloat .b {
-  font-weight: bold;
-}
-.BookReader .i, .BRmobileMenu .i, .BRfloat .i {
-  font-style: italic;
-}
-.BookReader .smaller, .BRmobileMenu .smaller, .BRfloat .smaller {
-  font-size: 0.8em;
-}
 .BookReader .larger, .BRmobileMenu .larger, .BRfloat .larger {
   font-size: 1.2em;
 }
-.BookReader .loader, .BRmobileMenu .loader, .BRfloat .loader {
-  background: url(images/loading.gif) no-repeat 50%;
-  height: 16px;
-  min-width: 16px;
-}
 @media (min-width: 801px) {
-  .BookReader .mobile-only, .BRmobileMenu .mobile-only, .BRfloat .mobile-only {
-    display: none;
-  }
-  .BookReader .pv20-lg, .BRmobileMenu .pv20-lg, .BRfloat .pv20-lg {
-    padding-top: 20px;
-    padding-bottom: 20px;
-  }
-  .BookReader .pv50-lg, .BRmobileMenu .pv50-lg, .BRfloat .pv50-lg {
-    padding-top: 50px;
-    padding-bottom: 50px;
-  }
   .BookReader .mv20-lg, .BRmobileMenu .mv20-lg, .BRfloat .mv20-lg {
     margin-top: 20px;
     margin-bottom: 20px;
   }
 }
-@media (max-width: 800px) {
-  .BookReader .desktop-only, .BRmobileMenu .desktop-only, .BRfloat .desktop-only {
-    display: none;
-  }
-}
-@media (min-width: 800px) and (max-width: 1050px) {
-  .BookReader .hide-md, .BRmobileMenu .hide-md, .BRfloat .hide-md {
-    display: none;
-  }
-}
 .BookReader h3, .BRmobileMenu h3, .BRfloat h3 {
   font-size: 20px;
   font-weight: 700;
@@ -181,6 +126,7 @@
   position: relative;
   overflow: hidden;
   background-color: black;
+  contain: strict;
 }
 
 .BRcontainer {
@@ -205,6 +151,21 @@
   z-index: 3000;
   color: #222;
 }
+.BRprogresspopup .close-popup {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 30px;
+  width: 30px;
+  padding: 0;
+  border: 0;
+  background-color: transparent;
+}
+.BRprogresspopup .close-popup .icon.icon-close-dark {
+  position: absolute;
+  top: 5px;
+  right: 5px;
+}
 
 .BRprogressbar {
   background-image: url("images/progressbar.gif");
@@ -501,6 +462,23 @@ body.BRfullscreenActive .mm-menu {
   cursor: unset;
 }
 
+.br-mode-1up__root {
+  display: block;
+  overflow: auto;
+  position: relative;
+  width: 100%;
+  height: 100%;
+  contain: strict;
+}
+.br-mode-1up__root .br-mode-1up__world {
+  position: absolute;
+  transform-origin: 0 0;
+}
+.br-mode-1up__root .br-mode-1up__visible-world {
+  position: absolute;
+  transform-origin: 0 0;
+}
+
 .BRpagecontainer {
   position: relative;
   overflow: hidden;
@@ -531,6 +509,18 @@ body.BRfullscreenActive .mm-menu {
   background-image: none;
 }
 
+svg.BRPageLayer {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+
+.BRpageFlipping .BRPageLayer {
+  display: none;
+}
+
 .BRbookcover {
   position: absolute;
   background-image: none;
@@ -1087,44 +1077,6 @@ i.BRicon {
 .BRReadAloudToolbar .BRnavCntlBtm:hover {
   background-color: #0074D1;
 }
-.BRReadAloudToolbar.BRnavEmbed {
-  background-color: white;
-  color: black;
-}
-.BRReadAloudToolbar.BRnavEmbed a {
-  color: black;
-}
-.BRReadAloudToolbar.BRnavEmbed .BRpager.ui-slider {
-  background: #B7B7B7;
-}
-.BRReadAloudToolbar.BRnavEmbed .BRpager.ui-slider .ui-slider-handle {
-  background: #0074D1;
-}
-.BRReadAloudToolbar.BRnavEmbed .BRpager.ui-slider .ui-slider-range {
-  background: rgba(0, 116, 209, 0.25);
-}
-.BRReadAloudToolbar.BRnavEmbed .BRpage .BRicon {
-  border-left: 1px solid #979797;
-}
-.BRReadAloudToolbar.BRnavEmbed .BRpage .BRicon.activated {
-  background-color: rgba(0, 116, 209, 0.4);
-}
-.BRReadAloudToolbar.BRnavEmbed .BRpage .BRicon.activated:before {
-  content: "";
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  box-sizing: border-box;
-  display: block;
-  border: 3px solid rgba(0, 116, 209, 0.3);
-}
-.BRReadAloudToolbar.BRnavEmbed .BRnavCntl {
-  background-color: #979797;
-}
-.BRReadAloudToolbar.BRnavEmbed .BRnavCntlBtm:hover {
-  background-color: #0074D1;
-}
 @media (max-width: 800px) {
   .BRbodyMobileNavEnabled .BRReadAloudToolbar, .BRbodyMobileNavEnabledFullscreen.BRfullscreenActive .BRReadAloudToolbar {
     background-color: white;
@@ -1245,23 +1197,6 @@ i.BRicon {
   color: white;
   /* Full mobile styles */
 }
-.BRnav.BRnavEmbed {
-  padding-top: 0;
-  height: auto;
-  align-items: center;
-}
-.BRnav.BRnavEmbed .BRembedreturn {
-  flex: 1 auto;
-  overflow-x: hidden;
-}
-.BRnav.BRnavEmbed .logo {
-  display: inline-block;
-  width: 25px;
-  height: 25px;
-  margin: 0 10px;
-  background: transparent url(images/icon_home.svg) no-repeat center center;
-  background-size: contain;
-}
 .BRnav a {
   color: white;
 }
@@ -1555,13 +1490,12 @@ i.BRicon {
   border-top-color: #333;
 }
 
-.BookReader .BookReaderSearchHilite, .BRmobileMenu .BookReaderSearchHilite, .BRfloat .BookReaderSearchHilite {
-  opacity: 0.2;
-  filter: alpha(opacity=20);
-  background-color: #0000ff;
-  position: absolute;
-  /* z-index is important */
-  z-index: 4;
+.BookReader .searchHiliteLayer, .BookReader .ttsHiliteLayer, .BRmobileMenu .searchHiliteLayer, .BRmobileMenu .ttsHiliteLayer, .BRfloat .searchHiliteLayer, .BRfloat .ttsHiliteLayer {
+  pointer-events: none;
+}
+.BookReader .searchHiliteLayer rect, .BookReader .ttsHiliteLayer rect, .BRmobileMenu .searchHiliteLayer rect, .BRmobileMenu .ttsHiliteLayer rect, .BRfloat .searchHiliteLayer rect, .BRfloat .ttsHiliteLayer rect {
+  fill: #0000ff;
+  fill-opacity: 0.2;
   animation: hiliteFadeIn 0.2s;
 }
 .BookReader .BRchapter, .BookReader .BRsearch, .BRmobileMenu .BRchapter, .BRmobileMenu .BRsearch, .BRfloat .BRchapter, .BRfloat .BRsearch {
@@ -1661,188 +1595,6 @@ i.BRicon {
   float: left;
   cursor: pointer;
 }
-.BookReader .BRbooksearch.mobile, .BRmobileMenu .BRbooksearch.mobile, .BRfloat .BRbooksearch.mobile {
-  position: relative;
-  top: 0;
-  display: flex;
-  flex-direction: row;
-}
-.BookReader .BRbooksearch.mobile .BRsearchInput, .BRmobileMenu .BRbooksearch.mobile .BRsearchInput, .BRfloat .BRbooksearch.mobile .BRsearchInput {
-  -webkit-appearance: none;
-  position: relative;
-  min-width: 100px;
-  float: left;
-  font-size: 14px;
-  width: 150px;
-  height: 30px;
-  border: 1px solid #979797;
-  flex: 1;
-  border-radius: 0;
-}
-.BookReader .BRbooksearch.mobile .BRsearchSubmit, .BRmobileMenu .BRbooksearch.mobile .BRsearchSubmit, .BRfloat .BRbooksearch.mobile .BRsearchSubmit {
-  width: 30px;
-  height: 30px;
-  border: none;
-  background-color: #0074D1;
-  background-image: url("images/icon_search_button.svg");
-  background-repeat: no-repeat;
-  background-position: center center;
-  text-align: center;
-  color: white;
-  overflow: hidden;
-  box-sizing: border-box;
-  display: inline-block;
-}
-.BookReader #BRsearch_tray, .BRmobileMenu #BRsearch_tray, .BRfloat #BRsearch_tray {
-  --menuSliderBg: #151515;
-  --primaryTextColor: #fff;
-  --activeButtonBg: #282828;
-  --searchResultText: #adaedc;
-  --searchResultBg: #272958;
-  --searchResultBorder: #fff;
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  padding: 15px 10px;
-  overflow-y: auto;
-  font-size: 14px;
-  color: var(--primaryTextColor);
-  background: var(--menuSliderBg);
-}
-.BookReader #BRsearch_tray header, .BRmobileMenu #BRsearch_tray header, .BRfloat #BRsearch_tray header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-.BookReader #BRsearch_tray h3, .BRmobileMenu #BRsearch_tray h3, .BRfloat #BRsearch_tray h3 {
-  padding: 0;
-  margin: 0 10px 0 0;
-  font-size: 20px;
-}
-.BookReader #BRsearch_tray header p, .BRmobileMenu #BRsearch_tray header p, .BRfloat #BRsearch_tray header p {
-  display: none;
-  padding: 0;
-  margin: 0;
-  font-size: 12px;
-  font-weight: bold;
-  font-style: italic;
-}
-.BookReader #BRsearch_tray header p.visible, .BRmobileMenu #BRsearch_tray header p.visible, .BRfloat #BRsearch_tray header p.visible {
-  display: block;
-}
-.BookReader #BRsearch_tray header div, .BRmobileMenu #BRsearch_tray header div, .BRfloat #BRsearch_tray header div {
-  display: flex;
-  align-items: baseline;
-}
-.BookReader #BRsearch_tray a.close, .BRmobileMenu #BRsearch_tray a.close, .BRfloat #BRsearch_tray a.close {
-  justify-self: end;
-}
-.BookReader #BRsearch_tray fieldset, .BRmobileMenu #BRsearch_tray fieldset, .BRfloat #BRsearch_tray fieldset {
-  padding: 20px 0 10px 0;
-  border: none;
-}
-.BookReader #BRsearch_tray [type=checkbox], .BRmobileMenu #BRsearch_tray [type=checkbox], .BRfloat #BRsearch_tray [type=checkbox] {
-  display: none;
-}
-.BookReader #BRsearch_tray #all_files, .BRmobileMenu #BRsearch_tray #all_files, .BRfloat #BRsearch_tray #all_files {
-  display: none;
-}
-.BookReader #BRsearch_tray #all_files + label, .BRmobileMenu #BRsearch_tray #all_files + label, .BRfloat #BRsearch_tray #all_files + label {
-  display: none;
-}
-.BookReader #BRsearch_tray label, .BRmobileMenu #BRsearch_tray label, .BRfloat #BRsearch_tray label {
-  display: block;
-  text-align: center;
-}
-.BookReader #BRsearch_tray label.checkbox, .BRmobileMenu #BRsearch_tray label.checkbox, .BRfloat #BRsearch_tray label.checkbox {
-  padding-bottom: 5px;
-  font-size: 16px;
-  line-height: 150%;
-  vertical-align: middle;
-}
-.BookReader #BRsearch_tray label.checkbox:after, .BRmobileMenu #BRsearch_tray label.checkbox:after, .BRfloat #BRsearch_tray label.checkbox:after {
-  display: inline-block;
-  width: 14px;
-  height: 14px;
-  margin-left: 7px;
-  content: "";
-  color: var(--primaryTextColor);
-  border: 1px solid var(--primaryTextColor);
-  border-radius: 2px;
-  background: var(--activeButtonBg) 50% 50% no-repeat;
-}
-.BookReader #BRsearch_tray :checked + label.checkbox:after, .BRmobileMenu #BRsearch_tray :checked + label.checkbox:after, .BRfloat #BRsearch_tray :checked + label.checkbox:after {
-  background-image: url("data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjEwIiB2aWV3Qm94PSIwIDAgMTMgMTAiIHdpZHRoPSIxMyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJtNC4zMzMzMzMzMyAxMC00LjMzMzMzMzMzLTQuMTY2NjY2NjcgMS43MzMzMzMzMy0xLjY2NjY2NjY2IDIuNiAyLjUgNi45MzMzMzMzNy02LjY2NjY2NjY3IDEuNzMzMzMzMyAxLjY2NjY2NjY3eiIgZmlsbD0iI2ZmZiIgZmlsbC1ydWxlPSJldmVub2RkIi8+PC9zdmc+");
-}
-.BookReader #BRsearch_tray [type=search], .BRmobileMenu #BRsearch_tray [type=search], .BRfloat #BRsearch_tray [type=search] {
-  -webkit-appearance: textfield;
-  width: 100%;
-  height: 22px;
-  padding: 0 15px;
-  box-sizing: border-box;
-  font: normal 16px "Helvetica Neue", Helvetica, Arial, sans-serif;
-  color: var(--primaryTextColor);
-  border: 1px solid var(--primaryTextColor);
-  border-radius: 15px;
-  background: transparent;
-}
-.BookReader #BRsearch_tray [type=search]:focus, .BRmobileMenu #BRsearch_tray [type=search]:focus, .BRfloat #BRsearch_tray [type=search]:focus {
-  outline: none;
-}
-.BookReader #BRsearch_tray [type=search]::-webkit-search-cancel-button, .BRmobileMenu #BRsearch_tray [type=search]::-webkit-search-cancel-button, .BRfloat #BRsearch_tray [type=search]::-webkit-search-cancel-button {
-  width: 18px;
-  height: 18px;
-  -webkit-appearance: none;
-  appearance: none;
-  /* Uses an X SVG shape as a mask */
-  -webkit-mask: url("data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgNDAgNDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgYXJpYS1sYWJlbGxlZGJ5PSJjbG9zZVRpdGxlSUQgY2xvc2VEZXNjSUQiPjxwYXRoIGQ9Ik0yOS4xOTIgMTAuODA4YTEuNSAxLjUgMCAwMTAgMi4xMkwyMi4xMjIgMjBsNy4wNyA3LjA3MmExLjUgMS41IDAgMDEtMi4xMiAyLjEyMWwtNy4wNzMtNy4wNy03LjA3IDcuMDdhMS41IDEuNSAwIDAxLTIuMTIxLTIuMTJsNy4wNy03LjA3My03LjA3LTcuMDdhMS41IDEuNSAwIDAxMi4xMi0yLjEyMUwyMCAxNy44NzhsNy4wNzItNy4wN2ExLjUgMS41IDAgMDEyLjEyMSAweiIgY2xhc3M9ImZpbGwtY29sb3IiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvc3ZnPg==") 0 0 no-repeat;
-  mask: url("data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgNDAgNDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgYXJpYS1sYWJlbGxlZGJ5PSJjbG9zZVRpdGxlSUQgY2xvc2VEZXNjSUQiPjxwYXRoIGQ9Ik0yOS4xOTIgMTAuODA4YTEuNSAxLjUgMCAwMTAgMi4xMkwyMi4xMjIgMjBsNy4wNyA3LjA3MmExLjUgMS41IDAgMDEtMi4xMiAyLjEyMWwtNy4wNzMtNy4wNy03LjA3IDcuMDdhMS41IDEuNSAwIDAxLTIuMTIxLTIuMTJsNy4wNy03LjA3My03LjA3LTcuMDdhMS41IDEuNSAwIDAxMi4xMi0yLjEyMUwyMCAxNy44NzhsNy4wNzItNy4wN2ExLjUgMS41IDAgMDEyLjEyMSAweiIgY2xhc3M9ImZpbGwtY29sb3IiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvc3ZnPg==") 0 0 no-repeat;
-  -webkit-mask-size: 100%;
-  mask-size: 100%;
-  background: #fff;
-}
-.BookReader #BRsearch_tray ul, .BRmobileMenu #BRsearch_tray ul, .BRfloat #BRsearch_tray ul {
-  padding: 0;
-  margin: 0;
-  list-style: none;
-}
-.BookReader #BRsearch_tray li, .BRmobileMenu #BRsearch_tray li, .BRfloat #BRsearch_tray li {
-  margin-bottom: 20px;
-  border-bottom: 1px solid #fff;
-}
-.BookReader #BRsearch_tray li:after, .BRmobileMenu #BRsearch_tray li:after, .BRfloat #BRsearch_tray li:after {
-  display: none;
-}
-.BookReader #BRsearch_tray li img, .BRmobileMenu #BRsearch_tray li img, .BRfloat #BRsearch_tray li img {
-  display: block;
-  width: 100%;
-}
-.BookReader #BRsearch_tray li h4, .BRmobileMenu #BRsearch_tray li h4, .BRfloat #BRsearch_tray li h4 {
-  padding: 0 0 20px 0;
-  margin: 0;
-  font-size: 14px;
-  font-weight: normal;
-}
-.BookReader #BRsearch_tray li p, .BRmobileMenu #BRsearch_tray li p, .BRfloat #BRsearch_tray li p {
-  padding: 0 0 15px 0;
-  margin: 0;
-  font-size: 12px;
-}
-.BookReader #BRsearch_tray mark, .BRmobileMenu #BRsearch_tray mark, .BRfloat #BRsearch_tray mark {
-  padding: 0 2px;
-  color: var(--searchResultText);
-  background: var(--searchResultBg);
-  border: 1px solid var(--searchResultBorder);
-  border-radius: 2px;
-}
-.BookReader #BRsearch_tray #search_pending, .BRmobileMenu #BRsearch_tray #search_pending, .BRfloat #BRsearch_tray #search_pending {
-  display: none;
-}
-.BookReader #BRsearch_tray #search_pending.visible, .BRmobileMenu #BRsearch_tray #search_pending.visible, .BRfloat #BRsearch_tray #search_pending.visible {
-  display: block;
-}
 .BookReader .BRsearch-navigation, .BRmobileMenu .BRsearch-navigation, .BRfloat .BRsearch-navigation {
   position: relative;
   z-index: 1;
@@ -1898,10 +1650,7 @@ i.BRicon {
 
 @keyframes hiliteFadeIn {
   from {
-    opacity: 0;
-  }
-  to {
-    opacity: 0.2;
+    fill-opacity: 0;
   }
 }
 /* Mid size breakpoint */
@@ -2880,6 +2629,12 @@ li.BRtable-contents-el .BRTOCElementPage {
   background-image: url("icons/close-circle.svg");
 }
 
+.icon-close-dark {
+  width: 12px;
+  height: 12px;
+  background-image: url("icons/close-circle-dark.svg");
+}
+
 .BRcontrols {
   width: 100%;
   /* BookReader defaults overrides */
@@ -2906,8 +2661,7 @@ li.BRtable-contents-el .BRTOCElementPage {
 .BRfullscreenActive .BRcontrols .icon-fullscreen {
   background-image: url("icons/fullscreen_exit.svg");
 }
-.BRcontrols select.playback-speed {
-  width: 24px;
+.BRcontrols select.playback-speed, .BRcontrols select.playback-voices {
   padding-top: 18px;
   -moz-appearance: none;
   -webkit-appearance: none;
@@ -2918,11 +2672,19 @@ li.BRtable-contents-el .BRTOCElementPage {
   color: #fff;
   border: none;
   cursor: pointer;
-  background: transparent url("icons/playback-speed.svg") 50% 0 no-repeat;
 }
-.BRcontrols select.playback-speed option {
+.BRcontrols select.playback-speed option, .BRcontrols select.playback-voices option {
   background: #333;
 }
+.BRcontrols select.playback-speed {
+  width: 30px;
+  background: transparent url("icons/playback-speed.svg") 50% 0 no-repeat;
+}
+.BRcontrols select.playback-voices {
+  width: 30px;
+  background: transparent url("icons/voice.svg") 50% 0 no-repeat;
+  background-size: 18px;
+}
 .BRcontrols .active {
   background: #fff;
 }
@@ -2975,6 +2737,10 @@ li.BRtable-contents-el .BRTOCElementPage {
   display: flex;
   animation: slideUp 0.2s;
 }
+.BRcontrols .read-aloud.visible button {
+  width: unset;
+  height: unset;
+}
 .BRcontrols .read-aloud li {
   padding: 0 10px;
 }
@@ -3095,11 +2861,6 @@ li.BRtable-contents-el .BRTOCElementPage {
 }
 
 .textSelectionSVG {
-  width: 100%;
-  position: absolute;
-  height: 100%;
-  top: 0;
-  left: 0;
   pointer-events: none;
 }
 .textSelectionSVG .BRwordElement {
@@ -3117,10 +2878,9 @@ li.BRtable-contents-el .BRTOCElementPage {
   color: transparent;
 }
 .textSelectionSVG .BRparagElement {
-  fill: red;
+  fill: transparent;
   cursor: text;
   white-space: pre;
-  fill-opacity: 0;
   font-family: Georgia, serif;
 }
 
@@ -3130,19 +2890,11 @@ li.BRtable-contents-el .BRTOCElementPage {
   user-select: none;
 }
 
-.BRpageFlipping .textSelectionSVG {
-  display: none;
-}
-
-.BRpagecontainer.BRemptypage .textSelectionSVG {
-  display: none;
-}
-
 /**
  * Hide modal-manager that loads item-navigator-modal 
  * loading bookmarks related alert messages 
  */
-#item-navigator-modal {
+modal-manager[mode=closed] {
   display: none;
 }