iglooform 2.4.25 → 2.4.28

package/lib/form/elements.js

@@ -33,6 +33,8 @@ var _uploadPhoto = _interopRequireDefault(require("../upload-photo"));
 
 var _render = _interopRequireDefault(require("./render"));
 
+var _typography = _interopRequireDefault(require("../typography"));
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -54,6 +56,7 @@ var elementMap = {
   RangePicker: _datePicker.IglooRangePicker,
   Radio: _radio.default,
   RadioGroup: _radio.RadioGroup,
+  RadioGroupWithOther: _radio.RadioGroupWithOther,
   Button: _button.default,
   Select: _select.AttachedSelect,
   TimeSelect: _select.TimeSelect,
@@ -67,7 +70,8 @@ var elementMap = {
   UploadPhoto: _uploadPhoto.default,
   InputDate: _input.InputDate,
   Confirmation: _confirmation.default,
-  ExpiryDate: _input.ExpiryDate
+  ExpiryDate: _input.ExpiryDate,
+  Typography: _typography.default
 };
 
 var Unknown = function Unknown() {
@@ -88,7 +92,7 @@ var useComponent = function useComponent(config) {
     return {
       Component: Component,
       formItemProps: formItemProps,
-      withoutForm: type === 'Divider' || Boolean(config.withoutForm)
+      withoutForm: type === 'Divider' || Boolean(config.withoutForm) || !config.name
     };
   }, [config.type]);
 };

package/lib/form/index.js

@@ -272,16 +272,16 @@ var IglooForm = function IglooForm(props, ref) {
         scrollToFirstError: true,
         children: [type === 'Pages' && (0, _jsxRuntime.jsx)(_pages.default, {
           config: config
-        }, void 0), type === 'Page' && (0, _jsxRuntime.jsx)(_page.default, {
+        }), type === 'Page' && (0, _jsxRuntime.jsx)(_page.default, {
           config: config
-        }, void 0), type === 'Steps' && (0, _jsxRuntime.jsx)(_steps.default, {
+        }), type === 'Steps' && (0, _jsxRuntime.jsx)(_steps.default, {
           config: config
-        }, void 0), type === 'Login' && (0, _jsxRuntime.jsx)(_login.default, {
+        }), type === 'Login' && (0, _jsxRuntime.jsx)(_login.default, {
           config: config
-        }, void 0)]
-      }, void 0)
-    }, void 0)
-  }, void 0);
+        })]
+      })
+    })
+  });
 };
 
 var ExportedForm = function () {

package/lib/form/login/index.js

@@ -59,7 +59,7 @@ var Login = function Login(_ref) {
     children: [label && (0, _jsxRuntime.jsx)("div", {
       className: 'igloo-login-label',
       children: label
-    }, void 0), (0, _jsxRuntime.jsx)("div", {
+    }), (0, _jsxRuntime.jsx)("div", {
       className: 'igloo-login-content',
       children: (0, _jsxRuntime.jsx)(_row.default, {
         gutter: [32, 24],
@@ -69,8 +69,8 @@ var Login = function Login(_ref) {
             config: child
           }, index);
         })
-      }, void 0)
-    }, void 0), showSubmitButton && (0, _jsxRuntime.jsx)(_form.default.Item, {
+      })
+    }), showSubmitButton && (0, _jsxRuntime.jsx)(_form.default.Item, {
       children: (0, _jsxRuntime.jsx)(_button.default, {
         type: "primary",
         htmlType: "submit",
@@ -79,9 +79,9 @@ var Login = function Login(_ref) {
         children: submitText || formatMessage({
           id: 'Log in'
         })
-      }, void 0)
-    }, void 0)]
-  }, void 0);
+      })
+    })]
+  });
 };
 
 var _default = Login;

package/lib/form/page/index.js

@@ -97,8 +97,8 @@ var Page = function Page(_ref) {
             parentName: (0, _formUtils.calcNamePath)(parentName, name)
           }, index);
         })
