@insticc/genericform 2.0.1 → 2.0.3

package/build/index.js

@@ -34,11 +34,12 @@ var _CustomSearch = _interopRequireDefault(require("./FormFields/CustomSearch"))
 var _CustomSeparator = _interopRequireDefault(require("./FormFields/CustomSeparator"));
 var _CustomTextArea = _interopRequireDefault(require("./FormFields/CustomTextArea"));
 var _CustomToggle = _interopRequireDefault(require("./FormFields/CustomToggle"));
+var _semanticUiReact = require("semantic-ui-react");
 var _Demo = _interopRequireDefault(require("./Demo"));
 var _Demo2 = _interopRequireDefault(require("./Demo2"));
 require("./index.css");
+var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
@@ -103,15 +104,17 @@ var groupByInline = function groupByInline(fields) {
 
 // #region GenericForm Props 
 var GenericForm = function GenericForm(_ref) {
-  var _ref$externalData = _ref.externalData,
-    externalData = _ref$externalData === void 0 ? {} : _ref$externalData,
-    _ref$fields = _ref.fields,
+  var _submitButton$icon, _cancelButton$icon;
+  var _ref$fields = _ref.fields,
     fields = _ref$fields === void 0 ? [] : _ref$fields,
     title = _ref.title,
     titleIcon = _ref.titleIcon,
+    titleStyle = _ref.titleStyle,
     _ref$containerStyle = _ref.containerStyle,
     containerStyle = _ref$containerStyle === void 0 ? {} : _ref$containerStyle,
     formStyle = _ref.formStyle,
+    actionsDivStyle = _ref.actionsDivStyle,
+    actionsStyle = _ref.actionsStyle,
     _ref$splitForm = _ref.splitForm,
     splitForm = _ref$splitForm === void 0 ? false : _ref$splitForm,
     splitField = _ref.splitField,
@@ -128,9 +131,13 @@ var GenericForm = function GenericForm(_ref) {
     _ref$showCancel = _ref.showCancel,
     showCancel = _ref$showCancel === void 0 ? true : _ref$showCancel,
     _ref$submitText = _ref.submitText,
-    submitText = _ref$submitText === void 0 ? 'Save' : _ref$submitText,
+    submitText = _ref$submitText === void 0 ? 'Submit' : _ref$submitText,
     _ref$cancelText = _ref.cancelText,
     cancelText = _ref$cancelText === void 0 ? 'Cancel' : _ref$cancelText,
+    _ref$submitButton = _ref.submitButton,
+    submitButton = _ref$submitButton === void 0 ? {} : _ref$submitButton,
+    _ref$cancelButton = _ref.cancelButton,
+    cancelButton = _ref$cancelButton === void 0 ? {} : _ref$cancelButton,
     _ref$validateOnChange = _ref.validateOnChange,
     validateOnChange = _ref$validateOnChange === void 0 ? true : _ref$validateOnChange,
     _ref$validateOnSubmit = _ref.validateOnSubmit,
@@ -231,7 +238,7 @@ var GenericForm = function GenericForm(_ref) {
 
   // #region Validation
   var validateField = (0, _react.useCallback)(function (field, value, currentFormData) {
-    if (['hr', 'label', 'component', 'accordion'].includes(field.type)) return null;
+    if (['hr', 'label', 'accordion'].includes(field.type)) return null;
     var errs = [];
     if (field.required) {
       var empty = value === undefined || value === null || value === '' || Array.isArray(value) && value.length === 0;
@@ -466,76 +473,63 @@ var GenericForm = function GenericForm(_ref) {
     switch (field.type) {
       // Abstract
       case 'hr':
-        return /*#__PURE__*/React.createElement(_CustomSeparator["default"], {
-          key: field.name || "sep-".concat(Math.random()),
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomSeparator["default"], {
           mainDivStyle: field.style
-        });
+        }, field.name || "sep-".concat(Math.random()));
       case 'label':
-        return /*#__PURE__*/React.createElement(_CustomLabel["default"], _extends({
-          key: field.name
-        }, cp, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomLabel["default"], _objectSpread(_objectSpread({}, cp), {}, {
           mainDivStyle: field.style,
           labelStyle: field.labelStyle
-        }));
+        }), field.name);
 
       // Simple
       case 'string':
       case 'text':
       case 'email':
       case 'password':
-        return /*#__PURE__*/React.createElement(_CustomInput["default"], _extends({
-          key: field.name
-        }, cp, sp, fp, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomInput["default"], _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, cp), sp), fp), {}, {
           value: value,
           type: field.type === 'email' ? 'email' : field.type === 'password' ? 'password' : 'text',
           placeholder: field.placeholder,
           onChange: fieldHandler(field),
           inputStyle: field.inputStyle,
           className: field.className
-        }));
+        }), field.name);
       case 'int':
       case 'number':
