Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[EuiFormRow] Respect child isDisabled #5022

Merged
merged 2 commits into from
Aug 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions src/components/form/form_row/form_row.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down