Merge pull request #84 from indec-it/fix/interruptionModal

fix(formBuilder): fix open interruption modal
indec-it · Sep 21, 2023 · 16131e2 · 16131e2
2 parents 28b29aa + 20fa914
commit 16131e2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@indec/form-builder",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "description": "Form builder",
   "main": "index.js",
   "private": false,

diff --git a/src/components/FormBuilder/FormBuilder.js b/src/components/FormBuilder/FormBuilder.js
@@ -92,9 +92,9 @@ function FormBuilder({
                       </Box>
                     )}
                     <Modals
-                      open={selectedSectionId === currentSection.id}
+                      open={selectedSectionId}
                       options={section.interruption.options}
-                      label={section.interruption.reason}
+                      label={{text: section.interruption.reason}}
                       name={`${section.name}.${index}.${section.interruption.name}`}
                       onAccept={
                         [modals.CONFIRM_DELETE_SECTION_MODAL, modals.INTERRUPTION_MODAL].includes(openModal)

diff --git a/src/components/FormBuilder/Modals/Modals.js b/src/components/FormBuilder/Modals/Modals.js
@@ -20,7 +20,7 @@ const getChildren = (modal, {options, label, name}) => {
     );
   case modals.INTERRUPTION_MODAL:
     return (
-      <FastField component={Radio} options={options} label={label} name={name} required readOnlyMode={false} />
+      <FastField component={Radio} options={options} label={label} name={name} />
     );
   default:
     return null;

diff --git a/src/components/FormBuilder/SectionHeader/SectionHeader.js b/src/components/FormBuilder/SectionHeader/SectionHeader.js
@@ -58,7 +58,14 @@ function SectionHeader({
           }
         </Stack>
         {section.introduction && (
-          <Typography data-testid="introduction" fontWeight="bold" color="gray">{section.introduction}</Typography>
+          <Typography
+            data-testid="introduction"
+            fontWeight="bold"
+            color="gray"
+            whiteSpace="pre-line"
+          >
+            {section.introduction}
+          </Typography>
         )}
         <Typography>{getHeaders(section.questions, values, section.headers)}</Typography>
       </Stack>