-      }, void 0)
-    }, void 0), showFooter && showSubmitButton && (0, _jsxRuntime.jsxs)("div", {
+      })
+    }), showFooter && showSubmitButton && (0, _jsxRuntime.jsxs)("div", {
       className: 'igloo-page-footer',
       children: [onCancel && (0, _jsxRuntime.jsx)(_col.default, {
         children: (0, _jsxRuntime.jsx)(_button.default, {
@@ -107,8 +107,8 @@ var Page = function Page(_ref) {
           children: cancelText || formatMessage({
             id: 'Cancel'
           })
-        }, void 0)
-      }, void 0), !onCancel && (0, _jsxRuntime.jsx)("div", {}, void 0), (0, _jsxRuntime.jsx)(_form.default.Item, {
+        })
+      }), !onCancel && (0, _jsxRuntime.jsx)("div", {}), (0, _jsxRuntime.jsx)(_form.default.Item, {
         children: (0, _jsxRuntime.jsx)(_button.default, {
           type: "primary",
           htmlType: "submit",
@@ -118,10 +118,10 @@ var Page = function Page(_ref) {
           children: submitText || formatMessage({
             id: 'Submit'
           })
-        }, void 0)
-      }, void 0)]
-    }, void 0)]
-  }, void 0);
+        })
+      })]
+    })]
+  });
 };
 
 var _default = Page;

package/lib/form/pages/index.js

@@ -199,7 +199,7 @@ var Pages = function Pages(_ref) {
         padding: md ? 0 : '0 16px'
       },
       children: renderElements[current].label
-    }, void 0), (0, _jsxRuntime.jsxs)("div", {
+    }), (0, _jsxRuntime.jsxs)("div", {
       className: 'igloo-pages-content',
       children: [renderElements.map(function (child, index) {
         (0, _invariant.default)(child.type === 'Page', 'Child of Pages should be Page');
@@ -214,11 +214,11 @@ var Pages = function Pages(_ref) {
             config: child,
             parentName: (0, _formUtils.calcNamePath)(parentName, name),
             showFooter: false
-          }, void 0)
+          })
         }, child.key || child.name);
       }), (0, _jsxRuntime.jsxs)("div", {
         className: 'igloo-pages-footer',
-        children: [current === 0 && (0, _jsxRuntime.jsx)("div", {}, void 0), current > 0 && (0, _jsxRuntime.jsx)(_button.default, {
+        children: [current === 0 && (0, _jsxRuntime.jsx)("div", {}), current > 0 && (0, _jsxRuntime.jsx)(_button.default, {
           className: 'igloo-pages-preview-button',
           onClick: function onClick() {
             return setCurrent(current - 1);
@@ -227,7 +227,7 @@ var Pages = function Pages(_ref) {
           children: previewText || formatMessage({
             id: 'Previous'
           })
-        }, void 0), current < renderElements.length - 1 && (0, _jsxRuntime.jsx)(_button.default, {
+        }), current < renderElements.length - 1 && (0, _jsxRuntime.jsx)(_button.default, {
           className: 'igloo-pages-next-button',
           onClick: handleNext,
           disabled: buttonDisabled,
@@ -235,7 +235,7 @@ var Pages = function Pages(_ref) {
           children: nextText || formatMessage({
             id: 'Next'
           })
-        }, void 0), current === renderElements.length - 1 && showSubmitButton && (0, _jsxRuntime.jsx)(_form.default.Item, {
+        }), current === renderElements.length - 1 && showSubmitButton && (0, _jsxRuntime.jsx)(_form.default.Item, {
           children: (0, _jsxRuntime.jsx)(_button.default, {
             type: "primary",
             htmlType: "submit",
@@ -245,11 +245,11 @@ var Pages = function Pages(_ref) {
             children: submitText || formatMessage({
               id: 'Submit'
             })
-          }, void 0)
-        }, void 0)]
-      }, void 0)]
-    }, void 0)]
-  }, void 0);
+          })
+        })]
+      })]
+    })]
+  });
 };
 
 var _default = Pages;

package/lib/form/render/index.js

