From 03640f78cdcf76b81a59acd995d652a2bf28e060 Mon Sep 17 00:00:00 2001
From: Bill Keese <wkeese@jp.ibm.com>
Date: Mon, 29 Jul 2024 17:23:22 +0900
Subject: [PATCH 1/2] fix: add disabled attribute back to FormGroup

Fixes #17057.
---
 packages/react/src/components/FormGroup/FormGroup.tsx | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/react/src/components/FormGroup/FormGroup.tsx b/packages/react/src/components/FormGroup/FormGroup.tsx
index 7dd2a8b541bb..e269cfa780a7 100644
--- a/packages/react/src/components/FormGroup/FormGroup.tsx
+++ b/packages/react/src/components/FormGroup/FormGroup.tsx
@@ -20,6 +20,10 @@ export interface FormGroupProps extends ReactAttr<HTMLFieldSetElement> {
    * Provide a custom className to be applied to the containing <fieldset> node
    */
   className?: string;
+  /**
+   * Specify whether the FormGroup should be disabled
+   */
+  disabled?: boolean;
   /**
    * Specify whether the <FormGroup> is invalid
    */
@@ -45,6 +49,7 @@ export interface FormGroupProps extends ReactAttr<HTMLFieldSetElement> {
 }
 
 const FormGroup = ({
+  disabled = false,
   legendId,
   legendText,
   invalid = false,
@@ -60,6 +65,7 @@ const FormGroup = ({
 
   return (
     <fieldset
+      disabled={disabled}
       {...(invalid && { 'data-invalid': '' })}
       className={classNamesFieldset}
       {...rest}
@@ -88,6 +94,11 @@ FormGroup.propTypes = {
    */
   className: PropTypes.string,
 
+  /**
+   * Specify whether the FormGroup should be disabled
+   */
+  disabled: PropTypes.bool,
+
   /**
    * Specify whether the <FormGroup> is invalid
    */

From 4677c4c1247924817189c0b3737a7d6c7092408b Mon Sep 17 00:00:00 2001
From: Bill Keese <wkeese@jp.ibm.com>
Date: Mon, 29 Jul 2024 21:55:34 +0900
Subject: [PATCH 2/2] chore: update snapshot to fix test

---
 packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap b/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
index 8447806aebf9..d4d657b13b23 100644
--- a/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
+++ b/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
@@ -3733,6 +3733,9 @@ Map {
       "className": Object {
         "type": "string",
       },
+      "disabled": Object {
+        "type": "bool",
+      },
       "invalid": Object {
         "type": "bool",
       },