Merge branch '3.2.0' into pbac-update-user-roles

CBIIT · Jan 6, 2025 · 88c8f56 · 88c8f56
2 parents 9a68a63 + b5e35fb
commit 88c8f56
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/src/components/Questionnaire/LabelCheckbox.tsx b/src/components/Questionnaire/LabelCheckbox.tsx
@@ -69,7 +69,7 @@ const LabelCheckbox: FC<Props> = ({
       data-type="boolean"
       value={checked ? "true" : "false"}
       onChange={() => {}}
-      aria-labelledby={`${idPrefix}-label`}
+      aria-label={rest?.inputProps?.["aria-label"]}
       checked
       hidden
     />

diff --git a/src/components/Questionnaire/ReviewDataListing.tsx b/src/components/Questionnaire/ReviewDataListing.tsx
@@ -29,7 +29,7 @@ const ReviewDataListing = ({ idPrefix, title, description, hideTitle, children }
     {title || description ? (
       <StyledGridHeader xs={12} item>
         {title && (
-          <StyledTitle id={idPrefix.concat(`-section-title`)} variant="h5">
+          <StyledTitle id={idPrefix.concat(`-section-title`)} variant="h4">
             {!hideTitle ? title : null}
           </StyledTitle>
         )}

diff --git a/src/components/Questionnaire/ReviewSection.tsx b/src/components/Questionnaire/ReviewSection.tsx
@@ -40,7 +40,7 @@ const ReviewSection: FC<Props> = ({ idPrefix, title, divider = true, children })
     <Grid className="review-section-header" xs={12} item sx={{ padding: "0 !important" }}>
       <Stack direction="row" alignItems="center">
         {title && (
-          <StyledTitle id={idPrefix.concat("-section-header-title")} variant="h6">
+          <StyledTitle id={idPrefix.concat("-section-header-title")} variant="h3">
             {title}
           </StyledTitle>
         )}

diff --git a/src/content/questionnaire/sections/C.tsx b/src/content/questionnaire/sections/C.tsx
@@ -163,6 +163,7 @@ const FormSectionC: FC<FormSectionProps> = ({ SectionOption, refs }: FormSection
               checked={otherCancerTypesEnabled}
               onChange={handleOtherCancerTypesCheckboxChange}
               readOnly={cancerTypes.includes(CUSTOM_CANCER_TYPES.NOT_APPLICABLE) || readOnlyInputs}
+              inputProps={{ "aria-label": "Toggle Other cancer type(s)" }}
             />
           }
           name="otherCancerTypes"
@@ -213,6 +214,7 @@ const FormSectionC: FC<FormSectionProps> = ({ SectionOption, refs }: FormSection
               checked={otherSpeciesEnabled}
               onChange={handleOtherSpeciesCheckboxChange}
               readOnly={readOnlyInputs}
+              inputProps={{ "aria-label": "Toggle Other Specie(s) involved" }}
             />
           }
           name="otherSpeciesOfSubjects"