Scroll to top when navigating to locators in scroll mode (#329)

Author: chrfalch

.github/workflows/checks.yml

@@ -28,7 +28,7 @@ jobs:
         run: |
           # Check that the Carthage project is up to date.
           make carthage-project
-          git diff --exit-code --name-only Support/Carthage/Readium.xcodeproj
+          git diff --exit-code Support/Carthage/Readium.xcodeproj
       - name: Build
         run: |
           xcodebuild build-for-testing -scheme "$scheme" -destination "platform=$platform,name=$device"
@@ -38,7 +38,7 @@ jobs:
 
   lint:
     name: Lint
-    runs-on: macos-11
+    runs-on: macos-12
     if: ${{ !github.event.pull_request.draft }}
     env:
       scripts: ${{ 'Sources/Navigator/EPUB/Scripts' }}
@@ -61,7 +61,7 @@ jobs:
 
   int-dev:
     name: Integration (Local)
-    runs-on: macos-11
+    runs-on: macos-12
     if: ${{ !github.event.pull_request.draft }}
     defaults:
       run:
@@ -80,7 +80,7 @@ jobs:
 
   int-spm:
     name: Integration (Swift Package Manager)
-    runs-on: macos-11
+    runs-on: macos-12
     if: ${{ !github.event.pull_request.draft }}
     defaults:
       run:
@@ -105,7 +105,7 @@ jobs:
 
   int-carthage:
     name: Integration (Carthage)
-    runs-on: macos-11
+    runs-on: macos-12
     if: ${{ !github.event.pull_request.draft }}
     defaults:
       run:
@@ -133,7 +133,7 @@ jobs:
   int-cocoapods:
     name: Integration (CocoaPods)
     if: github.event_name == 'push'
-    runs-on: macos-11
+    runs-on: macos-12
     defaults:
       run:
         working-directory: TestApp

Sources/Navigator/EPUB/Assets/Static/scripts/readium-fixed.js

@@ -2512,7 +2512,7 @@ function scrollToRange(range) {
 }
 function scrollToRect(rect) {
   if (isScrollModeEnabled()) {
-    document.scrollingElement.scrollTop = rect.top + window.scrollY - window.innerHeight / 2;
+    document.scrollingElement.scrollTop = rect.top + window.scrollY;
   } else {
     document.scrollingElement.scrollLeft = snapOffset(rect.left + window.scrollX);
   }

Sources/Navigator/EPUB/Assets/Static/scripts/readium-reflowable.js

@@ -2512,7 +2512,7 @@ function scrollToRange(range) {
 }
 function scrollToRect(rect) {
   if (isScrollModeEnabled()) {
-    document.scrollingElement.scrollTop = rect.top + window.scrollY - window.innerHeight / 2;
+    document.scrollingElement.scrollTop = rect.top + window.scrollY;
   } else {
     document.scrollingElement.scrollLeft = snapOffset(rect.left + window.scrollX);
   }

Sources/Navigator/EPUB/Scripts/src/utils.js

@@ -188,8 +188,7 @@ function scrollToRange(range) {
 
 function scrollToRect(rect) {
   if (isScrollModeEnabled()) {
-    document.scrollingElement.scrollTop =
-      rect.top + window.scrollY - window.innerHeight / 2;
+    document.scrollingElement.scrollTop = rect.top + window.scrollY;
   } else {
     document.scrollingElement.scrollLeft = snapOffset(
       rect.left + window.scrollX