Skip to content

Commit

Permalink
renamed GridRootRef to RootContainerRef
Browse files Browse the repository at this point in the history
  • Loading branch information
dtassone committed Jul 20, 2020
1 parent 19015a5 commit 32f382d
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 13 deletions.
16 changes: 11 additions & 5 deletions packages/grid/x-grid-modules/src/gridComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ import {
useSelection,
useSorting,
} from './hooks/features';
import { DEFAULT_GRID_OPTIONS, ElementSize, GridApi, GridOptions, GridRootRef } from './models';
import {
DEFAULT_GRID_OPTIONS,
ElementSize,
GridApi,
GridOptions,
RootContainerRef,
} from './models';
import { DATA_CONTAINER_CSS_CLASS } from './constants';
import { ColumnsContainer, DataContainer, GridRoot } from './components/styled-wrappers';
import { useVirtualRows } from './hooks/virtualization';
Expand All @@ -31,7 +37,7 @@ export const GridComponent: React.FC<GridComponentProps> = React.memo(
({ rows, columns, options, apiRef, loading, licenseStatus, className, components }) => {
useLoggerFactory(options?.logger, options?.logLevel);
const logger = useLogger('Grid');
const gridRootRef: GridRootRef = React.useRef<HTMLDivElement>(null);
const rootContainerRef: RootContainerRef = React.useRef<HTMLDivElement>(null);
const footerRef = React.useRef<HTMLDivElement>(null);
const columnsHeaderRef = React.useRef<HTMLDivElement>(null);
const columnsContainerRef = React.useRef<HTMLDivElement>(null);
Expand All @@ -51,7 +57,7 @@ export const GridComponent: React.FC<GridComponentProps> = React.memo(
apiRef = internalApiRef;
}

const initialised = useApi(gridRootRef, windowRef, internalOptions, apiRef);
const initialised = useApi(rootContainerRef, windowRef, internalOptions, apiRef);
const internalColumns = useColumns(internalOptions, columns, apiRef);
const internalRows = useRows(internalOptions, rows, initialised, apiRef);
useKeyboard(internalOptions, initialised, apiRef);
Expand Down Expand Up @@ -87,7 +93,7 @@ export const GridComponent: React.FC<GridComponentProps> = React.memo(
components,
paginationProps,
apiRef,
gridRootRef,
rootContainerRef,
);

const onResize = React.useCallback(
Expand Down Expand Up @@ -139,7 +145,7 @@ export const GridComponent: React.FC<GridComponentProps> = React.memo(
<AutoSizerWrapper onResize={debouncedOnResize} style={{ height: 'unset', width: 'unset' }}>
{(size: any) => (
<GridRoot
ref={gridRootRef}
ref={rootContainerRef}
className={`material-grid MuiGrid ${className || ''}`}
options={internalOptions}
style={{ width: size.width, height: getTotalHeight(size) }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
ApiRef,
GridComponentOverridesProp,
GridOptions,
GridRootRef,
RootContainerRef,
InternalColumns,
Rows,
} from '../../models';
Expand All @@ -18,7 +18,7 @@ export const useComponents = (
componentOverrides: GridComponentOverridesProp | undefined,
paginationProps: PaginationProps,
apiRef: ApiRef,
gridRootRef: GridRootRef,
gridRootRef: RootContainerRef,
) => {
const componentParams: ComponentParams = React.useMemo(
() => ({
Expand Down
3 changes: 0 additions & 3 deletions packages/grid/x-grid-modules/src/models/gridRootRef.ts

This file was deleted.

2 changes: 1 addition & 1 deletion packages/grid/x-grid-modules/src/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export * from './colDef';
export * from './containerProps';
export * from './elementSize';
export * from './gridOptions';
export * from './gridRootRef';
export * from './rootContainerRef';
export * from './renderContextProps';
export * from './rows';
export * from './sortModel';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Rows } from '../rows';
import { Columns } from '../colDef/colDef';
import { GridOptions } from '../gridOptions';
import { PaginationProps } from '../../hooks/features/usePagination';
import { GridRootRef } from '../gridRootRef';
import { RootContainerRef } from '../rootContainerRef';
import { ApiRef } from '../api';

export interface ComponentParams {
Expand All @@ -11,5 +11,5 @@ export interface ComponentParams {
columns: Columns;
options: GridOptions;
api: ApiRef;
rootElement: GridRootRef;
rootElement: RootContainerRef;
}
3 changes: 3 additions & 0 deletions packages/grid/x-grid-modules/src/models/rootContainerRef.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import * as React from 'react';

export type RootContainerRef = React.RefObject<HTMLDivElement>;

0 comments on commit 32f382d

Please sign in to comment.