Revert "Fix for leftover width less than half of container/screen size"

FormidableLabs · Oct 7, 2024 · fe7cbf8 · fe7cbf8
1 parent a579b58
commit fe7cbf8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 40 deletions.
diff --git a/packages/nuka/src/hooks/use-measurement.test.tsx b/packages/nuka/src/hooks/use-measurement.test.tsx
@@ -121,7 +121,7 @@ describe('useMeasurement', () => {
     const { totalPages, scrollOffset } = result.current;
 
     expect(totalPages).toBe(2);
-    expect(scrollOffset).toEqual([0, 400]);
+    expect(scrollOffset).toEqual([0, 500]);
   });
 
   it('should return measurements for screen with fractional pixels', () => {
@@ -150,36 +150,8 @@ describe('useMeasurement', () => {
 
     const { totalPages, scrollOffset } = result.current;
 
-    expect(totalPages).toBe(4);
-    // 573 * 0, 573 * 1, 573 * 2, 573 * 3 + (1720 - 573 * 3)
-    expect(scrollOffset).toEqual([0, 573, 1146, 1147]);
-  });
-
-  it('should return measurements for screen with less than half offset', () => {
-    const element = {
-      current: {
-        // this test covers that even when the leftover width is less than
-        // half of the screen width, it should still be scrollable so that user can see
-        // the small overflow
-        scrollWidth: 600,
-        offsetWidth: 500,
-        querySelector: () => ({
-          children: [{ offsetWidth: 200 }, { offsetWidth: 400 }],
-        }),
-      },
-    } as any;
-
-    const { result } = renderHook(() =>
-      useMeasurement({
-        element,
-        scrollDistance: 'screen',
-      }),
-    );
-
-    const { totalPages, scrollOffset } = result.current;
-
-    expect(totalPages).toBe(2);
-    expect(scrollOffset).toEqual([0, 100]);
+    expect(totalPages).toBe(3);
+    expect(scrollOffset).toEqual([0, 573, 1146]);
   });
 
   it('should return measurements for slide distance', () => {

diff --git a/packages/nuka/src/hooks/use-measurement.tsx b/packages/nuka/src/hooks/use-measurement.tsx
@@ -29,17 +29,10 @@ export function useMeasurement({ element, scrollDistance }: MeasurementProps) {
 
     switch (scrollDistance) {
       case 'screen': {
-        const pageCount = Math.ceil(scrollWidth / visibleWidth);
-        // For every page of the visibleWidth, we should scroll by the amount of the width
-        const fullScrollOffsets = arraySeq(pageCount - 1, visibleWidth);
-        // For the last page, we should only scroll by the leftover amount
-        const leftoverLastPage = scrollWidth % visibleWidth;
+        const pageCount = Math.round(scrollWidth / visibleWidth);
 
         setTotalPages(pageCount);
-        setScrollOffset([
-          ...fullScrollOffsets,
-          fullScrollOffsets[fullScrollOffsets.length - 1] + leftoverLastPage,
-        ]);
+        setScrollOffset(arraySeq(pageCount, visibleWidth));
         break;
       }
       case 'slide': {