javascript/element-plus
1
0
Fork 0
mirror of https://github.com/element-plus/element-plus.git synced 2025-08-26 12:32:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(components): fix virtual list scroll&wheel handler (#11472)

Browse Source 
fix xEndEdge&yEndEdge logic when wheel event emits

fix hasReachedEdge logic when  offsetX

offsetY is zero

closed #11463, #11155

Co-authored-by: 迦叶（仝航） <jiaye@xiaohongshu.com>
This commit is contained in:
Rapliangle
2023-02-08 23:20:46 +08:00
committed by GitHub
parent 3d747a0e56
commit 2793c8477f
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/components/virtual-list/src/builders/build-grid.ts
View File

@ -326,11 +326,15 @@ const createGrid = ({
{ {
atXStartEdge: computed(() => states.value.scrollLeft <= 0), atXStartEdge: computed(() => states.value.scrollLeft <= 0),
atXEndEdge: computed( atXEndEdge: computed(
() => states.value.scrollLeft >= estimatedTotalWidth.value () =>
states.value.scrollLeft >=
estimatedTotalWidth.value - unref(parsedWidth)
), ),
atYStartEdge: computed(() => states.value.scrollTop <= 0), atYStartEdge: computed(() => states.value.scrollTop <= 0),
atYEndEdge: computed( atYEndEdge: computed(
() => states.value.scrollTop >= estimatedTotalHeight.value () =>
states.value.scrollTop >=
estimatedTotalHeight.value - unref(parsedHeight)
), ),
}, },
(x: number, y: number) => { (x: number, y: number) => {

4
packages/components/virtual-list/src/hooks/use-grid-wheel.ts
View File

@ -21,9 +21,9 @@ export const useGridWheel = (
const hasReachedEdge = (x: number, y: number) => { const hasReachedEdge = (x: number, y: number) => {
const xEdgeReached = const xEdgeReached =
(x < 0 && atXStartEdge.value) || (x > 0 && atXEndEdge.value) (x <= 0 && atXStartEdge.value) || (x >= 0 && atXEndEdge.value)
const yEdgeReached = const yEdgeReached =
(y < 0 && atYStartEdge.value) || (y > 0 && atYEndEdge.value) (y <= 0 && atYStartEdge.value) || (y >= 0 && atYEndEdge.value)
return xEdgeReached && yEdgeReached return xEdgeReached && yEdgeReached
} }