[DataGrid] Don't export the internal utils (#2233)

* Export clean utils * Fix * Fix * Remove exports * Fix * Regen docs examples * Fix story
mui · Jul 30, 2021 · 363a7a1 · 363a7a1
1 parent f35cee0
commit 363a7a1
Show file tree

Hide file tree

Showing 44 changed files with 102 additions and 65 deletions.
diff --git a/docs/src/pages/components/data-grid/columns/RenderExpandCellGrid.js b/docs/src/pages/components/data-grid/columns/RenderExpandCellGrid.js
@@ -4,7 +4,7 @@ import Typography from '@material-ui/core/Typography';
 import Paper from '@material-ui/core/Paper';
 import Popper from '@material-ui/core/Popper';
 import { makeStyles } from '@material-ui/styles';
-import { DataGrid, isOverflown } from '@material-ui/data-grid';
+import { DataGrid } from '@material-ui/data-grid';
 
 const useStyles = makeStyles(() => ({
   root: {
@@ -22,6 +22,13 @@ const useStyles = makeStyles(() => ({
   },
 }));
 
+function isOverflown(element) {
+  return (
+    element.scrollHeight > element.clientHeight ||
+    element.scrollWidth > element.clientWidth
+  );
+}
+
 const GridCellExpand = React.memo(function GridCellExpand(props) {
   const { width, value } = props;
   const wrapper = React.useRef(null);

diff --git a/docs/src/pages/components/data-grid/columns/RenderExpandCellGrid.tsx b/docs/src/pages/components/data-grid/columns/RenderExpandCellGrid.tsx
@@ -3,12 +3,7 @@ import Typography from '@material-ui/core/Typography';
 import Paper from '@material-ui/core/Paper';
 import Popper from '@material-ui/core/Popper';
 import { createStyles, makeStyles } from '@material-ui/styles';
-import {
-  DataGrid,
-  GridColDef,
-  GridCellParams,
-  isOverflown,
-} from '@material-ui/data-grid';
+import { DataGrid, GridColDef, GridCellParams } from '@material-ui/data-grid';
 
 interface GridCellExpandProps {
   value: string;
@@ -33,6 +28,13 @@ const useStyles = makeStyles(() =>
   }),
 );
 
+function isOverflown(element: Element): boolean {
+  return (
+    element.scrollHeight > element.clientHeight ||
+    element.scrollWidth > element.clientWidth
+  );
+}
+
 const GridCellExpand = React.memo(function GridCellExpand(
   props: GridCellExpandProps,
 ) {

diff --git a/docs/src/pages/components/data-grid/editing/IsCellEditableGrid.js b/docs/src/pages/components/data-grid/editing/IsCellEditableGrid.js
@@ -2,13 +2,17 @@
 import * as React from 'react';
 import { createMuiTheme } from '@material-ui/core/styles';
 import { makeStyles } from '@material-ui/styles';
-import { DataGrid, getThemePaletteMode } from '@material-ui/data-grid';
+import { DataGrid } from '@material-ui/data-grid';
 import {
   randomCreatedDate,
   randomTraderName,
   randomUpdatedDate,
 } from '@material-ui/x-grid-data-generator';
 
+function getThemePaletteMode(palette) {
+  return palette.type || palette.mode;
+}
+
 const defaultTheme = createMuiTheme();
 const useStyles = makeStyles(
   (theme) => {

diff --git a/docs/src/pages/components/data-grid/editing/IsCellEditableGrid.tsx b/docs/src/pages/components/data-grid/editing/IsCellEditableGrid.tsx
@@ -2,18 +2,17 @@
 import * as React from 'react';
 import { createMuiTheme, Theme } from '@material-ui/core/styles';
 import { makeStyles } from '@material-ui/styles';
-import {
-  DataGrid,
-  getThemePaletteMode,
-  GridColumns,
-  GridRowsProp,
-} from '@material-ui/data-grid';
+import { DataGrid, GridColumns, GridRowsProp } from '@material-ui/data-grid';
 import {
   randomCreatedDate,
   randomTraderName,
   randomUpdatedDate,
 } from '@material-ui/x-grid-data-generator';
 
+function getThemePaletteMode(palette: any): string {
+  return palette.type || palette.mode;
+}
+
 const defaultTheme = createMuiTheme();
 const useStyles = makeStyles(
   (theme: Theme) => {

diff --git a/docs/src/pages/components/data-grid/editing/ValidateRowModelControlGrid.js b/docs/src/pages/components/data-grid/editing/ValidateRowModelControlGrid.js
@@ -2,14 +2,18 @@
 import * as React from 'react';
 import { createMuiTheme } from '@material-ui/core/styles';
 import { makeStyles } from '@material-ui/styles';
-import { DataGrid, getThemePaletteMode } from '@material-ui/data-grid';
+import { DataGrid } from '@material-ui/data-grid';
 import {
   randomCreatedDate,
   randomEmail,
   randomTraderName,
   randomUpdatedDate,
 } from '@material-ui/x-grid-data-generator';
 
+function getThemePaletteMode(palette) {
+  return palette.type || palette.mode;
+}
+
 const defaultTheme = createMuiTheme();
 const useStyles = makeStyles(
   (theme) => {

diff --git a/docs/src/pages/components/data-grid/editing/ValidateRowModelControlGrid.tsx b/docs/src/pages/components/data-grid/editing/ValidateRowModelControlGrid.tsx
@@ -4,7 +4,6 @@ import { createMuiTheme, Theme } from '@material-ui/core/styles';
 import { makeStyles } from '@material-ui/styles';
 import {
   DataGrid,
-  getThemePaletteMode,
   GridColumns,
   GridEditRowsModel,
   GridRowsProp,
@@ -16,6 +15,10 @@ import {
   randomUpdatedDate,
 } from '@material-ui/x-grid-data-generator';
 
+function getThemePaletteMode(palette: any): string {
+  return palette.type || palette.mode;
+}
+
 const defaultTheme = createMuiTheme();
 const useStyles = makeStyles(
   (theme: Theme) => {

diff --git a/docs/src/pages/components/data-grid/editing/ValidateServerNameGrid.js b/docs/src/pages/components/data-grid/editing/ValidateServerNameGrid.js
@@ -2,7 +2,11 @@
 import * as React from 'react';
 import { createMuiTheme } from '@material-ui/core/styles';
 import { makeStyles } from '@material-ui/styles';
-import { useGridApiRef, getThemePaletteMode, XGrid } from '@material-ui/x-grid';
+import { useGridApiRef, XGrid } from '@material-ui/x-grid';
+
+function getThemePaletteMode(palette) {
+  return palette.type || palette.mode;
+}
 
 const defaultTheme = createMuiTheme();
 const useStyles = makeStyles(

diff --git a/docs/src/pages/components/data-grid/editing/ValidateServerNameGrid.tsx b/docs/src/pages/components/data-grid/editing/ValidateServerNameGrid.tsx
@@ -7,10 +7,13 @@ import {
   GridEditCellPropsParams,
   GridRowsProp,
   useGridApiRef,
-  getThemePaletteMode,
   XGrid,
 } from '@material-ui/x-grid';
 
+function getThemePaletteMode(palette: any): string {
+  return palette.type || palette.mode;
+}
+
 const defaultTheme = createMuiTheme();
 const useStyles = makeStyles(
   (theme: Theme) => {

diff --git a/docs/src/pages/components/data-grid/filtering/QuickFilteringGrid.js b/docs/src/pages/components/data-grid/filtering/QuickFilteringGrid.js
@@ -4,7 +4,6 @@ import IconButton from '@material-ui/core/IconButton';
 import TextField from '@material-ui/core/TextField';
 import {
   DataGrid,
-  escapeRegExp,
   GridToolbarDensitySelector,
   GridToolbarFilterButton,
 } from '@material-ui/data-grid';
@@ -14,6 +13,10 @@ import SearchIcon from '@material-ui/icons/Search';
 import { createMuiTheme } from '@material-ui/core/styles';
 import { makeStyles } from '@material-ui/styles';
 
+function escapeRegExp(value) {
+  return value.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
+}
+
 const defaultTheme = createMuiTheme();
 const useStyles = makeStyles(
   (theme) => ({

diff --git a/docs/src/pages/components/data-grid/filtering/QuickFilteringGrid.tsx b/docs/src/pages/components/data-grid/filtering/QuickFilteringGrid.tsx
@@ -3,7 +3,6 @@ import IconButton from '@material-ui/core/IconButton';
 import TextField from '@material-ui/core/TextField';
 import {
   DataGrid,
-  escapeRegExp,
   GridToolbarDensitySelector,
   GridToolbarFilterButton,
 } from '@material-ui/data-grid';
@@ -13,6 +12,10 @@ import SearchIcon from '@material-ui/icons/Search';
 import { createMuiTheme, Theme } from '@material-ui/core/styles';
 import { createStyles, makeStyles } from '@material-ui/styles';
 
+function escapeRegExp(value: string): string {
+  return value.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
+}
+
 const defaultTheme = createMuiTheme();
 const useStyles = makeStyles(
   (theme: Theme) =>

diff --git a/docs/src/pages/components/data-grid/style/StylingRowsGrid.js b/docs/src/pages/components/data-grid/style/StylingRowsGrid.js
@@ -1,9 +1,13 @@
 import * as React from 'react';
-import { DataGrid, getThemePaletteMode } from '@material-ui/data-grid';
+import { DataGrid } from '@material-ui/data-grid';
 import { useDemoData } from '@material-ui/x-grid-data-generator';
 import { createMuiTheme, darken, lighten } from '@material-ui/core/styles';
 import { makeStyles } from '@material-ui/styles';
 
+function getThemePaletteMode(palette) {
+  return palette.type || palette.mode;
+}
+
 const defaultTheme = createMuiTheme();
 const useStyles = makeStyles(
   (theme) => {

diff --git a/docs/src/pages/components/data-grid/style/StylingRowsGrid.tsx b/docs/src/pages/components/data-grid/style/StylingRowsGrid.tsx
@@ -1,9 +1,13 @@
 import * as React from 'react';
-import { DataGrid, getThemePaletteMode } from '@material-ui/data-grid';
+import { DataGrid } from '@material-ui/data-grid';
 import { useDemoData } from '@material-ui/x-grid-data-generator';
 import { createMuiTheme, darken, lighten, Theme } from '@material-ui/core/styles';
 import { makeStyles } from '@material-ui/styles';
 
+function getThemePaletteMode(palette: any): string {
+  return palette.type || palette.mode;
+}
+
 const defaultTheme = createMuiTheme();
 const useStyles = makeStyles(
   (theme: Theme) => {

diff --git a/packages/grid/_modules_/grid/components/GridPagination.tsx b/packages/grid/_modules_/grid/components/GridPagination.tsx
@@ -6,7 +6,7 @@ import { useGridSelector } from '../hooks/features/core/useGridSelector';
 import { gridPaginationSelector } from '../hooks/features/pagination/gridPaginationSelector';
 import { optionsSelector } from '../hooks/utils/optionsSelector';
 import { useGridApiContext } from '../hooks/root/useGridApiContext';
-import { getMuiVersion, createTheme } from '../utils';
+import { createTheme, getMuiVersion } from '../utils/utils';
 import { GridRootPropsContext } from '../context/GridRootPropsContext';
 
 const defaultTheme = createTheme();

diff --git a/packages/grid/_modules_/grid/components/GridRow.tsx b/packages/grid/_modules_/grid/components/GridRow.tsx
@@ -9,7 +9,7 @@ import {
   GRID_ROW_OVER,
 } from '../constants/eventsConstants';
 import { GridRowId } from '../models';
-import { isFunction } from '../utils';
+import { isFunction } from '../utils/utils';
 import { gridDensityRowHeightSelector } from '../hooks/features/density';
 import { useGridApiContext } from '../hooks/root/useGridApiContext';
 import { useGridSelector } from '../hooks/features/core/useGridSelector';

diff --git a/packages/grid/_modules_/grid/components/cell/GridRowCells.tsx b/packages/grid/_modules_/grid/components/cell/GridRowCells.tsx
@@ -7,10 +7,10 @@ import {
   GridCellParams,
   GridRowId,
   GridEditRowProps,
-} from '../../models/index';
+} from '../../models';
 import { GridCell, GridCellProps } from './GridCell';
 import { useGridApiContext } from '../../hooks/root/useGridApiContext';
-import { isFunction } from '../../utils/index';
+import { isFunction } from '../../utils/utils';
 import { GRID_CSS_CLASS_PREFIX } from '../../constants/cssClassesConstants';
 
 interface RowCellsProps {

diff --git a/packages/grid/_modules_/grid/components/columnHeaders/GridColumnHeaderTitle.tsx b/packages/grid/_modules_/grid/components/columnHeaders/GridColumnHeaderTitle.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import clsx from 'clsx';
 import Tooltip from '@material-ui/core/Tooltip';
-import { isOverflown } from '../../utils/index';
+import { isOverflown } from '../../utils/domUtils';
 
 const ColumnHeaderInnerTitle = React.forwardRef<
   HTMLDivElement,

diff --git a/packages/grid/_modules_/grid/components/panel/GridPanel.tsx b/packages/grid/_modules_/grid/components/panel/GridPanel.tsx
@@ -6,7 +6,8 @@ import ClickAwayListener from '@material-ui/core/ClickAwayListener';
 import Paper from '@material-ui/core/Paper';
 import Popper, { PopperProps } from '@material-ui/core/Popper';
 import { useGridApiContext } from '../../hooks/root/useGridApiContext';
-import { isEscapeKey, getMuiVersion, createTheme } from '../../utils';
+import { getMuiVersion, createTheme } from '../../utils/utils';
+import { isEscapeKey } from '../../utils/keyboardUtils';
 import {
   InternalStandardProps as StandardProps,
   generateUtilityClasses,

diff --git a/packages/grid/_modules_/grid/components/panel/GridPanelWrapper.tsx b/packages/grid/_modules_/grid/components/panel/GridPanelWrapper.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import clsx from 'clsx';
 import TrapFocus from '@material-ui/core/Unstable_TrapFocus';
 import { makeStyles } from '@material-ui/styles';
-import { getMuiVersion } from '../../utils';
+import { getMuiVersion } from '../../utils/utils';
 
 const useStyles = makeStyles(
   () => ({

diff --git a/packages/grid/_modules_/grid/hooks/features/export/useGridCsvExport.tsx b/packages/grid/_modules_/grid/hooks/features/export/useGridCsvExport.tsx
@@ -8,7 +8,7 @@ import { gridSelectionStateSelector } from '../selection';
 import { GridCsvExportApi } from '../../../models/api/gridCsvExportApi';
 import { GridExportCsvOptions } from '../../../models/gridExport';
 import { useLogger } from '../../utils/useLogger';
-import { exportAs } from '../../../utils';
+import { exportAs } from '../../../utils/exportAs';
 import { buildCSV } from './serializers/csvSerializer';
 import { GridColDef } from '../../../models';
 

diff --git a/packages/grid/_modules_/grid/index.ts b/packages/grid/_modules_/grid/index.ts
@@ -3,7 +3,6 @@ export * from './constants';
 export * from './hooks';
 export * from './locales';
 export * from './models';
-export * from './utils';
 export * from './GridComponentProps';
 export * from './GridComponent';
 export * from './useGridComponent';

diff --git a/packages/grid/_modules_/grid/locales/bgBG.ts b/packages/grid/_modules_/grid/locales/bgBG.ts
@@ -1,6 +1,6 @@
 import { bgBG as bgBGCore } from '@material-ui/core/locale';
 import { GridLocaleText } from '../models/api/gridLocaleTextApi';
-import { getGridLocalization, Localization } from '../utils';
+import { getGridLocalization, Localization } from '../utils/getGridLocalization';
 
 const bgBGGrid: Partial<GridLocaleText> = {
   // Root

diff --git a/packages/grid/_modules_/grid/locales/csCZ.ts b/packages/grid/_modules_/grid/locales/csCZ.ts
@@ -1,6 +1,6 @@
 import { csCZ as csCZCore } from '@material-ui/core/locale';
 import { GridLocaleText } from '../models/api/gridLocaleTextApi';
-import { getGridLocalization, Localization } from '../utils';
+import { getGridLocalization, Localization } from '../utils/getGridLocalization';
 
 const csCZKGrid: Partial<GridLocaleText> = {
   // Root

diff --git a/packages/grid/_modules_/grid/locales/deDE.ts b/packages/grid/_modules_/grid/locales/deDE.ts
@@ -1,6 +1,6 @@
 import { deDE as deDECore } from '@material-ui/core/locale';
 import { GridLocaleText } from '../models/api/gridLocaleTextApi';
-import { getGridLocalization, Localization } from '../utils';
+import { getGridLocalization, Localization } from '../utils/getGridLocalization';
 
 const deDEGrid: Partial<GridLocaleText> = {
   // Root

diff --git a/packages/grid/_modules_/grid/locales/elGR.ts b/packages/grid/_modules_/grid/locales/elGR.ts
@@ -1,5 +1,5 @@
 import { GridLocaleText } from '../models/api/gridLocaleTextApi';
-import { getGridLocalization, Localization } from '../utils';
+import { getGridLocalization, Localization } from '../utils/getGridLocalization';
 
 const elGRGrid: Partial<GridLocaleText> = {
   // Root

diff --git a/packages/grid/_modules_/grid/locales/enUS.ts b/packages/grid/_modules_/grid/locales/enUS.ts
@@ -1,5 +1,5 @@
 import { enUS as enUSCore } from '@material-ui/core/locale';
-import { getGridLocalization, Localization } from '../utils';
+import { getGridLocalization, Localization } from '../utils/getGridLocalization';
 import { GRID_DEFAULT_LOCALE_TEXT } from '../constants/localeTextConstants';
 
 export const enUS: Localization = getGridLocalization(GRID_DEFAULT_LOCALE_TEXT, enUSCore);
diff --git a/packages/grid/_modules_/grid/locales/esES.ts b/packages/grid/_modules_/grid/locales/esES.ts
@@ -1,6 +1,6 @@
 import { esES as esESCore } from '@material-ui/core/locale';
 import { GridLocaleText } from '../models/api/gridLocaleTextApi';
-import { getGridLocalization, Localization } from '../utils';
+import { getGridLocalization, Localization } from '../utils/getGridLocalization';
 
 const esESGrid: Partial<GridLocaleText> = {
   // Root

diff --git a/packages/grid/_modules_/grid/locales/frFR.ts b/packages/grid/_modules_/grid/locales/frFR.ts
@@ -1,6 +1,6 @@
 import { frFR as frFRCore } from '@material-ui/core/locale';
 import { GridLocaleText } from '../models/api/gridLocaleTextApi';
-import { getGridLocalization, Localization } from '../utils';
+import { getGridLocalization, Localization } from '../utils/getGridLocalization';
 
 const frFRGrid: Partial<GridLocaleText> = {
   // Root

diff --git a/packages/grid/_modules_/grid/locales/itIT.ts b/packages/grid/_modules_/grid/locales/itIT.ts
@@ -1,6 +1,6 @@
 import { itIT as itITCore } from '@material-ui/core/locale';
 import { GridLocaleText } from '../models/api/gridLocaleTextApi';
-import { getGridLocalization, Localization } from '../utils';
+import { getGridLocalization, Localization } from '../utils/getGridLocalization';
 
 const itITGrid: Partial<GridLocaleText> = {
   // Root

diff --git a/packages/grid/_modules_/grid/locales/jaJP.ts b/packages/grid/_modules_/grid/locales/jaJP.ts
@@ -1,6 +1,6 @@
 import { jaJP as jaJPCore } from '@material-ui/core/locale';
 import { GridLocaleText } from '../models/api/gridLocaleTextApi';
-import { getGridLocalization, Localization } from '../utils';
+import { getGridLocalization, Localization } from '../utils/getGridLocalization';
 
 const jaJPGrid: Partial<GridLocaleText> = {
   // Root

diff --git a/packages/grid/_modules_/grid/locales/nlNL.ts b/packages/grid/_modules_/grid/locales/nlNL.ts
@@ -1,6 +1,6 @@
 import { nlNL as nlNLCore } from '@material-ui/core/locale';
 import { GridLocaleText } from '../models/api/gridLocaleTextApi';
-import { getGridLocalization, Localization } from '../utils';
+import { getGridLocalization, Localization } from '../utils/getGridLocalization';
 
 const nlNLGrid: Partial<GridLocaleText> = {
   // Root

diff --git a/packages/grid/_modules_/grid/locales/plPL.ts b/packages/grid/_modules_/grid/locales/plPL.ts
@@ -1,6 +1,6 @@
 import { plPL as plPLCore } from '@material-ui/core/locale';
 import { GridLocaleText } from '../models/api/gridLocaleTextApi';
-import { getGridLocalization, Localization } from '../utils';
+import { getGridLocalization, Localization } from '../utils/getGridLocalization';
 
 export const plPLGrid: Partial<GridLocaleText> = {
   // Root

diff --git a/packages/grid/_modules_/grid/locales/ptBR.ts b/packages/grid/_modules_/grid/locales/ptBR.ts
@@ -1,6 +1,6 @@
 import { ptBR as ptBRCore } from '@material-ui/core/locale';
 import { GridLocaleText } from '../models/api/gridLocaleTextApi';
-import { getGridLocalization, Localization } from '../utils';
+import { getGridLocalization, Localization } from '../utils/getGridLocalization';
 
 const ptBRGrid: Partial<GridLocaleText> = {
   // Root