Nuke Viewport file

Author: nstepien

packages/react-data-grid/src/Canvas.tsx

@@ -9,10 +9,10 @@ import * as rowUtils from './RowUtils';
 import { getColumnScrollPosition, isPositionStickySupported } from './utils';
 import { EventTypes, SCROLL_DIRECTION } from './common/enums';
 import { CalculatedColumn, Position, ScrollPosition, SubRowDetails, RowRenderer, RowRendererProps, RowData } from './common/types';
-import { ViewportProps } from './Viewport';
+import { GridProps } from './Grid';
 import { getScrollDirection, getVerticalRangeToRender, getHorizontalRangeToRender } from './utils/viewportUtils';
 
-type SharedViewportProps<R> = Pick<ViewportProps<R>,
+type SharedViewportProps<R> = Pick<GridProps<R>,
 | 'rowKey'
 | 'rowGetter'
 | 'rowsCount'

packages/react-data-grid/src/Grid.tsx

@@ -3,8 +3,7 @@ import { isValidElementType } from 'react-is';
 
 import Header, { HeaderHandle, HeaderProps } from './Header';
 import Canvas from './Canvas';
-import { ScrollState } from './Viewport';
-import { HeaderRowData, CellMetaData, RowSelection, InteractionMasksMetaData, SelectedRow, ColumnMetrics } from './common/types';
+import { HeaderRowData, CellMetaData, RowSelection, InteractionMasksMetaData, SelectedRow, ColumnMetrics, ScrollState } from './common/types';
 import { DEFINE_SORT } from './common/enums';
 import { ReactDataGridProps } from './ReactDataGrid';
 import { EventBus } from './masks';

packages/react-data-grid/src/ReactDataGrid.tsx

@@ -15,7 +15,6 @@ import { SelectAll } from './formatters';
 import * as rowUtils from './RowUtils';
 import KeyCodes from './KeyCodes';
 import { getColumnMetrics } from './ColumnMetrics';
-import { ScrollState } from './Viewport';
 import { RowsContainerProps } from './RowsContainer';
 import { EventBus } from './masks';
 import { CellNavigationMode, EventTypes, UpdateActions, HeaderRowType, DEFINE_SORT } from './common/enums';
@@ -41,7 +40,8 @@ import {
   SubRowDetails,
   SubRowOptions,
   SelectedRow,
-  RowRendererProps
+  RowRendererProps,
+  ScrollState
 } from './common/types';
 
 export interface ReactDataGridProps<R extends {}> {

packages/react-data-grid/src/Viewport.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { KeyboardEvent, ReactNode } from 'react';
 import { List } from 'immutable';
-import { HeaderRowType, UpdateActions } from './enums';
+import { HeaderRowType, UpdateActions, SCROLL_DIRECTION } from './enums';
 
 export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
@@ -243,6 +243,12 @@ export interface RowRenderer<TRow> {
   getDecoratedComponentInstance?(idx: number): { row: RowRenderer<TRow> & React.Component<RowRendererProps<TRow>> } | undefined;
 }
 
+export interface ScrollState {
+  scrollTop: number;
+  scrollLeft: number;
+  scrollDirection: SCROLL_DIRECTION;
+}
+
 export interface ScrollPosition {
   scrollLeft: number;
   scrollTop: number;