@insticc/genericform 1.0.10 → 2.0.0

package/build/index.js

@@ -3,435 +3,789 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "Demo", {
+  enumerable: true,
+  get: function get() {
+    return _Demo["default"];
+  }
+});
+Object.defineProperty(exports, "Demo2", {
+  enumerable: true,
+  get: function get() {
+    return _Demo2["default"];
+  }
+});
 exports["default"] = void 0;
-var _react = _interopRequireDefault(require("react"));
-var _semanticUiReact = require("semantic-ui-react");
-var _shallowequal = _interopRequireDefault(require("shallowequal"));
+var _react = require("react");
+var _reactBootstrap = require("react-bootstrap");
+var _CustomAccordion = _interopRequireDefault(require("./FormFields/CustomAccordion"));
 var _CustomCheckbox = _interopRequireDefault(require("./FormFields/CustomCheckbox"));
+var _CustomCheckboxGroup = _interopRequireDefault(require("./FormFields/CustomCheckboxGroup"));
+var _CustomComponent = _interopRequireDefault(require("./FormFields/CustomComponent"));
 var _CustomDatePicker = _interopRequireDefault(require("./FormFields/CustomDatePicker"));
 var _CustomDropdown = _interopRequireDefault(require("./FormFields/CustomDropdown"));
 var _CustomInput = _interopRequireDefault(require("./FormFields/CustomInput"));
+var _CustomJson = _interopRequireDefault(require("./FormFields/CustomJson"));
 var _CustomLabel = _interopRequireDefault(require("./FormFields/CustomLabel"));
+var _CustomMultiDropdown = _interopRequireDefault(require("./FormFields/CustomMultiDropdown"));
 var _CustomNumberInput = _interopRequireDefault(require("./FormFields/CustomNumberInput"));
-var _CustomRadioButton = _interopRequireDefault(require("./FormFields/CustomRadioButton"));
+var _CustomRadioGroup = _interopRequireDefault(require("./FormFields/CustomRadioGroup"));
 var _CustomSearch = _interopRequireDefault(require("./FormFields/CustomSearch"));
+var _CustomSeparator = _interopRequireDefault(require("./FormFields/CustomSeparator"));
 var _CustomTextArea = _interopRequireDefault(require("./FormFields/CustomTextArea"));
-var _MultipleCheckbox = _interopRequireDefault(require("./FormFields/MultipleCheckbox"));
-var _MultipleDropdown = _interopRequireDefault(require("./FormFields/MultipleDropdown"));
-var _MultipleRadioButton = _interopRequireDefault(require("./FormFields/MultipleRadioButton"));
-var _YearDatePicker = _interopRequireDefault(require("./FormFields/YearDatePicker"));
+var _CustomToggle = _interopRequireDefault(require("./FormFields/CustomToggle"));
+var _Demo = _interopRequireDefault(require("./Demo"));
+var _Demo2 = _interopRequireDefault(require("./Demo2"));
 require("./index.css");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-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 _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); }
+function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
-function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
-function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
-function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
-function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
-function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
-function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
-function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
-function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
-function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; } // #region FormFields
 require('react-datetime/css/react-datetime.css');
