Rename event. Test cleanup

Author: arminmeh

packages/x-data-grid-pro/src/hooks/features/infiniteLoader/useGridInfiniteLoader.tsx

@@ -4,6 +4,7 @@ import {
   useGridEventPriority,
   gridVisibleColumnDefinitionsSelector,
   useGridEvent,
+  GridEventListener,
 } from '@mui/x-data-grid';
 import { useGridVisibleRows, runIf } from '@mui/x-data-grid/internals';
 import useEventCallback from '@mui/utils/useEventCallback';
@@ -28,16 +29,18 @@ export const useGridInfiniteLoader = (
 
   const isEnabled = props.rowsLoadingMode === 'client' && !!props.onRowsScrollEnd;
 
-  const handleLoadMoreRows = useEventCallback(() => {
-    const viewportPageSize = apiRef.current.getViewportPageSize();
-    const rowScrollEndParams: GridRowScrollEndParams = {
-      visibleColumns,
-      viewportPageSize,
-      visibleRowsCount: currentPage.rows.length,
-    };
-    apiRef.current.publishEvent('rowsScrollEnd', rowScrollEndParams);
-  });
+  const handleLoadMoreRows: GridEventListener<'rowsScrollEndIntersection'> = useEventCallback(
+    () => {
+      const viewportPageSize = apiRef.current.getViewportPageSize();
+      const rowScrollEndParams: GridRowScrollEndParams = {
+        visibleColumns,
+        viewportPageSize,
+        visibleRowsCount: currentPage.rows.length,
+      };
+      apiRef.current.publishEvent('rowsScrollEnd', rowScrollEndParams);
+    },
+  );
 
   useGridEventPriority(apiRef, 'rowsScrollEnd', props.onRowsScrollEnd);
-  useGridEvent(apiRef, 'onIntersection', runIf(isEnabled, handleLoadMoreRows));
+  useGridEvent(apiRef, 'rowsScrollEndIntersection', runIf(isEnabled, handleLoadMoreRows));
 };

packages/x-data-grid-pro/src/hooks/features/serverSideLazyLoader/useGridDataSourceLazyLoader.ts

@@ -347,32 +347,33 @@ export const useGridDataSourceLazyLoader = (
     privateApiRef.current.requestPipeProcessorsApplication('hydrateRows');
   }, [privateApiRef, updateLoadingTrigger, addSkeletonRows]);
 
-  const handleIntersection: GridEventListener<'onIntersection'> = React.useCallback(() => {
-    if (rowsStale.current || loadingTrigger.current !== LoadingTrigger.SCROLL_END) {
-      return;
-    }
+  const handleIntersection: GridEventListener<'rowsScrollEndIntersection'> =
+    React.useCallback(() => {
+      if (rowsStale.current || loadingTrigger.current !== LoadingTrigger.SCROLL_END) {
+        return;
+      }
 
-    const renderContext = gridRenderContextSelector(privateApiRef);
-    if (previousLastRowIndex.current >= renderContext.lastRowIndex) {
-      return;
-    }
+      const renderContext = gridRenderContextSelector(privateApiRef);
+      if (previousLastRowIndex.current >= renderContext.lastRowIndex) {
+        return;
+      }
 
-    previousLastRowIndex.current = renderContext.lastRowIndex;
+      previousLastRowIndex.current = renderContext.lastRowIndex;
 
-    const paginationModel = gridPaginationModelSelector(privateApiRef);
-    const sortModel = gridSortModelSelector(privateApiRef);
-    const filterModel = gridFilterModelSelector(privateApiRef);
-    const getRowsParams: GridGetRowsParams = {
-      start: renderContext.lastRowIndex,
-      end: renderContext.lastRowIndex + paginationModel.pageSize - 1,
-      sortModel,
-      filterModel,
-    };
+      const paginationModel = gridPaginationModelSelector(privateApiRef);
+      const sortModel = gridSortModelSelector(privateApiRef);
+      const filterModel = gridFilterModelSelector(privateApiRef);
+      const getRowsParams: GridGetRowsParams = {
+        start: renderContext.lastRowIndex,
+        end: renderContext.lastRowIndex + paginationModel.pageSize - 1,
+        sortModel,
+        filterModel,
+      };
 
-    privateApiRef.current.setLoading(true);
+      privateApiRef.current.setLoading(true);
 
-    fetchRows(adjustRowParams(getRowsParams));
-  }, [privateApiRef, adjustRowParams, fetchRows]);
+      fetchRows(adjustRowParams(getRowsParams));
+    }, [privateApiRef, adjustRowParams, fetchRows]);
 
   const handleRenderedRowsIntervalChange = React.useCallback<
     GridEventListener<'renderedRowsIntervalChange'>
