[EuiFormRow] Respect child isDisabled (#5022)

* respect isDisabled * CL
elastic · Aug 12, 2021 · 036a89c · 036a89c
1 parent 73b0276
commit 036a89c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 **Bug fixes**
 
 - Fixed usage of `outsideClickCloses` prop of `EuiFlyout` ([#4986](https://github.com/elastic/eui/pull/4986))
+- Fixed `EuiFormRow` ignoring `isDisabled` prop on the child element. ([#5022](https://github.com/elastic/eui/pull/5022))
 
 ## [`37.1.0`](https://github.com/elastic/eui/tree/v37.1.0)
 

diff --git a/src/components/form/form_row/form_row.tsx b/src/components/form/form_row/form_row.tsx
@@ -271,8 +271,8 @@ export class EuiFormRow extends Component<EuiFormRowProps, EuiFormRowState> {
     const child = Children.only(children);
     const field = cloneElement(child, {
       id,
-      // Allow the child's disabled prop to supercede the `isDisabled`
-      disabled: child.props.disabled ?? isDisabled,
+      // Allow the child's disabled or isDisabled prop to supercede the `isDisabled`
+      disabled: child.props.disabled ?? child.props.isDisabled ?? isDisabled,
       onFocus: this.onFocus,
       onBlur: this.onBlur,
       ...optionalProps,