-        return /*#__PURE__*/React.createElement(_CustomNumberInput["default"], _extends({
-          key: field.name
-        }, cp, sp, fp, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomNumberInput["default"], _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, cp), sp), fp), {}, {
           value: value,
           placeholder: field.placeholder,
           min: field.min,
           max: field.max,
           step: field.step,
           onChange: fieldHandler(field)
-        }));
+        }), field.name);
       case 'textArea':
-        return /*#__PURE__*/React.createElement(_CustomTextArea["default"], _extends({
-          key: field.name
-        }, cp, sp, fp, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomTextArea["default"], _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, cp), sp), fp), {}, {
           value: value,
           placeholder: field.placeholder,
           rows: field.rows,
           height: field.height,
           onChange: fieldHandler(field)
-        }));
+        }), field.name);
 
       // Date
       case 'date':
       case 'datetime':
       case 'time':
       case 'year':
-        return /*#__PURE__*/React.createElement(_CustomDatePicker["default"], _extends({
-          key: field.name
-        }, cp, sp, fp, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomDatePicker["default"], _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, cp), sp), fp), {}, {
           value: value,
           placeholder: field.placeholder,
           onChange: dateFieldHandler(field),
           dateFormat: field.type === 'time' ? false : field.type === 'year' ? 'YYYY' : 'DD/MM/YYYY',
           timeFormat: field.type === 'datetime' || field.type === 'time' ? 'HH:mm' : false
-        }));
+        }), field.name);
 
       // Option
       case 'select':
-        return /*#__PURE__*/React.createElement(_CustomDropdown["default"], _extends({
-          key: field.name
-        }, cp, sp, fp, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomDropdown["default"], _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, cp), sp), fp), {}, {
           value: value,
           options: field.options,
           placeholder: field.placeholder,
@@ -548,20 +542,16 @@ var GenericForm = function GenericForm(_ref) {
               option: fullOption
             });
           }
-        }));
+        }), field.name);
       case 'multipleDropdown':
-        return /*#__PURE__*/React.createElement(_CustomMultiDropdown["default"], _extends({
-          key: field.name
-        }, cp, sp, fp, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomMultiDropdown["default"], _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, cp), sp), fp), {}, {
           value: value,
           options: field.options,
           placeholder: field.placeholder,
           onChange: fieldHandler(field)
-        }));
+        }), field.name);
       case 'search':
-        return /*#__PURE__*/React.createElement(_CustomSearch["default"], _extends({
-          key: field.name
-        }, cp, sp, fp, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomSearch["default"], _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, cp), sp), fp), {}, {
           value: value,
           options: field.options,
           placeholder: field.placeholder,
@@ -569,65 +559,53 @@ var GenericForm = function GenericForm(_ref) {
           onChange: handleSearchChange,
           handleResultSelect: handleResultSelect,
           resultRenderer: resultRenderer
-        }));
+        }), field.name);
       case 'accordion':