@@ -39,7 +39,7 @@ RenderElement.formItemPropsHandler = function (_ref2) {
         render: render,
         preview: true,
         value: value
-      }, void 0);
+      });
     },
     fullRow: true,
     required: false

package/lib/form/section/index.js

@@ -94,7 +94,7 @@ var Section = function Section(_ref) {
       level: "h4",
       wrapElement: "div",
       children: label
-    }), void 0), (0, _jsxRuntime.jsx)("div", _objectSpread(_objectSpread({
+    })), (0, _jsxRuntime.jsx)("div", _objectSpread(_objectSpread({
       className: 'igloo-section-content'
     }, contentProps), {}, {
       children: (0, _jsxRuntime.jsx)(_row.default, {
@@ -108,9 +108,9 @@ var Section = function Section(_ref) {
             setShowStepButton: setShowStepButton
           }, index);
         })
-      }, void 0)
-    }), void 0)]
-  }, void 0) : null;
+      })
+    }))]
+  }) : null;
 };
 
 var _default = Section;

package/lib/form/step/index.js

@@ -124,11 +124,11 @@ var Step = function Step(_ref) {
         children: [(index !== total - 1 || showLastIndex) && (0, _jsxRuntime.jsx)("span", {
           className: "igloo-step-label-index",
           children: specialDisplayIndex(index + 1)
-        }, void 0), (0, _jsxRuntime.jsx)("span", {
+        }), (0, _jsxRuntime.jsx)("span", {
           className: "igloo-step-label-text",
           children: label
-        }, void 0)]
-      }, void 0), !preview && (index !== total - 1 || showLastIndex) && (0, _jsxRuntime.jsx)("div", {
+        })]
+      }), !preview && (index !== total - 1 || showLastIndex) && (0, _jsxRuntime.jsx)("div", {
         className: "igloo-step-label-step-count",
         children: formatMessage({
           id: "{currentStep} of {allSteps}",
@@ -137,7 +137,7 @@ var Step = function Step(_ref) {
             allSteps: displayTotal
           }
         })
-      }, void 0), preview && (0, _jsxRuntime.jsx)(_button.default, {
+      }), preview && (0, _jsxRuntime.jsx)(_button.default, {
         type: "link",
         className: "igloo-step-label-edit",
         onClick: handleEdit,
@@ -145,8 +145,8 @@ var Step = function Step(_ref) {
         children: editButtonLabel || formatMessage({
           id: 'Edit'
         })
-      }, void 0)]
-    }, void 0), (edit || preview) && (0, _jsxRuntime.jsxs)("div", {
+      })]
+    }), (edit || preview) && (0, _jsxRuntime.jsxs)("div", {
       className: 'igloo-step-content',
       children: [(0, _jsxRuntime.jsx)(_row.default, {
         gutter: [32, preview ? 16 : 24],
@@ -158,7 +158,7 @@ var Step = function Step(_ref) {
             preview: preview
           }, index);
         })
-      }, void 0), edit && index !== total - 1 && showButton && (0, _jsxRuntime.jsx)(_row.default, {
+      }), edit && index !== total - 1 && showButton && (0, _jsxRuntime.jsx)(_row.default, {
         children: (0, _jsxRuntime.jsx)(_button.default, {
           onClick: handleNext,
           className: 'igloo-step-button',
@@ -167,8 +167,8 @@ var Step = function Step(_ref) {
           children: buttonText || continueText || formatMessage({
             id: 'Continue'
           })
-        }, void 0)
-      }, void 0), edit && index === total - 1 && showButton && showSubmitButton && (0, _jsxRuntime.jsx)(_form.default.Item, {
+        })
+      }), edit && index === total - 1 && showButton && showSubmitButton && (0, _jsxRuntime.jsx)(_form.default.Item, {
         style: {
           marginBottom: 0
         },
@@ -181,12 +181,12 @@ var Step = function Step(_ref) {
           children: buttonText || submitText || formatMessage({
             id: 'Submit'
           })
-        }, void 0)
-      }, void 0)]
-    }, void 0), !edit && !preview && (0, _jsxRuntime.jsx)(_divider.default, {
+        })
+      })]
+    }), !edit && !preview && (0, _jsxRuntime.jsx)(_divider.default, {
       className: "igloo-step-divider"
-    }, void 0)]
-  }, void 0);
+    })]
+  });
 };
 
 var _default = Step;

