Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "refactor: overscrollBehavior set none not scrollbar effect #4675\n\n",
"type": "none",
"packageName": "@visactor/vtable"
}
],
"packageName": "@visactor/vtable",
"email": "892739385@qq.com"
}
12 changes: 10 additions & 2 deletions packages/vtable/src/event/listener/touch.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
import { vglobal } from '@src/vrender';
import type { FederatedPointerEvent } from '@src/vrender';
import { handleWhell, isHorizontalScrollable, isVerticalScrollable } from '../scroll';
import {
handleWhell,
isHorizontalExistScrollBar,
isHorizontalScrollable,
isVerticalExistScrollBar,
isVerticalScrollable
} from '../scroll';
import type { EventManager } from '../event';
import { IconFuncTypeEnum } from '../../ts-types';

Expand Down Expand Up @@ -69,7 +75,9 @@ export function bindTouchListener(eventManager: EventManager) {

if (
e.cancelable &&
(table.internalProps.overscrollBehavior === 'none' ||
((table.internalProps.overscrollBehavior === 'none' &&
((deltaY && isVerticalExistScrollBar(stateManager)) ||
(deltaX && isHorizontalExistScrollBar(stateManager)))) ||
(Math.abs(deltaY) >= Math.abs(deltaX) && deltaY !== 0 && isVerticalScrollable(deltaY, stateManager)) ||
(Math.abs(deltaY) <= Math.abs(deltaX) && deltaX !== 0 && isHorizontalScrollable(deltaX, stateManager)))
) {
Expand Down
19 changes: 18 additions & 1 deletion packages/vtable/src/event/scroll.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ export function handleWhell(event: FederatedWheelEvent, state: StateManager, isW
isWheelEvent && state.resetInteractionState(state.interactionStateBeforeScroll);
if (
event.nativeEvent?.cancelable &&
(state.table.internalProps.overscrollBehavior === 'none' ||
((state.table.internalProps.overscrollBehavior === 'none' &&
((deltaY && isVerticalExistScrollBar(state)) || (deltaX && isHorizontalExistScrollBar(state)))) ||
(Math.abs(deltaY) >= Math.abs(deltaX) && deltaY !== 0 && isVerticalScrollable(deltaY, state)) ||
(Math.abs(deltaY) <= Math.abs(deltaX) && deltaX !== 0 && isHorizontalScrollable(deltaX, state)))
) {
Expand Down Expand Up @@ -80,6 +81,22 @@ export function isHorizontalScrollable(deltaX: number, state: StateManager) {
return !isScrollToLeft(deltaX, state) && !isScrollToRight(deltaX, state);
}

export function isVerticalExistScrollBar(state: StateManager) {
const totalHeight = state.table.getAllRowsHeight() - state.table.scenegraph.height;
if (totalHeight <= 0) {
return false;
}
return true;
}

export function isHorizontalExistScrollBar(state: StateManager) {
const totalWidth = state.table.getAllColsWidth() - state.table.scenegraph.width;
if (totalWidth <= 0) {
return false;
}
return true;
}

function isScrollToTop(deltaY: number, state: StateManager) {
const totalHeight = state.table.getAllRowsHeight() - state.table.scenegraph.height;
return totalHeight !== 0 && deltaY <= 0 && state.scroll.verticalBarPos < 1;
Expand Down
Loading