iglooform 2.4.7 → 2.4.11

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

@@ -0,0 +1,22 @@
+.igloo-addable-section-container {
+  .igloo-addable-section {
+    .igloo-addable-section-label {
+      .igloo-addable-section-label-remove {
+        height: auto;
+        border: none;
+      }
+    }
+
+    .igloo-addable-section-content {
+      margin-top: 16px;
+    }
+
+    & + .igloo-addable-section {
+      margin-top: 24px;
+    }
+  }
+
+  .igloo-addable-section-button {
+    min-width: 221px;
+  }
+}

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

@@ -25,11 +25,11 @@ var _jsxRuntime = require("react/jsx-runtime");
 
 var _react = require("react");
 
-var _icons = require("@ant-design/icons");
+var _iglooicon = require("iglooicon");
 
 var _formUtils = require("../../utils/form-utils");
 
-var _context = _interopRequireDefault(require("../context"));
+var _formContext = _interopRequireDefault(require("../../form-context"));
 
 var _omit = _interopRequireDefault(require("omit.js"));
 
@@ -39,18 +39,18 @@ require("./style/index.less");
 
 var _invariant = _interopRequireDefault(require("invariant"));
 
-var _excluded = ["parentName", "preview", "disabled", "disabledFromParent", "children"],
+var _excluded = ["parentName", "preview", "disabledFromParent", "children"],
     _excluded2 = ["halfRow"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -81,14 +81,13 @@ var useBreakpoint = _grid.default.useBreakpoint;
 var Element = function Element(props) {
   var parentName = props.parentName,
       preview = props.preview,
-      disabled = props.disabled,
       disabledFromParent = props.disabledFromParent,
       children = props.children,
       rest = _objectWithoutProperties(props, _excluded);
 
   (0, _invariant.default)(!(rest.selectValue || rest.copyValue || rest.initialValue) || rest.name, 'Form item with selectValue/copyValue/initialValue should have a name.');
 
-  var _useContext = (0, _react.useContext)(_context.default),
+  var _useContext = (0, _react.useContext)(_formContext.default),
       form = _useContext.form,
       requiredMark = _useContext.requiredMark,
       registerDependencies = _useContext.registerDependencies;
@@ -109,7 +108,9 @@ var Element = function Element(props) {
         dependField = props.dependField,
         getOptions = props.getOptions,
         subscribedFields = props.subscribedFields,
-        extraLabel = props.extraLabel;
+        extraLabel = props.extraLabel,
+        disabled = props.disabled,
+        requiredAsserts = props.requiredAsserts;
     var dependentField = dependencies || [];
 
     if (Array.isArray(subscribedFields)) {
@@ -123,13 +124,20 @@ var Element = function Element(props) {
       });
     }
 
+    if (requiredAsserts && requiredAsserts.length) {
+      requiredAsserts.forEach(function (_ref2) {
+        var field = _ref2.field;
+        return dependentField.push(field);
+      });
+    }
+
     if (copyValue) {
       dependentField.push(copyValue.assert.field);
     }
 
     if (selectValue && selectValue.length) {
-      selectValue.forEach(function (_ref2) {
-        var assert = _ref2.assert;
+      selectValue.forEach(function (_ref3) {
+        var assert = _ref3.assert;
         return dependentField.push(assert.field);
       });
     }
@@ -143,8 +151,8 @@ var Element = function Element(props) {
     }
 
     if (Array.isArray(disabled)) {
-      disabled.forEach(function (_ref3) {
-        var field = _ref3.field;
+      disabled.forEach(function (_ref4) {
+        var field = _ref4.field;
         return dependentField.push(field);
       });
     } else if (_typeof(disabled) === 'object') {
@@ -232,7 +240,7 @@ var Element = function Element(props) {
   var transformChildren = function transformChildren() {
     if (! /*#__PURE__*/(0, _react.isValidElement)(children)) return children;
     return /*#__PURE__*/(0, _react.cloneElement)(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), elementProps), {}, {
-      disabled: elementProps.disabled || disabledFromParent,
+      disabled: children.props.disabled || elementProps.disabled || disabledFromParent,
       containerRef: ref,
       setFieldError: setFieldError,
       setFieldValue: setFieldValue,
@@ -244,75 +252,69 @@ var Element = function Element(props) {
   if (!display) return null;
 
   if (preview) {
-    return (0, _jsxRuntime.jsx)(_col.default, Object.assign({
+    return (0, _jsxRuntime.jsx)(_col.default, {
       span: 24,
       className: (0, _classnames.default)('igloo-freeform-element-preview', {
         'igloo-freeform-element-preview-hide': props.hideWhenPreview,
         'igloo-freeform-element-preview-hide-divider': props.hidePreviewDivider
-      })
-    }, {
-      children: (0, _jsxRuntime.jsx)(_form.default.Item, Object.assign({}, (0, _omit.default)(formItemProps, ['copiedValue', 'selectedValue']), {
+      }),
+      children: (0, _jsxRuntime.jsx)(_form.default.Item, _objectSpread(_objectSpread({}, (0, _omit.default)(formItemProps, ['copiedValue', 'selectedValue'])), {}, {
         labelCol: {
           span: 24
         },
         wrapperCol: {
           span: 24
         },
-        label: null
-      }, {
-        children: (0, _jsxRuntime.jsxs)(_row.default, Object.assign({
+        label: null,
+        children: (0, _jsxRuntime.jsxs)(_row.default, {
           className: "igloo-freeform-element-preview-item",
           gutter: {
             md: 32,
             sm: 0,
             xs: 0
-          }
-        }, {
-          children: [(rest.previewLabel || rest.label) && (0, _jsxRuntime.jsx)(_col.default, Object.assign({
+          },
+          children: [(rest.previewLabel || rest.label) && (0, _jsxRuntime.jsx)(_col.default, {
             span: 12,
             md: 12,
             sm: 24,
             xs: 24,
-            className: "igloo-freeform-element-preview-label"
-          }, {
+            className: "igloo-freeform-element-preview-label",
             children: rest.previewLabel || rest.label
-          }), void 0), (0, _jsxRuntime.jsxs)(_col.default, Object.assign({
+          }, void 0), (0, _jsxRuntime.jsxs)(_col.default, {
             span: rest.previewLabel || rest.label ? 12 : 24,
             md: rest.previewLabel || rest.label ? 12 : 24,
             sm: 24,
             xs: 24,
-            className: "igloo-freeform-element-preview-value"
-          }, {
-            children: [error && !!error.length && (0, _jsxRuntime.jsx)(_icons.CloseCircleFilled, {
+            className: "igloo-freeform-element-preview-value",
+            children: [error && !!error.length && (0, _jsxRuntime.jsx)(_iglooicon.AlertFilled, {
               className: "igloo-freeform-element-preview-value-icon"
             }, void 0), previewFormater ? previewFormater(value, form) : value || '-']
-          }), void 0)]
-        }), void 0)
+          }, void 0)]
+        }, void 0)
       }), void 0)
-    }), void 0);
+    }, void 0);
   }
 
-  return props.hideWhenEdit ? null : (0, _jsxRuntime.jsx)(_col.default, Object.assign({}, restColProps, {
-    className: "igloo-freeform-item"
-  }, {
-    children: (0, _jsxRuntime.jsx)("div", Object.assign({
+  return props.hideWhenEdit ? null : (0, _jsxRuntime.jsx)(_col.default, _objectSpread(_objectSpread({}, restColProps), {}, {
+    className: "igloo-freeform-item",
+    children: (0, _jsxRuntime.jsx)("div", {
       ref: ref,
       style: {
         width: halfRow && md ? '50%' : '100%',
         paddingRight: halfRow && md ? 16 : 0
-      }
-    }, {
-      children: (0, _jsxRuntime.jsx)(_form.default.Item, Object.assign({
+      },
+      children: (0, _jsxRuntime.jsx)(_form.default.Item, _objectSpread(_objectSpread({
         labelCol: {
           span: 24
         },
         wrapperCol: {
           span: 24
         }
-      }, (0, _omit.default)(formItemProps, ['copiedValue', 'selectedValue']), {
+      }, (0, _omit.default)(formItemProps, ['copiedValue', 'selectedValue'])), {}, {
+        className: "igloo-freeform-element-edit",
         children: transformChildren()
       }), void 0)
-    }), void 0)
+    }, void 0)
   }), void 0);
 };
 

package/lib/free-form/element/style/index.less

@@ -20,12 +20,17 @@
       white-space: pre-wrap;
       word-break: break-word;
       line-height: 24px;
+
+      .igloo-freeform-element-preview-value-icon {
+        color: @error-color;
+        margin-right: 8px;
+      }
     }
   }
 
   .ant-form-item-explain-error {
     margin-top: 0;
-    margin-left: 50%;
+    margin-left: calc(~'50%' + 16px);
   }
 
   .ant-form-item-extra,
@@ -33,7 +38,8 @@
     display: none;
   }
 
-  .ant-form-item-explain-error {
+  .ant-form-item-explain-error,
+  .ant-form-item-explain-connected {
     display: block;
   }
 }
@@ -71,6 +77,10 @@
   }
 }
 
+.igloo-freeform-element-edit {
+  flex-direction: column;
+}
+
 .ant-form-item-control-input {
   min-height: unset;
 }

package/lib/free-form/index.d.ts

@@ -1,7 +1,11 @@
 import { FC } from 'react';
+import { Form } from 'antd';
 import { FormBasicConfig } from '../types';
 import './style/index.less';
 interface FreeFormProps extends Omit<FormBasicConfig, 'config'> {
 }
-declare const FreeForm: FC<FreeFormProps>;
+interface FreeFormType extends FC<FreeFormProps> {
+    useForm: typeof Form.useForm;
+}
+declare const FreeForm: FreeFormType;
 export default FreeForm;

package/lib/free-form/index.js

@@ -13,7 +13,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 
 var _react = require("react");
 
-var _context2 = _interopRequireDefault(require("./context"));
+var _formContext = _interopRequireDefault(require("../form-context"));
 
 var _messages = _interopRequireDefault(require("./messages"));
 
@@ -25,9 +25,9 @@ var _excluded = ["validateMessages"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -70,7 +70,8 @@ var FreeForm = function FreeForm(props) {
     return window;
   } : _props$getScrollConta,
       _props$onFirstModifie = props.onFirstModified,
-      onFirstModified = _props$onFirstModifie === void 0 ? function () {} : _props$onFirstModifie;
+      onFirstModified = _props$onFirstModifie === void 0 ? function () {} : _props$onFirstModifie,
+      uploadApi = props.uploadApi;
 
   var _Form$useForm = _form.default.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -197,13 +198,12 @@ var FreeForm = function FreeForm(props) {
     }
   };
 
-  return (0, _jsxRuntime.jsx)("div", Object.assign({
+  return (0, _jsxRuntime.jsx)("div", {
     className: (0, _classnames.default)(className, {
       'igloo-freeform-without-button': !showSubmitButton
     }),
-    style: style
-  }, {
-    children: (0, _jsxRuntime.jsx)(_context2.default.Provider, Object.assign({
+    style: style,
+    children: (0, _jsxRuntime.jsx)(_formContext.default.Provider, {
       value: _objectSpread({
         form: form,
         onCancel: onCancel,
@@ -211,23 +211,23 @@ var FreeForm = function FreeForm(props) {
         requiredMark: requiredMark,
         showSubmitButton: showSubmitButton,
         getScrollContainer: getScrollContainer,
-        registerDependencies: registerDependencies
-      }, locales)
-    }, {
-      children: (0, _jsxRuntime.jsx)(_form.default, Object.assign({
+        registerDependencies: registerDependencies,
+        uploadApi: uploadApi
+      }, locales),
+      children: (0, _jsxRuntime.jsx)(_form.default, {
         form: form,
         onFinish: handleSubmit,
         onFieldsChange: handleValuesChange,
         colon: false,
         validateMessages: validateMessages || _messages.default,
         initialValues: initialValues,
-        scrollToFirstError: true
-      }, {
+        scrollToFirstError: true,
         children: children
-      }), void 0)
-    }), void 0)
-  }), void 0);
+      }, void 0)
+    }, void 0)
+  }, void 0);
 };
 
+FreeForm.useForm = _form.default.useForm;
 var _default = FreeForm;
 exports.default = _default;

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

@@ -21,7 +21,7 @@ var _button = _interopRequireDefault(require("../../button"));
 
 var _formUtils = require("../../utils/form-utils");
 
-var _context2 = _interopRequireDefault(require("../context"));
+var _formContext = _interopRequireDefault(require("../../form-context"));
 
 var _locale = require("../../locale");
 
@@ -35,9 +35,9 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -74,7 +74,7 @@ var Page = function Page(_ref) {
       shouldRender = _ref.shouldRender,
       subscribedFields = _ref.subscribedFields;
 
-  var _useContext = (0, _react.useContext)(_context2.default),
+  var _useContext = (0, _react.useContext)(_formContext.default),
       submitText = _useContext.submitText,
       previewText = _useContext.previewText,
       nextText = _useContext.nextText,
@@ -112,10 +112,11 @@ var Page = function Page(_ref) {
       return children.map(function (c, index) {
         var _c$type;
 
-        if (['Igloo_Free_Form_Item', 'Igloo_Free_Form_Section'].includes(c === null || c === void 0 ? void 0 : (_c$type = c.type) === null || _c$type === void 0 ? void 0 : _c$type.displayName)) {
-          return /*#__PURE__*/(0, _react.cloneElement)(c, _objectSpread(_objectSpread({}, c.props), {}, {
-            parentName: pName,
-            key: c.props.key || index
+        if (['Igloo_Free_Form_Item', 'Igloo_Free_Form_Section', 'Igloo_Free_Form_AddabledSection'].includes(c === null || c === void 0 ? void 0 : (_c$type = c.type) === null || _c$type === void 0 ? void 0 : _c$type.displayName)) {
+          return /*#__PURE__*/(0, _react.cloneElement)(c, _objectSpread(_objectSpread({
+            key: index
+          }, c.props), {}, {
+            parentName: pName
           }));
         }
 
@@ -200,90 +201,79 @@ var Page = function Page(_ref) {
     };
   }();
 
-  return (0, _jsxRuntime.jsxs)("div", Object.assign({
+  return (0, _jsxRuntime.jsxs)("div", {
     className: 'igloo-freeform-page-container',
     style: {
       display: current === index ? 'block' : 'none'
-    }
-  }, {
-    children: [(0, _jsxRuntime.jsx)(_typography.default, Object.assign({
+    },
+    children: [(0, _jsxRuntime.jsx)(_typography.default, {
       level: "h3b",
       wrapElement: "div",
       style: {
         marginBottom: 8
-      }
-    }, {
+      },
       children: label
-    }), void 0), (0, _jsxRuntime.jsx)(_typography.default, Object.assign({
+    }, void 0), (0, _jsxRuntime.jsx)(_typography.default, {
       level: "body1",
       wrapElement: "div",
       style: {
         marginBottom: 24,
         color: '#666666'
-      }
-    }, {
+      },
       children: description
-    }), void 0), (0, _jsxRuntime.jsx)("div", Object.assign({
-      className: 'igloo-freeform-page-content'
-    }, {
-      children: (0, _jsxRuntime.jsx)(_row.default, Object.assign({
-        gutter: [32, 24]
-      }, {
+    }, void 0), (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", Object.assign({
-      className: 'igloo-freeform-page-footer'
-    }, {
+      }, void 0)
+    }, void 0), 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: (0, _jsxRuntime.jsx)(_button.default, Object.assign({
+        children: (0, _jsxRuntime.jsx)(_button.default, {
           type: "primary",
           htmlType: "submit",
           className: 'igloo-freeform-page-submit-button',
           loading: submitting,
-          disabled: buttonDisabled
-        }, {
+          disabled: buttonDisabled,
           children: submitText || formatMessage({
             id: 'Submit'
           })
-        }), void 0)
+        }, void 0)
       }, void 0), buttonPlacement === 'left' && (0, _jsxRuntime.jsx)("div", {}, void 0)]
-    }), void 0) : (0, _jsxRuntime.jsxs)("div", Object.assign({
-      className: 'igloo-freeform-page-footer'
-    }, {
-      children: [index === 0 && (0, _jsxRuntime.jsx)("div", {}, void 0), index > 0 && total > 1 && (0, _jsxRuntime.jsx)(_button.default, Object.assign({
+    }, void 0) : (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, {
         className: 'igloo-freeform-page-preview-button',
         onClick: function onClick() {
           return handlePreviousPage && handlePreviousPage(index);
         },
-        disabled: previousDisabled
-      }, {
+        disabled: previousDisabled,
         children: previewText || formatMessage({
           id: 'Previous'
         })
-      }), void 0), index < total - 1 && (0, _jsxRuntime.jsx)(_button.default, Object.assign({
+      }, void 0), index < total - 1 && (0, _jsxRuntime.jsx)(_button.default, {
         className: 'igloo-freeform-page-next-button',
         onClick: handleNext,
         disabled: buttonDisabled,
-        type: "primary"
-      }, {
+        type: "primary",
         children: nextText || formatMessage({
           id: 'Next'
         })
-      }), void 0), current === total - 1 && (0, _jsxRuntime.jsx)(_form.default.Item, {
-        children: (0, _jsxRuntime.jsx)(_button.default, Object.assign({
+      }, void 0), current === total - 1 && (0, _jsxRuntime.jsx)(_form.default.Item, {
+        children: (0, _jsxRuntime.jsx)(_button.default, {
           type: "primary",
           htmlType: "submit",
           className: 'igloo-freeform-page-submit-button',
           loading: submitting,
-          disabled: buttonDisabled
-        }, {
+          disabled: buttonDisabled,
           children: submitText || formatMessage({
             id: 'Submit'
           })
-        }), void 0)
+        }, void 0)
       }, void 0)]
-    }), void 0))]
-  }), void 0);
+    }, void 0))]
+  }, void 0);
 };
 
 Page.displayName = 'Igloo_Free_Form_Page';

package/lib/free-form/page/style/index.less

@@ -47,21 +47,23 @@
     .igloo-freeform-page-footer {
       display: flex;
       flex-direction: column-reverse;
-      row-gap: 16px;
 
       .igloo-freeform-page-preview-button {
         min-width: none;
         width: 100%;
+        margin-top: 16px;
       }
 
       .igloo-freeform-page-next-button {
         min-width: none;
         width: 100%;
+        margin-top: 16px;
       }
 
       .igloo-freeform-page-cancel-button {
         min-width: none;
         width: 100%;
+        margin-top: 16px;
       }
 
       .igloo-freeform-page-submit-button {

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

@@ -13,9 +13,9 @@ var _formUtils = require("../../utils/form-utils");
 
 require("./style/index.less");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -90,15 +90,13 @@ var Pages = function Pages(_ref) {
     })) : children;
   };
 
-  return (0, _jsxRuntime.jsx)("div", Object.assign({
-    className: 'igloo-freeform-pages-container'
-  }, {
-    children: (0, _jsxRuntime.jsx)("div", Object.assign({
-      className: 'igloo-freeform-pages-content'
-    }, {
+  return (0, _jsxRuntime.jsx)("div", {
+    className: 'igloo-freeform-pages-container',
+    children: (0, _jsxRuntime.jsx)("div", {
+      className: 'igloo-freeform-pages-content',
       children: transformChildren()
-    }), void 0)
-  }), void 0);
+    }, void 0)
+  }, void 0);
 };
 
 var _default = Pages;