@internetarchive/bookreader 5.0.0-12-fixsorting-7 → 5.0.0-120

package/src/css/_BRpages.scss

@@ -10,17 +10,41 @@
   }
 }
 
-.BRmodeThumb .BRpagecontainer, .BRmode2Up .BRpagecontainer {
+.BRmodeThumb .BRpagecontainer, .BRmode2up .BRpagecontainer {
   cursor: pointer;
 }
 .BRpagecontainer.BRemptypage {
   cursor: unset;
 }
 
+.br-mode-1up__root {
+  display: block;
+  overflow: auto;
+  position: relative;
+  width: 100%;
+  height: 100%;
+
+  // This is a performance optimization that basically tells the browser "the size
+  // of this element doesn't depend on the size of its children".
+  contain: strict;
+
+  .br-mode-1up__world {
+    position: absolute;
+    transform-origin: 0 0;
+  }
+  
+  .br-mode-1up__visible-world {
+    position: absolute;
+    transform-origin: 0 0;
+  }
+}
+
 .BRpagecontainer {
   position: relative;
   overflow: hidden;
   background: $brColorPlaceholderBg;
+  overflow: hidden;
+  overflow: clip;
   img {
     position: absolute;
     background: transparent;
@@ -36,9 +60,28 @@
     left: 0;
     z-index: 1;
   }
-  &.BRpageloading img {
+  &.BRpageloading {
     // Don't show the alt text while loading
-    color: transparent;
+    img {
+      color: transparent;
+    }
+
+    // src can be set async, so hide the image if it's not set
+    img:not([src]) {
+      display: none;
+    }
+
+    &::after {
+      display: block;
+      content: "";
+      width: 20px;
+      height: 20px;
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      transform: translate(-50%, -50%);
+      background: url("images/loading.gif") center/20px no-repeat;
+    }
   }
   &.BRemptypage {
     background: transparent;
@@ -48,57 +91,146 @@
   }
 }
 
-.BRbookcover {
+// Used for search result rectangles
+svg.BRPageLayer {
   position: absolute;
-  background-image: none;
-  box-shadow: 1px 0 10px #111;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
 }
-.BRPreview .BRpageimage {
-  background-color: #eee;
-  -webkit-filter: grayscale(100%);
-  filter: grayscale(100%);
+
+// Hides page layers during page flip animation
+.BRpageFlipping {
+  // If the text layer has an annotation, don't hide it
+  .BRpagecontainer:not(:has(hypothesis-highlight)):not(:has(.BRhighlight)) .BRtextLayer {
+    display: none;
+  }
 }
 
-.BRleafEdgeR {
-  border-style: solid solid solid none;
-  border-color: rgb(51, 51, 34);
-  border-width: 1px 1px 1px 0px;
+.br-mode-2up__root {
+  display: block;
+  overflow: auto;
+  width: 100%;
+  height: 100%;
+}
 
-  background: transparent url(images/back_pages.png) repeat scroll 0% 0%;
-  position: absolute;
-  cursor: pointer;
+.br-mode-2up__book {
+  position: relative;
+  transform-origin: 0 0;
+  width: 0px;
+  height: 0px;
 }
 
-.BRleafEdgeL {
-  /* border-style: solid none solid solid;
-  border-color: rgb(51, 51, 34);
-  border-width: 1px 0px 1px 1px; */
-  background: transparent url(images/back_pages.png) repeat scroll 0% 0%; /* XXXmang replace file */
-  position: absolute;
-  cursor: pointer;
+.BRmode2up {
+  // Used while loading stuff
+  transition: opacity 0.2s;
 }
 
-.BRleafEdgeTmp {
-  /* border-style: solid none solid solid;
-  border-color: rgb(51, 51, 34);
-  border-width: 1px 0px 1px 1px; */
-  background: transparent url(images/back_pages.png) repeat scroll 0% 0%; /* XXXmang replace file */
-  position: absolute;
+.BRmode2up .BRpagecontainer {
+  backface-visibility: hidden;
+  &:not(.BRpage-visible) {
+    display: none;
+  }
 }
 
-.BRgutter {
-  /* border: 1px solid rgb(68, 25, 17); */
+.br-mode-2up__leafs {
   position: absolute;
-  background: transparent url(images/booksplit.png) repeat scroll 0% 0%;
+  cursor: pointer;
+  top: 0;
+  transform-style: preserve-3d;
+  
+  &[side=left] {
+    border-radius: 4px 0 0 4px;
+    .br-leaf-edges__label {
+      padding-right: 10px;
+      border-radius: 4px 0 0 4px;
+    }
+  }
+  &[side=right] {
+    border-radius: 0 4px 4px 0;
+    .br-leaf-edges__label {
+      padding-left: 20px;
+      border-radius: 0 4px 4px 0;
+    }
+  }
+  &.br-mode-2up__leafs--flipping {
+    z-index: 200000;
+    transition: transform 5s;
+    transition-timing-function: ease-in-out;
+    border-radius: 0;
+
+    // Have a copy of the background at a perpendicular angle,
+    // so that during the rotation, it's always visible.
+    &:before {
+      content: '';
+      display: block;
+      width: 100%;
+      height: 100%;
+      position: absolute;
+      transform: rotateY(-90deg);
+    }
+  }
+
+  &, &.br-mode-2up__leafs--flipping::before {
+    background: transparent url(images/back_pages.png) repeat scroll 0% 0%;
+  }
+
+  .br-leaf-edges__bar {
+    display: none;
+    pointer-events: none;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    min-width: 1px;
+    background-color: #9A9B9D;
+    opacity: 0.85;
+    transform: translateX(-50%);
+  }
+  
+  .br-leaf-edges__label {
+    display: none;
+    pointer-events: none;
+    z-index: 1000;
+    position: absolute;
+    padding: 6px;
+    color: white;
+    background-color: #9A9B9D;
+    opacity: 0.85;
+    white-space: nowrap;
+    transform: translateY(-10px);
+  }
 }
 
-.BRtwoPagePopUp {
-  padding: 6px;
-  position: absolute;
-  font-size: $brFontSizeSmaller;
-  color: white;
-  background-color: #9A9B9D;
-  opacity: 0.85;
-  border-radius: 4px;
-  white-space: nowrap;
+.br-mode-2up--flipping-left {
+  .BRpage-entering[data-side=R] {
+    z-index: 10;
+    transform-origin: left;
+    transform: rotateY(0deg);
+  }
+
+  .BRpage-exiting[data-side=L] {
+    z-index: 10;
+    transform-origin: right;
+  }
+
+  .BRpage-exiting[data-side=R] {
+    z-index: 9;
+  }
+}
+
+.br-mode-2up--flipping-right {
+  .BRpage-entering[data-side=L] {
+    z-index: 10;
+    transform-origin: right;
+  }
+
+  .BRpage-exiting[data-side=R] {
+    z-index: 10;
+    transform-origin: left;
+  }
+
+  .BRpage-exiting[data-side=L] {
+    z-index: 9;
+  }
 }

package/src/css/_BRsearch.scss

@@ -1,40 +1,72 @@
+@mixin ellipsis-lines($lines: 4) {
+  display: -webkit-box;
+  -webkit-line-clamp: $lines;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+}
+
 %timeline-tooltip {
   display: none;
   position: absolute;
   bottom: calc(100% + 5px);
-  left: 50%;
-  transform: translateX(-50%);
-  width: 230px;
+  left: -14px;
+  width: 350px;
+  max-width: 100vw;
   padding: 12px 14px;
+  padding-bottom: 10px;
   color: $tooltipText;
-  font-weight: bold;
   background: $tooltipBG;
   box-shadow: 0 2px 4px rgba(0, 0, 0, .5);
+  border-radius: 4px;
+  animation: fadeUp 0.2s;
+
+  // Disable text selection
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  -o-user-select: none;
+  user-select: none;
+
+  // Create a triangle under the tooltip using clip-path
+  // This makes it possible to move the mouse onto the tooltip
   &:after {
-    display: none;
     position: absolute;
-    top: 100%;
-    left: 50%;
-    transform: translateX(-50%);
     content: "";
-    border: 7px solid transparent;
-    border-width: 7px 4px;
-    border-bottom: none;
-    border-top-color: $tooltipBG;
+    bottom: -9px;
+    left: 0;
+    width: 30px;
+    height: 10px;
+    clip-path: polygon(0 0, 100% 0, 50% 100%);
   }
 }
 
 #{$brScope} {
-  .BookReaderSearchHilite {
-    opacity: 0.20;
-    filter: alpha(opacity = 20);
-    background-color: #0000ff;
-    position: absolute;
-    /* z-index is important */
-    z-index: $brZindexBase + 3;
+  // FIXME: .ttsHiliteLayer should probably not be in this file,
+  // but they appear the same in the UI.
+  .searchHiliteLayer, .ttsHiliteLayer {
+    pointer-events: none;
+    z-index: 4;
+
+    rect {
+      // Note: Can't use fill-opacity ; safari inexplicably applies that to
+      // the outline as well
+      fill: rgba(0, 0, 255, 0.2);
+    }
+  }
 
-    animation: hiliteFadeIn .2s;
+  .searchHiliteLayer rect {
+    animation: highlightFocus 600ms 1 reverse;
+    stroke: blue;
+    stroke-width: 4px;
+
+    // Sass for loop for nth-child animation delay
+    @for $i from 1 through 10 {
+      &:nth-child(#{$i}) {
+        animation-delay: #{($i - 1) * 50}ms;
+      }
+    }
   }
+
   .BRchapter, .BRsearch {
     position: absolute;
     bottom: 0;  /* Relative to nav line */
@@ -64,6 +96,10 @@
       // background-image: url(images/marker_chap-on.svg);
       background-color: blue;
     }
+    .BRchapterPage {
+      font-size: 0.85em;
+      opacity: .8;
+    }
   }
   .BRsearch {
     width: 9px;
@@ -90,7 +126,17 @@
   }
   .BRquery {
     @extend %timeline-tooltip;
-    b {
+    main {
+      @include ellipsis-lines(4);
+      margin-bottom: 6px;
+      &:before { content: "“"; }
+      &:after { content: "”"; }
+    }
+    footer {
+      font-size: 0.85em;
+      opacity: .8;
+    }
+    mark {
       color: $searchResultText;
       font-weight: bold;
       background-color: $searchResultBG;
@@ -119,7 +165,6 @@
       max-width: 160px;
       height: 100%;
       color: white;
-      outline: none;
       border: none;
       padding: 3px 0px 3px 10px;
       margin: 0;
@@ -197,17 +242,11 @@
         height: 18px;
       }
     }
-    + .BRnav {
-      .BRnavCntl {
-        display: none;
-      }
-    }
   }
 }
 
-@keyframes hiliteFadeIn {
-  from { opacity: 0; }
-  to { opacity: 0.2; }
+@keyframes highlightFocus {
+  to { stroke-width: 20px; }
 }
 
 /* Mid size breakpoint */

package/src/css/_BRtoolbar.scss

@@ -34,8 +34,6 @@
 }
 .BRtoolbarbuttons {
   white-space: nowrap;
-  text-align: right;
-  border-spacing: 0;
   box-sizing: border-box;
   display: flex;
   flex-direction: row;
@@ -65,13 +63,11 @@
   display: none;
 }
 .BRtoolbarLeft {
-  text-align: left;
   flex: 1 auto;
   overflow-y: hidden;
 }
 // .BRtoolbarSectionTitle {}
 .BRtoolbarRight {
-  text-align: right;
   flex: none;
 }
 
@@ -81,4 +77,8 @@
     padding: 0;
     box-shadow: 0px 1px 3px 0px rgba(#666, .25);
   }
-}
+}
+
+ia-bookreader .BRtoolbar {
+  padding-left: 50px;
+}