Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Oct 7, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 3 additions & 31 deletions packages/nuka/src/hooks/use-measurement.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down Expand Up @@ -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', () => {
Expand Down
11 changes: 2 additions & 9 deletions packages/nuka/src/hooks/use-measurement.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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': {
Expand Down