package/lib/form/steps/index.js

@@ -202,8 +202,8 @@ var Steps = function Steps(_ref) {
           shouldScroll: shouldScroll
         }, child.key || child.name);
       })
-    }, void 0)
-  }, void 0);
+    })
+  });
 };
 
 var _default = Steps;

package/lib/free-form/addable-section/index.js

@@ -9,10 +9,18 @@ require("antd/es/row/style");
 
 var _row = _interopRequireDefault(require("antd/es/row"));
 
+require("antd/es/divider/style");
+
+var _divider = _interopRequireDefault(require("antd/es/divider"));
+
 require("antd/es/col/style");
 
 var _col = _interopRequireDefault(require("antd/es/col"));
 
+require("antd/es/grid/style");
+
+var _grid = _interopRequireDefault(require("antd/es/grid"));
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 var _react = require("react");
@@ -59,6 +67,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+var useBreakpoint = _grid.default.useBreakpoint;
+
 var AddableSection = function AddableSection(props) {
   var name = props.name,
       _props$label = props.label,
@@ -81,6 +91,9 @@ var AddableSection = function AddableSection(props) {
       addButtonIcon = props.addButtonIcon,
       children = props.children;
 
+  var _useBreakpoint = useBreakpoint(),
+      md = _useBreakpoint.md;
+
   var _useReducer = (0, _react.useReducer)(function (r) {
     return r + 1;
   }, 0),
@@ -244,14 +257,18 @@ var AddableSection = function AddableSection(props) {
     return (0, _jsxRuntime.jsxs)(_col.default, {
       span: 24,
       className: 'igloo-addable-section',
-      children: [(groupKeys.length > min && !preview || label) && (0, _jsxRuntime.jsxs)(_row.default, {
+      children: [index > 0 && (0, _jsxRuntime.jsx)(_divider.default, {
+        style: {
+          margin: !md ? preview ? '16px 0 24px 0' : '24px 0' : preview ? '16px 0 24px' : '32px 0 24px 0'
+        }
+      }), (groupKeys.length > min && !preview || label) && (0, _jsxRuntime.jsxs)(_row.default, {
         justify: "space-between",
         className: 'igloo-addable-section-label',
-        children: [label ? (0, _jsxRuntime.jsxs)(_typography.default, _objectSpread(_objectSpread({}, labelProps), {}, {
-          level: "h4",
+        children: [label ? (0, _jsxRuntime.jsx)(_typography.default, _objectSpread(_objectSpread({}, labelProps), {}, {
+          level: !md ? 'body1' : 'h3b',
           wrapElement: "div",
-          children: [label, " ", index + 1]
-        }), void 0) : (0, _jsxRuntime.jsx)("div", {}, void 0), groupKeys.length > min && !preview && (0, _jsxRuntime.jsx)(_button.default, {
+          children: label
+        })) : (0, _jsxRuntime.jsx)("div", {}), groupKeys.length > min && !preview && (0, _jsxRuntime.jsx)(_button.default, {
           type: "link",
           className: "igloo-addable-section-label-remove",
           onClick: function onClick() {
@@ -263,15 +280,18 @@ var AddableSection = function AddableSection(props) {
           children: formatMessage({
             id: 'Remove'
           })
-        }, void 0)]
-      }, void 0), (0, _jsxRuntime.jsx)("div", _objectSpread(_objectSpread({
+        })]
+      }), (0, _jsxRuntime.jsx)("div", _objectSpread(_objectSpread({
         className: 'igloo-addable-section-content'
       }, contentProps), {}, {
+        style: {
+          marginTop: !md ? 16 : preview ? 16 : 24
+        },
         children: (0, _jsxRuntime.jsx)(_row.default, {
           gutter: [32, preview ? 16 : 24],
           children: transformChildren(parentName)
-        }, void 0)
-      }), void 0)]
+        })
+      }))]
     }, key);
   });
   return (0, _jsxRuntime.jsxs)("div", {
@@ -282,7 +302,7 @@ var AddableSection = function AddableSection(props) {
     children: [groups, groupKeys.length < max && !preview && (0, _jsxRuntime.jsx)(_col.default, {
       span: 24,
       style: {
-        marginTop: 16
+        marginTop: !md ? 24 : 32
       },
       children: (0, _jsxRuntime.jsx)(_button.default, {
         onClick: function onClick() {
@@ -296,9 +316,9 @@ var AddableSection = function AddableSection(props) {
         children: addButtonText || "".concat(formatMessage({
           id: 'Add'
         }), " ").concat(label)
-      }, void 0)
-    }, void 0)]
-  }, void 0);
+      })
+    })]
+  });
 };
 
 var _default = AddableSection;

