diff --git a/ui/src/shared/components/MultiGrid/MultiGrid.tsx b/ui/src/shared/components/MultiGrid/MultiGrid.tsx index ad0fab32a1..f80eddbe90 100644 --- a/ui/src/shared/components/MultiGrid/MultiGrid.tsx +++ b/ui/src/shared/components/MultiGrid/MultiGrid.tsx @@ -1,7 +1,7 @@ import * as React from 'react' import CellMeasurerCacheDecorator from './CellMeasurerCacheDecorator' import {Grid} from 'react-virtualized' -import {DapperScrollbars} from '@influxdata/clockface' +import {DapperScrollbars, FusionScrollEvent} from '@influxdata/clockface' const SCROLLBAR_SIZE_BUFFER = 20 type HeightWidthFunction = (arg: {index: number}) => number @@ -401,9 +401,8 @@ class MultiGrid extends React.PureComponent { return this.topGridHeight } - private onScrollbarsScroll = (e: React.MouseEvent) => { - const {target} = e - this.onScroll(target) + private onScrollbarsScroll = (e: FusionScrollEvent) => { + this.onScroll(e) } private onScroll = scrollInfo => { diff --git a/ui/src/timeMachine/components/RawFluxDataTable.tsx b/ui/src/timeMachine/components/RawFluxDataTable.tsx index ba067799a4..02726c9ed3 100644 --- a/ui/src/timeMachine/components/RawFluxDataTable.tsx +++ b/ui/src/timeMachine/components/RawFluxDataTable.tsx @@ -1,11 +1,11 @@ // Libraries -import React, {PureComponent, MouseEvent} from 'react' +import React, {PureComponent} from 'react' import memoizeOne from 'memoize-one' import RawFluxDataGrid from 'src/timeMachine/components/RawFluxDataGrid' // Utils import {parseFiles} from 'src/timeMachine/utils/rawFluxDataTable' -import {DapperScrollbars} from '@influxdata/clockface' +import {DapperScrollbars, FusionScrollEvent} from '@influxdata/clockface' interface Props { files: string[] @@ -58,11 +58,8 @@ class RawFluxDataTable extends PureComponent { ) } - private onScrollbarsScroll = (e: MouseEvent) => { - e.preventDefault() - e.stopPropagation() - - const {scrollTop, scrollLeft} = e.currentTarget + private onScrollbarsScroll = (e: FusionScrollEvent) => { + const {scrollTop, scrollLeft} = e this.setState({scrollLeft, scrollTop}) }