fix: fixed some tests

mbret · Aug 19, 2024 · 3964bdc · 3964bdc
1 parent a73c08f
commit 3964bdc
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 11 deletions.
diff --git a/packages/core/src/navigation/InternalNavigator.test.ts b/packages/core/src/navigation/InternalNavigator.test.ts
@@ -100,12 +100,14 @@ describe(`Given loaded book`, () => {
 
   describe("Given invalid positive navigation spine item", () => {
     it(`should fallback to length - 1`, async () => {
-      const { internalNavigator, userNavigator, spineItemsManagerMock } =
+      const { internalNavigator, userNavigator, spineItemsManagerMock, spine } =
         createNavigator()
       const navigations: InternalNavigationEntry[] = []
 
       spineItemsManagerMock.load(generateItems(100, 2))
 
+      spine.layout()
+
       const sub = internalNavigator.navigated$.subscribe((navigation) => {
         navigations.push(navigation)
       })

diff --git a/packages/core/src/navigation/restoration/restoreNavigationForControlledPageTurnMode.test.ts b/packages/core/src/navigation/restoration/restoreNavigationForControlledPageTurnMode.test.ts
@@ -53,6 +53,8 @@ describe(`Given a backward navigation to a new item`, () => {
         // items of 2 pages
         spineItemsManager.load(generateItems(100, 2))
 
+        spine.layout()
+
         const position = restoreNavigationForControlledPageTurnMode({
           navigation: {
             position: {

diff --git a/packages/core/src/navigation/tests/SpineItemsManagerMock.ts b/packages/core/src/navigation/tests/SpineItemsManagerMock.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Subject } from "rxjs"
+import { BehaviorSubject, NEVER, of, Subject } from "rxjs"
 
 export type Item = {
   left: number
@@ -15,6 +15,8 @@ export class SpineItemsManagerMock {
 
   public layout$ = new Subject()
 
+  public items$ = new BehaviorSubject<Item[]>([])
+
   load(
     items: {
       left: number
@@ -29,7 +31,15 @@ export class SpineItemsManagerMock {
       ...item,
       getElementDimensions: () => ({ width: item.width, height: item.height }),
       isUsingVerticalWriting: () => false,
+      adjustPositionOfElement: () => {},
+      layout: () => ({ width: item.width, height: item.height }),
+      $: {
+        contentLayout$: NEVER,
+        loaded$: of(true),
+      },
     }))
+
+    this.items$.next(this.items)
   }
 
   get(id: number) {

diff --git a/packages/core/src/navigation/tests/utils.ts b/packages/core/src/navigation/tests/utils.ts
@@ -90,5 +90,5 @@ export const createNavigator = () => {
     userNavigator.locker.isLocked$,
   )
 
-  return { internalNavigator, userNavigator, context, spineItemsManagerMock }
+  return { internalNavigator, userNavigator, context, spineItemsManagerMock, spine }
 }
diff --git a/packages/core/src/spine/locator/getItemVisibilityForPosition.ts b/packages/core/src/spine/locator/getItemVisibilityForPosition.ts
@@ -91,11 +91,15 @@ export const getItemVisibilityForPosition = ({
   context: Context
 }) => {
   const viewportLeft = viewportPosition.x
-  const viewportRight =
-    viewportPosition.x + (context.state.visibleAreaRect.width - 1)
+  const viewportRight = Math.max(
+    viewportPosition.x + (context.state.visibleAreaRect.width - 1),
+    0,
+  )
   const viewportTop = viewportPosition.y
-  const viewportBottom =
-    viewportPosition.y + (context.state.visibleAreaRect.height - 1)
+  const viewportBottom = Math.max(
+    viewportPosition.y + (context.state.visibleAreaRect.height - 1),
+    0,
+  )
   // const viewportWidth = context.state.visibleAreaRect.width
 
   const visibleWidthOfItem =

diff --git a/packages/core/src/spine/locator/getVisibleSpineItemsFromPosition.test.ts b/packages/core/src/spine/locator/getVisibleSpineItemsFromPosition.test.ts
@@ -49,8 +49,19 @@ describe("Given single page items and no spread", () => {
           settings,
         )
 
+        context.update({
+          visibleAreaRect: {
+            height: 100,
+            width: 100,
+            x: 0,
+            y: 0,
+          },
+        })
+
         spineItemsManager.load(singlePageItems)
 
+        spineLayout.layout()
+
         const { beginIndex, endIndex } =
           getVisibleSpineItemsFromPosition({
             context: context,
@@ -78,8 +89,19 @@ describe("Given single page items and no spread", () => {
           settings,
         )
 
+        context.update({
+          visibleAreaRect: {
+            height: 100,
+            width: 100,
+            x: 0,
+            y: 0,
+          },
+        })
+
         spineItemsManager.load(singlePageItems)
 
+        spineLayout.layout()
+
         const { beginIndex, endIndex } =
           getVisibleSpineItemsFromPosition({
             context: context,
@@ -107,8 +129,19 @@ describe("Given single page items and no spread", () => {
           settings,
         )
 
+        context.update({
+          visibleAreaRect: {
+            height: 100,
+            width: 100,
+            x: 0,
+            y: 0,
+          },
+        })
+
         spineItemsManager.load(singlePageItems)
 
+        spineLayout.layout()
+
         const { beginIndex, endIndex } =
           getVisibleSpineItemsFromPosition({
             context: context,

diff --git a/packages/core/src/spine/locator/getVisibleSpineItemsFromPosition.ts b/packages/core/src/spine/locator/getVisibleSpineItemsFromPosition.ts
@@ -26,9 +26,7 @@ export const getVisibleSpineItemsFromPosition = ({
 }):
   | {
       beginIndex: number
-      // beginPosition: ViewportPosition
       endIndex: number
-      // endPosition: ViewportPosition
     }
   | undefined => {
   const fallbackSpineItem =
@@ -70,8 +68,6 @@ export const getVisibleSpineItemsFromPosition = ({
 
   return {
     beginIndex: beginItemIndex ?? 0,
-    // beginPosition: position,
     endIndex: endItemIndex ?? 0,
-    // endPosition: position,
   }
 }