package/lib/free-form/addable-section/style/index.less

@@ -10,10 +10,6 @@
     .igloo-addable-section-content {
       margin-top: 16px;
     }
-
-    & + .igloo-addable-section {
-      margin-top: 24px;
-    }
   }
 
   .igloo-addable-section-button {

package/lib/free-form/element/index.js

@@ -280,7 +280,7 @@ var Element = function Element(props) {
             xs: 24,
             className: "igloo-freeform-element-preview-label",
             children: rest.previewLabel || rest.label
-          }, void 0), (0, _jsxRuntime.jsxs)(_col.default, {
+          }), (0, _jsxRuntime.jsxs)(_col.default, {
             span: rest.previewLabel || rest.label ? 12 : 24,
             md: rest.previewLabel || rest.label ? 12 : 24,
             sm: 24,
@@ -288,13 +288,13 @@ var Element = function Element(props) {
             className: "igloo-freeform-element-preview-value",
             children: [error && !!error.length && (0, _jsxRuntime.jsx)(_iglooicon.AlertFilled, {
               className: "igloo-freeform-element-preview-value-icon"
-            }, void 0), (0, _jsxRuntime.jsx)("div", {
+            }), (0, _jsxRuntime.jsx)("div", {
               children: previewFormater ? previewFormater(value, form) : _typeof(value) === 'object' ? JSON.stringify(value) : value
-            }, void 0)]
-          }, void 0)]
-        }, void 0)
-      }), void 0)
-    }, void 0);
+            })]
+          })]
+        })
+      }))
+    });
   }
 
   return props.hideWhenEdit ? null : (0, _jsxRuntime.jsx)(_col.default, _objectSpread(_objectSpread({}, restColProps), {}, {
@@ -315,9 +315,9 @@ var Element = function Element(props) {
       }, (0, _omit.default)(formItemProps, ['copiedValue', 'selectedValue'])), {}, {
         className: "igloo-freeform-element-edit",
         children: transformChildren()
-      }), void 0)
-    }, void 0)
-  }), void 0);
+      }))
+    })
+  }));
 };
 
 Element.displayName = 'Igloo_Free_Form_Item';

package/lib/free-form/index.js

@@ -223,9 +223,9 @@ var FreeForm = function FreeForm(props) {
         initialValues: initialValues,
         scrollToFirstError: true,
         children: children
-      }, void 0)
-    }, void 0)
-  }, void 0);
+      })
+    })
+  });
 };
 
 FreeForm.useForm = _form.default.useForm;

package/lib/free-form/page/index.js

@@ -213,7 +213,7 @@ var Page = function Page(_ref) {
         marginBottom: 8
       },
       children: label
