IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

UI/Field: Undefined defaults no longer override child props (#48182)

Browse Source 
Closes #48131
This commit is contained in:
kay delaney
2022-04-26 12:51:42 +01:00
committed by GitHub
parent 090afc9ae0
commit 706d3d1161
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/grafana-ui/src/components/Forms/Field.tsx
View File

@@ -97,11 +97,12 @@ export const Field: React.FC<FieldProps> = ({
label
);
const childProps = deleteUndefinedProps({ invalid, disabled, loading });
return (
<div className={cx(styles.field, horizontal && styles.fieldHorizontal, className)} {...otherProps}>
{labelElement}
<div>
{React.cloneElement(children, { invalid, disabled, loading })}
{React.cloneElement(children, childProps)}
{invalid && error && !horizontal && (
<div
className={cx(styles.fieldValidationWrapper, {
@@ -125,3 +126,13 @@ export const Field: React.FC<FieldProps> = ({
</div>
);
};
function deleteUndefinedProps<T extends Object>(obj: T): Partial<T> {
for (const key in obj) {
if (obj[key] === undefined) {
delete obj[key];
}
}
return obj;
}