move useGridApiInitialization out of useGridInitialization

packages/x-data-grid-premium/src/DataGridPremium/DataGridPremium.tsx

@@ -8,6 +8,7 @@ import {
   propValidatorsDataGridPro,
   PropValidator,
   validateProps,
+  useGridApiInitialization,
 } from '@mui/x-data-grid-pro/internals';
 import { useMaterialCSSVariables } from '@mui/x-data-grid/material';
 import { forwardRef } from '@mui/x-internals/forwardRef';
@@ -22,6 +23,7 @@ import { GridSidebar } from '../components/sidebar/GridSidebar';
 import { GridSidebarColumnPanel } from '../components/sidebar/columnPanel/GridSidebarColumnPanel';
 import { useGridAriaAttributes } from '../hooks/utils/useGridAriaAttributes';
 import { useGridRowAriaAttributes } from '../hooks/features/rows/useGridRowAriaAttributes';
+import type { GridApiPremium, GridPrivateApiPremium } from '../models/gridApiPremium';
 
 export type { GridPremiumSlotsComponent as GridSlots } from '../models';
 
@@ -46,7 +48,11 @@ const DataGridPremiumRaw = forwardRef(function DataGridPremium<R extends GridVal
   ref: React.Ref<HTMLDivElement>,
 ) {
   const props = useDataGridPremiumProps(inProps);
-  const privateApiRef = useDataGridPremiumComponent(props.apiRef, props);
+  const privateApiRef = useGridApiInitialization<GridPrivateApiPremium, GridApiPremium>(
+    props.apiRef,
+    props,
+  );
+  useDataGridPremiumComponent(privateApiRef, props);
   useLicenseVerifier('x-data-grid-premium', releaseInfo);
 
   const { pivotParams } = props;

packages/x-data-grid-premium/src/DataGridPremium/useDataGridPremiumComponent.tsx

@@ -74,7 +74,7 @@ import {
   listViewStateInitializer,
   propsStateInitializer,
 } from '@mui/x-data-grid-pro/internals';
-import { GridApiPremium, GridPrivateApiPremium } from '../models/gridApiPremium';
+import { GridPrivateApiPremium } from '../models/gridApiPremium';
 import { DataGridPremiumProcessedProps } from '../models/dataGridPremiumProps';
 import { useGridDataSourcePremium as useGridDataSource } from '../hooks/features/dataSource/useGridDataSourcePremium';
 // Premium-only features
@@ -97,10 +97,10 @@ import {
 import { useGridClipboardImport } from '../hooks/features/clipboard/useGridClipboardImport';
 
 export const useDataGridPremiumComponent = (
-  inputApiRef: RefObject<GridApiPremium | null> | undefined,
+  apiRef: RefObject<GridPrivateApiPremium>,
   props: DataGridPremiumProcessedProps,
 ) => {
-  const apiRef = useGridInitialization<GridPrivateApiPremium, GridApiPremium>(inputApiRef, props);
+  useGridInitialization<GridPrivateApiPremium>(apiRef, props);
 
   /**
    * Register all pre-processors called during state initialization here.
@@ -195,6 +195,4 @@ export const useDataGridPremiumComponent = (
   useGridDataSource(apiRef, props);
   useGridVirtualization(apiRef, props);
   useGridListView(apiRef, props);
-
-  return apiRef;
 };

packages/x-data-grid-pro/src/DataGridPro/DataGridPro.tsx

@@ -3,7 +3,7 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import { useLicenseVerifier, Watermark } from '@mui/x-license';
 import { GridRoot, GridContextProvider, GridValidRowModel } from '@mui/x-data-grid';
-import { validateProps } from '@mui/x-data-grid/internals';
+import { useGridApiInitialization, validateProps } from '@mui/x-data-grid/internals';
 import { useMaterialCSSVariables } from '@mui/x-data-grid/material';
 import { forwardRef } from '@mui/x-internals/forwardRef';
 import { useDataGridProComponent } from './useDataGridProComponent';
@@ -13,6 +13,7 @@ import { getReleaseInfo } from '../utils/releaseInfo';
 import { propValidatorsDataGridPro } from '../internals/propValidation';
 import { useGridAriaAttributes } from '../hooks/utils/useGridAriaAttributes';
 import { useGridRowAriaAttributes } from '../hooks/features/rows/useGridRowAriaAttributes';
+import type { GridApiPro, GridPrivateApiPro } from '../models/gridApiPro';
 
 export type { GridProSlotsComponent as GridSlots } from '../models';
 
@@ -31,7 +32,11 @@ const DataGridProRaw = forwardRef(function DataGridPro<R extends GridValidRowMod
   ref: React.Ref<HTMLDivElement>,
 ) {
   const props = useDataGridProProps(inProps);
-  const privateApiRef = useDataGridProComponent(props.apiRef, props);
+  const privateApiRef = useGridApiInitialization<GridPrivateApiPro, GridApiPro>(
+    props.apiRef,
+    props,
+  );
+  useDataGridProComponent(privateApiRef, props);
   useLicenseVerifier('x-data-grid-pro', releaseInfo);
 
   if (process.env.NODE_ENV !== 'production') {

packages/x-data-grid-pro/src/DataGridPro/useDataGridProComponent.tsx

@@ -53,7 +53,7 @@ import {
   listViewStateInitializer,
   propsStateInitializer,
 } from '@mui/x-data-grid/internals';
-import { GridApiPro, GridPrivateApiPro } from '../models/gridApiPro';
+import { GridPrivateApiPro } from '../models/gridApiPro';
 import { DataGridProProcessedProps } from '../models/dataGridProProps';
 // Pro-only features
 import { useGridInfiniteLoader } from '../hooks/features/infiniteLoader/useGridInfiniteLoader';
@@ -90,10 +90,10 @@ import {
 import { useGridDataSourceLazyLoader } from '../hooks/features/serverSideLazyLoader/useGridDataSourceLazyLoader';
 
 export const useDataGridProComponent = (
-  inputApiRef: RefObject<GridApiPro | null> | undefined,
+  apiRef: RefObject<GridPrivateApiPro>,
   props: DataGridProProcessedProps,
 ) => {
-  const apiRef = useGridInitialization<GridPrivateApiPro, GridApiPro>(inputApiRef, props);
+  useGridInitialization<GridPrivateApiPro>(apiRef, props);
 
   /**
    * Register all pre-processors called during state initialization here.
@@ -177,6 +177,4 @@ export const useDataGridProComponent = (
   useGridVirtualization(apiRef, props);
   useGridDataSource(apiRef, props);
   useGridListView(apiRef, props);
-
-  return apiRef;
 };

packages/x-data-grid/src/DataGrid/DataGrid.tsx

@@ -12,6 +12,8 @@ import { useDataGridProps } from './useDataGridProps';
 import { GridValidRowModel } from '../models/gridRows';
 import { propValidatorsDataGrid, validateProps } from '../internals/utils/propValidation';
 import { useMaterialCSSVariables } from '../material/variables';
+import type { GridApiCommunity, GridPrivateApiCommunity } from '../models/api/gridApiCommunity';
+import { useGridApiInitialization } from '../hooks/core/useGridApiInitialization';
 
 export type { GridSlotsComponent as GridSlots } from '../models';
 
@@ -28,7 +30,11 @@ const DataGridRaw = forwardRef(function DataGrid<R extends GridValidRowModel>(
   ref: React.Ref<HTMLDivElement>,
 ) {
   const props = useDataGridProps(inProps);
-  const privateApiRef = useDataGridComponent(props.apiRef, props);
+  const privateApiRef = useGridApiInitialization<GridPrivateApiCommunity, GridApiCommunity>(
+    props.apiRef,
+    props,
+  );
+  useDataGridComponent(privateApiRef, props);
 
   if (process.env.NODE_ENV !== 'production') {
     validateProps(props, propValidatorsDataGrid);

packages/x-data-grid/src/DataGrid/useDataGridComponent.tsx

@@ -1,6 +1,6 @@
 import { RefObject } from '@mui/x-internals/types';
 import { DataGridProcessedProps } from '../models/props/DataGridProps';
-import { GridApiCommunity, GridPrivateApiCommunity } from '../models/api/gridApiCommunity';
+import { GridPrivateApiCommunity } from '../models/api/gridApiCommunity';
 import { useGridInitialization } from '../hooks/core/useGridInitialization';
 import { useGridInitializeState } from '../hooks/utils/useGridInitializeState';
 import { useGridClipboard } from '../hooks/features/clipboard/useGridClipboard';
@@ -66,13 +66,10 @@ import { propsStateInitializer } from '../hooks/core/useGridProps';
 import { useGridDataSource } from '../hooks/features/dataSource/useGridDataSource';
 
 export const useDataGridComponent = (
-  inputApiRef: RefObject<GridApiCommunity | null> | undefined,
+  apiRef: RefObject<GridPrivateApiCommunity>,
   props: DataGridProcessedProps,
 ) => {
-  const apiRef = useGridInitialization<GridPrivateApiCommunity, GridApiCommunity>(
-    inputApiRef,
-    props,
-  );
+  useGridInitialization<GridPrivateApiCommunity>(apiRef, props);
 
   /**
    * Register all pre-processors called during state initialization here.
@@ -131,6 +128,4 @@ export const useDataGridComponent = (
   useGridVirtualization(apiRef, props);
   useGridListView(apiRef, props);
   useGridDataSource(apiRef, props);
-
-  return apiRef;
 };

packages/x-data-grid/src/hooks/core/useGridInitialization.ts

@@ -1,10 +1,9 @@
 import { RefObject } from '@mui/x-internals/types';
-import type { GridApiCommon, GridPrivateApiCommon } from '../../models/api/gridApiCommon';
+import type { GridPrivateApiCommon } from '../../models/api/gridApiCommon';
 import { DataGridProcessedProps } from '../../models/props/DataGridProps';
 import { useGridRefs } from './useGridRefs';
 import { useGridIsRtl } from './useGridIsRtl';
 import { useGridLoggerFactory } from './useGridLoggerFactory';
-import { useGridApiInitialization } from './useGridApiInitialization';
 import { useGridLocaleText } from './useGridLocaleText';
 import { useGridPipeProcessing } from './pipeProcessing';
 import { useGridStrategyProcessing } from './strategyProcessing';
@@ -14,15 +13,10 @@ import { useGridProps } from './useGridProps';
 /**
  * Initialize the technical pieces of the DataGrid (logger, state, ...) that any DataGrid implementation needs
  */
-export const useGridInitialization = <
-  PrivateApi extends GridPrivateApiCommon,
-  Api extends GridApiCommon,
->(
-  inputApiRef: RefObject<Api | null> | undefined,
+export const useGridInitialization = <PrivateApi extends GridPrivateApiCommon>(
+  privateApiRef: RefObject<PrivateApi>,
   props: DataGridProcessedProps,
 ) => {
-  const privateApiRef = useGridApiInitialization<PrivateApi, Api>(inputApiRef, props);
-
   useGridRefs(privateApiRef);
   useGridProps(privateApiRef, props);
   useGridIsRtl(privateApiRef);
@@ -33,6 +27,4 @@ export const useGridInitialization = <
   useGridLocaleText(privateApiRef, props);
 
   privateApiRef.current.register('private', { rootProps: props });
-
-  return privateApiRef;
 };

packages/x-data-grid/src/internals/index.ts

@@ -29,7 +29,7 @@ export type {
   GridStrategyProcessorName,
 } from '../hooks/core/strategyProcessing';
 export { useGridInitialization } from '../hooks/core/useGridInitialization';
-export { unwrapPrivateAPI } from '../hooks/core/useGridApiInitialization';
+export { unwrapPrivateAPI, useGridApiInitialization } from '../hooks/core/useGridApiInitialization';
 
 export { useGridClipboard } from '../hooks/features/clipboard/useGridClipboard';
 export * from '../hooks/features/columnHeaders/useGridColumnHeaders';