@agilemotion/oui-react-js 1.3.8 → 1.4.0

package/dist/components/form/FieldSet.js

@@ -45,45 +45,32 @@ var _RestUtils = require("../../RestUtils");
 
 var _SignatureTemplateDesignerField = _interopRequireDefault(require("./SignatureTemplateDesignerField"));
 
-var _ApplicationContext = _interopRequireDefault(require("../../ApplicationContext"));
+var _ApplicationManager = _interopRequireDefault(require("../../ApplicationManager"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _createForOfIteratorHelper(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+require("./fieldset.css");
 
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+var _Button = _interopRequireDefault(require("../Button"));
 
-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."); }
+var _HtmlPanel = _interopRequireDefault(require("../HtmlPanel"));
 
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+var _AutoComplete = _interopRequireDefault(require("./AutoComplete"));
 
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+var _MultiFileUploadField = _interopRequireDefault(require("./MultiFileUploadField"));
 
-function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+var _Icon = _interopRequireDefault(require("../Icon"));
 
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+var _Switch = _interopRequireDefault(require("./Switch"));
 
-const FieldSet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwardRef((props, ref) => {
-  const _React$useState = _react.default.useState(null),
-        _React$useState2 = _slicedToArray(_React$useState, 2),
-        fieldGrid = _React$useState2[0],
-        setFieldGrid = _React$useState2[1];
+var _IconField = _interopRequireDefault(require("./IconField"));
 
-  const _React$useState3 = _react.default.useState({}),
-        _React$useState4 = _slicedToArray(_React$useState3, 1),
-        componentHandles = _React$useState4[0];
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-  const _React$useState5 = _react.default.useState(_Utils.default.getComponentAttribute(props.config, 'defaultVisibility', false)),
-        _React$useState6 = _slicedToArray(_React$useState5, 2),
-        visible = _React$useState6[0],
-        setVisible = _React$useState6[1];
+const FieldSet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwardRef((props, ref) => {
+  const [fieldGrid] = _react.default.useState(_Utils.default.getFieldGrid(props.config.attributes, props.config.fields));
 
-  const _React$useState7 = _react.default.useState(true),
-        _React$useState8 = _slicedToArray(_React$useState7, 2),
-        initializing = _React$useState8[0],
-        setInitializing = _React$useState8[1];
+  const [componentHandles] = _react.default.useState({});
 
-  let componentKey = 0;
+  const [visible, setVisible] = _react.default.useState(false);
 
   const createComponentHandle = field => {
     if (_Utils.default.isNull(componentHandles[field.id])) {
@@ -97,20 +84,22 @@ const FieldSet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.f
 
   _react.default.useEffect(() => {
     props.handle.api = api();
+  });
 
-    if (initializing) {
-      let parsedConfig = _Utils.default.parseConfig(props.config, props.viewId);
+  _react.default.useLayoutEffect(() => {
+    props.handle.api = api();
+  }, []);
 
-      _Observable.default.addSubscriptions(parsedConfig.eventHandlingConfig, props.handle, props.viewId);
+  _react.default.useEffect(() => {
+    props.handle.api = api();
+    props.handle.api.refresh();
 
-      _Observable.default.addSystemSubscriptions(parsedConfig);
+    let parsedConfig = _Utils.default.parseConfig(props.config, props.viewId);
 
-      let fieldGrid = _Utils.default.getFieldGrid(props.config.attributes, props.config.fields);
+    _Observable.default.addSubscriptions(parsedConfig.eventHandlingConfig, props.handle, props.viewId);
 
-      setFieldGrid(fieldGrid);
-      setInitializing(false);
-    }
-  });
+    _Observable.default.addSystemSubscriptions(props.viewId, parsedConfig);
+  }, []);
 
   function fireChangeEvent() {
     let event = new _Event.default(props.handle, props.viewId);
@@ -121,42 +110,26 @@ const FieldSet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.f
   function setDisabled(disabled) {
     let properties = Object.getOwnPropertyNames(componentHandles);
 
-    var _iterator = _createForOfIteratorHelper(properties),
-        _step;
-
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        const property = _step.value;
-        let componentHandle = componentHandles[property];
-        componentHandle.api.disabled = disabled;
-      }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
+    for (const property of properties) {
+      let componentHandle = componentHandles[property];
+      componentHandle.api.disabled = disabled;
     }
   }
 
   function refreshComponents() {
     let properties = Object.getOwnPropertyNames(componentHandles);
 
-    var _iterator2 = _createForOfIteratorHelper(properties),
-        _step2;
-
-    try {
-      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        const property = _step2.value;
-        let componentHandle = componentHandles[property];
-        componentHandle.api.refresh();
-      }
-    } catch (err) {
-      _iterator2.e(err);
-    } finally {
-      _iterator2.f();
+    for (const property of properties) {
+      let componentHandle = componentHandles[property];
+      componentHandle.api.refresh();
     }
   }
 
   function renderComponent(component) {
+    if (!component.fieldType) {
+      console.error('ERROR RENDING COMPONENT : ' + component.id + ' - NO FIELD TYPE SPECIFIED');
+    }
+
     return component.fieldType === 'LOOKUP' ? /*#__PURE__*/_react.default.createElement(_LookupField.default, {
       keyHandler: props.keyHandler,
       config: component,
@@ -164,27 +137,22 @@ const FieldSet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.f
       parentId: props.parentId,
       handle: createComponentHandle(component),
       ref: /*#__PURE__*/_react.default.createRef(),
-      loadCompleteHandler: props.loadCompleteHandler,
       valueChangeHandler: () => fireChangeEvent(),
       values: props.values,
-      viewId: props.viewId,
-      key: componentKey++
+      viewId: props.viewId
     }) : component.fieldType === 'TEXT_FIELD' ? /*#__PURE__*/_react.default.createElement(_TextField.default, {
       keyHandler: props.keyHandler,
       config: component,
-      loadCompleteHandler: props.loadCompleteHandler,
       valueChangeHandler: () => fireChangeEvent(),
       form: props.form,
       parentId: props.parentId,
       handle: createComponentHandle(component),
       ref: /*#__PURE__*/_react.default.createRef(),
       values: props.values,
-      viewId: props.viewId,
-      key: componentKey++
+      viewId: props.viewId
     }) : component.fieldType === 'PASSWORD' ? /*#__PURE__*/_react.default.createElement(_TextField.default, {
       keyHandler: props.keyHandler,
       config: component,
-      loadCompleteHandler: props.loadCompleteHandler,
       valueChangeHandler: () => fireChangeEvent(),
       form: props.form,
       type: 'password',
@@ -192,34 +160,29 @@ const FieldSet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.f
       handle: createComponentHandle(component),
       ref: /*#__PURE__*/_react.default.createRef(),
       values: props.values,
-      viewId: props.viewId,
-      key: componentKey++
+      viewId: props.viewId
     }) : component.fieldType === 'TEXT_AREA' ? /*#__PURE__*/_react.default.createElement(_TextField.default, {
       keyHandler: props.keyHandler,
       config: component,
       multiline: true,
-      loadCompleteHandler: props.loadCompleteHandler,
       valueChangeHandler: () => fireChangeEvent(),
       form: props.form,
       parentId: props.parentId,
       handle: createComponentHandle(component),
       ref: /*#__PURE__*/_react.default.createRef(),
       values: props.values,
-      viewId: props.viewId,
-      key: componentKey++
+      viewId: props.viewId
     }) : component.fieldType === 'ADDRESS_SEARCH' ? /*#__PURE__*/_react.default.createElement(_AddressSearch.default, {
       keyHandler: props.keyHandler,
       config: component,
       multiline: true,
-      loadCompleteHandler: props.loadCompleteHandler,
       valueChangeHandler: () => fireChangeEvent(),
       form: props.form,
       parentId: props.parentId,
       handle: createComponentHandle(component),
       ref: /*#__PURE__*/_react.default.createRef(),
       values: props.values,
-      viewId: props.viewId,
-      key: componentKey++
+      viewId: props.viewId
     }) : component.fieldType === 'SELECT' ? /*#__PURE__*/_react.default.createElement(_SelectItem.default, {
       keyHandler: props.keyHandler,
       config: component,
@@ -227,11 +190,9 @@ const FieldSet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.f
       parentId: props.parentId,
       handle: createComponentHandle(component),
       ref: /*#__PURE__*/_react.default.createRef(),
-      loadCompleteHandler: props.loadCompleteHandler,
       valueChangeHandler: () => fireChangeEvent(),
       values: props.values,
-      viewId: props.viewId,
-      key: componentKey++
+      viewId: props.viewId
     }) : component.fieldType === 'DATE' ? /*#__PURE__*/_react.default.createElement(_DatePicker.default, {
       keyHandler: props.keyHandler,
       config: component,
@@ -239,11 +200,19 @@ const FieldSet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.f
       parentId: props.parentId,
       handle: createComponentHandle(component),
       ref: /*#__PURE__*/_react.default.createRef(),
-      loadCompleteHandler: props.loadCompleteHandler,
       valueChangeHandler: () => fireChangeEvent(),
       values: props.values,
-      viewId: props.viewId,
-      key: componentKey++
+      viewId: props.viewId
+    }) : component.fieldType === 'AUTO_COMPLETE' ? /*#__PURE__*/_react.default.createElement(_AutoComplete.default, {
+      keyHandler: props.keyHandler,
+      config: component,
+      form: props.form,
+      parentId: props.parentId,
+      handle: createComponentHandle(component),
+      ref: /*#__PURE__*/_react.default.createRef(),
+      valueChangeHandler: () => fireChangeEvent(),
+      values: props.values,
+      viewId: props.viewId
     }) : component.fieldType === 'CHECKBOX' ? /*#__PURE__*/_react.default.createElement(_Checkbox.default, {
       keyHandler: props.keyHandler,
       config: component,
@@ -251,11 +220,19 @@ const FieldSet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.f
       parentId: props.parentId,
       handle: createComponentHandle(component),
       ref: /*#__PURE__*/_react.default.createRef(),
-      loadCompleteHandler: props.loadCompleteHandler,
       valueChangeHandler: () => fireChangeEvent(),
       values: props.values,
-      viewId: props.viewId,
-      key: componentKey++
+      viewId: props.viewId
+    }) : component.fieldType === 'SWITCH' ? /*#__PURE__*/_react.default.createElement(_Switch.default, {
+      keyHandler: props.keyHandler,
+      config: component,
+      form: props.form,
+      parentId: props.parentId,
+      handle: createComponentHandle(component),
+      ref: /*#__PURE__*/_react.default.createRef(),
+      valueChangeHandler: () => fireChangeEvent(),
+      values: props.values,
+      viewId: props.viewId
     }) : component.fieldType === 'LABEL' ? /*#__PURE__*/_react.default.createElement(_LabelField.default, {
       keyHandler: props.keyHandler,
       config: component,
@@ -263,11 +240,9 @@ const FieldSet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.f
       parentId: props.parentId,
       handle: createComponentHandle(component),
       ref: /*#__PURE__*/_react.default.createRef(),
-      loadCompleteHandler: props.loadCompleteHandler,
       valueChangeHandler: () => fireChangeEvent(),
       values: props.values,
-      viewId: props.viewId,
-      key: componentKey++
+      viewId: props.viewId
     }) : component.fieldType === 'FILE_UPLOAD' ? /*#__PURE__*/_react.default.createElement(_UploadField.default, {
       keyHandler: props.keyHandler,
       config: component,
@@ -275,11 +250,9 @@ const FieldSet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.f
       parentId: props.parentId,
       handle: createComponentHandle(component),
       ref: /*#__PURE__*/_react.default.createRef(),
-      loadCompleteHandler: props.loadCompleteHandler,
       valueChangeHandler: () => fireChangeEvent(),
       values: props.values,
-      viewId: props.viewId,
-      key: componentKey++
+      viewId: props.viewId
     }) : component.fieldType === 'IMAGE_UPLOAD' ? /*#__PURE__*/_react.default.createElement(_UploadField.default, {
       keyHandler: props.keyHandler,
       config: component,
@@ -288,11 +261,19 @@ const FieldSet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.f
       handle: createComponentHandle(component),
       ref: /*#__PURE__*/_react.default.createRef(),
       style: 'IMAGE',
-      loadCompleteHandler: props.loadCompleteHandler,
       valueChangeHandler: () => fireChangeEvent(),
       values: props.values,
-      viewId: props.viewId,
-      key: componentKey++
+      viewId: props.viewId
+    }) : component.fieldType === 'MULTI_FILE_UPLOAD' ? /*#__PURE__*/_react.default.createElement(_MultiFileUploadField.default, {
+      keyHandler: props.keyHandler,
+      config: component,
+      form: props.form,
+      parentId: props.parentId,
+      handle: createComponentHandle(component),
+      ref: /*#__PURE__*/_react.default.createRef(),
+      valueChangeHandler: () => fireChangeEvent(),
+      values: props.values,
+      viewId: props.viewId
     }) : component.fieldType === 'TRANSFER_LIST' ? /*#__PURE__*/_react.default.createElement(_TransferList.default, {
       keyHandler: props.keyHandler,
       config: component,
@@ -300,11 +281,9 @@ const FieldSet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.f
       parentId: props.parentId,
       handle: createComponentHandle(component),
       ref: /*#__PURE__*/_react.default.createRef(),
-      loadCompleteHandler: props.loadCompleteHandler,
       valueChangeHandler: () => fireChangeEvent(),
       values: props.values,
-      viewId: props.viewId,
-      key: componentKey++
+      viewId: props.viewId
     }) : component.fieldType === 'GRID' ? /*#__PURE__*/_react.default.createElement(_GridField.default, {
       keyHandler: props.keyHandler,
       config: component,
@@ -312,11 +291,9 @@ const FieldSet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.f
       parentId: props.parentId,
       handle: createComponentHandle(component),
       ref: /*#__PURE__*/_react.default.createRef(),
-      loadCompleteHandler: props.loadCompleteHandler,
       valueChangeHandler: () => fireChangeEvent(),
       values: props.values,
-      viewId: props.viewId,
-      key: componentKey++
+      viewId: props.viewId
     }) : component.fieldType === 'TIME' ? /*#__PURE__*/_react.default.createElement(_TimePicker.default, {
       keyHandler: props.keyHandler,
       config: component,
@@ -324,11 +301,9 @@ const FieldSet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.f
       parentId: props.parentId,
       handle: createComponentHandle(component),
       ref: /*#__PURE__*/_react.default.createRef(),
-      loadCompleteHandler: props.loadCompleteHandler,
       valueChangeHandler: () => fireChangeEvent(),
       values: props.values,
-      viewId: props.viewId,
-      key: componentKey++
+      viewId: props.viewId
     }) : component.fieldType === 'IMAGE_EDITOR' ? /*#__PURE__*/_react.default.createElement(_ImageEditor.default, {
       keyHandler: props.keyHandler,
       config: component,
@@ -336,11 +311,9 @@ const FieldSet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.f
       parentId: props.parentId,
       handle: createComponentHandle(component),
       ref: /*#__PURE__*/_react.default.createRef(),
-      loadCompleteHandler: props.loadCompleteHandler,
       valueChangeHandler: () => fireChangeEvent(),
       values: props.values,
-      viewId: props.viewId,
-      key: componentKey++
+      viewId: props.viewId
     }) : component.fieldType === 'RADIO_GROUP' ? /*#__PURE__*/_react.default.createElement(_RadioGroup.default, {
       keyHandler: props.keyHandler,
       config: component,
@@ -348,11 +321,31 @@ const FieldSet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.f
       parentId: props.parentId,
       handle: createComponentHandle(component),
       ref: /*#__PURE__*/_react.default.createRef(),
-      loadCompleteHandler: props.loadCompleteHandler,
       valueChangeHandler: () => fireChangeEvent(),
       values: props.values,
-      viewId: props.viewId,
-      key: componentKey++
+      viewId: props.viewId
+    }) : component.fieldType === 'BUTTON' ? /*#__PURE__*/_react.default.createElement(_Button.default, {
+      config: component,
+      form: props.form,
+      handle: createComponentHandle(component),
+      ref: /*#__PURE__*/_react.default.createRef(),
+      viewId: props.viewId
+    }) : component.fieldType === 'HTML_PANEL' ? /*#__PURE__*/_react.default.createElement(_HtmlPanel.default, {
+      config: component,
+      form: props.form,
+      handle: createComponentHandle(component),
+      ref: /*#__PURE__*/_react.default.createRef(),
+      viewId: props.viewId
+    }) : component.fieldType === 'ICON' ? /*#__PURE__*/_react.default.createElement(_IconField.default, {
+      keyHandler: props.keyHandler,
+      config: component,
+      form: props.form,
+      parentId: props.parentId,
+      handle: createComponentHandle(component),
+      ref: /*#__PURE__*/_react.default.createRef(),
+      valueChangeHandler: () => fireChangeEvent(),
+      values: props.values,
+      viewId: props.viewId
     }) : component.fieldType === 'SIGNATURE_TEMPLATE_DESIGNER' ? /*#__PURE__*/_react.default.createElement(_SignatureTemplateDesignerField.default, {
       keyHandler: props.keyHandler,
       config: component,
@@ -360,12 +353,10 @@ const FieldSet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.f
       parentId: props.parentId,
       handle: createComponentHandle(component),
       ref: /*#__PURE__*/_react.default.createRef(),
-      loadCompleteHandler: props.loadCompleteHandler,
       valueChangeHandler: () => fireChangeEvent(),
       values: props.values,
-      viewId: props.viewId,
-      key: componentKey++
-    }) : /*#__PURE__*/_react.default.createElement("div", null, "Unsupported fieldset component type " + component.fieldType + ' - ' + component.id);
+      viewId: props.viewId
+    }) : /*#__PURE__*/_react.default.createElement("div", null, 'Unsupported fieldset component type ' + component.fieldType + ' - ' + component.id);
   }
 
   const api = () => {
@@ -377,18 +368,8 @@ const FieldSet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.f
       get fieldDataBindings() {
         let fieldNames = [];
 
-        var _iterator3 = _createForOfIteratorHelper(props.config.fields),
-            _step3;
-
-        try {
-          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-            const field = _step3.value;
-            fieldNames.push(!_Utils.default.isNull(field.dataBinding) ? field.dataBinding : field.id);
-          }
-        } catch (err) {
-          _iterator3.e(err);
-        } finally {
-          _iterator3.f();
+        for (const field of props.config.fields) {
+          fieldNames.push(!_Utils.default.isNull(field.dataBinding) ? field.dataBinding : field.id);
         }
 
         return fieldNames;
@@ -401,94 +382,66 @@ const FieldSet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.f
       clear() {
         let properties = Object.getOwnPropertyNames(componentHandles);
 
-        var _iterator4 = _createForOfIteratorHelper(properties),
-            _step4;
-
-        try {
-          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-            const property = _step4.value;
-            let componentRef = componentHandles[property];
-            componentRef.api.value = null;
-          }
-        } catch (err) {
-          _iterator4.e(err);
-        } finally {
-          _iterator4.f();
+        for (const property of properties) {
+          let componentRef = componentHandles[property];
+          componentRef.api.value = null;
         }
       },
 
       getChildren: () => {
-        return [];
+        let children = [];
+        let properties = Object.getOwnPropertyNames(componentHandles);
+
+        for (const property of properties) {
+          children.push(componentHandles[property]);
+        }
+
+        return children;
       },
 
       set model(model) {
-        var _iterator5 = _createForOfIteratorHelper(props.config.fields),
-            _step5;
-
-        try {
-          for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-            const field = _step5.value;
-            props.form().model[field.id] = model[field.id];
-            let componentRef = componentHandles[field.id];
-            componentRef.api.value = model[field.id];
-          }
-        } catch (err) {
-          _iterator5.e(err);
-        } finally {
-          _iterator5.f();
+        for (const field of props.config.fields) {
+          props.form().model[field.id] = model[field.id];
+          let componentRef = componentHandles[field.id];
+          componentRef.api.value = model[field.id];
         }
       },
 
       get value() {
-        let value = {}; // TODO : First check if the form binding is map and process accordingly
-
-        let map = {};
+        let value = {};
         let formValue = props.form().value;
 
         if (formValue === null) {
           return null;
         }
 
-        if (!_Utils.default.isNull(formValue) && !_Utils.default.isNull(formValue.map)) {
-          var _iterator6 = _createForOfIteratorHelper(props.config.fields),
-              _step6;
-
-          try {
-            for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-              const field = _step6.value;
-              map[field.id] = formValue.map[field.id];
-            }
-          } catch (err) {
-            _iterator6.e(err);
-          } finally {
-            _iterator6.f();
-          }
+        for (const field of props.config.fields) {
+          value[field.id] = formValue[field.id];
         }
 
-        value.map = map;
         return value;
       },
 
       loadData: (actionConfig, actionEvent) => {
         let service = !_Utils.default.isNull(actionConfig.dataService) ? actionConfig.dataService : !_Utils.default.isNull(props.config) ? props.config.dataService : null;
-        let componentValue = !_Utils.default.isNull(props.config.value) ? props.config.value : actionConfig !== null ? actionConfig.value : null;
+        let componentValue = !_Utils.default.isNull(props.config.value) ? props.config.value : actionConfig.value;
 
         if (componentValue) {
-          let isEventData = componentValue.toString().startsWith("$event.data");
+          let isEventData = componentValue.toString().startsWith('$event.data');
 
-          let isEpression = _ApplicationContext.default.isExpression(componentValue);
+          let isEpression = _ApplicationManager.default.isExpression(componentValue);
 
-          let val = isEventData || isEpression ? _ApplicationContext.default.resolveExpressionValue(componentValue, actionEvent ? actionEvent.data : null) : componentValue;
+          let val = isEventData || isEpression ? _ApplicationManager.default.resolveExpressionValue(componentValue, actionEvent ? actionEvent.data : null) : componentValue;
           props.form().bindData(val);
           let event = new _Event.default(props.handle, props.viewId, val);
 
           _Observable.default.fireEvent(_EventType.default.DATA_ARRIVED, event);
         } else {
           if (!_Utils.default.isNull(service)) {
-            let method = service.type === 'remoteObjectProxy' ? _RestUtils.invokeRpc : _RestUtils.invokeRest;
+            let method = service.type === 'rpc' ? _RestUtils.invokeRpc : _RestUtils.invokeRest;
             method(service, ref.current, props.viewId, result => {
               if (!_Utils.default.isNull(result)) {
-                let data = service.type === 'remoteObjectProxy' ? result.data : result;
+                let data = service.type === 'rpc' ? result.data : result;
 
                 if (data) {
                   props.form().bindData(data);
@@ -510,53 +463,70 @@ const FieldSet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.f
       refresh() {
         if (!_Utils.default.isNull(props.config) && !_Utils.default.isNull(props.config.visible)) {
           setVisible(_Utils.default.evaluateBooleanExpression(props.config.visible, props.config.id));
-          refreshComponents();
         } else {
           setVisible(true);
-          refreshComponents();
         }
 
         if (!_Utils.default.isNull(props.config) && !_Utils.default.isNull(props.config.disabled)) {
           setDisabled(_Utils.default.evaluateBooleanExpression(props.config.disabled, props.config.id));
         }
+
+        refreshComponents();
       }
 
     };
   };
 
   function render(fieldSet) {
-    return _Utils.default.isNull(fieldSet.fields) || fieldSet.fields.length === 0 ? /*#__PURE__*/_react.default.createElement("div", null, " Error: A fieldSet must have fields") : /*#__PURE__*/_react.default.createElement("div", null, fieldGrid.rows.map(row => {
+    return _Utils.default.isNull(fieldSet.fields) || fieldSet.fields.length === 0 ? /*#__PURE__*/_react.default.createElement("div", null, " Error: A fieldSet must have fields") : /*#__PURE__*/_react.default.createElement("div", null, fieldGrid.rows.map((row, i) => {
       return /*#__PURE__*/_react.default.createElement("div", {
         className: "row",
-        key: componentKey++,
+        key: i,
         style: {
           marginLeft: '0',
           marginRight: '0'
         }
-      }, row.fields.map(field => {
+      }, row.fields.map((field, index) => {
+        let colspan;
+        let width;
+
+        if (_Utils.default.isNull(field.attributes) || _Utils.default.isNull(field.attributes.colspan)) {
+          colspan = 1;
+        } else {
+          if (field.attributes.colspan > fieldGrid.maxColPerRow) {
+            colspan = fieldGrid.maxColPerRow;
+          } else {
+            colspan = field.attributes.colspan;
+          }
+        }
+
+        width = colspan / fieldGrid.maxColPerRow * 100;
         return /*#__PURE__*/_react.default.createElement("div", {
-          key: componentKey++,
+          key: index,
           className: "col-*-*",
-          style: {
+          style: _Utils.default.mergeStyles({
             paddingLeft: '0',
             paddingRight: '0',
-            width: 100 / fieldGrid.maxColPerRow + '%'
-          }
-        }, renderComponent(field));
+            marginLeft: '0',
+            marginRight: '0',
+            width: width + '%',
+            minWidth: '320px'
+          }, field)
+        }, renderComponent(field, index));
       }));
     }));
   }
 
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: ref,
+    className: 'fieldSetWrapper',
     style: _Utils.default.mergeStyles({
       display: visible ? 'block' : 'none',
-      width: '60%',
       margin: '0'
     }, props.config)
-  }, !initializing && !_Utils.default.isNull(props.config.attributes) && !_Utils.default.isNull(props.config.attributes['label']) ? /*#__PURE__*/_react.default.createElement("div", {
+  }, !_Utils.default.isNull(props.config.attributes) && !_Utils.default.isNull(props.config.attributes['label']) ? /*#__PURE__*/_react.default.createElement("div", {
     className: 'fieldSetTitle'
-  }, props.config.attributes['label']) : null, !initializing && !_Utils.default.isNull(fieldGrid) ? render(props.config) : null);
+  }, props.config.attributes['label']) : null, !_Utils.default.isNull(fieldGrid) ? render(props.config) : null);
 }));
 
 var _default = FieldSet;

package/dist/components/form/Form.css

@@ -29,4 +29,4 @@
         padding-left: 24px;
         padding-right: 24px;
     }
-}
+}