-        return /*#__PURE__*/React.createElement(_CustomAccordion["default"], {
-          key: field.name,
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomAccordion["default"], {
           name: field.name,
           sections: field.sections,
           defaultOpen: field.defaultOpen,
           activeAllIndex: field.activeAllIndex,
           mainDivStyle: field.style,
           inputStyle: field.inputStyle
-        });
+        }, field.name);
       case 'toggle':
-        return /*#__PURE__*/React.createElement(_CustomToggle["default"], _extends({
-          key: field.name
-        }, cp, sp, fp, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomToggle["default"], _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, cp), sp), fp), {}, {
           value: !!value,
           onChange: fieldHandler(field)
-        }));
+        }), field.name);
       case 'checkbox':
-        return /*#__PURE__*/React.createElement(_CustomCheckbox["default"], _extends({
-          key: field.name
-        }, cp, sp, fp, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomCheckbox["default"], _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, cp), sp), fp), {}, {
           checked: !!value,
           onChange: fieldHandler(field),
           onOptionChange: field.onOptionChange
-        }));
+        }), field.name);
       case 'checkboxGroup':
-        return /*#__PURE__*/React.createElement(_CustomCheckboxGroup["default"], _extends({
-          key: field.name
-        }, cp, sp, fp, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomCheckboxGroup["default"], _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, cp), sp), fp), {}, {
           checked: value !== null && value !== void 0 ? value : [],
           options: field.options,
+          grouped: field.grouped,
           onChange: fieldHandler(field),
           onOptionChange: field.onOptionChange
-        }));
+        }), field.name);
       case 'radioGroup':
       case 'radioGroupInline':
-        return /*#__PURE__*/React.createElement(_CustomRadioGroup["default"], _extends({
-          key: field.name
-        }, cp, sp, fp, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomRadioGroup["default"], _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, cp), sp), fp), {}, {
           value: value,
           options: field.options,
           inline: field.type === 'radioGroupInline',
           onChange: fieldHandler(field),
           onOptionChange: field.onOptionChange,
           formData: internalFormData
-        }));
+        }), field.name);
 
       // Other
       case 'component':
-        return /*#__PURE__*/React.createElement(_CustomComponent["default"], _extends({
-          key: field.name || "cmp-".concat(Math.random())
-        }, cp, sp, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomComponent["default"], _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, cp), sp), fp), {}, {
           component: field.component
-        }));
+        }), field.name || "cmp-".concat(Math.random()));
       case 'json':
-        return /*#__PURE__*/React.createElement(_CustomJson["default"], _extends({
-          key: field.name
-        }, cp, sp, fp, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomJson["default"], _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, cp), sp), fp), {}, {
           value: value,
           datatype: field.datatype,
           allowModeSwitch: field.allowModeSwitch,
@@ -645,18 +623,15 @@ var GenericForm = function GenericForm(_ref) {
           onValidate: function onValidate(name, raw, isMulti) {
             return validateJsonField(name, raw, isMulti, false, field);
           }
-        }));
+        }), field.name);
       default:
