[DataGridPro] Make @mui/x-data-grid-pro import shared code from @mui/x-data-grid

docs/pages/_app.js

@@ -43,10 +43,15 @@ ponyfillGlobal.muiDocConfig = {
   csbIncludePeerDependencies: (deps, { versions }) => {
     const newDeps = { ...deps };
 
-    if (newDeps['@mui/x-data-grid-pro'] || newDeps['@mui/x-data-grid']) {
+    if (newDeps['@mui/x-data-grid']) {
       newDeps['@mui/material'] = versions['@mui/material'];
     }
 
+    if (newDeps['@mui/x-data-grid-pro']) {
+      newDeps['@mui/material'] = versions['@mui/material'];
+      newDeps['@mui/x-data-grid'] = versions['@mui/x-data-grid'];
+    }
+
     if (newDeps['@mui/x-data-grid-generator']) {
       newDeps['@mui/material'] = versions['@mui/material'];
       newDeps['@mui/icons-material'] = versions['@mui/icons-material'];

docs/scripts/api/buildApi.ts

@@ -99,7 +99,8 @@ async function run() {
       });
 
       buildEventsDocumentation({
-        project: projects.get('x-data-grid')!,
+        // TODO: Pass all the projects and add the pro icon for pro-only events
+        project: projects.get('x-data-grid-pro')!,
         documentedInterfaces,
       });
 

package.json

@@ -57,7 +57,7 @@
     "build:codesandbox": "yarn release:build",
     "release:changelog": "node scripts/releaseChangelog",
     "release:version": "lerna version --exact --no-changelog --no-push --no-git-tag-version",
-    "release:build": "yarn release:build:next && cd packages/grid/x-data-grid-pro && yarn build && cd ../x-data-grid && yarn build && cd ../x-data-grid-generator && yarn build",
+    "release:build": "yarn release:build:next && cd packages/grid/x-data-grid && yarn build && cd ../x-data-grid-pro && yarn build && cd ../x-data-grid-generator && yarn build",
     "release:build:next": "lerna run --parallel --scope \"@mui/x-license-pro\" build",
     "release:publish": "lerna publish from-package --dist-tag latest --contents build",
     "release:publish:dry-run": "lerna publish from-package --dist-tag latest --contents build --registry=\"http://localhost:4873/\""

packages/grid/_modules_/grid/components/cell/index.ts

@@ -3,5 +3,3 @@ export * from './GridEditInputCell';
 export * from './GridEditSingleSelectCell';
 export * from './GridActionsCell';
 export * from './GridActionsCellItem';
-export * from './GridTreeDataGroupingCell';
-export * from './GridDetailPanelToggleCell';

packages/grid/_modules_/grid/components/menu/columnMenu/index.ts

@@ -7,4 +7,3 @@ export * from './HideGridColMenuItem';
 export * from './SortGridMenuItems';
 export * from './GridColumnMenuContainer';
 export * from './GridColumnMenuProps';
-export * from './GridColumnPinningMenuItems';

packages/grid/_modules_/grid/components/panel/GridColumnsPanel.tsx

@@ -10,12 +10,12 @@ import {
 } from '../../hooks/features/columns/gridColumnsSelector';
 import { useGridSelector } from '../../hooks/utils/useGridSelector';
 import { useGridApiContext } from '../../hooks/utils/useGridApiContext';
-import { GridDragIcon } from '../icons/index';
+import { GridDragIcon } from '../icons';
 import { GridPanelContent } from './GridPanelContent';
 import { GridPanelFooter } from './GridPanelFooter';
 import { GridPanelHeader } from './GridPanelHeader';
 import { GridPanelWrapper } from './GridPanelWrapper';
-import { GRID_EXPERIMENTAL_ENABLED } from '../../constants';
+import { GRID_EXPERIMENTAL_ENABLED } from '../../constants/envConstants';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
 import { DataGridProcessedProps } from '../../models/props/DataGridProps';
 import { getDataGridUtilityClass } from '../../gridClasses';

packages/grid/_modules_/grid/constants/defaultGridSlotsComponents.ts

@@ -67,7 +67,10 @@ const DEFAULT_GRID_ICON_SLOTS_COMPONENTS: GridIconSlotsComponent = {
   DetailPanelCollapseIcon: GridRemoveIcon,
 };
 
-export const DEFAULT_GRID_SLOTS_COMPONENTS: GridSlotsComponent = {
+/**
+ * TODO: Differentiate community and pro value and interface
+ */
+export const DATA_GRID_DEFAULT_SLOTS_COMPONENTS: GridSlotsComponent = {
   ...DEFAULT_GRID_ICON_SLOTS_COMPONENTS,
   BaseCheckbox: MUICheckbox,
   BaseTextField: MUITextField,

packages/grid/_modules_/grid/constants/index.ts

@@ -1,2 +1,3 @@
 export * from './envConstants';
 export * from './localeTextConstants';
+export * from './defaultGridSlotsComponents';

packages/grid/_modules_/grid/context/index.ts

@@ -0,0 +1 @@
+export * from './GridContextProvider';

packages/grid/_modules_/grid/hooks/core/preProcessing/gridPreProcessingApi.ts

@@ -4,30 +4,25 @@ import { GridColDef } from '../../../models/colDef/gridColDef';
 import {
   GridRestoreStatePreProcessingContext,
   GridRestoreStatePreProcessingValue,
-} from '../../features/statePersistence';
+} from '../../features/statePersistence/gridStatePersistenceInterface';
 import { GridFilteringMethodCollection } from '../../features/filter/gridFilterState';
 import { GridSortingMethodCollection } from '../../features/sorting/gridSortingState';
-import { GridCanBeReorderedPreProcessingContext } from '../../features/columnReorder/columnReorderInterfaces';
 import { GridColumnsRawState } from '../../features/columns/gridColumnsInterfaces';
 import { GridRowEntry } from '../../../models/gridRows';
 
 export type PreProcessorCallback = (value: any, params?: any) => any;
 
 export type GridPreProcessingGroup = keyof GridPreProcessingGroupLookup;
 
-interface GridPreProcessingGroupLookup {
+export interface GridPreProcessingGroupLookup {
   hydrateColumns: {
     value: Omit<GridColumnsRawState<any>, 'columnVisibilityModel'>;
   };
   scrollToIndexes: {
     value: Partial<GridScrollParams>;
     context: Partial<GridCellIndexCoordinates>;
   };
-  columnMenu: { value: JSX.Element[]; context: GridColDef };
-  canBeReordered: {
-    value: boolean;
-    context: GridCanBeReorderedPreProcessingContext;
-  };
+  columnMenu: { value: JSX.Element[]; context: GridColDef<any> };
   filteringMethod: { value: GridFilteringMethodCollection };
   sortingMethod: { value: GridSortingMethodCollection };
   exportState: { value: GridInitialStateCommunity };

packages/grid/_modules_/grid/hooks/features/filter/useGridRegisterFilteringMethod.ts

@@ -1,10 +1,10 @@
 import * as React from 'react';
 import { GridFilteringMethod } from './gridFilterState';
 import { GridPreProcessor, useGridRegisterPreProcessor } from '../../core/preProcessing';
-import { GridApiCommunity } from '../../../models/api/gridApiCommunity';
+import { GridApiCommon } from '../../../models';
 
-export const useGridRegisterFilteringMethod = (
-  apiRef: React.MutableRefObject<GridApiCommunity>,
+export const useGridRegisterFilteringMethod = <Api extends GridApiCommon>(
+  apiRef: React.MutableRefObject<Api>,
   groupingName: string,
   filteringMethod: GridFilteringMethod,
 ) => {

packages/grid/_modules_/grid/hooks/features/index.ts

@@ -1,8 +1,5 @@
 // Only export the variable and types that should be publicly exposed
 export * from './columnMenu';
-export * from './columnReorder';
-export * from './columnResize';
-export * from './columnPinning';
 export * from './columns';
 export * from './density';
 export * from './editRows';
@@ -14,7 +11,4 @@ export * from './rows';
 export * from './selection';
 export * from './sorting';
 export * from './dimensions';
-export * from './treeData';
-export * from './rowGrouping';
-export * from './detailPanel';
 export * from './statePersistence';

packages/grid/_modules_/grid/hooks/features/rows/gridRowsMetaState.ts

@@ -1,13 +1,13 @@
 /**
- * The grid rows total height and row possitions.
+ * The grid rows total height and row positions.
  */
 export interface GridRowsMetaState {
   /**
-   * The sum of of all visible grid rows in the current rows.
+   * The sum of all visible grid rows in the current rows.
    */
   currentPageTotalHeight: number;
   /**
-   * The grid rows possitions.
+   * The grid rows positions.
    */
   positions: number[];
 }

packages/grid/_modules_/grid/hooks/features/rows/index.ts

@@ -1,3 +1,4 @@
 export * from './gridRowsMetaSelector';
+export * from './gridRowsMetaState';
 export * from './gridRowsSelector';
 export * from './gridRowsState';

packages/grid/_modules_/grid/hooks/features/sorting/useGridRegisterSortingMethod.ts

@@ -1,10 +1,10 @@
 import * as React from 'react';
 import { GridSortingMethod } from './gridSortingState';
 import { GridPreProcessor, useGridRegisterPreProcessor } from '../../core/preProcessing';
-import { GridApiCommunity } from '../../../models/api/gridApiCommunity';
+import { GridApiCommon } from '../../../models';
 
-export const useGridRegisterSortingMethod = (
-  apiRef: React.MutableRefObject<GridApiCommunity>,
+export const useGridRegisterSortingMethod = <Api extends GridApiCommon>(
+  apiRef: React.MutableRefObject<Api>,
   groupingName: string,
   filteringMethod: GridSortingMethod,
 ) => {

packages/grid/_modules_/grid/hooks/features/statePersistence/index.ts

@@ -1 +1 @@
-export * from './GridStatePersistenceApi';
+export type { GridStatePersistenceApi } from './gridStatePersistenceInterface';

packages/grid/_modules_/grid/hooks/features/statePersistence/useGridStatePersistence.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { GridInitialStateCommunity } from '../../../models/gridStateCommunity';
 import { GridApiCommunity } from '../../../models/api/gridApiCommunity';
-import { GridStatePersistenceApi } from './GridStatePersistenceApi';
+import { GridStatePersistenceApi } from './gridStatePersistenceInterface';
 import { useGridApiMethod } from '../../utils';
 
 export const useGridStatePersistence = (apiRef: React.MutableRefObject<GridApiCommunity>) => {

packages/grid/_modules_/grid/hooks/utils/index.ts

@@ -7,3 +7,4 @@ export * from './useGridScrollFn';
 export * from './useGridSelector';
 export * from './useGridState';
 export * from './useGridNativeEventListener';
+export * from './useFirstRender';

packages/grid/_modules_/grid/hooks/utils/useGridApiEventHandler.ts

@@ -1,10 +1,10 @@
 import * as React from 'react';
-import { GridApiCommunity } from '../../models/api/gridApiCommunity';
-import { GridEventListener, GridEvents, GridEventsStr } from '../../models/events';
+import { GridEventListener, GridEventsStr } from '../../models/events';
 import { UnregisterToken, CleanupTracking } from '../../utils/cleanupTracking/CleanupTracking';
 import { EventListenerOptions } from '../../utils/EventManager';
 import { TimerBasedCleanupTracking } from '../../utils/cleanupTracking/TimerBasedCleanupTracking';
 import { FinalizationRegistryBasedCleanupTracking } from '../../utils/cleanupTracking/FinalizationRegistryBasedCleanupTracking';
+import { GridApiCommon } from '../../models';
 
 /**
  * Signal to the underlying logic what version of the public component API
@@ -23,8 +23,8 @@ class ObjectToBeRetainedByReact {}
 export function createUseGridApiEventHandler(registry: CleanupTracking) {
   let cleanupTokensCounter = 0;
 
-  return function useGridApiEventHandler<E extends GridEventsStr>(
-    apiRef: React.MutableRefObject<GridApiCommunity>,
+  return function useGridApiEventHandler<Api extends GridApiCommon, E extends GridEventsStr>(
+    apiRef: React.MutableRefObject<Api>,
     eventName: E,
     handler?: GridEventListener<E>,
     options?: EventListenerOptions,
@@ -108,8 +108,8 @@ export const useGridApiEventHandler = createUseGridApiEventHandler(registry);
 
 const optionsSubscriberOptions: EventListenerOptions = { isFirst: true };
 
-export function useGridApiOptionHandler<E extends GridEvents>(
-  apiRef: React.MutableRefObject<GridApiCommunity>,
+export function useGridApiOptionHandler<Api extends GridApiCommon, E extends GridEventsStr>(
+  apiRef: React.MutableRefObject<Api>,
   eventName: E,
   handler?: GridEventListener<E>,
 ) {

packages/grid/_modules_/grid/hooks/utils/useGridNativeEventListener.ts

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import { GridEvents } from '../../models/events';
-import { GridApiCommunity } from '../../models/api/gridApiCommunity';
 import { isFunction } from '../../utils/utils';
 import { useGridLogger } from './useGridLogger';
+import { GridApiCommon } from '../../models';
 
-export const useGridNativeEventListener = <E extends Event>(
-  apiRef: React.MutableRefObject<GridApiCommunity>,
+export const useGridNativeEventListener = <Api extends GridApiCommon, E extends Event>(
+  apiRef: React.MutableRefObject<Api>,
   ref: React.MutableRefObject<HTMLDivElement | null> | (() => Element | undefined | null),
   eventName: string,
   handler?: (event: E) => any,

packages/grid/_modules_/grid/hooks/utils/useGridRootProps.ts

@@ -1,11 +1,8 @@
 import * as React from 'react';
 import { GridRootPropsContext } from '../../context/GridRootPropsContext';
 import type { DataGridProcessedProps } from '../../models/props/DataGridProps';
-import type { DataGridProProcessedProps } from '../../models/props/DataGridProProps';
 
-export const useGridRootProps = <
-  Props extends DataGridProcessedProps | DataGridProProcessedProps,
->() => {
+export const useGridRootProps = () => {
   const contextValue = React.useContext(GridRootPropsContext);
 
   if (!contextValue) {
@@ -14,5 +11,5 @@ export const useGridRootProps = <
     );
   }
 
-  return contextValue as Props;
+  return contextValue as DataGridProcessedProps;
 };

packages/grid/_modules_/grid/index.ts

@@ -4,3 +4,7 @@ export * from './hooks';
 export * from './locales';
 export * from './models';
 export * from './gridClasses';
+export * from './context';
+export type { OutputSelector } from './utils/createSelector';
+
+export type { GridPreProcessingGroupLookup } from './hooks/core/preProcessing/gridPreProcessingApi';

packages/grid/_modules_/grid/models/api/gridApiCommunity.ts

@@ -1,7 +1,7 @@
 import type { GridStateApi } from './gridStateApi';
 import type { GridInitialStateCommunity, GridStateCommunity } from '../gridStateCommunity';
 import type { GridApiCommon } from './gridApiCommon';
-import type { GridStatePersistenceApi } from '../../hooks';
+import type { GridStatePersistenceApi } from '../../hooks/features/statePersistence';
 
 type GridStateApiUntyped = {
   [key in keyof (GridStateApi<any> & GridStatePersistenceApi<any>)]: any;

packages/grid/_modules_/grid/models/api/index.ts

@@ -20,9 +20,7 @@ export * from './gridDisableVirtualizationApi';
 export * from './gridClipboardApi';
 export * from './gridCallbackDetails';
 export * from './gridScrollApi';
-export * from './gridColumnPinningApi';
 export * from './gridVirtualScrollerApi';
-export * from './gridDetailPanelApi';
 export * from './gridApiCommon';
 
 export type { GridEditingApi } from './gridEditingApi';