From dc22c5fa531ac0aefc901045b0f5f9a91b2baeba Mon Sep 17 00:00:00 2001
From: Yong Hu <t-yonghu@microsoft.com>
Date: Thu, 11 Jul 2024 17:42:32 +0800
Subject: [PATCH 1/2] Fix: default scrolling behavior does not work when the
 gridProps property of the DataGridBody component has an onScroll function

---
 .../src/components/DataGridBody/useDataGridBody.tsx | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/react-data-grid-react-window-grid/src/components/DataGridBody/useDataGridBody.tsx b/packages/react-data-grid-react-window-grid/src/components/DataGridBody/useDataGridBody.tsx
index 81418959a..c4b59a22f 100644
--- a/packages/react-data-grid-react-window-grid/src/components/DataGridBody/useDataGridBody.tsx
+++ b/packages/react-data-grid-react-window-grid/src/components/DataGridBody/useDataGridBody.tsx
@@ -92,6 +92,17 @@ export const useDataGridBody_unstable = (
     [headerListRef]
   );
 
+  const combinedOnScroll = React.useCallback(
+    (scrollProps: GridOnScrollProps) => {
+      onScroll(scrollProps);
+
+      if (gridProps && gridProps.onScroll) {
+        gridProps.onScroll(scrollProps);
+      }
+    },
+    [onScroll, gridProps]
+  );
+
   return {
     ...baseState,
     rowHeight,
@@ -103,7 +114,7 @@ export const useDataGridBody_unstable = (
     ariaRowIndexStart,
     gridRef: bodyRef,
     gridProps: {
-      onScroll,
+      onScroll: combinedOnScroll,
       ...gridProps,
     },
   };

From 82506c0203ca3172d76b9a9e666517d3a0a87a9e Mon Sep 17 00:00:00 2001
From: Yong Hu <t-yonghu@microsoft.com>
Date: Fri, 12 Jul 2024 10:48:11 +0800
Subject: [PATCH 2/2] Fix: default scrolling behavior does not work when the
 gridProps property of the DataGridBody component has an onScroll function

---
 .../src/components/DataGridBody/useDataGridBody.tsx             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-data-grid-react-window-grid/src/components/DataGridBody/useDataGridBody.tsx b/packages/react-data-grid-react-window-grid/src/components/DataGridBody/useDataGridBody.tsx
index c4b59a22f..280a12631 100644
--- a/packages/react-data-grid-react-window-grid/src/components/DataGridBody/useDataGridBody.tsx
+++ b/packages/react-data-grid-react-window-grid/src/components/DataGridBody/useDataGridBody.tsx
@@ -114,8 +114,8 @@ export const useDataGridBody_unstable = (
     ariaRowIndexStart,
     gridRef: bodyRef,
     gridProps: {
-      onScroll: combinedOnScroll,
       ...gridProps,
+      onScroll: combinedOnScroll,
     },
   };
 };