-        return /*#__PURE__*/React.createElement(_CustomInput["default"], _extends({
-          key: field.name
-        }, cp, sp, fp, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomInput["default"], _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, cp), sp), fp), {}, {
           value: value,
           type: "text",
           placeholder: field.placeholder,
           onChange: fieldHandler(field),
-          inputStyle: field.inputStyle,
           className: field.className
-        }));
+        }), field.name);
     }
   }, [
   // eslint-disable-line react-hooks/exhaustive-deps
@@ -674,21 +649,23 @@ var GenericForm = function GenericForm(_ref) {
   }, [sortedFields]);
   var renderFields = function renderFields(fieldList) {
     return groupByInline(fieldList).map(function (group, idx) {
-      return group.type === 'inline' ? /*#__PURE__*/React.createElement("div", {
-        key: idx,
-        className: "ufg-field-row"
-      }, group.fields.map(function (_ref9) {
-        var field = _ref9.field;
-        return renderField(field);
-      })) : renderField(group.field);
+      return group.type === 'inline' ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "ufg-field-row",
+        children: group.fields.map(function (_ref9) {
+          var field = _ref9.field;
+          return renderField(field);
+        })
+      }, idx) : renderField(group.field);
     });
   };
   var renderGroupSection = function renderGroupSection(g, fieldList) {
-    return /*#__PURE__*/React.createElement("div", {
-      key: g,
+    return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "ufg-form",
-      style: formStyle
-    }, g !== 'ungrouped' && /*#__PURE__*/React.createElement("h2", null, g), renderFields(fieldList));
+      style: formStyle,
+      children: [g !== 'ungrouped' && /*#__PURE__*/(0, _jsxRuntime.jsx)("h2", {
+        children: g
+      }), renderFields(fieldList)]
+    }, g);
   };
   var splitByField = function splitByField(fieldList) {
     var idx = fieldList.findIndex(function (f) {
@@ -714,24 +691,34 @@ var GenericForm = function GenericForm(_ref) {
       if (splitIdx === -1) return groups.map(function (g) {
         return renderGroupSection(g, groupedFields[g]);
       });
-      return /*#__PURE__*/React.createElement("div", {
-        className: "ufg-form-columns"
-      }, /*#__PURE__*/React.createElement("div", null, groups.slice(0, splitIdx + 1).map(function (g) {
-        return renderGroupSection(g, groupedFields[g]);
-      })), /*#__PURE__*/React.createElement("div", null, groups.slice(splitIdx + 1).map(function (g) {
-        return renderGroupSection(g, groupedFields[g]);
-      })));
+      return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+        className: "ufg-form-columns",
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          children: groups.slice(0, splitIdx + 1).map(function (g) {
+            return renderGroupSection(g, groupedFields[g]);
+          })
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          children: groups.slice(splitIdx + 1).map(function (g) {
+            return renderGroupSection(g, groupedFields[g]);
+          })
+        })]
+      });
     }
     if (splitForm && splitField) {
-      return /*#__PURE__*/React.createElement("div", {
-        className: "ufg-form-columns"
-      }, /*#__PURE__*/React.createElement("div", null, groups.map(function (g) {
-        return renderGroupSection(g, splitByField(groupedFields[g]).left);
-      })), /*#__PURE__*/React.createElement("div", null, groups.map(function (g) {
-        var _splitByField = splitByField(groupedFields[g]),
-          right = _splitByField.right;
-        return right.length ? renderGroupSection(g, right) : null;
-      })));
+      return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+        className: "ufg-form-columns",
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          children: groups.map(function (g) {
+            return renderGroupSection(g, splitByField(groupedFields[g]).left);
+          })
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          children: groups.map(function (g) {
+            var _splitByField = splitByField(groupedFields[g]),
+              right = _splitByField.right;
+            return right.length ? renderGroupSection(g, right) : null;
+          })
+        })]
+      });
     }
     return groups.map(function (g) {
       return renderGroupSection(g, groupedFields[g]);
@@ -741,51 +728,79 @@ var GenericForm = function GenericForm(_ref) {
   // #endregion
   // #region Actions bar
   var hasErrors = Object.values(errors).some(Boolean);
-  var actionsBar = /*#__PURE__*/React.createElement("div", {
-    className: "ufg-actions"
-  }, customActions.map(function (action, idx) {
-    return /*#__PURE__*/React.createElement("button", {
-      key: idx,
+  var actionsBar = /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    className: "ufg-actions",
+    style: actionsDivStyle,
+    children: [customActions.map(function (action, idx) {
+      return /*#__PURE__*/(0, _jsxRuntime.jsxs)("button", {
+        type: "button",
+        className: "ufg-button ".concat(action.className || 'ufg-button-secondary'),
+        onClick: action.onClick,
+        disabled: !!action.disabled,
+        style: _objectSpread(_objectSpread({}, actionsStyle), action.style),
+        children: [action.icon, action.label]
+      }, idx);
+    }), showSubmit && haveSaveButton && /*#__PURE__*/(0, _jsxRuntime.jsx)("button", {
+      type: "submit",
+      className: "ufg-button ".concat(submitButton.className || 'ufg-button-primary'),
+      disabled: isSubmitting || hasErrors,
+      style: _objectSpread(_objectSpread({}, actionsStyle), submitButton.style),
+      children: isSubmitting ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_semanticUiReact.Icon, {
+          name: "spinner",
+          loading: true
+        }), " ", submitText]
+      }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+        children: [(_submitButton$icon = submitButton.icon) !== null && _submitButton$icon !== void 0 ? _submitButton$icon : '', submitText]
+      })
+    }), onCancel && showCancel && /*#__PURE__*/(0, _jsxRuntime.jsxs)("button", {
       type: "button",
-      className: "ufg-button ".concat(action.className || 'ufg-button-secondary'),
-      onClick: action.onClick,
-      disabled: !!action.disabled,
-      style: action.style
-    }, action.icon, action.label);
-  }), showSubmit && haveSaveButton && /*#__PURE__*/React.createElement("button", {
-    type: "submit",
-    className: "ufg-button ufg-button-primary",
-    disabled: isSubmitting || hasErrors
-  }, isSubmitting ? 'Saving…' : submitText), onCancel && showCancel && /*#__PURE__*/React.createElement("button", {
-    type: "button",
-    className: "ufg-button ufg-button-secondary",
-    onClick: onCancel
-  }, cancelText));
+      className: "ufg-button ".concat(cancelButton.className || 'ufg-button-secondary'),
+      onClick: onCancel,
+      style: _objectSpread(_objectSpread({}, actionsStyle), cancelButton.style),
+      children: [(_cancelButton$icon = cancelButton.icon) !== null && _cancelButton$icon !== void 0 ? _cancelButton$icon : '', cancelText]
+    })]
+  });
 
   // #endregion
   // #region Form JSX