-    }, void 0), (0, _jsxRuntime.jsx)(_typography.default, {
+    }), (0, _jsxRuntime.jsx)(_typography.default, {
       level: "body1",
       wrapElement: "div",
       style: {
@@ -221,15 +221,15 @@ var Page = function Page(_ref) {
         color: '#666666'
       },
       children: description
-    }, void 0), (0, _jsxRuntime.jsx)("div", {
+    }), (0, _jsxRuntime.jsx)("div", {
       className: 'igloo-freeform-page-content',
       children: (0, _jsxRuntime.jsx)(_row.default, {
         gutter: [32, 24],
         children: tranformChildren()
-      }, void 0)
-    }, void 0), showFooter && showSubmitButton && (current === undefined || index === undefined || total === undefined ? (0, _jsxRuntime.jsxs)("div", {
+      })
+    }), showFooter && showSubmitButton && (current === undefined || index === undefined || total === undefined ? (0, _jsxRuntime.jsxs)("div", {
       className: 'igloo-freeform-page-footer',
-      children: [buttonPlacement === 'right' && (0, _jsxRuntime.jsx)("div", {}, void 0), (0, _jsxRuntime.jsx)(_form.default.Item, {
+      children: [buttonPlacement === 'right' && (0, _jsxRuntime.jsx)("div", {}), (0, _jsxRuntime.jsx)(_form.default.Item, {
         children: (0, _jsxRuntime.jsx)(_button.default, {
           type: "primary",
           htmlType: "submit",
@@ -239,11 +239,11 @@ var Page = function Page(_ref) {
           children: submitText || formatMessage({
             id: 'Submit'
           })
-        }, void 0)
-      }, void 0), buttonPlacement === 'left' && (0, _jsxRuntime.jsx)("div", {}, void 0)]
-    }, void 0) : (0, _jsxRuntime.jsxs)("div", {
+        })
+      }), buttonPlacement === 'left' && (0, _jsxRuntime.jsx)("div", {})]
+    }) : (0, _jsxRuntime.jsxs)("div", {
       className: 'igloo-freeform-page-footer',
-      children: [index === 0 && (0, _jsxRuntime.jsx)("div", {}, void 0), index > 0 && total > 1 && (0, _jsxRuntime.jsx)(_button.default, {
+      children: [index === 0 && (0, _jsxRuntime.jsx)("div", {}), index > 0 && total > 1 && (0, _jsxRuntime.jsx)(_button.default, {
         className: 'igloo-freeform-page-preview-button',
         onClick: function onClick() {
           return handlePreviousPage && handlePreviousPage(index);
@@ -252,7 +252,7 @@ var Page = function Page(_ref) {
         children: previewText || formatMessage({
           id: 'Previous'
         })
-      }, void 0), index < total - 1 && (0, _jsxRuntime.jsx)(_button.default, {
+      }), index < total - 1 && (0, _jsxRuntime.jsx)(_button.default, {
         className: 'igloo-freeform-page-next-button',
         onClick: handleNext,
         disabled: buttonDisabled,
@@ -260,7 +260,7 @@ var Page = function Page(_ref) {
         children: nextText || formatMessage({
           id: 'Next'
         })
-      }, void 0), current === total - 1 && (0, _jsxRuntime.jsx)(_form.default.Item, {
+      }), current === total - 1 && (0, _jsxRuntime.jsx)(_form.default.Item, {
         children: (0, _jsxRuntime.jsx)(_button.default, {
           type: "primary",
           htmlType: "submit",
@@ -270,10 +270,10 @@ var Page = function Page(_ref) {
           children: submitText || formatMessage({
             id: 'Submit'
           })
-        }, void 0)
-      }, void 0)]
-    }, void 0))]
-  }, void 0);
+        })
+      })]
+    }))]
+  });
 };
 
 Page.displayName = 'Igloo_Free_Form_Page';

package/lib/free-form/pages/index.js

@@ -95,8 +95,8 @@ var Pages = function Pages(_ref) {
     children: (0, _jsxRuntime.jsx)("div", {
       className: 'igloo-freeform-pages-content',
       children: transformChildren()
-    }, void 0)
-  }, void 0);
+    })
+  });
 };
 
 var _default = Pages;

package/lib/free-form/section/index.js

