From 303b9b6fea11e487d6ca291657e7dea32b242037 Mon Sep 17 00:00:00 2001 From: hujianming Date: Wed, 15 Apr 2020 16:51:45 +0800 Subject: [PATCH 1/2] no need to do event.preventDefault when not use fixedColunms --- src/Table.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Table.tsx b/src/Table.tsx index b88b2b308..8dbab5b8c 100644 --- a/src/Table.tsx +++ b/src/Table.tsx @@ -410,11 +410,13 @@ class Table extends React.Component, TableState handleWheel: React.WheelEventHandler = event => { const { scroll = {} } = this.props; - if (window.navigator.userAgent.match(/Trident\/7\./) && scroll.y) { + const { bodyTable, fixedColumnsBodyLeft, fixedColumnsBodyRight } = this; + + if (window.navigator.userAgent.match(/Trident\/7\./) && scroll.y && (fixedColumnsBodyLeft || fixedColumnsBodyRight)) { + // https://github.com/ant-design/ant-design/issues/22341 event.preventDefault(); const wd = event.deltaY; const { target } = event; - const { bodyTable, fixedColumnsBodyLeft, fixedColumnsBodyRight } = this; let scrollTop = 0; if (this.lastScrollTop) { From 97f40395ce0fa5a30f7b64920be950d53492d135 Mon Sep 17 00:00:00 2001 From: hujianming Date: Thu, 23 Apr 2020 10:06:38 +0800 Subject: [PATCH 2/2] no need to do event.preventDefault when not use fixedColumns --- src/Table.tsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Table.tsx b/src/Table.tsx index 8dbab5b8c..d5f2cad8d 100644 --- a/src/Table.tsx +++ b/src/Table.tsx @@ -410,13 +410,10 @@ class Table extends React.Component, TableState handleWheel: React.WheelEventHandler = event => { const { scroll = {} } = this.props; - const { bodyTable, fixedColumnsBodyLeft, fixedColumnsBodyRight } = this; - - if (window.navigator.userAgent.match(/Trident\/7\./) && scroll.y && (fixedColumnsBodyLeft || fixedColumnsBodyRight)) { - // https://github.com/ant-design/ant-design/issues/22341 - event.preventDefault(); + if (window.navigator.userAgent.match(/Trident\/7\./) && scroll.y) { const wd = event.deltaY; const { target } = event; + const { bodyTable, fixedColumnsBodyLeft, fixedColumnsBodyRight } = this; let scrollTop = 0; if (this.lastScrollTop) { @@ -426,12 +423,16 @@ class Table extends React.Component, TableState } if (fixedColumnsBodyLeft && target !== fixedColumnsBodyLeft) { + event.preventDefault(); fixedColumnsBodyLeft.scrollTop = scrollTop; } if (fixedColumnsBodyRight && target !== fixedColumnsBodyRight) { + event.preventDefault(); fixedColumnsBodyRight.scrollTop = scrollTop; } if (bodyTable && target !== bodyTable) { + // https://github.com/ant-design/ant-design/issues/22341 + event.preventDefault(); bodyTable.scrollTop = scrollTop; } }