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.

Sign up for GitHub

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

feat: [DHIS2-17648] Replace Material UI FormGroup, FormLabel and FormControl #3713

Merged
merged 1 commit into from
Aug 6, 2024
Merged

feat: [DHIS2-17648] Replace Material UI FormGroup, FormLabel and FormControl #3713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 5 additions & 11 deletions src/core_modules/capture-core/components/FormFields/Generic/D2TrueOnly.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// @flow
import React, { Component } from 'react';
import { Checkbox, Switch, spacersNum } from '@dhis2/ui';
import FormControl from '@material-ui/core/FormControl';
import FormLabel from '@material-ui/core/FormLabel';
import { Checkbox, Switch, spacersNum, FieldSet, Label } from '@dhis2/ui';
import { withStyles } from '@material-ui/core/styles';

const styles = theme => ({
Expand Down Expand Up @@ -65,32 +63,28 @@ class D2TrueOnlyPlain extends Component<Props> {
ref={(containerInstance) => { this.materialUIContainerInstance = containerInstance; }}
style={style}
>
<FormControl
component="fieldset"
>
<FieldSet>
{
(() => {
if (!label || useValueLabel) {
return null;
}

return (
<FormLabel
component="label"
<Label
required={!!required}
classes={this.labelClasses}
focused={false}
>
{label}
</FormLabel>
</Label>
);
})()
}
{useSwitch ?
<Switch checked={!!value} label={useValueLabel ? label : ''} onChange={this.handleChange} value={value} dense className={classes.checkbox} /> :
<Checkbox checked={!!value} label={useValueLabel ? label : ''} onChange={this.handleChange} value={value} dense className={classes.checkbox} />
}
</FormControl>
</FieldSet>
</div>
);
}
Expand Down
29 changes: 29 additions & 0 deletions src/core_modules/capture-core/components/FormFields/Options/FormGroup.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// @flow
import React from 'react';
import { withStyles } from '@material-ui/core';

const styles = {
formGroup: {
display: 'flex',
flexDirection: 'column',
},
formGroupRow: {
display: 'flex',
flexDirection: 'row',
},
};

type Props = {
row?: boolean;
classes: Object;
children: any;
}

const FormGroupPlain = ({ children, classes, row = false, ...props }: Props) => (
<div {...props} className={row ? classes.formGroupRow : classes.formGroup} >
{children}
</div>
)
;

export const FormGroup = withStyles(styles)(FormGroupPlain);
18 changes: 7 additions & 11 deletions ...capture-core/components/FormFields/Options/MultiSelectBoxes/MultiSelectBoxes.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
// @flow
/* eslint-disable react/no-array-index-key */
import React, { Component, type ComponentType } from 'react';
import { Checkbox, spacersNum } from '@dhis2/ui';
import FormControl from '@material-ui/core/FormControl';
import FormLabel from '@material-ui/core/FormLabel';
import FormGroup from '@material-ui/core/FormGroup';
import { Checkbox, spacersNum, FieldSet, Label } from '@dhis2/ui';
import { withStyles } from '@material-ui/core/styles';
import { multiOrientations } from './multiSelectBoxes.const';
import { FormGroup } from '../FormGroup.component';

const styles = theme => ({
label: theme.typography.formFieldTitle,
Expand Down Expand Up @@ -137,27 +135,25 @@ class MultiSelectBoxesPlain extends Component<Props> {

return (
<div ref={(containerInstance) => { this.materialUIContainerInstance = containerInstance; }}>
<FormControl component="fieldset">
<FieldSet>
{
(() => {
if (!label) {
return null;
}

return (
<FormLabel
component="label"
<Label
required={!!required}
classes={this.labelClasses}
focused={false}
className={this.labelClasses}
>
{label}
</FormLabel>
</Label>
);
})()
}
{this.renderCheckboxes()}
</FormControl>
</FieldSet>
</div>
);
}
Expand Down
25 changes: 11 additions & 14 deletions ...pture-core/components/FormFields/Options/SingleSelectBoxes/SingleSelectBoxes.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
// @flow
/* eslint-disable react/no-array-index-key */
import React, { Component, type ComponentType } from 'react';
import FormControl from '@material-ui/core/FormControl';
import { Radio, colors, spacersNum } from '@dhis2/ui';
import FormLabel from '@material-ui/core/FormLabel';
import FormGroup from '@material-ui/core/FormGroup';
import { Radio, colors, spacersNum, FieldSet, Label } from '@dhis2/ui';
import { withStyles } from '@material-ui/core/styles';
import { singleOrientations } from './singleSelectBoxes.const';
import type { Props } from './singleSelectBoxes.types';
import { FormGroup } from '../FormGroup.component';


const styles = ({ typography, palette }) => ({
label: typography.formFieldTitle,
Expand All @@ -17,7 +16,7 @@ const styles = ({ typography, palette }) => ({
iconDeselected: {
fill: colors.grey700,
},
checkbox: {
radio: {
marginTop: spacersNum.dp8,
marginBottom: spacersNum.dp16,
},
Expand Down Expand Up @@ -52,7 +51,7 @@ class SingleSelectBoxesPlain extends Component<Props> {
name={`singleSelectBoxes-${index}`}
onChange={(e: Object) => { this.handleOptionChange(e, value); }}
value={value}
className={classes.checkbox}
className={classes.radio}
dense
/>
));
Expand Down Expand Up @@ -112,27 +111,25 @@ class SingleSelectBoxesPlain extends Component<Props> {

return (
<div ref={(containerInstance) => { this.materialUIContainerInstance = containerInstance; }}>
<FormControl component="fieldset">
<FieldSet>
{
(() => {
if (!label) {
return null;
}

return (
<FormLabel
component="label"
<Label
required={!!required}
classes={this.labelClasses}
focused={false}
className={this.labelClasses}
>
{label}
</FormLabel>
</Label>
);
})()
}
{this.renderBoxes()}
</FormControl>
{ this.renderBoxes() }
</FieldSet>
</div>
);
}
Expand Down
2 changes: 1 addition & 1 deletion ...s/capture-core/components/FormFields/Options/SingleSelectBoxes/singleSelectBoxes.types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export type Props = {
label: string,
iconSelected: string,
iconDeselected: string,
checkbox: string,
radio: string,
},
style?: ?Object,
};
Loading