-  var formJSX = /*#__PURE__*/React.createElement("form", {
+  var formJSX = /*#__PURE__*/(0, _jsxRuntime.jsxs)("form", {
     className: "ufg-form",
-    style: formStyle || {
+    style: {
       margin: 'auto'
     },
-    onSubmit: onFormSubmit
-  }, buildContent(), actionsBar);
+    onSubmit: onFormSubmit,
+    children: [buildContent(), actionsBar]
+  });
   if (enableModal) {
-    return /*#__PURE__*/React.createElement(_reactBootstrap.Modal, {
+    return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactBootstrap.Modal, {
       show: modalShow,
       onHide: onCancel,
       size: modalSize,
-      style: containerStyle
-    }, /*#__PURE__*/React.createElement(_reactBootstrap.Modal.Header, {
-      closeButton: true
-    }, /*#__PURE__*/React.createElement(_reactBootstrap.Modal.Title, null, titleIcon, " ", /*#__PURE__*/React.createElement("span", null, title))), /*#__PURE__*/React.createElement(_reactBootstrap.Modal.Body, null, formJSX));
+      style: containerStyle,
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactBootstrap.Modal.Header, {
+        closeButton: true,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactBootstrap.Modal.Title, {
+          style: titleStyle,
+          children: [titleIcon, " ", /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+            children: title
+          })]
+        })
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactBootstrap.Modal.Body, {
+        children: formJSX
+      })]
+    });
   }
-  return /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: disableDefaultContainer ? '' : 'ufg-container',
-    style: containerStyle
-  }, title && /*#__PURE__*/React.createElement("div", {
-    className: "ufg-title"
-  }, titleIcon, /*#__PURE__*/React.createElement("span", null, title)), formJSX);
+    style: containerStyle,
+    children: [title && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: "ufg-title",
+      style: titleStyle,
+      children: [titleIcon, /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+        children: title
+      })]
+    }), formJSX]
+  });
 };
 var _default = exports["default"] = GenericForm;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@insticc/genericform",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "A generic form with a comprehensive set of field types, validation, and external state management",
   "main": "build/index.js",
   "scripts": {