Skip to content

Commit

Permalink
Merge branch 'main' into feat/1562-carbon-upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaopeng0202 authored Jan 9, 2025
2 parents de4542f + b106086 commit 7b91b68
Showing 1 changed file with 5 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ const CollectionStep = ({ isReview }: CollectionStepProps) => {
helperText={isReview ? null : fieldsConfig.startDate.helperText}
invalid={state.startDate.isInvalid}
invalidText={fieldsConfig.startDate.invalidText}
aria-invalid={state.startDate.isInvalid ? 'true' : 'false'}
size="md"
autoComplete="off"
/>
Expand All @@ -218,6 +219,7 @@ const CollectionStep = ({ isReview }: CollectionStepProps) => {
helperText={isReview ? null : fieldsConfig.endDate.helperText}
invalid={state.endDate.isInvalid}
invalidText={fieldsConfig.endDate.invalidText}
aria-invalid={state.endDate.isInvalid ? 'true' : 'false'}
size="md"
autoComplete="off"
/>
Expand All @@ -235,6 +237,7 @@ const CollectionStep = ({ isReview }: CollectionStepProps) => {
readOnly={isFormSubmitted && !isReview}
invalid={state.numberOfContainers.isInvalid}
invalidText={fieldsConfig.numberOfContainers.invalidText}
aria-invalid={state.numberOfContainers.isInvalid ? 'true' : 'false'}
onWheel={(e: React.ChangeEvent<HTMLInputElement>) => e.target.blur()}
onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
handleContainerNumAndVol(true, e.target.value);
Expand All @@ -251,6 +254,7 @@ const CollectionStep = ({ isReview }: CollectionStepProps) => {
readOnly={isFormSubmitted && !isReview}
invalid={state.volumePerContainers.isInvalid}
invalidText={fieldsConfig.volumePerContainers.invalidText}
aria-invalid={state.volumePerContainers.isInvalid ? 'true' : 'false'}
onWheel={(e: React.ChangeEvent<HTMLInputElement>) => e.target.blur()}
onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
handleContainerNumAndVol(false, e.target.value);
Expand All @@ -272,6 +276,7 @@ const CollectionStep = ({ isReview }: CollectionStepProps) => {
warn={isCalcWrong}
readOnly={isFormSubmitted && !isReview}
warnText={fieldsConfig.volumeOfCones.warnText}
aria-invalid={state.volumeOfCones.isInvalid ? 'true' : 'false'}
onWheel={(e: React.ChangeEvent<HTMLInputElement>) => e.target.blur()}
onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
handleVolOfCones(e.target.value);
Expand Down

0 comments on commit 7b91b68

Please sign in to comment.