Skip to content

feat: 修复页面在缩放时scrollTop值出现精度问题导致永远小于scrollHeight并且不会触发翻页的BUG #113

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: 修复页面在缩放时scrollTop值出现精度问题导致永远小于scrollHeight并且不会触发翻页的BUG #113

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
7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
"name": "virtuallist-antd",
"version": "0.8.0-beta.1",
"description": "virtualList for antd-table, 实现antd-table的虚拟列表, antd-table无限滚动, infinite scrolling for antd-table",
"main": "dist/index.js",
"module": "dist/index.es.js",
"main": "dist/dist/index.js",
"module": "dist/dist/index.es.js",
"jsnext:main": "dist/index.es.js",
"type": "module",
"engines": {
"node": ">=8",
"npm": ">=5"
Expand Down Expand Up @@ -40,7 +41,7 @@
"@babel/preset-env": "^7.9.0",
"@babel/preset-react": "^7.9.4",
"@babel/preset-typescript": "^7.16.0",
"@svgr/rollup": "^4.3.3",
"@svgr/rollup": "^8.1.0",
"@testing-library/jest-dom": "^5.16.1",
"@testing-library/react": "^12.1.2",
"@types/jest": "^27.0.3",
Expand Down
4 changes: 3 additions & 1 deletion rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ import nested from 'postcss-nested';
import cssnext from 'postcss-cssnext';
import cssnano from 'cssnano';

import pkg from './package.json';
import pkg from "./package.json" assert { type: "json" }

console.log(svgr)

export default {
input: 'src/index.tsx',
Expand Down
7 changes: 4 additions & 3 deletions src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,12 +313,13 @@ function VTable(props: any, otherParams): JSX.Element {
const scrollTop: number = e?.target?.scrollTop ?? 0
const scrollHeight: number = e?.target?.scrollHeight ?? 0
const clientHeight: number = e?.target?.clientHeight ?? 0

const ratio: number = window.devicePixelRatio
const precisionScrollTop = ratio === 1 ? scrollTop : Math.ceil(scrollTop)
// 到底了 没有滚动条就不会触发reachEnd. 建议设置scrolly高度少点或者数据量多点.
if (scrollTop === scrollHeight) {
if (precisionScrollTop === scrollHeight) {
// reachEnd && reachEnd()
} else if (
scrollTop + clientHeight >= scrollHeight &&
precisionScrollTop + clientHeight >= scrollHeight &&
historyScrollHeight !== scrollHeight
) {
// 相同的tableData情况下, 上次reachEnd执行后, scrollHeight不变, 则不会再次请求reachEnd
Expand Down