Skip to content

Commit

Permalink
remove defaultProps
Browse files Browse the repository at this point in the history
  • Loading branch information
barbalex committed Aug 27, 2024
1 parent 0d2d22f commit 69b6192
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 39 deletions.
13 changes: 8 additions & 5 deletions src/components/shared/CheckboxWithInfo.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,14 @@ const StyledFormControlLabel = styled(FormControlLabel)`
}
`

const CheckboxWithInfo = ({ value, label, name, popover, saveToDb, error }) => {
const CheckboxWithInfo = ({
value = null,
label,
name,
popover,
saveToDb,
error,
}) => {
const onCheck = useCallback((e, val) => saveToDb(val), [saveToDb])

return (
Expand Down Expand Up @@ -68,8 +75,4 @@ const CheckboxWithInfo = ({ value, label, name, popover, saveToDb, error }) => {
)
}

CheckboxWithInfo.defaultProps = {
value: null,
}

export default observer(CheckboxWithInfo)
4 changes: 0 additions & 4 deletions src/components/shared/InfoWithPopover.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,4 @@ const InfoWithPopover = ({ children, name }) => {
)
}

InfoWithPopover.defaultProps = {
popupAnchorEl: null,
}

export default InfoWithPopover
17 changes: 5 additions & 12 deletions src/components/shared/RadioButtonGroup.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const StyledRadio = styled(Radio)`
`

const RadioButtonGroup = ({
value,
value = null,
label,
name,
error,
Expand Down Expand Up @@ -69,13 +69,10 @@ const RadioButtonGroup = ({
const targetValue = event.target.value
// values are passed as strings > need to convert
const valueToUse =
targetValue === 'true'
? true
: targetValue === 'false'
? false
: isNaN(targetValue)
? targetValue
: +targetValue
targetValue === 'true' ? true
: targetValue === 'false' ? false
: isNaN(targetValue) ? targetValue
: +targetValue
const fakeEvent = {
target: {
value: valueToUse,
Expand Down Expand Up @@ -137,8 +134,4 @@ const RadioButtonGroup = ({
)
}

RadioButtonGroup.defaultProps = {
value: null,
}

export default RadioButtonGroup
6 changes: 1 addition & 5 deletions src/components/shared/RadioButtonGroupWithInfo.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const Container = styled.div`
const RadioButtonGroupWithInfo = ({
label,
name,
value,
value = '',
error,
dataSource,
saveToDb,
Expand All @@ -34,8 +34,4 @@ const RadioButtonGroupWithInfo = ({
</Container>
)

RadioButtonGroupWithInfo.defaultProps = {
value: '',
}

export default observer(RadioButtonGroupWithInfo)
50 changes: 37 additions & 13 deletions src/components/shared/Status.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const StyledLabel = styled.div`
color: ${(props) => (props.error ? '#f44336' : 'unset')};
`

const Status = ({ apJahr, showFilter, saveToDb, row = {}, errors }) => {
const Status = ({ apJahr = null, showFilter, saveToDb, row = {}, errors }) => {
const herkunftValue = row.status
const bekanntSeitValue = row.bekanntSeit
const error = errors?.status || errors?.bekanntSeit
Expand Down Expand Up @@ -198,14 +198,24 @@ const Status = ({ apJahr, showFilter, saveToDb, row = {}, errors }) => {
<GroupLabelContainer>ursprünglich:</GroupLabelContainer>
<FormControlLabel
value="100"
control={<StyledRadio data-id="status_100" color="primary" />}
control={
<StyledRadio
data-id="status_100"
color="primary"
/>
}
label="aktuell"
disabled={statusDisabled}
onClick={onClickButton}
/>
<FormControlLabel
value="101"
control={<StyledRadio data-id="status_101" color="primary" />}
control={
<StyledRadio
data-id="status_101"
color="primary"
/>
}
label="erloschen"
disabled={statusDisabled}
onClick={onClickButton}
Expand All @@ -215,21 +225,36 @@ const Status = ({ apJahr, showFilter, saveToDb, row = {}, errors }) => {
<GroupLabelContainer>{angesiedeltLabel}</GroupLabelContainer>
<FormControlLabel
value="200"
control={<StyledRadio data-id="status_200" color="primary" />}
control={
<StyledRadio
data-id="status_200"
color="primary"
/>
}
label="aktuell"
disabled={statusDisabled}
onClick={onClickButton}
/>
<FormControlLabel
value="201"
control={<StyledRadio data-id="status_201" color="primary" />}
control={
<StyledRadio
data-id="status_201"
color="primary"
/>
}
label="Ansaatversuch"
disabled={statusDisabled}
onClick={onClickButton}
/>
<FormControlLabel
value="202"
control={<StyledRadio data-id="status_202" color="primary" />}
control={
<StyledRadio
data-id="status_202"
color="primary"
/>
}
label="erloschen / nicht etabliert"
disabled={statusDisabled}
onClick={onClickButton}
Expand All @@ -239,7 +264,12 @@ const Status = ({ apJahr, showFilter, saveToDb, row = {}, errors }) => {
<GroupLabelContainer>potenziell:</GroupLabelContainer>
<FormControlLabel
value="300"
control={<StyledRadio data-id="status_300" color="primary" />}
control={
<StyledRadio
data-id="status_300"
color="primary"
/>
}
label="potenzieller Wuchs-/Ansiedlungsort"
disabled={statusDisabled}
onClick={onClickButton}
Expand All @@ -256,10 +286,4 @@ const Status = ({ apJahr, showFilter, saveToDb, row = {}, errors }) => {
)
}

Status.defaultProps = {
apJahr: null,
herkunftValue: null,
bekanntSeitValue: '',
}

export default Status

0 comments on commit 69b6192

Please sign in to comment.