From 811b17361c564df7b16d855f710cdf0e938c9ffd Mon Sep 17 00:00:00 2001
From: schroda <50052685+schroda@users.noreply.github.com>
Date: Mon, 17 Feb 2025 14:31:18 +0100
Subject: [PATCH] Fix intersection root margin for horizontal pager

---
 .../useReaderInfiniteScrollUpdateChapter.ts   | 42 +++++++++++++++++--
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/modules/reader/hooks/useReaderInfiniteScrollUpdateChapter.ts b/src/modules/reader/hooks/useReaderInfiniteScrollUpdateChapter.ts
index 3dcf72f0..9a2caff2 100644
--- a/src/modules/reader/hooks/useReaderInfiniteScrollUpdateChapter.ts
+++ b/src/modules/reader/hooks/useReaderInfiniteScrollUpdateChapter.ts
@@ -26,7 +26,43 @@ interface ElementIntersectionInfo {
     [ReadingMode.CONTINUOUS_HORIZONTAL]: ElementIntersection;
 }
 
+type PageType = 'first' | 'last';
+
 const OPEN_CHAPTER_INTERSECTION_RATIO = 0;
+const INTERSECTION_THRESHOLD = '-10px';
+
+const getRootMargin = (
+    pageType: PageType,
+    readingMode: ReadingMode,
+    readingDirection: ReadingDirection,
+): string | undefined => {
+    if (!isContinuousReadingMode(readingMode)) {
+        return undefined;
+    }
+
+    const themeDirectionOfReadingDirection = READING_DIRECTION_TO_THEME_DIRECTION[readingDirection];
+
+    const firstPageMarginHorizontal = `0px ${INTERSECTION_THRESHOLD} 0px 0px`;
+    const lastPageMarginHorizontal = `0px 0px 0px ${INTERSECTION_THRESHOLD}`;
+
+    if (isContinuousVerticalReadingMode(readingMode)) {
+        if (pageType === 'first') {
+            return `0px 0px ${INTERSECTION_THRESHOLD} 0px`;
+        }
+
+        return `${INTERSECTION_THRESHOLD} 0px 0px 0px`;
+    }
+
+    if (pageType === 'first') {
+        return getOptionForDirection(
+            firstPageMarginHorizontal,
+            lastPageMarginHorizontal,
+            themeDirectionOfReadingDirection,
+        );
+    }
+
+    return getOptionForDirection(lastPageMarginHorizontal, firstPageMarginHorizontal, themeDirectionOfReadingDirection);
+};
 
 /**
  * Returns info about if the start or end of an element is intersecting.
@@ -184,7 +220,7 @@ const getElementIntersection = (
  *
  */
 export const useReaderInfiniteScrollUpdateChapter = (
-    pageType: 'first' | 'last',
+    pageType: PageType,
     chapterId: number,
     chapterToOpenId: number | undefined,
     isCurrentChapter: boolean,
@@ -255,11 +291,11 @@ export const useReaderInfiniteScrollUpdateChapter = (
         useMemo(
             () => ({
                 threshold: [OPEN_CHAPTER_INTERSECTION_RATIO],
-                rootMargin: pageType === 'first' ? '0px 0px -10px 0px' : '-10px 0px 0px 0px',
+                rootMargin: getRootMargin(pageType, readingMode, readingDirection),
                 // gets immediately observed once on initial render
                 ignoreInitialObserve: true,
             }),
-            [pageType],
+            [pageType, readingMode, readingDirection],
         ),
     );
 };