Skip to content

fix(virtual-core): loosen approxEqual to allow 1px difference #995

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

Merged
piecyk merged 2 commits into from
May 5, 2025
Merged

fix(virtual-core): loosen approxEqual to allow 1px difference #995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f97c9c8
fix(virtual-core): loosen approxEqual to allow 1px difference
piecyk May 5, 2025
e538844
Create fluffy-books-attend.md
piecyk May 5, 2025
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
5 changes: 5 additions & 0 deletions .changeset/fluffy-books-attend.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@tanstack/virtual-core': patch
---

fix(virtual-core): loosen approxEqual to allow 1px difference
15 changes: 3 additions & 12 deletions packages/virtual-core/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,16 +904,7 @@ export class Virtualizer<
toOffset -= size
}

const scrollSizeProp = this.options.horizontal
? 'scrollWidth'
: 'scrollHeight'
const scrollSize = this.scrollElement
? 'document' in this.scrollElement
? this.scrollElement.document.documentElement[scrollSizeProp]
: this.scrollElement[scrollSizeProp]
: 0

const maxOffset = scrollSize - size
const maxOffset = this.getTotalSize() - size

return Math.max(Math.min(maxOffset, toOffset), 0)
}
Expand Down Expand Up @@ -1010,8 +1001,8 @@ export class Virtualizer<
const [latestOffset] = notUndefined(
this.getOffsetForIndex(index, align),
)

if (!approxEqual(latestOffset, this.getScrollOffset())) {
const currentScrollOffset = this.getScrollOffset()
if (!approxEqual(latestOffset, currentScrollOffset)) {
Copy link

@ogonkov ogonkov May 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like there still a chance to get infinite loop

Copy link
Collaborator Author

@piecyk piecyk May 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you have something specific in mind?

Copy link

@ogonkov ogonkov May 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess for any given scrollToIndex we want to set some kind of counter, and break recursion when this counter is reach some limit, kinda dead loop detector

this.scrollToIndex(index, { align, behavior })
}
} else {
Expand Down
2 changes: 1 addition & 1 deletion packages/virtual-core/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export function notUndefined<T>(value: T | undefined, msg?: string): T {
}
}

export const approxEqual = (a: number, b: number) => Math.abs(a - b) < 1
export const approxEqual = (a: number, b: number) => Math.abs(a - b) <= 1

export const debounce = (
targetWindow: Window & typeof globalThis,
Expand Down