@@ -504,7 +505,7 @@ export const useGridDataSourceLazyLoader = (
   );
   useGridEvent(
     privateApiRef,
-    'onIntersection',
+    'rowsScrollEndIntersection',
     runIf(lazyLoadingRowsUpdateStrategyActive, handleIntersection),
   );
   useGridEvent(

packages/x-data-grid-pro/src/hooks/features/serverSideLazyLoader/useGridIntersectionObserver.tsx

@@ -46,7 +46,7 @@ export const useGridIntersectionObserver = (
       observer.current?.disconnect();
       // do not observe this node anymore
       triggerElement.current = null;
-      apiRef.current.publishEvent('onIntersection');
+      apiRef.current.publishEvent('rowsScrollEndIntersection');
     }
   });
 

packages/x-data-grid-pro/src/tests/dataSourceLazyLoader.DataGridPro.test.tsx

@@ -254,11 +254,11 @@ describeSkipIf(isJSDOM)('<DataGridPro /> - Data source lazy loader', () => {
       });
     });
 
-    it('should call make a new data source request when there is not enough rows to cover the viewport height', async () => {
+    it('should make a new data source request when there is not enough rows to cover the viewport height', async () => {
       render(
         <TestDataSourceLazyLoader
           initialState={{
-            pagination: { paginationModel: { page: 0, pageSize: 2 }, rowCount: undefined },
+            pagination: { paginationModel: { page: 0, pageSize: 2 } },
           }}
         />,
       );
@@ -270,12 +270,12 @@ describeSkipIf(isJSDOM)('<DataGridPro /> - Data source lazy loader', () => {
       expect(lastSearchParams.get('end')).to.equal('5'); // 6th row
     });
 
-    it('should call stop making data source requests if the new rows were not added on the last call', async () => {
+    it('should stop making data source requests if the new rows were not added on the last call', async () => {
       render(
         <TestDataSourceLazyLoader
           mockServerRowCount={2}
           initialState={{
-            pagination: { paginationModel: { page: 0, pageSize: 2 }, rowCount: undefined },
+            pagination: { paginationModel: { page: 0, pageSize: 2 } },
           }}
         />,
       );
@@ -344,7 +344,7 @@ describeSkipIf(isJSDOM)('<DataGridPro /> - Data source lazy loader', () => {
   describe('Row count updates', () => {
     it('should add skeleton rows once the rowCount becomes known', async () => {
       // override rowCount
-      transformGetRowsResponse = (response) => ({ ...response, rowCount: undefined });
+      transformGetRowsResponse = (response) => ({ ...response });
       const { setProps } = render(<TestDataSourceLazyLoader />);
       // wait until the rows are rendered
       await waitFor(() => expect(getRow(0)).not.to.be.undefined);
@@ -363,7 +363,7 @@ describeSkipIf(isJSDOM)('<DataGridPro /> - Data source lazy loader', () => {
 
     it('should reset the grid if the rowCount becomes unknown', async () => {
       // override rowCount
-      transformGetRowsResponse = (response) => ({ ...response, rowCount: undefined });
+      transformGetRowsResponse = (response) => ({ ...response });
       const { setProps } = render(<TestDataSourceLazyLoader rowCount={100} />);
       // wait until the rows are rendered
       await waitFor(() => expect(getRow(0)).not.to.be.undefined);
@@ -380,7 +380,7 @@ describeSkipIf(isJSDOM)('<DataGridPro /> - Data source lazy loader', () => {
 
     it('should reset the grid if the rowCount becomes smaller than the actual row count', async () => {
       // override rowCount
-      transformGetRowsResponse = (response) => ({ ...response, rowCount: undefined });
+      transformGetRowsResponse = (response) => ({ ...response });
       render(
         <TestDataSourceLazyLoader rowCount={100} paginationModel={{ page: 0, pageSize: 30 }} />,
       );
@@ -405,7 +405,7 @@ describeSkipIf(isJSDOM)('<DataGridPro /> - Data source lazy loader', () => {
 
     it('should allow setting the row count via API', async () => {
       // override rowCount
-      transformGetRowsResponse = (response) => ({ ...response, rowCount: undefined });
+      transformGetRowsResponse = (response) => ({ ...response });
       render(<TestDataSourceLazyLoader />);
       // wait until the rows are rendered
       await waitFor(() => expect(getRow(0)).not.to.be.undefined);

packages/x-data-grid/src/models/events/gridEventLookup.ts

@@ -577,7 +577,7 @@ export interface GridEventLookup
    * Used to trigger infinite loading.
    * @ignore - do not document.
    */
-  onIntersection: {};
+  rowsScrollEndIntersection: {};
 
   // Selection
   /**