-var GenericForm = exports["default"] = /*#__PURE__*/function (_React$Component) {
-  function GenericForm(props) {
-    var _this;
-    _classCallCheck(this, GenericForm);
-    _this = _callSuper(this, GenericForm, [props]);
-    _defineProperty(_this, "sortFields", function (fields) {
-      var grouped = {},
-        ungrouped = [];
-      fields.forEach(function (field) {
-        if (field.group) {
-          if (!grouped[field.group]) {
-            grouped[field.group] = [];
-          }
-          grouped[field.group].push(field);
-        } else {
-          ungrouped.push(field);
-        }
+
+// #region Pure helpers
+var sortFieldsFn = function sortFieldsFn(fields) {
+  var grouped = {},
+    ungrouped = [];
+  fields.forEach(function (field) {
+    if (field.group) {
+      if (!grouped[field.group]) grouped[field.group] = [];
+      grouped[field.group].push(field);
+    } else ungrouped.push(field);
+  });
+  return Object.keys(grouped).sort().flatMap(function (g) {
+    return grouped[g];
+  }).concat(ungrouped);
+};
+var groupByInline = function groupByInline(fields) {
+  var groups = [];
+  var buffer = [];
+  fields.forEach(function (field, index) {
+    if (field.inline) {
+      buffer.push({
+        field: field,
+        index: index
       });
-      var sortedGroups = Object.keys(grouped).sort();
-      var sortedFields = sortedGroups.flatMap(function (group) {
-        return grouped[group];
-      }).concat(ungrouped);
-      _this.setState({
-        sortedFields: sortedFields
+    } else {
+      if (buffer.length) {
+        groups.push({
+          type: 'inline',
+          fields: buffer
+        });
+        buffer = [];
+      }
+      groups.push({
+        type: 'single',
+        field: field,
+        index: index
       });
+    }
+  });
+  if (buffer.length) groups.push({
+    type: 'inline',
+    fields: buffer
+  });
+  return groups;
+};
+
+// #region GenericForm Props 
+var GenericForm = function GenericForm(_ref) {
+  var _ref$externalData = _ref.externalData,
+    externalData = _ref$externalData === void 0 ? {} : _ref$externalData,
+    _ref$fields = _ref.fields,
+    fields = _ref$fields === void 0 ? [] : _ref$fields,
+    title = _ref.title,
+    titleIcon = _ref.titleIcon,
+    _ref$containerStyle = _ref.containerStyle,
+    containerStyle = _ref$containerStyle === void 0 ? {} : _ref$containerStyle,
+    formStyle = _ref.formStyle,
+    _ref$splitForm = _ref.splitForm,
+    splitForm = _ref$splitForm === void 0 ? false : _ref$splitForm,
+    splitField = _ref.splitField,
+    splitGroup = _ref.splitGroup,
+    _ref$disableDefaultCo = _ref.disableDefaultContainer,
+    disableDefaultContainer = _ref$disableDefaultCo === void 0 ? false : _ref$disableDefaultCo,
+    handleSubmit = _ref.handleSubmit,
+    onSubmit = _ref.onSubmit,
+    onCancel = _ref.onCancel,
+    _ref$haveSaveButton = _ref.haveSaveButton,
+    haveSaveButton = _ref$haveSaveButton === void 0 ? true : _ref$haveSaveButton,
+    _ref$showSubmit = _ref.showSubmit,
+    showSubmit = _ref$showSubmit === void 0 ? true : _ref$showSubmit,
+    _ref$showCancel = _ref.showCancel,
+    showCancel = _ref$showCancel === void 0 ? true : _ref$showCancel,
+    _ref$submitText = _ref.submitText,
+    submitText = _ref$submitText === void 0 ? 'Save' : _ref$submitText,
+    _ref$cancelText = _ref.cancelText,
+    cancelText = _ref$cancelText === void 0 ? 'Cancel' : _ref$cancelText,
+    _ref$validateOnChange = _ref.validateOnChange,
+    validateOnChange = _ref$validateOnChange === void 0 ? true : _ref$validateOnChange,
+    _ref$validateOnSubmit = _ref.validateOnSubmit,
+    validateOnSubmit = _ref$validateOnSubmit === void 0 ? true : _ref$validateOnSubmit,
+    onDataChange = _ref.onDataChange,
+    onFieldChange = _ref.onFieldChange,
+    handleSearchChange = _ref.handleSearchChange,
+    handleResultSelect = _ref.handleResultSelect,
+    resultRenderer = _ref.resultRenderer,
+    _ref$customActions = _ref.customActions,
+    customActions = _ref$customActions === void 0 ? [] : _ref$customActions,
+    _ref$enableModal = _ref.enableModal,
+    enableModal = _ref$enableModal === void 0 ? false : _ref$enableModal,
+    _ref$modalShow = _ref.modalShow,
+    modalShow = _ref$modalShow === void 0 ? false : _ref$modalShow,
+    _ref$modalSize = _ref.modalSize,
+    modalSize = _ref$modalSize === void 0 ? 'lg' : _ref$modalSize;
+  var _useState = (0, _react.useState)([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    sortedFields = _useState2[0],
+    setSortedFields = _useState2[1];
+  var _useState3 = (0, _react.useState)({}),
+    _useState4 = _slicedToArray(_useState3, 2),
+    internalFormData = _useState4[0],
+    setInternalFormData = _useState4[1];
+  var formDataRef = (0, _react.useRef)({});
+  var _useState5 = (0, _react.useState)({}),
+    _useState6 = _slicedToArray(_useState5, 2),
+    errors = _useState6[0],
+    setErrors = _useState6[1];
+  var _useState7 = (0, _react.useState)(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    isSubmitting = _useState8[0],
+    setIsSubmitting = _useState8[1];
+  var prevFieldValuesRef = (0, _react.useRef)({});
+
+  // ── Sync fields ─────────────────────────────────────────────────────────────
+  (0, _react.useEffect)(function () {
+    var prev = prevFieldValuesRef.current;
+    var next = {};
+    fields.forEach(function (field) {
+      if (field.name !== undefined) next[field.name] = field.value;
     });
-    _defineProperty(_this, "reRenderDropdown", function (field) {
-      var update = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-      var list = _this.state.list;
-      var toReturn = /*#__PURE__*/_react["default"].createElement(_semanticUiReact.Select, {
-        style: field.inputStyle ? field.inputStyle : {
-          maxWidth: 350,
-          display: 'inline-block',
-          margin: '0 0 1em'
-        },
-        clearable: true,
-        fluid: true,
-        search: true,
-        id: "form-input-" + field.name,
-        name: field.name,
-        value: field.value,
-        options: field.options,
-        onChange: _this.props.handleChange,
-        disabled: field.disabled,
-        upward: field.openUpward,
-        placeholder: field.placeholder || 'Select option'
-      });
-      var findList = list.find(function (l) {
-        return l.name === field.name;
+
+    // Detect which field.value props actually changed
+    var changed = Object.entries(next).filter(function (_ref2) {
+      var _ref3 = _slicedToArray(_ref2, 2),
+        name = _ref3[0],
+        val = _ref3[1];
+      return prev[name] !== val;
+    });
+    prevFieldValuesRef.current = next;
+
+    // First mount — initialise everything
+    if (Object.keys(prev).length === 0) {
+      var data = {};
+      fields.forEach(function (field) {
+        if (field.name && field.value !== undefined) data[field.name] = field.value;
       });
-      if (!findList) {
-        if (update === true) _this.setState({
-          list: [].concat(_toConsumableArray(list), [{
-            name: field.name,
-            value: toReturn,
-            props: field.options
-          }])
-        });
-        return toReturn;
-      } else {
-        if (field.value !== findList.value.props.value) {
-          if (update === true) _this.setState({
-            list: list.map(function (l) {
-              return l.name === field.name ? _objectSpread(_objectSpread({}, l), {}, {
-                value: toReturn
-              }) : l;
-            })
-          });
-          return toReturn;
-        } else if (field.disabled !== findList.value.props.disabled) {
-          if (update === true) _this.setState({
-            list: list.map(function (l) {
-              return l.name === field.name ? _objectSpread(_objectSpread({}, l), {}, {
-                value: toReturn
-              }) : l;
-            })
+      setInternalFormData(data);
+      formDataRef.current = data;
+      setSortedFields(sortFieldsFn(fields));
+      return;
+    }
+
+    // Subsequent renders — only merge fields whose .value changed
+    if (changed.length > 0) {
+      var patch = Object.fromEntries(changed.filter(function (_ref4) {
+        var _ref5 = _slicedToArray(_ref4, 2),
+          val = _ref5[1];
+        return val !== undefined;
+      }).map(function (_ref6) {
+        var _ref7 = _slicedToArray(_ref6, 2),
+          name = _ref7[0],
+          val = _ref7[1];
+        return [name, val];
+      }));
+      setInternalFormData(function (prev) {
+        var merged = _objectSpread(_objectSpread({}, prev), patch);
+        formDataRef.current = merged;
+        if (validateOnChange) {
+          setErrors(function (prevErrors) {
+            var nextErrors = _objectSpread({}, prevErrors);
+            Object.keys(patch).forEach(function (name) {
+              var field = fields.find(function (f) {
+                return f.name === name;
+              });
+              if (field) nextErrors[name] = validateField(field, patch[name], merged) || undefined;
+            });
+            return nextErrors;
           });
-          return toReturn;
         }
-        return findList.value;
-      }
-    });
-    _defineProperty(_this, "renderContent", function () {
-      var _this$props = _this.props,
-        divStyle = _this$props.divStyle,
-        formStyle = _this$props.formStyle,
-        _this$props$haveSaveB = _this$props.haveSaveButton,
-        haveSaveButton = _this$props$haveSaveB === void 0 ? true : _this$props$haveSaveB,
-        handleSubmit = _this$props.handleSubmit,
-        _this$props$splitForm = _this$props.splitForm,
-        splitForm = _this$props$splitForm === void 0 ? false : _this$props$splitForm,
-        splitField = _this$props.splitField,
-        splitGroup = _this$props.splitGroup;
-      var sortedFields = _this.state.sortedFields;
-
-      // Group fields by their group name or 'ungrouped'
-      var groupedFields = {};
-      sortedFields.forEach(function (field) {
-        var group = field.group || 'ungrouped';
-        if (!groupedFields[group]) groupedFields[group] = [];
-        groupedFields[group].push(field);
+        return merged;
       });
-      divStyle = divStyle || {
-        width: '100%'
-      };
-      formStyle = formStyle || {
-        margin: 'auto'
-      };
+    }
+    setSortedFields(sortFieldsFn(fields));
+  }, [fields]); // eslint-disable-line react-hooks/exhaustive-deps
 
-      // Helper: split array of fields by splitField name
-      var splitByField = function splitByField(fields) {
-        var index = fields.findIndex(function (f) {
-          return f.name === splitField;
-        });
-        if (index === -1) {
-          return {
-            left: fields,
-            right: []
-          }; // No splitField found, all on left
+  // #region Validation
+  var validateField = (0, _react.useCallback)(function (field, value, currentFormData) {
+    if (['hr', 'label', 'component', 'accordion'].includes(field.type)) return null;
+    var errs = [];
+    if (field.required) {
+      var empty = value === undefined || value === null || value === '' || Array.isArray(value) && value.length === 0;
+      if (empty) errs.push(field.errorMessage || "".concat(typeof field.label === 'string' && field.label || field.displayName || field.name, " is required"));
+    }
+    if (field.type === 'email' && value && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value)) errs.push(field.errorMessage || 'Invalid email format');
+    if (field.minLength && value && value.length < field.minLength) errs.push(field.errorMessage || "Minimum ".concat(field.minLength, " characters required"));
+    if (field.maxLength && value && value.length > field.maxLength) errs.push(field.errorMessage || "Maximum ".concat(field.maxLength, " characters allowed"));
+    if (field.min !== undefined && value !== '' && Number(value) < field.min) errs.push(field.errorMessage || "Minimum value is ".concat(field.min));
+    if (field.max !== undefined && value !== '' && Number(value) > field.max) errs.push(field.errorMessage || "Maximum value is ".concat(field.max));
+    if (typeof field.validate === 'function') {
+      var custom = field.validate(value, currentFormData || internalFormData);
+      if (custom) errs.push(custom);
+    }
+    return errs.length ? errs[0] : null;
+  }, [internalFormData]);
+  var validateForm = (0, _react.useCallback)(function () {
+    if (!validateOnSubmit) return true;
+    var newErrors = {};
+    var isValid = true;
+    fields.forEach(function (field) {
+      var hidden = typeof field.hide === 'function' ? field.hide(internalFormData, field) : field.hide;
+      if (field.name && !hidden) {
+        var _internalFormData$fie;
+        var err = validateField(field, (_internalFormData$fie = internalFormData[field.name]) !== null && _internalFormData$fie !== void 0 ? _internalFormData$fie : field.value, internalFormData);
+        if (err) {
+          newErrors[field.name] = err;
+          isValid = false;
         }
-        return {
-          left: fields.slice(0, index + 1),
-          right: fields.slice(index + 1)
-        };
-      };
+      }
+    });
+    setErrors(newErrors);
+    return isValid;
+  }, [fields, internalFormData, validateField, validateOnSubmit]);
 
-      // Helper: render list of fields filtering hidden ones
-      var renderFields = function renderFields(fields) {
-        return fields.map(function (field) {
-          if (!field.hide) {
-            return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, {
-              key: field.name
-            }, _this.renderField(field));
-          }
-          return null;
-        });
-      };
+  // #region Field handlers
+  var handleFieldChange = (0, _react.useCallback)(function (name, value, field) {
+    var _field$onChange;
+    var next = _objectSpread(_objectSpread({}, formDataRef.current), {}, _defineProperty({}, name, value));
+    formDataRef.current = next;
+    setInternalFormData(next);
+    if (validateOnChange) {
+      var err = validateField(field, value, next);
+      setErrors(function (e) {
+        return _objectSpread(_objectSpread({}, e), {}, _defineProperty({}, name, err || undefined));
+      });
+    }
+    onDataChange === null || onDataChange === void 0 || onDataChange(next);
+    field === null || field === void 0 || (_field$onChange = field.onChange) === null || _field$onChange === void 0 || _field$onChange.call(field, value, next);
+  }, [validateOnChange, validateField, onDataChange]);
 
-      // If splitting is requested and splitField is provided
-      if (splitForm && splitField) {
-        if (splitGroup) {
-          // Split at the group level
-          var groups = Object.keys(groupedFields).sort();
+  /** onChange(name, value) */
+  var fieldHandler = (0, _react.useCallback)(function (field) {
+    return function (name, value) {
+      handleFieldChange(name, value, field);
+      onFieldChange === null || onFieldChange === void 0 || onFieldChange({
+        name: name,
+        value: value
+      });
+    };
+  }, [handleFieldChange, onFieldChange]);
 
-          // Find which group contains the splitField
-          var splitGroupIndex = groups.findIndex(function (group) {
-            return groupedFields[group].some(function (f) {
-              return f.name === splitField;
-            });
-          });
-          if (splitGroupIndex === -1) {
-            // splitField not found, render normal
-            return /*#__PURE__*/_react["default"].createElement("div", {
-              style: divStyle
-            }, /*#__PURE__*/_react["default"].createElement(_semanticUiReact.Form, {
-              style: formStyle,
-              onSubmit: handleSubmit
-            }, groups.map(function (group) {
-              return /*#__PURE__*/_react["default"].createElement("div", {
-                key: group
-              }, group !== 'ungrouped' && /*#__PURE__*/_react["default"].createElement("h2", null, group), renderFields(groupedFields[group]));
-            })));
-          }
+  /**
+   * date / datetime / time / year fields.
+   * Datetime calls onChange(momentObj | string, name) — we normalise to a
+   * formatted string before storing so the value is always serialisable.
+   *
+   * Stored value format:
+   *   type="date"     → "DD/MM/YYYY"
+   *   type="datetime" → "DD/MM/YYYY HH:mm"
+   *   type="time"     → "HH:mm"
+   *   type="year"     → "YYYY"
+   */
+  var dateFieldHandler = (0, _react.useCallback)(function (field) {
+    return function (momentOrString, name) {
+      var scalar = momentOrString;
+      if (momentOrString && typeof momentOrString.format === "function") {
+        switch (field.type) {
+          case "year":
+            scalar = momentOrString.format("YYYY");
+            break;
+          case "time":
+            scalar = momentOrString.format("HH:mm");
+            break;
+          case "datetime":
+            scalar = momentOrString.format("DD/MM/YYYY HH:mm");
+            break;
+          default:
+            scalar = momentOrString.format("DD/MM/YYYY");
+        }
+      }
+      handleFieldChange(name, scalar, field);
+      onFieldChange === null || onFieldChange === void 0 || onFieldChange({
+        name: name,
+        value: scalar
+      });
+    };
+  }, [handleFieldChange, onFieldChange]);
 
-          // Groups for left and right columns
-          var leftGroups = groups.slice(0, splitGroupIndex + 1);
-          var rightGroups = groups.slice(splitGroupIndex + 1);
-          return /*#__PURE__*/_react["default"].createElement("div", {
-            style: divStyle
-          }, /*#__PURE__*/_react["default"].createElement(_semanticUiReact.Form, {
-            style: formStyle,
-            onSubmit: handleSubmit
-          }, /*#__PURE__*/_react["default"].createElement("div", {
-            className: "form-columns"
-          }, /*#__PURE__*/_react["default"].createElement("div", {
-            className: "form-column"
-          }, leftGroups.map(function (group) {
-            return /*#__PURE__*/_react["default"].createElement("div", {
-              key: group
-            }, group !== 'ungrouped' && /*#__PURE__*/_react["default"].createElement("h2", null, group), renderFields(groupedFields[group]));
-          })), /*#__PURE__*/_react["default"].createElement("div", {
-            className: "form-column"
-          }, rightGroups.map(function (group) {
-            return /*#__PURE__*/_react["default"].createElement("div", {
-              key: group
-            }, group !== 'ungrouped' && /*#__PURE__*/_react["default"].createElement("h2", null, group), renderFields(groupedFields[group]));
-          })))));
+  // ── Form submit ─────────────────────────────────────────────────────────────
+  var onFormSubmit = (0, _react.useCallback)(/*#__PURE__*/function () {
+    var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(e) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            e.preventDefault();
+            if (validateForm()) {
+              _context.next = 3;
+              break;
+            }
+            return _context.abrupt("return");
+          case 3:
+            if (!handleSubmit) {
+              _context.next = 6;
+              break;
+            }
+            handleSubmit(e);
+            return _context.abrupt("return");
+          case 6:
+            if (onSubmit) {
+              _context.next = 8;
+              break;
+            }
+            return _context.abrupt("return");
+          case 8:
+            setIsSubmitting(true);
+            _context.prev = 9;
+            _context.next = 12;
+            return onSubmit(internalFormData);
+          case 12:
+            _context.next = 17;
+            break;
+          case 14:
+            _context.prev = 14;
+            _context.t0 = _context["catch"](9);
+            console.error('GenericForm submission error:', _context.t0);
+          case 17:
+            _context.prev = 17;
+            setIsSubmitting(false);
+            return _context.finish(17);
+          case 20:
+          case "end":
+            return _context.stop();
         }
+      }, _callee, null, [[9, 14, 17, 20]]);
+    }));
+    return function (_x) {
+      return _ref8.apply(this, arguments);
+    };
+  }(), [validateForm, handleSubmit, onSubmit, internalFormData]);
 
-        // Split inside each group by splitField
-        return /*#__PURE__*/_react["default"].createElement("div", {
-          style: divStyle
-        }, /*#__PURE__*/_react["default"].createElement(_semanticUiReact.Form, {
-          style: formStyle,
-          onSubmit: handleSubmit
-        }, /*#__PURE__*/_react["default"].createElement("div", {
-          className: "form-columns"
-        }, /*#__PURE__*/_react["default"].createElement("div", {
-          className: "form-column"
-        }, Object.keys(groupedFields).map(function (group) {
-          var fields = groupedFields[group];
-          var _splitByField = splitByField(fields),
-            left = _splitByField.left;
-          return /*#__PURE__*/_react["default"].createElement("div", {
-            key: group
-          }, group !== 'ungrouped' && /*#__PURE__*/_react["default"].createElement("h2", null, group), renderFields(left));
-        })), /*#__PURE__*/_react["default"].createElement("div", {
-          className: "form-column"
-        }, Object.keys(groupedFields).map(function (group) {
-          var fields = groupedFields[group];
-          var _splitByField2 = splitByField(fields),
-            right = _splitByField2.right;
-          if (right.length === 0) return null;
-          return /*#__PURE__*/_react["default"].createElement("div", {
-            key: group
-          }, group !== 'ungrouped' && /*#__PURE__*/_react["default"].createElement("h2", null, group), renderFields(right));
-        })))));
+  // ── JSON validation ─────────────────────────────────────────────────────────
+  var validateJsonField = (0, _react.useCallback)(function (name, rawValue, isMultipleMode, skipTypeCheck, field) {
+    var parseStrict = function parseStrict(str) {
+      try {
+        return JSON.parse(str);
+      } catch (_unused) {
+        throw new Error(str.includes("'") ? "Use double quotes instead of single quotes" : 'Invalid JSON format');
       }
-
-      // Default: no split
-      return /*#__PURE__*/_react["default"].createElement("div", {
-        style: divStyle
-      }, /*#__PURE__*/_react["default"].createElement(_semanticUiReact.Form, {
-        style: formStyle,
-        onSubmit: handleSubmit
-      }, Object.keys(groupedFields).map(function (group) {
-        return /*#__PURE__*/_react["default"].createElement("div", {
-          key: group
-        }, group !== 'ungrouped' && /*#__PURE__*/_react["default"].createElement("h2", null, group), renderFields(groupedFields[group]));
-      })));
+    };
+    var parsed;
+    try {
+      if (isMultipleMode) {
+        parsed = parseStrict(rawValue);
+      } else if (field.datatype === 'object') {
+        parsed = parseStrict(rawValue);
+        if (_typeof(parsed) !== 'object' || Array.isArray(parsed)) throw new Error('Expected an object');
+      } else if (field.datatype === 'number') {
+        var n = Number(rawValue);
+        if (Number.isNaN(n)) throw new Error('Expected a number');
+        parsed = n;
+      } else {
+        parsed = rawValue;
+      }
+    } catch (err) {
+      setErrors(function (e) {
+        return _objectSpread(_objectSpread({}, e), {}, _defineProperty({}, name, err.message));
+      });
+      return;
+    }
+    if (isMultipleMode && !Array.isArray(parsed)) {
+      setErrors(function (e) {
+        return _objectSpread(_objectSpread({}, e), {}, _defineProperty({}, name, "Multiple mode requires a ".concat(field.datatype, " array")));
+      });
+      return;
+    }
+    if (!skipTypeCheck && !isMultipleMode && field.datatype) {
+      var actual = Array.isArray(parsed) ? 'array' : _typeof(parsed);
+      if (actual !== field.datatype) {
+        setErrors(function (e) {
+          return _objectSpread(_objectSpread({}, e), {}, _defineProperty({}, name, "Expected ".concat(field.datatype, " but got ").concat(actual)));
+        });
+        return;
+      }
+    }
+    setErrors(function (e) {
+      return _objectSpread(_objectSpread({}, e), {}, _defineProperty({}, name, undefined));
     });
-    _defineProperty(_this, "renderField", function (field) {
-      var _this$props2 = _this.props,
-        handleChange = _this$props2.handleChange,
-        onChangeTime = _this$props2.onChangeTime,
-        onChangeYear = _this$props2.onChangeYear,
-        handleSearchChange = _this$props2.handleSearchChange,
-        handleResultSelect = _this$props2.handleResultSelect,
-        resultRenderer = _this$props2.resultRenderer,
-        handleCheckboxChange = _this$props2.handleCheckboxChange,
-        handleRadioChange = _this$props2.handleRadioChange,
-        handleMultipleCheckboxChange = _this$props2.handleMultipleCheckboxChange,
-        handleMultipleRadioChange = _this$props2.handleMultipleRadioChange;
-      var componentMap = {
-        string: _CustomInput["default"],
-        "int": _CustomNumberInput["default"],
-        date: _CustomDatePicker["default"],
-        yearDate: _YearDatePicker["default"],
-        multipleDropdown: _MultipleDropdown["default"],
-        search: _CustomSearch["default"],
-        list: _CustomDropdown["default"],
-        textArea: _CustomTextArea["default"],
-        checkbox: _CustomCheckbox["default"],
-        radioButton: _CustomRadioButton["default"],
-        multipleCheckboxes: _MultipleCheckbox["default"],
-        multipleRadioButtons: _MultipleRadioButton["default"],
-        label: _CustomLabel["default"]
-      };
-      var commonProps = {
-        name: field.name,
-        displayName: field.displayName,
-        value: field.value,
-        disabled: field.disabled,
-        required: field.required,
-        style: field.style
-      };
-      var additionalProps = {
-        CustomInput: {
-          onChange: handleChange,
+    if (!field.storeAsString) setInternalFormData(function (prev) {
+      return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, name, parsed));
+    });
+  }, []);
+
+  // #region RenderField
+  var renderField = (0, _react.useCallback)(function (field) {
+    var _internalFormData$fie2;
+    var isHidden = typeof field.hide === 'function' ? field.hide(internalFormData, field) : field.hide;
+    if (isHidden) return null;
+    var error = errors[field.name];
+    var value = (_internalFormData$fie2 = internalFormData[field.name]) !== null && _internalFormData$fie2 !== void 0 ? _internalFormData$fie2 : field.value;
+
+    // Props shared by all interactive fields
+    var cp = {
+      name: field.name,
+      displayName: field.label || field.displayName,
+      disabled: field.disabled,
+      required: field.required
+    };
+    var sp = {
+      mainDivStyle: field.style,
+      labelStyle: field.labelStyle,
+      spanStyle: field.spanStyle,
+      inputStyle: field.inputStyle,
+      tooltipStyle: field.tooltipStyle
+    };
+    var fp = {
+      error: error,
+      tooltip: field.tooltip,
+      showHelp: field.showHelp,
+      helpText: field.helpText
+    };
+    switch (field.type) {
+      // Abstract
+      case 'hr':
+        return /*#__PURE__*/React.createElement(_CustomSeparator["default"], {
+          key: field.name || "sep-".concat(Math.random()),
+          mainDivStyle: field.style
+        });
+      case 'label':
+        return /*#__PURE__*/React.createElement(_CustomLabel["default"], _extends({
+          key: field.name
+        }, cp, {
+          mainDivStyle: field.style,
+          labelStyle: field.labelStyle
+        }));
+
+      // Simple
+      case 'string':
+      case 'text':
+      case 'email':
+      case 'password':
+        return /*#__PURE__*/React.createElement(_CustomInput["default"], _extends({
+          key: field.name
+        }, 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
-        },
-        CustomNumberInput: {
-          onChange: handleChange,
-          showHelp: field.showHelp,
-          helpText: field.helpText,
-          tooltip: field.tooltip
-        },
-        CustomDatePicker: {
-          onChange: onChangeTime,
-          tooltip: field.tooltip
-        },
-        YearDatePicker: {
-          onChange: onChangeYear,
-          currentMaxYear: field.currentMaxYear
-        },
-        MultipleDropdown: {
-          onChange: handleChange,
-          options: field.options
-        },
-        CustomSearch: {
+        }));
+      case 'int':
+      case 'number':
+        return /*#__PURE__*/React.createElement(_CustomNumberInput["default"], _extends({
+          key: field.name
+        }, cp, sp, fp, {
+          value: value,
+          placeholder: field.placeholder,
+          min: field.min,
+          max: field.max,
+          step: field.step,
+          onChange: fieldHandler(field)
+        }));
+      case 'textArea':
+        return /*#__PURE__*/React.createElement(_CustomTextArea["default"], _extends({
+          key: field.name
+        }, cp, sp, fp, {
+          value: value,
+          placeholder: field.placeholder,
+          rows: field.rows,
+          height: field.height,
+          onChange: fieldHandler(field)
+        }));
+
+      // Date
+      case 'date':
+      case 'datetime':
+      case 'time':
+      case 'year':
+        return /*#__PURE__*/React.createElement(_CustomDatePicker["default"], _extends({
+          key: field.name
+        }, 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
+        }));
+
+      // Option
+      case 'select':
+        return /*#__PURE__*/React.createElement(_CustomDropdown["default"], _extends({
+          key: field.name
+        }, cp, sp, fp, {
+          value: value,
+          options: field.options,
+          placeholder: field.placeholder,
+          multiple: field.multiple,
+          onChange: function onChange(name, val, fullOption) {
+            handleFieldChange(name, val, field);
+            onFieldChange === null || onFieldChange === void 0 || onFieldChange({
+              name: name,
+              value: val,
+              option: fullOption
+            });
+          }
+        }));
+      case 'multipleDropdown':
+        return /*#__PURE__*/React.createElement(_CustomMultiDropdown["default"], _extends({
+          key: field.name
+        }, cp, sp, fp, {
+          value: value,
+          options: field.options,
+          placeholder: field.placeholder,
+          onChange: fieldHandler(field)
+        }));
+      case 'search':
+        return /*#__PURE__*/React.createElement(_CustomSearch["default"], _extends({
+          key: field.name
+        }, cp, sp, fp, {
+          value: value,
+          options: field.options,
+          placeholder: field.placeholder,
+          isLoading: field.isLoading,
           onChange: handleSearchChange,
           handleResultSelect: handleResultSelect,
-          resultRenderer: resultRenderer,
-          isLoading: field.isLoading,
-          options: field.options
-        },
-        CustomDropdown: {
-          field: field,
-          reRenderDropdown: _this.reRenderDropdown
-        },
-        CustomTextArea: {
-          onChange: handleChange,
-          height: field.height,
-          tooltip: field.tooltip
-        },
-        CustomCheckbox: {
-          onChange: handleCheckboxChange,
-          checked: field.checked,
-          showHelp: field.showHelp,
-          helpText: field.helpText
-        },
-        CustomRadioButton: {
-          onChange: handleRadioChange,
-          checked: field.checked,
-          showHelp: field.showHelp,
-          helpText: field.helpText
-        },
-        MultipleCheckbox: {
-          onChange: handleMultipleCheckboxChange,
+          resultRenderer: resultRenderer
+        }));
+      case 'accordion':
+        return /*#__PURE__*/React.createElement(_CustomAccordion["default"], {
+          key: field.name,
+          name: field.name,
+          sections: field.sections,
+          defaultOpen: field.defaultOpen,
+          activeAllIndex: field.activeAllIndex,
+          mainDivStyle: field.style,
+          inputStyle: field.inputStyle
+        });
+      case 'toggle':
+        return /*#__PURE__*/React.createElement(_CustomToggle["default"], _extends({
+          key: field.name
+        }, cp, sp, fp, {
+          value: !!value,
+          onChange: fieldHandler(field)
+        }));
+      case 'checkbox':
+        return /*#__PURE__*/React.createElement(_CustomCheckbox["default"], _extends({
+          key: field.name
+        }, cp, sp, fp, {
+          checked: !!value,
+          onChange: fieldHandler(field),
+          onOptionChange: field.onOptionChange
+        }));
+      case 'checkboxGroup':
+        return /*#__PURE__*/React.createElement(_CustomCheckboxGroup["default"], _extends({
+          key: field.name
+        }, cp, sp, fp, {
+          checked: value !== null && value !== void 0 ? value : [],
           options: field.options,
-          divStyle: field.divStyle,
-          labelStyle: field.labelStyle,
-          checkboxDivStyle: field.checkboxDivStyle
-        },
-        MultipleRadioButton: {
-          onChange: handleMultipleRadioChange,
+          onChange: fieldHandler(field),
+          onOptionChange: field.onOptionChange
+        }));
+      case 'radioGroup':
+      case 'radioGroupInline':
+        return /*#__PURE__*/React.createElement(_CustomRadioGroup["default"], _extends({
+          key: field.name
+        }, cp, sp, fp, {
+          value: value,
           options: field.options,
-          divStyle: field.divStyle,
-          labelStyle: field.labelStyle,
-          radioButtonDivStyle: field.radioButtonDivStyle,
+          inline: field.type === 'radioGroupInline',
+          onChange: fieldHandler(field),
+          onOptionChange: field.onOptionChange,
+          formData: internalFormData
+        }));
+
+      // Other
+      case 'component':
+        return /*#__PURE__*/React.createElement(_CustomComponent["default"], _extends({
+          key: field.name || "cmp-".concat(Math.random())
+        }, cp, sp, {
           component: field.component
-        },
-        CustomLabel: {}
-      };
-      var Component = componentMap[field.type] || _CustomInput["default"];
-      return /*#__PURE__*/_react["default"].createElement(Component, _extends({}, commonProps, additionalProps[Component.name] || {}));
+        }));
+      case 'json':
+        return /*#__PURE__*/React.createElement(_CustomJson["default"], _extends({
+          key: field.name
+        }, cp, sp, fp, {
+          value: value,
+          datatype: field.datatype,
+          allowModeSwitch: field.allowModeSwitch,
+          storeAsString: field.storeAsString,
+          rows: field.rows,
+          onChange: function onChange(name, raw, isMulti) {
+            setInternalFormData(function (prev) {
+              return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, name, raw));
+            });
+            setErrors(function (e) {
+              return _objectSpread(_objectSpread({}, e), {}, _defineProperty({}, name, undefined));
+            });
+            if (raw.trim()) validateJsonField(name, raw, isMulti, true, field);
+          },
+          onValidate: function onValidate(name, raw, isMulti) {
+            return validateJsonField(name, raw, isMulti, false, field);
+          }
+        }));
+      default:
+        return /*#__PURE__*/React.createElement(_CustomInput["default"], _extends({
+          key: field.name
+        }, cp, sp, fp, {
+          value: value,
+          type: "text",
+          placeholder: field.placeholder,
+          onChange: fieldHandler(field),
+          inputStyle: field.inputStyle,
+          className: field.className
+        }));
+    }
+  }, [
+  // eslint-disable-line react-hooks/exhaustive-deps
+  internalFormData, errors, fieldHandler, fieldHandler, dateFieldHandler, handleSearchChange, handleResultSelect, resultRenderer, validateJsonField]);
+
+  // #region Grouped fields map
+  var groupedFields = (0, _react.useMemo)(function () {
+    var map = {};
+    sortedFields.forEach(function (field) {
+      var g = field.group || 'ungrouped';
+      if (!map[g]) map[g] = [];
+      map[g].push(field);
     });
-    _this.state = {
-      operations: [{
-        value: "<",
-        key: 1,
-        text: "<"
-      }, {
-        value: ">",
-        key: 2,
-        text: ">"
-      }, {
-        value: "=",
-        key: 3,
-        text: "="
-      }],
-      list: [{
-        name: "",
-        value: "",
-        options: []
-      }],
-      sortedFields: []
+    return map;
+  }, [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);
+    });
+  };
+  var renderGroupSection = function renderGroupSection(g, fieldList) {
+    return /*#__PURE__*/React.createElement("div", {
+      key: g,
+      className: "ufg-form",
+      style: formStyle
+    }, g !== 'ungrouped' && /*#__PURE__*/React.createElement("h2", null, g), renderFields(fieldList));
+  };
+  var splitByField = function splitByField(fieldList) {
+    var idx = fieldList.findIndex(function (f) {
+      return f.name === splitField;
+    });
+    if (idx === -1) return {
+      left: fieldList,
+      right: []
     };
-    return _this;
-  }
-  _inherits(GenericForm, _React$Component);
-  return _createClass(GenericForm, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      var fields = this.props.fields;
-      this.sortFields(fields);
-    }
-  }, {
-    key: "componentDidUpdate",
-    value: function componentDidUpdate(prevProps) {
-      var _this2 = this;
-      var fields = this.props.fields;
-      if (!(0, _shallowequal["default"])(fields, prevProps.fields)) {
-        fields.forEach(function (element) {
-          if (element.type === 'list') {
-            _this2.reRenderDropdown(element, true);
-          }
+    return {
+      left: fieldList.slice(0, idx + 1),
+      right: fieldList.slice(idx + 1)
+    };
+  };
+  var buildContent = function buildContent() {
+    var groups = Object.keys(groupedFields);
+    if (splitForm && splitField && splitGroup) {
+      var splitIdx = groups.findIndex(function (g) {
+        return groupedFields[g].some(function (f) {
+          return f.name === splitField;
         });
-        this.sortFields(fields);
-      }
+      });
+      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]);
+      })));
     }
-  }, {
-    key: "render",
-    value: function render() {
-      return /*#__PURE__*/_react["default"].createElement("div", null, this.renderContent());
+    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;
+      })));
     }
-  }]);
-}(_react["default"].Component);
+    return groups.map(function (g) {
+      return renderGroupSection(g, groupedFields[g]);
+    });
+  };
+
+  // #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,
+      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));
+
+  // #endregion
+  // #region Form JSX
+  var formJSX = /*#__PURE__*/React.createElement("form", {
+    className: "ufg-form",
+    style: formStyle || {
+      margin: 'auto'
+    },
+    onSubmit: onFormSubmit
+  }, buildContent(), actionsBar);
+  if (enableModal) {
+    return /*#__PURE__*/React.createElement(_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));
+  }
+  return /*#__PURE__*/React.createElement("div", {
+    className: disableDefaultContainer ? '' : 'ufg-container',
+    style: containerStyle
+  }, title && /*#__PURE__*/React.createElement("div", {
+    className: "ufg-title"
+  }, titleIcon, /*#__PURE__*/React.createElement("span", null, title)), formJSX);
+};
+var _default = exports["default"] = GenericForm;