From 761f3ec701b98f4e7ae57482f6229fafba10b4a6 Mon Sep 17 00:00:00 2001
From: Bilal Shafi <bilalshafidev@gmail.com>
Date: Mon, 16 Dec 2024 17:53:00 +0500
Subject: [PATCH] [DataGrid] Fix `aria-label` value for group checkboxes
 (#15861)

---
 .../columnSelection/GridCellCheckboxRenderer.tsx          | 8 ++++----
 .../src/components/columnSelection/GridHeaderCheckbox.tsx | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/x-data-grid/src/components/columnSelection/GridCellCheckboxRenderer.tsx b/packages/x-data-grid/src/components/columnSelection/GridCellCheckboxRenderer.tsx
index 5bfadd9b96f7..49d3b3485c48 100644
--- a/packages/x-data-grid/src/components/columnSelection/GridCellCheckboxRenderer.tsx
+++ b/packages/x-data-grid/src/components/columnSelection/GridCellCheckboxRenderer.tsx
@@ -98,15 +98,15 @@ const GridCellCheckboxForwardRef = React.forwardRef<HTMLInputElement, GridRender
       return null;
     }
 
-    const label = apiRef.current.getLocaleText(
-      isChecked ? 'checkboxSelectionUnselectRow' : 'checkboxSelectionSelectRow',
-    );
-
     const checked =
       rootProps.indeterminateCheckboxAction === 'select'
         ? isChecked && !isIndeterminate
         : isChecked;
 
+    const label = apiRef.current.getLocaleText(
+      checked ? 'checkboxSelectionUnselectRow' : 'checkboxSelectionSelectRow',
+    );
+
     return (
       <rootProps.slots.baseCheckbox
         ref={handleRef}
diff --git a/packages/x-data-grid/src/components/columnSelection/GridHeaderCheckbox.tsx b/packages/x-data-grid/src/components/columnSelection/GridHeaderCheckbox.tsx
index f968f9108669..1c91b906bdab 100644
--- a/packages/x-data-grid/src/components/columnSelection/GridHeaderCheckbox.tsx
+++ b/packages/x-data-grid/src/components/columnSelection/GridHeaderCheckbox.tsx
@@ -125,15 +125,15 @@ const GridHeaderCheckbox = React.forwardRef<HTMLButtonElement, GridColumnHeaderP
       return apiRef.current.subscribeEvent('rowSelectionChange', handleSelectionChange);
     }, [apiRef, handleSelectionChange]);
 
-    const label = apiRef.current.getLocaleText(
-      isChecked ? 'checkboxSelectionUnselectAllRows' : 'checkboxSelectionSelectAllRows',
-    );
-
     const checked =
       rootProps.indeterminateCheckboxAction === 'select'
         ? isChecked && !isIndeterminate
         : isChecked;
 
+    const label = apiRef.current.getLocaleText(
+      checked ? 'checkboxSelectionUnselectAllRows' : 'checkboxSelectionSelectAllRows',
+    );
+
     return (
       <rootProps.slots.baseCheckbox
         ref={ref}