@@ -197,15 +197,15 @@ var Section = function Section(props) {
       level: "h4",
       wrapElement: "div",
       children: label
-    }), void 0), (0, _jsxRuntime.jsx)("div", _objectSpread(_objectSpread({
+    })), (0, _jsxRuntime.jsx)("div", _objectSpread(_objectSpread({
       className: 'igloo-freeform-section-content'
     }, contentProps), {}, {
       children: (0, _jsxRuntime.jsx)(_row.default, {
         gutter: [32, preview ? 16 : 24],
         children: transformChildren()
-      }, void 0)
-    }), void 0)]
-  }, void 0) : null;
+      })
+    }))]
+  }) : null;
 };
 
 Section.displayName = 'Igloo_Free_Form_Section';

package/lib/free-form/step/index.js

@@ -252,11 +252,11 @@ var Step = function Step(_ref) {
         children: [(index !== total - 1 || showLastIndex) && (0, _jsxRuntime.jsx)("span", {
           className: "igloo-freeform-step-label-index",
           children: specialDisplayIndex(index + 1)
-        }, void 0), (0, _jsxRuntime.jsx)("span", {
+        }), (0, _jsxRuntime.jsx)("span", {
           className: "igloo-freeform-step-label-text",
           children: label
-        }, void 0)]
-      }, void 0), !preview && (index !== total - 1 || showLastIndex) && (0, _jsxRuntime.jsx)("div", {
+        })]
+      }), !preview && (index !== total - 1 || showLastIndex) && (0, _jsxRuntime.jsx)("div", {
         className: "igloo-freeform-step-label-step-count",
         children: formatMessage({
           id: "{currentStep} of {allSteps}",
@@ -265,7 +265,7 @@ var Step = function Step(_ref) {
             allSteps: displayTotal
           }
         })
-      }, void 0), preview && (0, _jsxRuntime.jsx)(_button.default, {
+      }), preview && (0, _jsxRuntime.jsx)(_button.default, {
         type: "link",
         className: "igloo-freeform-step-label-edit",
         onClick: handleEdit,
@@ -273,13 +273,13 @@ var Step = function Step(_ref) {
         children: editButtonLabel || formatMessage({
           id: 'Edit'
         })
-      }, void 0)]
-    }, void 0), (edit || preview) && (0, _jsxRuntime.jsxs)("div", {
+      })]
+    }), (edit || preview) && (0, _jsxRuntime.jsxs)("div", {
       className: 'igloo-freeform-step-content',
       children: [(0, _jsxRuntime.jsx)(_row.default, {
         gutter: [32, preview ? 16 : 24],
         children: transformChildren()
-      }, void 0), edit && index !== total - 1 && showButton && (0, _jsxRuntime.jsx)(_row.default, {
+      }), edit && index !== total - 1 && showButton && (0, _jsxRuntime.jsx)(_row.default, {
         children: (0, _jsxRuntime.jsx)(_button.default, {
           onClick: handleNext,
           className: 'igloo-freeform-step-button',
@@ -288,8 +288,8 @@ var Step = function Step(_ref) {
           children: buttonText || continueText || formatMessage({
             id: 'Continue'
           })
-        }, void 0)
-      }, void 0), edit && index === total - 1 && showButton && showSubmitButton && (0, _jsxRuntime.jsx)(_form.default.Item, {
+        })
+      }), edit && index === total - 1 && showButton && showSubmitButton && (0, _jsxRuntime.jsx)(_form.default.Item, {
         style: {
           marginBottom: 0
         },
@@ -302,12 +302,12 @@ var Step = function Step(_ref) {
           children: buttonText || submitText || formatMessage({
             id: 'Submit'
           })
-        }, void 0)
-      }, void 0)]
-    }, void 0), !edit && !preview && (0, _jsxRuntime.jsx)(_divider.default, {
+        })
+      })]
+    }), !edit && !preview && (0, _jsxRuntime.jsx)(_divider.default, {
       className: "igloo-freeform-step-divider"
-    }, void 0)]
-  }, void 0);
+    })]
+  });
 };
 
 var _default = Step;