datastake-daf 0.6.830 → 0.6.831

package/dist/components/index.js

@@ -4827,7 +4827,7 @@ const config$2 = {
   AddDocument: config$3
 };
 
-const _excluded$F = ["width", "height", "size", "name", "fill"];
+const _excluded$E = ["width", "height", "size", "name", "fill"];
 const CustomIcon = _ref => {
   let {
       width = 14,
@@ -4836,7 +4836,7 @@ const CustomIcon = _ref => {
       name = "",
       fill = "none"
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$F);
+    props = _objectWithoutProperties(_ref, _excluded$E);
   const conf = config$2[name];
   if (conf) {
     return /*#__PURE__*/jsxRuntime.jsx("svg", _objectSpread2(_objectSpread2({}, props), {}, {
@@ -5125,7 +5125,7 @@ createCommonjsModule(function (module, exports) {
 !function(e,n){module.exports=n();}(commonjsGlobal,(function(){return {name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(e){var n=["th","st","nd","rd"],t=e%100;return "["+e+(n[(t-20)%10]||n[t]||n[0])+"]"}}}));
 });
 
-const _excluded$E = ["view", "module", "scope", "form", "meta", "createdAt", "updatedAt"];
+const _excluded$D = ["view", "module", "scope", "form", "meta", "createdAt", "updatedAt"];
 dayjs__default["default"].extend(customParseFormat);
 dayjs__default["default"].extend(utc);
 dayjs__default["default"].extend(utc);
@@ -5501,7 +5501,7 @@ const filterCreateData = data => {
       createdAt,
       updatedAt
     } = data,
-    rest = _objectWithoutProperties(data, _excluded$E);
+    rest = _objectWithoutProperties(data, _excluded$D);
   const _meta = isObjectEmpty(meta) ? undefined : meta;
   return _objectSpread2(_objectSpread2({}, rest), {}, {
     meta: _meta
@@ -6033,7 +6033,7 @@ SelectFilters.propTypes = {
   apiUrl: PropTypes__default["default"].string
 };
 
-const _excluded$D = ["columns", "data", "defaultFilters", "style", "pagination", "loading", "onChange", "onFilterChange", "selectOptions", "filtersConfig", "rowSelection", "setShowFilters", "rowKey", "showFilters", "hideOnLoading", "sourcesKey", "className", "projects", "t", "selectedProject", "sourceId", "projectSources", "language", "scrollX", "apiUrl", "app", "doEmptyRows"];
+const _excluded$C = ["columns", "data", "defaultFilters", "style", "pagination", "loading", "onChange", "onFilterChange", "selectOptions", "filtersConfig", "rowSelection", "setShowFilters", "rowKey", "showFilters", "hideOnLoading", "sourcesKey", "className", "projects", "t", "selectedProject", "sourceId", "projectSources", "language", "scrollX", "apiUrl", "app", "doEmptyRows"];
 function DAFTable(_ref) {
   let {
       columns = [],
@@ -6064,7 +6064,7 @@ function DAFTable(_ref) {
       app,
       doEmptyRows
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$D);
+    rest = _objectWithoutProperties(_ref, _excluded$C);
   const source = React.useMemo(() => {
     if (data && Array.isArray(data)) {
       return data;
@@ -6889,7 +6889,7 @@ function ComponentWithFocus(_ref) {
 }
 
 var _templateObject$h;
-const _excluded$C = ["size", "maxHeight", "containerHeight", "dataSource", "columns", "pagination", "doEmptyRows"];
+const _excluded$B = ["size", "maxHeight", "containerHeight", "dataSource", "columns", "pagination", "doEmptyRows"];
 function StickyTable(_ref) {
   let {
       size = "small",
@@ -6900,7 +6900,7 @@ function StickyTable(_ref) {
       pagination = false,
       doEmptyRows = true
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$C);
+    props = _objectWithoutProperties(_ref, _excluded$B);
   const data = React__default["default"].useMemo(() => {
     if (!doEmptyRows) {
       return dataSource;
@@ -7428,7 +7428,7 @@ const BTN_SIZE = {
   LG: 'large'
 };
 
-const _excluded$B = ["content", "size", "type", "icon", "onClick", "disabled", "loading", "title", "style", "className"];
+const _excluded$A = ["content", "size", "type", "icon", "onClick", "disabled", "loading", "title", "style", "className"];
 function DafButton(_ref) {
   let {
       content = '',
@@ -7442,7 +7442,7 @@ function DafButton(_ref) {
       style = {},
       className = ''
     } = _ref,
-    restProps = _objectWithoutProperties(_ref, _excluded$B);
+    restProps = _objectWithoutProperties(_ref, _excluded$A);
   return /*#__PURE__*/jsxRuntime.jsx(antd.Button, _objectSpread2(_objectSpread2({
     icon: icon,
     type: type,
@@ -7561,12 +7561,12 @@ const Style$R = styled__default["default"].div`
   }
 `;
 
-const _excluded$A = ["children"];
+const _excluded$z = ["children"];
 const BorderedButton = _ref => {
   let {
       children
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$A);
+    props = _objectWithoutProperties(_ref, _excluded$z);
   return /*#__PURE__*/jsxRuntime.jsx(Style$R, {
     className: "d-btn-cont",
     children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, _objectSpread2(_objectSpread2({}, props), {}, {
@@ -7706,12 +7706,12 @@ Badge.propTypes = {
   props: PropTypes__default["default"].object
 };
 
-const _excluded$z = ["icon"];
+const _excluded$y = ["icon"];
 function GetIcon(_ref) {
   let {
       icon
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$z);
+    props = _objectWithoutProperties(_ref, _excluded$y);
   let Icon = Icons__namespace.CloseOutlined;
   if (Icons__namespace[icon]) {
     Icon = Icons__namespace[icon];
@@ -8041,7 +8041,7 @@ const MultiSelectStyled = styled__default["default"](antd.Select)`
   }
 `;
 
-const _excluded$y = ["options", "defaultSelected", "onChange", "textWhenMultiple", "withCount", "oneAlwaysSelected", "canUnselectLast", "isAvatarGroup", "maxAvatarCount", "dropDownWidth", "topAvatarValue", "isSingle", "selectionType"];
+const _excluded$x = ["options", "defaultSelected", "onChange", "textWhenMultiple", "withCount", "oneAlwaysSelected", "canUnselectLast", "isAvatarGroup", "maxAvatarCount", "dropDownWidth", "topAvatarValue", "isSingle", "selectionType"];
 const {
   useToken: useToken$p
 } = antd.theme;
@@ -8134,7 +8134,7 @@ function Multiselect(_ref) {
       isSingle = false,
       selectionType = SELECTION_TYPES.DEFAULT
     } = _ref,
-    restProps = _objectWithoutProperties(_ref, _excluded$y);
+    restProps = _objectWithoutProperties(_ref, _excluded$x);
   const {
     token
   } = useToken$p();
@@ -8854,7 +8854,7 @@ DAFHeader.propTypes = {
   filtersConfig: PropTypes__default["default"].any
 };
 
-const _excluded$x = ["tabs", "onChange", "value", "className"];
+const _excluded$w = ["tabs", "onChange", "value", "className"];
 function TabsHeader(_ref) {
   let {
       tabs = [],
@@ -8862,7 +8862,7 @@ function TabsHeader(_ref) {
       value = '',
       className = 'mt-2'
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$x);
+    rest = _objectWithoutProperties(_ref, _excluded$w);
   return /*#__PURE__*/jsxRuntime.jsx("div", {
     className: formatClassname(['daf-tabs-header pl-6 pr-6', className]),
     children: /*#__PURE__*/jsxRuntime.jsx(antd.Tabs, _objectSpread2({
@@ -8959,7 +8959,7 @@ DrawerHeader.propTypes = {
   tabsConfig: PropTypes__default["default"].any
 };
 
-const _excluded$w = ["label", "onClick", "icon", "type", "tooltip", "disabled", "loading", "style", "className"];
+const _excluded$v = ["label", "onClick", "icon", "type", "tooltip", "disabled", "loading", "style", "className"];
 const useFooter = _ref => {
   let {
     leftContent,
@@ -8994,7 +8994,7 @@ const useFooter = _ref => {
                 style = {},
                 className = ""
               } = button,
-              restProps = _objectWithoutProperties(button, _excluded$w);
+              restProps = _objectWithoutProperties(button, _excluded$v);
             return /*#__PURE__*/jsxRuntime.jsx(DafButton, _objectSpread2({
               content: label,
               type: type,
@@ -11875,7 +11875,7 @@ Widget.propTypes = {
 };
 Widget.displayName = 'Widget';
 
-const _excluded$v = ["loading", "title", "image", "description", "imgAlt", "noDescriptionText", "isPdf"];
+const _excluded$u = ["loading", "title", "image", "description", "imgAlt", "noDescriptionText", "isPdf"];
 function ImageWidget(_ref) {
   let {
       loading = false,
@@ -11886,7 +11886,7 @@ function ImageWidget(_ref) {
       noDescriptionText,
       isPdf = false
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$v);
+    props = _objectWithoutProperties(_ref, _excluded$u);
   const expandable = isPdf ? false : props.expandable;
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     loading: loading,
@@ -11946,7 +11946,7 @@ function ImageWidget(_ref) {
 ImageWidget.displayName = 'ImageWidget';
 
 var _templateObject$e;
-const _excluded$u = ["title", "loading", "data", "current", "defaultActiveTab", "widgetClassname", "className", "direction"];
+const _excluded$t = ["title", "loading", "data", "current", "defaultActiveTab", "widgetClassname", "className", "direction"];
 function FlowWidget(_ref) {
   let {
       title,
@@ -11958,7 +11958,7 @@ function FlowWidget(_ref) {
       className,
       direction = "horizontal"
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$u);
+    rest = _objectWithoutProperties(_ref, _excluded$t);
   const [activeTab, setActiveTab] = React.useState();
   React.useEffect(() => {
     if (defaultActiveTab) {
@@ -15689,7 +15689,7 @@ Map$3.propTypes = {
   link: PropTypes__default["default"].any
 };
 
-const _excluded$t = ["isExpanded", "shouldRenderMap", "renderKey", "title", "loading", "t", "user", "data", "height", "widgetConfig"];
+const _excluded$s = ["isExpanded", "shouldRenderMap", "renderKey", "title", "loading", "t", "user", "data", "height", "widgetConfig"];
 function InExpandableWidgetMap(_ref) {
   let {
       isExpanded,
@@ -15703,7 +15703,7 @@ function InExpandableWidgetMap(_ref) {
       height,
       widgetConfig
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$t);
+    rest = _objectWithoutProperties(_ref, _excluded$s);
   const [mapKey, setMapKey] = React.useState(0);
   const [isMapReady, setIsMapReady] = React.useState(false);
   React.useEffect(() => {
@@ -17903,14 +17903,14 @@ const MapConfig = ({
   });
 };
 
-const _excluded$s = ["config", "title", "loading"];
+const _excluded$r = ["config", "title", "loading"];
 const Details = _ref => {
   let {
       config = [],
       title,
       loading = false
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$s);
+    rest = _objectWithoutProperties(_ref, _excluded$r);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     className: "with-border-header h-w-btn-header card",
     loading: loading,
@@ -17926,14 +17926,14 @@ const Details = _ref => {
   }));
 };
 
-const _excluded$r = ["config", "title", "loading"];
+const _excluded$q = ["config", "title", "loading"];
 const KeyIndicatorsDetails = _ref => {
   let {
       config,
       title,
       loading = false
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$r);
+    rest = _objectWithoutProperties(_ref, _excluded$q);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     className: "with-border-header h-w-btn-header",
     title: title,
@@ -17963,7 +17963,7 @@ const Style$G = styled__default["default"].div`
     }    
 `;
 
-const _excluded$q = ["children", "config", "detailsTitle", "firstColumnWidth"];
+const _excluded$p = ["children", "config", "detailsTitle", "firstColumnWidth"];
 const DetailsSection = _ref => {
   let {
       children,
@@ -17971,7 +17971,7 @@ const DetailsSection = _ref => {
       detailsTitle,
       firstColumnWidth = "250px"
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$q);
+    rest = _objectWithoutProperties(_ref, _excluded$p);
   return /*#__PURE__*/jsxRuntime.jsx(Style$G, {
     firstColumnWidth: firstColumnWidth,
     children: /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -18147,14 +18147,14 @@ const getGoalConfig = () => {
 };
 
 var _templateObject$c;
-const _excluded$p = ["title", "activeSdgGoals", "t"];
+const _excluded$o = ["title", "activeSdgGoals", "t"];
 function SDGWidget(_ref) {
   let {
       title = "Sustainable Development Goals",
       activeSdgGoals = [],
       t = key => key
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$p);
+    props = _objectWithoutProperties(_ref, _excluded$o);
   const sdgConfig = getGoalConfig();
   return /*#__PURE__*/jsxRuntime.jsx(Widget, _objectSpread2(_objectSpread2({
     title: title,
@@ -18452,7 +18452,7 @@ function SdgList({
   });
 }
 
-const _excluded$o = ["title", "description", "onLinkClick", "image", "linkIcon", "sdgList", "items", "onCardClick", "hideSDGList", "t"];
+const _excluded$n = ["title", "description", "onLinkClick", "image", "linkIcon", "sdgList", "items", "onCardClick", "hideSDGList", "t"];
 const {
   Meta
 } = antd.Card;
@@ -18472,7 +18472,7 @@ function ProjectWidget(_ref) {
       hideSDGList = false,
       t = x => x
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$o);
+    props = _objectWithoutProperties(_ref, _excluded$n);
   const [isHovered, setIsHovered] = React__default["default"].useState(false);
   const {
     token
@@ -18744,13 +18744,13 @@ const WidgetCard = _ref => {
   });
 };
 
-const _excluded$n = ["title", "children"];
+const _excluded$m = ["title", "children"];
 const CarouselWidget = /*#__PURE__*/React.forwardRef((_ref, ref) => {
   let {
       title,
       children
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$n);
+    rest = _objectWithoutProperties(_ref, _excluded$m);
   /**
    * Handles carousel slide change events
    * @param {number} currentSlide - The index of the current slide after change
@@ -18914,7 +18914,7 @@ const EmptyStateContainer = styled__default["default"].div`
   }
 `;
 
-const _excluded$m = ["title", "images", "height", "fallback", "activeDotColor", "inactiveDotColor", "arrowIconColor", "arrowHoverIconColor", "customArrows", "emptyLogo", "emptyText"];
+const _excluded$l = ["title", "images", "height", "fallback", "activeDotColor", "inactiveDotColor", "arrowIconColor", "arrowHoverIconColor", "customArrows", "emptyLogo", "emptyText"];
 function ImageCarousel(_ref) {
   let {
       title,
@@ -18929,7 +18929,7 @@ function ImageCarousel(_ref) {
       emptyLogo = antd.Empty.PRESENTED_IMAGE_SIMPLE,
       emptyText = "No Image"
     } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded$m);
+    rest = _objectWithoutProperties(_ref, _excluded$l);
   const [previewVisible, setPreviewVisible] = React.useState(false);
   const [current, setCurrent] = React.useState(0);
   const carouselRef = React.useRef(null);
@@ -19298,7 +19298,7 @@ const getVegetationConfig = () => {
 };
 
 var _templateObject$a, _templateObject2$3;
-const _excluded$l = ["title", "activeVegetationConditions", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "growthObservations", "t"];
+const _excluded$k = ["title", "activeVegetationConditions", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "growthObservations", "t"];
 function VegetationWidget(_ref) {
   let {
       title = "Vegetation Health",
@@ -19310,7 +19310,7 @@ function VegetationWidget(_ref) {
       growthObservations = [],
       t = key => key
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$l);
+    props = _objectWithoutProperties(_ref, _excluded$k);
   let vegetationConfig = getVegetationConfig();
   const allVegetationKeys = vegetationConfig.map(item => item.key);
   if (filterKeys && Array.isArray(filterKeys)) {
@@ -19426,7 +19426,7 @@ const getFaunaConfig = () => {
 };
 
 var _templateObject$9, _templateObject2$2;
-const _excluded$k = ["title", "faunaPresent", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "t"];
+const _excluded$j = ["title", "faunaPresent", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "t"];
 function FaunaWidget(_ref) {
   let {
       title = "Observed Fauna",
@@ -19437,7 +19437,7 @@ function FaunaWidget(_ref) {
       itemHeight = 100,
       t = key => key
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$k);
+    props = _objectWithoutProperties(_ref, _excluded$j);
   let faunaConfig = getFaunaConfig();
 
   // Filter to show only specific keys if filterKeys is provided
@@ -19502,7 +19502,7 @@ const getInvasiveSpeciesConfig = () => {
 };
 
 var _templateObject$8, _templateObject2$1;
-const _excluded$j = ["title", "invasiveSpecies", "hasInvasiveSpecies", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "t"];
+const _excluded$i = ["title", "invasiveSpecies", "hasInvasiveSpecies", "filterKeys", "columnsPerRow", "itemWidth", "itemHeight", "t"];
 function InvasiveSpeciesWidget(_ref) {
   let {
       title = "Invasive Species",
@@ -19514,7 +19514,7 @@ function InvasiveSpeciesWidget(_ref) {
       itemHeight = 100,
       t = key => key
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$j);
+    props = _objectWithoutProperties(_ref, _excluded$i);
   let invasiveSpeciesConfig = getInvasiveSpeciesConfig();
 
   // Filter to show only specific keys if filterKeys is provided
@@ -24937,7 +24937,7 @@ const RepeatableModals = ({
   }) : null;
 };
 
-const _excluded$i = ["viewGroup"],
+const _excluded$h = ["viewGroup"],
   _excluded2$2 = ["label", "icon", "position"];
 const Content$1 = _ref => {
   let {
@@ -25009,7 +25009,7 @@ const Content$1 = _ref => {
       if (groups[gKey].viewGroup === key) {
         // eslint-disable-next-line no-unused-vars
         const _groups$gKey = groups[gKey],
-          gCfg = _objectWithoutProperties(_groups$gKey, _excluded$i);
+          gCfg = _objectWithoutProperties(_groups$gKey, _excluded$h);
         items[gKey] = gCfg;
       }
       return items;
@@ -25289,7 +25289,7 @@ const Content$1 = _ref => {
   });
 };
 
-const _excluded$h = ["t", "open", "title", "children", "onClose", "onSuccess", "cancelBtnText", "saveBtnText", "className", "loading", "disabled", "withModalFormWrapper"];
+const _excluded$g = ["t", "open", "title", "children", "onClose", "onSuccess", "cancelBtnText", "saveBtnText", "className", "loading", "disabled", "withModalFormWrapper"];
 function Modal(_ref) {
   let {
       t = text => text,
@@ -25305,7 +25305,7 @@ function Modal(_ref) {
       disabled = false,
       withModalFormWrapper = true
     } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded$h);
+    props = _objectWithoutProperties(_ref, _excluded$g);
   return /*#__PURE__*/jsxRuntime.jsxs(antd.Modal, _objectSpread2(_objectSpread2({
     width: 650,
     footer: null,
@@ -35952,7 +35952,7 @@ const beforeUpload = allowedExtensions => file => {
 };
 const allowedImageExtensions = ['.jpg', '.jpeg', '.png', '.gif', '.webp', '.avif', '.bmp', '.tiff', '.tif', '.heif', '.heic', '.svg', '.ico'];
 
-const _excluded$g = ["placeholder"],
+const _excluded$f = ["placeholder"],
   _excluded2$1 = ["label", "description", "excludeFromEdit", "showFormIf", "icon", "position", "template", "formClass"];
 dayjs__default["default"].extend(utc);
 dayjs__default["default"].extend(timezone);
@@ -36918,7 +36918,7 @@ const inputTypeComponent$1 = {
         },
         commentHint
       } = _ref19,
-      props = _objectWithoutProperties(_ref19.props, _excluded$g);
+      props = _objectWithoutProperties(_ref19.props, _excluded$f);
     let {
       onChange,
       value,
@@ -39624,7 +39624,7 @@ function AjaxSelect(props) {
   }, props));
 }
 
-const _excluded$f = ["placeholder"];
+/* eslint-disable no-case-declarations */
 const propHasValue = val => {
   if (Array.isArray(val)) {
     return val.length > 0 ? true : false;
@@ -39642,14 +39642,14 @@ const checkCondition = (condition, repeatValues, formsValue) => {
   return isShown;
 };
 function showHideInput(input, formsValue, repeatIndex, repeatValues, setValues, ref) {
-  var _input$meta;
-  if ((input === null || input === void 0 || (_input$meta = input.meta) === null || _input$meta === void 0 ? void 0 : _input$meta.hidden) === true) {
-    var _input$meta2;
+  if (input?.meta?.hidden === true) {
     // Set default value for hidden fields
-    if ((input === null || input === void 0 || (_input$meta2 = input.meta) === null || _input$meta2 === void 0 ? void 0 : _input$meta2.defaultValue) !== undefined && !propHasValue(formsValue[ref])) {
+    if (input?.meta?.defaultValue !== undefined && !propHasValue(formsValue[ref])) {
       formsValue[ref] = input.meta.defaultValue;
       if (setValues && typeof setValues === 'function') {
-        setValues(_objectSpread2({}, formsValue));
+        setValues({
+          ...formsValue
+        });
       }
     }
     return false;
@@ -39708,35 +39708,35 @@ function getInputHeadLines(type, i, input, values) {
   switch (type) {
     case "h2":
       return /*#__PURE__*/jsxRuntime.jsx("h2", {
-        className: "title-semibold-2 ".concat(input.marginBottom || "", " ").concat(input.groupHeader || "", " ").concat(i ? input.marginTop || "" : ""),
+        className: `title-semibold-2 ${input.marginBottom || ""} ${input.groupHeader || ""} ${i ? input.marginTop || "" : ""}`,
         children: /*#__PURE__*/jsxRuntime.jsx("span", {
           children: getInputLabel(input, values)
         })
       });
     case "h3":
       return /*#__PURE__*/jsxRuntime.jsx("h3", {
-        className: "title-semibold-3 ".concat(input.marginBottom || "", " ").concat(input.groupHeader || "", " ").concat(i ? input.marginTop || "" : ""),
+        className: `title-semibold-3 ${input.marginBottom || ""} ${input.groupHeader || ""} ${i ? input.marginTop || "" : ""}`,
         children: /*#__PURE__*/jsxRuntime.jsx("span", {
           children: getInputLabel(input, values)
         })
       });
     case "h4":
       return /*#__PURE__*/jsxRuntime.jsx("h4", {
-        className: "title-semibold-4 ".concat(input.marginBottom || "", " ").concat(input.groupHeader || "", " ").concat(i ? input.marginTop || "" : ""),
+        className: `title-semibold-4 ${input.marginBottom || ""} ${input.groupHeader || ""} ${i ? input.marginTop || "" : ""}`,
         children: /*#__PURE__*/jsxRuntime.jsx("span", {
           children: getInputLabel(input, values)
         })
       });
     case "h5":
       return /*#__PURE__*/jsxRuntime.jsx("h5", {
-        className: "title-semibold-5 ".concat(input.marginBottom || "", " ").concat(input.groupHeader || "", " ").concat(i ? input.marginTop || "" : ""),
+        className: `title-semibold-5 ${input.marginBottom || ""} ${input.groupHeader || ""} ${i ? input.marginTop || "" : ""}`,
         children: /*#__PURE__*/jsxRuntime.jsx("span", {
           children: getInputLabel(input, values)
         })
       });
     case "h6":
       return /*#__PURE__*/jsxRuntime.jsx("h6", {
-        className: "title-semibold-6 ".concat(input.marginBottom || "", " ").concat(input.groupHeader || "", " ").concat(i ? input.marginTop || "" : ""),
+        className: `title-semibold-6 ${input.marginBottom || ""} ${input.groupHeader || ""} ${i ? input.marginTop || "" : ""}`,
         children: /*#__PURE__*/jsxRuntime.jsx("span", {
           children: getInputLabel(input, values)
         })
@@ -39745,9 +39745,7 @@ function getInputHeadLines(type, i, input, values) {
       return null;
   }
 }
-function getInputLabel(input) {
-  let formsValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  let asText = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+function getInputLabel(input, formsValue = {}, asText = false) {
   if (typeof input.label === "object") {
     const validations = Object.keys(input.label);
     const key = validations.find(v => {
@@ -39805,8 +39803,7 @@ function getInputLabel(input) {
     }) : ReactHtmlParser__default["default"](input.label);
   }
 }
-function getSelectOptions$1(option) {
-  let formsValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+function getSelectOptions$1(option, formsValue = {}) {
   if (typeof option.label === "object") {
     const validations = Object.keys(option.label);
     const key = validations.find(v => {
@@ -39830,9 +39827,7 @@ function getSectionLabel(labels, values) {
   }
   return labels;
 }
-function getSubtitles(subtitles, position) {
-  let formsValue = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  let repeatValues = arguments.length > 4 ? arguments[4] : undefined;
+function getSubtitles(subtitles, position, formsValue = {}, repeatIndex, repeatValues) {
   let subtitle = subtitles && subtitles[position];
   if (subtitle && typeof subtitle === "object") {
     let newSubtitle = subtitle.default || "";
@@ -39876,12 +39871,14 @@ function getSubtitles(subtitles, position) {
 function getFormTitles(titles, key, position) {
   let tilte = titles && titles[key];
   return tilte ? /*#__PURE__*/jsxRuntime.jsx("h3", {
-    className: "title-semibold-3 mb0 ".concat(position ? "mt-3" : ""),
+    className: `title-semibold-3 mb0 ${position ? "mt-3" : ""}`,
     children: tilte
   }) : null;
 }
 const updateFormValues = (repeatIndex, repeatValues, inputName, value, formsValue, name, mainForm) => {
-  formsValue = Object.assign(formsValue, _objectSpread2({}, mainForm.getFieldsValue(true)));
+  formsValue = Object.assign(formsValue, {
+    ...mainForm.getFieldsValue(true)
+  });
   if (typeof repeatIndex === "number" && repeatValues) {
     if (!repeatValues[inputName] || !___default["default"].isEqual(repeatValues[inputName], value)) {
       repeatValues[inputName] = value;
@@ -39915,52 +39912,48 @@ const updateFormValues = (repeatIndex, repeatValues, inputName, value, formsValu
   }
 };
 const inputTypeComponent = {
-  text: (_ref, _ref2) => {
-    let {
-      props,
-      rules
-    } = _ref;
-    let {
-      inputMeta = {},
-      t
-    } = _ref2;
+  text: ({
+    props,
+    rules
+  }, {
+    inputMeta = {},
+    t
+  }) => {
     const maxRule = rules.find(r => r.max);
     const maxProps = {};
     if (maxRule) {
       maxProps.maxLength = maxRule.max;
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Input, _objectSpread2(_objectSpread2(_objectSpread2({
-      size: "medium"
-    }, maxProps), {}, {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Input, {
+      size: "medium",
+      ...maxProps,
       allowClear: true,
       autoComplete: "new-password",
-      type: "text"
-    }, props), {}, {
+      type: "text",
+      ...props,
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || t("Type")
-    }));
+    });
   },
-  drawTerritory: (_ref3, _ref4) => {
-    let {
-      formsValue,
-      name,
-      addressData,
-      onValuesChange
-    } = _ref3;
-    let {
-      setFormValues,
-      form
-    } = _ref4;
+  drawTerritory: ({
+    formsValue,
+    name,
+    addressData,
+    onValuesChange
+  }, {
+    setFormValues,
+    form
+  }) => {
     let search = formsValue.country;
     if (addressData && addressData.address && Object.keys(addressData.address).length > 0) {
       if (addressData.address.country) {
         search = addressData.address.country;
       }
       if (addressData.address.level1) {
-        search = "".concat(addressData.address.level1, ", ").concat(addressData.address.country);
+        search = `${addressData.address.level1}, ${addressData.address.country}`;
       }
       if (addressData.address.level2) {
-        search = "".concat(addressData.address.level2, ", ").concat(addressData.address.level1, ", ").concat(addressData.address.country);
+        search = `${addressData.address.level2}, ${addressData.address.level1}, ${addressData.address.country}`;
       }
     } else {
       const country = countriesList.countries[formsValue.country] || {};
@@ -39968,10 +39961,10 @@ const inputTypeComponent = {
         search = country.name;
       }
       if (formsValue.administrativeLevel1Name) {
-        search = "".concat(search, " ").concat(formsValue.administrativeLevel1Name);
+        search = `${search} ${formsValue.administrativeLevel1Name}`;
       }
       if (formsValue.administrativeLevel2Name) {
-        search = "".concat(search, " ").concat(formsValue.administrativeLevel2Name);
+        search = `${search} ${formsValue.administrativeLevel2Name}`;
       }
     }
     console.log("search", {
@@ -39991,9 +39984,10 @@ const inputTypeComponent = {
         const allFormValues = form && typeof form.getFieldsValue === 'function' ? form.getFieldsValue(true) : formsValue;
 
         // Create the updated values
-        const updatedValues = _objectSpread2(_objectSpread2({}, allFormValues), {}, {
+        const updatedValues = {
+          ...allFormValues,
           [name]: val
-        });
+        };
 
         // Call onValuesChange with the change and all values
         if (typeof onValuesChange === 'function') {
@@ -40008,44 +40002,39 @@ const inputTypeComponent = {
       searchValue: search
     });
   },
-  link: (_ref5, _ref6) => {
-    let {
-      props,
-      rules
-    } = _ref5;
-    let {
-      inputMeta = {},
-      t
-    } = _ref6;
+  link: ({
+    props,
+    rules
+  }, {
+    inputMeta = {},
+    t
+  }) => {
     const maxRule = rules.find(r => r.max);
     const maxProps = {};
     if (maxRule) {
       maxProps.maxLength = maxRule.max;
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Input, _objectSpread2(_objectSpread2(_objectSpread2({
-      size: "medium"
-    }, maxProps), {}, {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Input, {
+      size: "medium",
+      ...maxProps,
       allowClear: true,
       autoComplete: "new-password",
-      type: "text"
-    }, props), {}, {
+      type: "text",
+      ...props,
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || t("Type")
-    }));
+    });
   },
-  number: (_ref7, _ref8) => {
-    var _input$meta3;
-    let {
-      props,
-      rules,
-      input
-    } = _ref7;
-    let {
-      inputMeta = {},
-      t
-    } = _ref8;
+  number: ({
+    props,
+    rules,
+    input
+  }, {
+    inputMeta = {},
+    t
+  }) => {
     const maxRule = rules.find(r => r.max);
-    const integerRule = !(input !== null && input !== void 0 && (_input$meta3 = input.meta) !== null && _input$meta3 !== void 0 && _input$meta3.isDecimal);
+    const integerRule = !input?.meta?.isDecimal;
     const parser = value => {
       if (!value) {
         return "";
@@ -40056,53 +40045,50 @@ const inputTypeComponent = {
       return value.replace(/\$\s?|(,*)/g, "");
     };
     if (maxRule) {
-      return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, _objectSpread2(_objectSpread2({
+      return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, {
         allowClear: true,
-        autoComplete: "new-password"
-      }, props), {}, {
+        autoComplete: "new-password",
+        ...props,
         type: "number",
         min: 0,
         max: maxRule.max,
         parser: parser
-      }));
+      });
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, _objectSpread2(_objectSpread2({
+    return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, {
       allowClear: true,
-      autoComplete: "new-password"
-    }, props), {}, {
+      autoComplete: "new-password",
+      ...props,
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || t("Type number"),
       min: 0,
       formatter: value => numberWithCommas$1(value),
       parser: parser
-    }));
+    });
   },
-  select: (_ref9, _ref10) => {
-    var _input$meta4;
-    let {
-      value,
-      options,
-      optionGroup,
-      props,
-      formsValue,
-      optionsFilter,
-      filterCond,
-      repeatValues,
-      repeatIndex,
-      name,
-      inputName,
-      address,
-      addressData,
-      input
-    } = _ref9;
-    let {
-      forms,
-      form,
-      setAddress,
-      inputMeta = {},
-      t,
-      changeInputMeta
-    } = _ref10;
+  select: ({
+    value,
+    options,
+    optionGroup,
+    props,
+    formsValue,
+    optionsFilter,
+    filterCond,
+    repeatValues,
+    repeatIndex,
+    name,
+    inputName,
+    address,
+    addressData,
+    input
+  }, {
+    forms,
+    form,
+    setAddress,
+    inputMeta = {},
+    t,
+    changeInputMeta
+  }) => {
     let opts;
     if (typeof options === "string") {
       const [formName, key] = options.split(".");
@@ -40158,19 +40144,18 @@ const inputTypeComponent = {
       }
       opts = groupOptions;
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Select, _objectSpread2(_objectSpread2({
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
       autoComplete: "new-password",
       allowClear: true,
       showSearch: true,
-      defaultValue: input === null || input === void 0 || (_input$meta4 = input.meta) === null || _input$meta4 === void 0 ? void 0 : _input$meta4.defaultValue,
+      defaultValue: input?.meta?.defaultValue,
       filterOption: filterSelectOptions,
-      optionFilterProp: "children"
-    }, props), {}, {
+      optionFilterProp: "children",
+      ...props,
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || getInputProp$1(props.placeholder, formsValue) || t("Select one option"),
       onChange: (val, selectedValue) => {
-        var _input$meta5;
-        if (typeof (input === null || input === void 0 || (_input$meta5 = input.meta) === null || _input$meta5 === void 0 ? void 0 : _input$meta5.onChange) === "string") {
+        if (typeof input?.meta?.onChange === "string") {
           const [value, otherKey, otherVal] = input.meta.onChange.split(".");
           if (val === value) {
             changeInputMeta({
@@ -40184,7 +40169,9 @@ const inputTypeComponent = {
         }
         if (address && selectedValue) {
           dot__default["default"].str(address, selectedValue.children, addressData);
-          setAddress(_objectSpread2({}, addressData));
+          setAddress({
+            ...addressData
+          });
         }
         if (props.onChange) {
           props.onChange(val);
@@ -40196,35 +40183,33 @@ const inputTypeComponent = {
           value: og.value,
           disabled: og.disabled,
           children: og.label
-        }, "".concat(i).concat(j)))
+        }, `${i}${j}`))
       }, i) : /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, {
         value: option.value,
         disabled: option.disabled,
         children: option.label
       }, i))
-    }));
+    });
   },
-  multiselect: (_ref11, _ref12) => {
-    let {
-      value,
-      options,
-      optionGroup,
-      optionsFilter,
-      filterCond,
-      props,
-      formsValue,
-      repeatValues,
-      repeatIndex,
-      inputName,
-      name,
-      tags
-    } = _ref11;
-    let {
-      forms,
-      form,
-      inputMeta = {},
-      t
-    } = _ref12;
+  multiselect: ({
+    value,
+    options,
+    optionGroup,
+    optionsFilter,
+    filterCond,
+    props,
+    formsValue,
+    repeatValues,
+    repeatIndex,
+    inputName,
+    name,
+    tags
+  }, {
+    forms,
+    form,
+    inputMeta = {},
+    t
+  }) => {
     let opts;
     if (typeof options === "string") {
       const [formName, key] = options.split(".");
@@ -40281,16 +40266,16 @@ const inputTypeComponent = {
       }
       opts = groupOptions;
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Select, _objectSpread2(_objectSpread2(_objectSpread2({
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
       allowClear: true,
       autoComplete: "new-password",
       mode: tags ? "tags" : "multiple",
-      optionFilterProp: "children"
-    }, tags ? {
-      tokenSeparators: [",", "\n", "\t"]
-    } : {}), {}, {
-      filterOption: filterSelectOptions
-    }, props), {}, {
+      optionFilterProp: "children",
+      ...(tags ? {
+        tokenSeparators: [",", "\n", "\t"]
+      } : {}),
+      filterOption: filterSelectOptions,
+      ...props,
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || getInputProp$1(props.placeholder, formsValue) || t("Select all relevant options"),
       children: (opts || []).map((option, i) => option.items ? /*#__PURE__*/jsxRuntime.jsx(antd.Select.OptGroup, {
@@ -40299,42 +40284,42 @@ const inputTypeComponent = {
           value: og.value,
           disabled: og.disabled,
           children: og.label
-        }, "".concat(i).concat(j)))
+        }, `${i}${j}`))
       }, i) : /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, {
         value: option.value,
         disabled: option.disabled,
         children: option.label
       }, i))
-    }));
+    });
   },
-  date: (_ref13, _ref14) => {
-    let {
-      props,
-      rules,
-      repeatValues,
-      formsValue,
-      name
-    } = _ref13;
-    let {
-      inputMeta,
-      t,
-      groupFormId,
-      form,
-      setFormValues
-    } = _ref14;
+  date: ({
+    props,
+    rules,
+    repeatValues,
+    formsValue,
+    name
+  }, {
+    inputMeta,
+    t,
+    groupFormId,
+    form,
+    setFormValues
+  }) => {
     const lng = localStorage.getItem("datastakeLng") || "en";
     const maxRule = rules.find(r => r.max);
     const handleDateChange = date => {
       if (date) {
         const localDate = dayjs__default["default"].utc(date);
         if (groupFormId) {
-          const _new = _objectSpread2(_objectSpread2({}, formsValue[groupFormId] || {}), {}, {
+          const _new = {
+            ...(formsValue[groupFormId] || {}),
             [name]: localDate
-          });
+          };
           form.setFieldValue(groupFormId, _new);
-          setFormValues(_objectSpread2(_objectSpread2({}, formsValue), {}, {
+          setFormValues({
+            ...formsValue,
             [groupFormId]: _new
-          }));
+          });
         } else {
           form.setFieldValue(name, localDate);
         }
@@ -40346,10 +40331,10 @@ const inputTypeComponent = {
         checkForMax = checkCondition(maxRule.condition, repeatValues, formsValue);
       }
       if (checkForMax) {
-        return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, _objectSpread2(_objectSpread2({
+        return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, {
           allowClear: true,
-          autoComplete: "new-password"
-        }, props), {}, {
+          autoComplete: "new-password",
+          ...props,
           onChange: handleDateChange,
           format: DATE_FORMATS,
           locale: lng === "fr" ? localeFr__default["default"] : localeEn__default["default"],
@@ -40358,33 +40343,31 @@ const inputTypeComponent = {
           disabledDate: current => {
             return current && current >= dayjs__default["default"]().endOf("day");
           }
-        }));
+        });
       }
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, _objectSpread2(_objectSpread2({
+    return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, {
       allowClear: true,
-      autoComplete: "new-password"
-    }, props), {}, {
+      autoComplete: "new-password",
+      ...props,
       onChange: handleDateChange,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || t("Select date"),
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       format: DATE_FORMATS,
       locale: lng === "fr" ? localeFr__default["default"] : localeEn__default["default"]
-    }));
+    });
   },
-  comment: (_ref15, _ref16) => {
-    let {
-        props: {
-          placeholder
-        },
-        commentHint
-      } = _ref15,
-      props = _objectWithoutProperties(_ref15.props, _excluded$f);
-    let {
-      onChange,
-      value
-    } = _ref16;
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Input.TextArea, _objectSpread2(_objectSpread2({
+  comment: ({
+    props: {
+      placeholder,
+      ...props
+    },
+    commentHint
+  }, {
+    onChange,
+    value
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Input.TextArea, {
       allowClear: true,
       value: value,
       onChange: e => onChange(e.target.value),
@@ -40394,60 +40377,56 @@ const inputTypeComponent = {
       autoSize: {
         minRows: 5,
         maxRows: 5
-      }
-    }, props), {}, {
+      },
+      ...props,
       disabled: false
-    }));
+    });
   },
-  textarea: (_ref17, _ref18) => {
-    let {
-      props,
-      rules
-    } = _ref17;
-    let {
-      inputMeta,
-      t
-    } = _ref18;
+  textarea: ({
+    props,
+    rules
+  }, {
+    inputMeta,
+    t
+  }) => {
     const maxRule = rules.find(r => r.max);
     let maxLength = MAX_TEXT_AREA_LENGTH;
     if (maxRule) {
       maxLength = maxRule.max;
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Input.TextArea, _objectSpread2(_objectSpread2({
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Input.TextArea, {
       allowClear: true,
       autoComplete: "new-password",
       maxLength: maxLength,
       autoSize: {
         minRows: 5,
         maxRows: 5
-      }
-    }, props), {}, {
+      },
+      ...props,
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || t("Type")
-    }));
+    });
   },
-  phoneNumber: (_ref19, _ref20) => {
-    let {
-      name,
-      inputName,
-      props,
-      value,
-      repeatIndex,
-      repeatValues,
-      formsValue
-    } = _ref19;
-    let {
-      setFormValues,
-      t
-    } = _ref20;
-    return /*#__PURE__*/jsxRuntime.jsx(PhoneInput, _objectSpread2(_objectSpread2({
+  phoneNumber: ({
+    name,
+    inputName,
+    props,
+    value,
+    repeatIndex,
+    repeatValues,
+    formsValue
+  }, {
+    setFormValues,
+    t
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(PhoneInput, {
       t: t,
       doChangeErrors: false,
       allowClear: true,
-      country: formsValue === null || formsValue === void 0 ? void 0 : formsValue.country,
+      country: formsValue?.country,
       formsValue: formsValue,
-      initialValue: value
-    }, props), {}, {
+      initialValue: value,
+      ...props,
       onChange: val => {
         if (repeatValues) {
           const inputValues = Array.isArray(formsValue[name]) ? formsValue[name] || [] : [];
@@ -40463,25 +40442,24 @@ const inputTypeComponent = {
           setFormValues(formsValue);
         }
       }
-    }));
+    });
   },
-  switch: (_ref21, _ref22) => {
-    let {
-      props,
-      value,
-      restricted,
-      autocomplete,
-      formsValue,
-      repeatIndex,
-      name,
-      inputName,
-      replace
-    } = _ref21;
-    let {
-      form,
-      setFormValues
-    } = _ref22;
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Switch, _objectSpread2(_objectSpread2({}, props), {}, {
+  switch: ({
+    props,
+    value,
+    restricted,
+    autocomplete,
+    formsValue,
+    repeatIndex,
+    name,
+    inputName,
+    replace
+  }, {
+    form,
+    setFormValues
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Switch, {
+      ...props,
       defaultChecked: value || false,
       checked: value || false,
       onChange: isChecked => {
@@ -40523,15 +40501,14 @@ const inputTypeComponent = {
           setFormValues(formsValue);
         }
       }
-    }));
+    });
   },
-  total100: _ref23 => {
-    let {
-      props,
-      name,
-      options,
-      value
-    } = _ref23;
+  total100: ({
+    props,
+    name,
+    options,
+    value
+  }) => {
     value = value ? Array.isArray(value) ? value : [value] : [];
     function totalValue() {
       let total = 0;
@@ -40555,11 +40532,10 @@ const inputTypeComponent = {
       className: "total100",
       children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.List, {
         name: name,
-        children: (fields, _ref24) => {
-          let {
-            add,
-            remove
-          } = _ref24;
+        children: (fields, {
+          add,
+          remove
+        }) => {
           if (fields.length === 0) {
             const formData = value || [];
             if (formData.length) {
@@ -40578,26 +40554,26 @@ const inputTypeComponent = {
               const v = value[field.name];
               return /*#__PURE__*/jsxRuntime.jsxs(antd.Space, {
                 className: "total",
-                children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _objectSpread2(_objectSpread2({
-                  noStyle: true
-                }, field), {}, {
+                children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+                  noStyle: true,
+                  ...field,
                   name: [field.name, "type"],
                   fieldKey: [field.fieldKey, "type"],
                   initialValue: v.type,
-                  children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, _objectSpread2(_objectSpread2({
+                  children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
                     allowClear: true,
                     showSearch: true,
                     filterOption: filterSelectOptions,
-                    optionFilterProp: "children"
-                  }, props), {}, {
+                    optionFilterProp: "children",
+                    ...props,
                     children: options.map((option, i) => /*#__PURE__*/jsxRuntime.jsx(antd.Select.Option, {
                       value: option.value,
                       children: option.label
                     }, i))
-                  }))
-                })), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _objectSpread2(_objectSpread2({
-                  noStyle: true
-                }, field), {}, {
+                  })
+                }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+                  noStyle: true,
+                  ...field,
                   name: [field.name, "value"],
                   fieldKey: [field.fieldKey, "value"],
                   initialValue: v.value,
@@ -40605,14 +40581,14 @@ const inputTypeComponent = {
                     allowClear: true,
                     name: "value",
                     formatter: value => {
-                      return value ? "".concat(value, "%") : "";
+                      return value ? `${value}%` : "";
                     },
                     disabled: !v.type,
                     placeholder: props.valueplaceholder ? props.valueplaceholder : "Value",
                     min: 1,
                     max: 100 - siblingTotal(v.type)
                   })
-                })), fields.length - 1 === i ? /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
+                }), fields.length - 1 === i ? /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
                   disabled: !v.value || !v.type || totalValue() >= 100,
                   type: "primary",
                   icon: /*#__PURE__*/jsxRuntime.jsx(Icons.PlusOutlined, {}),
@@ -40644,21 +40620,18 @@ const inputTypeComponent = {
       }) : null]
     });
   },
-  percentage: (_ref25, _ref26) => {
-    var _input$meta6;
-    let {
-      name,
-      inputName,
-      totalMax,
-      repeatIndex,
-      props,
-      formsValue,
-      input
-    } = _ref25;
-    let {
-      inputMeta,
-      t
-    } = _ref26;
+  percentage: ({
+    name,
+    inputName,
+    totalMax,
+    repeatIndex,
+    props,
+    formsValue,
+    input
+  }, {
+    inputMeta,
+    t
+  }) => {
     const isRepeatable = Array.isArray(formsValue[name]);
     let totalSiblings = 0;
     if (isRepeatable && totalMax) {
@@ -40666,15 +40639,15 @@ const inputTypeComponent = {
         totl = totl + (grp[inputName] || 0);
         return totl;
       }, 0);
-    } else if (Array.isArray(input === null || input === void 0 || (_input$meta6 = input.meta) === null || _input$meta6 === void 0 ? void 0 : _input$meta6.siblings)) {
+    } else if (Array.isArray(input?.meta?.siblings)) {
       totalSiblings = input.meta.siblings.reduce((totl, key) => {
         totl = totl + (formsValue[key] || 0);
         return totl;
       }, 0);
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, _objectSpread2(_objectSpread2({
-      allowClear: true
-    }, props), {}, {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.InputNumber, {
+      allowClear: true,
+      ...props,
       style: {
         width: "100%"
       },
@@ -40683,36 +40656,33 @@ const inputTypeComponent = {
       min: 0,
       max: 100 - totalSiblings,
       formatter: value => {
-        return value ? "".concat(value) : "";
+        return value ? `${value}` : "";
       },
       parser: value => value.replace("%", ""),
       addonAfter: "%"
-    }));
+    });
   },
-  year: _ref27 => {
-    let {
-      props
-    } = _ref27;
+  year: ({
+    props
+  }) => {
     const lng = localStorage.getItem("datastakeLng") || "en";
-    return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, _objectSpread2(_objectSpread2({
+    return /*#__PURE__*/jsxRuntime.jsx(antd.DatePicker, {
       allowClear: true,
       locale: lng === "fr" ? localeFr__default["default"] : localeEn__default["default"],
-      picker: "year"
-    }, props), {}, {
+      picker: "year",
+      ...props,
       format: "YYYY"
-    }));
+    });
   },
-  upload: (_ref28, _ref29) => {
-    let {
-      rules,
-      value
-    } = _ref28;
-    let {
-      setLoading,
-      t,
-      getApiBaseUrl,
-      getAppHeader
-    } = _ref29;
+  upload: ({
+    rules,
+    value
+  }, {
+    setLoading,
+    t,
+    getApiBaseUrl,
+    getAppHeader
+  }) => {
     const apiURL = getApiBaseUrl();
     const accept = rules.length ? rules.find(rule => Object.keys(rule).includes("accept")).accept || "*" : null;
     const values = (Array.isArray(value) ? value : value && typeof value === "object" && value.fileList && Array.isArray(value.fileList) ? value.fileList.map(f => f.response).filter(f => f) : []) || [];
@@ -40725,12 +40695,13 @@ const inputTypeComponent = {
       }
     }
     const allowedExtensions = accept && accept !== "*" ? accept.split(",").map(ext => ext.trim().toLowerCase()) : [];
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Upload, _objectSpread2(_objectSpread2({}, maxProps), {}, {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Upload, {
+      ...maxProps,
       accept: accept,
-      action: "".concat(apiURL, "/upload"),
+      action: `${apiURL}/upload`,
       beforeUpload: beforeUpload(allowedExtensions),
       onChange: val => {
-        if (val !== null && val !== void 0 && val.file && typeof setLoading === "function") {
+        if (val?.file && typeof setLoading === "function") {
           if (val.file.percent !== 100) {
             setLoading(true);
           } else {
@@ -40738,9 +40709,10 @@ const inputTypeComponent = {
           }
         }
       },
-      headers: _objectSpread2({
-        Authorization: "Bearer ".concat(getToken())
-      }, getAppHeader()),
+      headers: {
+        Authorization: `Bearer ${getToken()}`,
+        ...getAppHeader()
+      },
       defaultFileList: values,
       children: /*#__PURE__*/jsxRuntime.jsxs(antd.Button, {
         style: {
@@ -40750,19 +40722,17 @@ const inputTypeComponent = {
           children: t("Upload")
         })]
       })
-    }));
+    });
   },
-  imageUpload: (_ref30, _ref31) => {
-    let {
-      rules,
-      value
-    } = _ref30;
-    let {
-      setLoading,
-      getApiBaseUrl,
-      getAppHeader,
-      t
-    } = _ref31;
+  imageUpload: ({
+    rules,
+    value
+  }, {
+    setLoading,
+    getApiBaseUrl,
+    getAppHeader,
+    t
+  }) => {
     const apiURL = getApiBaseUrl();
     const values = getImageUploadEditValue(value);
     const maxRule = rules.find(r => r.max);
@@ -40773,17 +40743,17 @@ const inputTypeComponent = {
         maxProps.multiple = true;
       }
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Upload, _objectSpread2(_objectSpread2({}, maxProps), {}, {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Upload, {
+      ...maxProps,
       beforeUpload: beforeUpload(allowedImageExtensions),
       accept: "image/*",
       classList: !values || !values.length ? "empty" : "",
       listType: "picture",
-      action: "".concat(apiURL, "/upload"),
+      action: `${apiURL}/upload`,
       onChange: val => {
         if (typeof setLoading === "function") {
-          if (val !== null && val !== void 0 && val.file) {
-            var _val$file;
-            if ((val === null || val === void 0 || (_val$file = val.file) === null || _val$file === void 0 ? void 0 : _val$file.status) === "removed") {
+          if (val?.file) {
+            if (val?.file?.status === "removed") {
               setLoading(false);
               return;
             }
@@ -40795,9 +40765,10 @@ const inputTypeComponent = {
           setLoading(false);
         }
       },
-      headers: _objectSpread2({
-        Authorization: "Bearer ".concat(getToken())
-      }, getAppHeader()),
+      headers: {
+        Authorization: `Bearer ${getToken()}`,
+        ...getAppHeader()
+      },
       defaultFileList: values,
       children: /*#__PURE__*/jsxRuntime.jsxs(antd.Button, {
         style: {
@@ -40807,19 +40778,17 @@ const inputTypeComponent = {
           children: t("Upload")
         })]
       })
-    }));
+    });
   },
-  videoUpload: (_ref32, _ref33) => {
-    let {
-      rules,
-      value
-    } = _ref32;
-    let {
-      setLoading = () => {},
-      getApiBaseUrl,
-      getAppHeader,
-      t
-    } = _ref33;
+  videoUpload: ({
+    rules,
+    value
+  }, {
+    setLoading = () => {},
+    getApiBaseUrl,
+    getAppHeader,
+    t
+  }) => {
     const apiURL = getApiBaseUrl();
     const values = getImageUploadEditValue(value);
     const maxRule = rules.find(r => r.max);
@@ -40830,25 +40799,21 @@ const inputTypeComponent = {
         maxProps.multiple = true;
       }
     }
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Upload, _objectSpread2(_objectSpread2({
-      itemRender: (item, fileList) => {
-        var _fileList$response;
-        return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-          children: [/*#__PURE__*/jsxRuntime.jsx(EditVideoPreview, {
-            url: (fileList === null || fileList === void 0 || (_fileList$response = fileList.response) === null || _fileList$response === void 0 ? void 0 : _fileList$response.url) || (fileList === null || fileList === void 0 ? void 0 : fileList.url)
-          }), item]
-        });
-      }
-    }, maxProps), {}, {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Upload, {
+      itemRender: (item, fileList) => /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+        children: [/*#__PURE__*/jsxRuntime.jsx(EditVideoPreview, {
+          url: fileList?.response?.url || fileList?.url
+        }), item]
+      }),
+      ...maxProps,
       accept: "video/*",
       classList: !values || !values.length ? "empty" : "",
       listType: "picture",
-      action: "".concat(apiURL, "/upload"),
+      action: `${apiURL}/upload`,
       onChange: val => {
         if (typeof setLoading === "function") {
-          if (val !== null && val !== void 0 && val.file) {
-            var _val$file2;
-            if ((val === null || val === void 0 || (_val$file2 = val.file) === null || _val$file2 === void 0 ? void 0 : _val$file2.status) === "removed") {
+          if (val?.file) {
+            if (val?.file?.status === "removed") {
               setLoading(false);
               return;
             }
@@ -40860,9 +40825,10 @@ const inputTypeComponent = {
           setLoading(false);
         }
       },
-      headers: _objectSpread2({
-        Authorization: "Bearer ".concat(getToken())
-      }, getAppHeader()),
+      headers: {
+        Authorization: `Bearer ${getToken()}`,
+        ...getAppHeader()
+      },
       defaultFileList: values,
       children: /*#__PURE__*/jsxRuntime.jsxs(antd.Button, {
         style: {
@@ -40872,19 +40838,17 @@ const inputTypeComponent = {
           children: t("Upload")
         })]
       })
-    }));
+    });
   },
-  geolocation: (_ref34, _ref35) => {
-    let {
-      value,
-      name,
-      formsValue,
-      addressData,
-      props
-    } = _ref34;
-    let {
-      inputMeta
-    } = _ref35;
+  geolocation: ({
+    value,
+    name,
+    formsValue,
+    addressData,
+    props
+  }, {
+    inputMeta
+  }) => {
     let search = formsValue.country;
     if (addressData && Object.keys(addressData).length > 0) {
       const country = countriesList.countries[formsValue.country] || {};
@@ -40892,10 +40856,10 @@ const inputTypeComponent = {
         search = addressData.country;
       }
       if (addressData.level1) {
-        search = "".concat(addressData.level1, ", ").concat(addressData.country || country.name);
+        search = `${addressData.level1}, ${addressData.country || country.name}`;
       }
       if (addressData.level2) {
-        search = "".concat(addressData.level2, ", ").concat(addressData.level1, ", ").concat(addressData.country || country.name);
+        search = `${addressData.level2}, ${addressData.level1}, ${addressData.country || country.name}`;
       }
     } else {
       const country = countriesList.countries[formsValue.country] || {};
@@ -40903,10 +40867,10 @@ const inputTypeComponent = {
         search = country.name;
       }
       if (formsValue.administrativeLevel1Name) {
-        search = "".concat(search, " ").concat(formsValue.administrativeLevel1Name);
+        search = `${search} ${formsValue.administrativeLevel1Name}`;
       }
       if (formsValue.administrativeLevel2Name) {
-        search = "".concat(search, " ").concat(formsValue.administrativeLevel2Name);
+        search = `${search} ${formsValue.administrativeLevel2Name}`;
       }
     }
     return /*#__PURE__*/jsxRuntime.jsx(Geolocation, {
@@ -40919,35 +40883,33 @@ const inputTypeComponent = {
       searchValue: search
     });
   },
-  ajaxSelect: (_ref36, _ref37) => {
-    let {
-      call,
-      automaticallyLink,
-      name,
-      preSelected,
-      inputName,
-      props,
-      formsValue,
-      onNewSetValue,
-      multiple,
-      updateOptions,
-      repeatValues,
-      repeatIndex,
-      value,
-      unique,
-      address,
-      addressData = {},
-      input
-    } = _ref36;
-    let {
-      form,
-      forms,
-      setAddress,
-      changeInputMeta,
-      inputMeta = {},
-      meta,
-      setFormValues
-    } = _ref37;
+  ajaxSelect: ({
+    call,
+    automaticallyLink,
+    name,
+    preSelected,
+    inputName,
+    props,
+    formsValue,
+    onNewSetValue,
+    multiple,
+    updateOptions,
+    repeatValues,
+    repeatIndex,
+    value,
+    unique,
+    address,
+    addressData = {},
+    input
+  }, {
+    form,
+    forms,
+    setAddress,
+    changeInputMeta,
+    inputMeta = {},
+    meta,
+    setFormValues
+  }) => {
     return /*#__PURE__*/jsxRuntime.jsx(AjaxSelect, {
       preSelected: preSelected,
       input: input,
@@ -40983,41 +40945,40 @@ const inputTypeComponent = {
           const selectedValue = data.find(v => v.value === ev);
           if (address && selectedValue) {
             dot__default["default"].str(address, selectedValue.label, addressData);
-            setAddress(_objectSpread2({}, addressData));
+            setAddress({
+              ...addressData
+            });
           }
         }
       },
       setAddress: setAddress
     });
   },
-  tag: _ref38 => {
-    let {
-      value,
-      repeatLabel
-    } = _ref38;
+  tag: ({
+    value,
+    repeatLabel
+  }) => {
     return /*#__PURE__*/jsxRuntime.jsx(TagInput$1, {
       allowClear: true,
       value: value || [],
       newPlaceholder: repeatLabel
     });
   },
-  modal: (_ref39, _ref40) => {
-    let {
-      call,
-      automaticallyLink,
-      name,
-      inputName,
-      props,
-      formsValue,
-      onNewSetValue,
-      repeatValues,
-      repeatIndex,
-      value,
-      modalTitle
-    } = _ref39;
-    let {
-      form
-    } = _ref40;
+  modal: ({
+    call,
+    automaticallyLink,
+    name,
+    inputName,
+    props,
+    formsValue,
+    onNewSetValue,
+    repeatValues,
+    repeatIndex,
+    value,
+    modalTitle
+  }, {
+    form
+  }) => {
     return /*#__PURE__*/jsxRuntime.jsx(AjaxModal$2, {
       allowClear: true,
       call: call,
@@ -41035,69 +40996,63 @@ const inputTypeComponent = {
       buttonText: modalTitle
     });
   },
-  website: (_ref41, _ref42) => {
-    let {
-      name,
-      inputName,
-      props,
-      value,
-      repeatIndex,
-      repeatValues,
-      formsValue
-    } = _ref41;
-    let {
-      form,
-      inputMeta = {},
-      t
-    } = _ref42;
-    return /*#__PURE__*/jsxRuntime.jsx(Website, _objectSpread2(_objectSpread2({
+  website: ({
+    name,
+    inputName,
+    props,
+    value,
+    repeatIndex,
+    repeatValues,
+    formsValue
+  }, {
+    form,
+    inputMeta = {},
+    t
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(Website, {
       allowClear: true,
       initialValue: value,
-      t: t
-    }, props), {}, {
+      t: t,
+      ...props,
       onChange: val => updateFormValues(repeatIndex, repeatValues, inputName, val, formsValue, name, form),
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || "www.example.com"
-    }));
+    });
   },
-  dataLink: (_ref43, _ref44) => {
-    var _input$meta7, _input$meta10, _formsValue$meta, _input$meta11;
-    let {
-      setValues,
-      name,
-      onValuesChange,
-      formsValue,
-      input,
-      changeLinking,
-      call,
-      automaticallyLink,
-      inputName,
-      props,
-      onNewSetValue,
-      multiple,
-      updateOptions,
-      repeatValues,
-      repeatIndex,
-      value,
-      unique,
-      address,
-      addressData = {},
-      getFromLinking
-    } = _ref43;
-    let {
-      form,
-      groupFormId,
-      setAddress,
-      isHighlighted,
-      changeInputMeta,
-      meta,
-      inputMeta,
-      forms
-    } = _ref44;
-    if ((input === null || input === void 0 || (_input$meta7 = input.meta) === null || _input$meta7 === void 0 || (_input$meta7 = _input$meta7.optionsView) === null || _input$meta7 === void 0 ? void 0 : _input$meta7.editInputType) === "ajaxSelect") {
-      var _formsValue$groupForm, _input$meta8, _input$meta9;
-      const currentValue = groupFormId ? (_formsValue$groupForm = formsValue[groupFormId]) === null || _formsValue$groupForm === void 0 ? void 0 : _formsValue$groupForm[name] : formsValue[name];
-      (input === null || input === void 0 || (_input$meta8 = input.meta) === null || _input$meta8 === void 0 || (_input$meta8 = _input$meta8.optionsView) === null || _input$meta8 === void 0 ? void 0 : _input$meta8.call) || (input === null || input === void 0 || (_input$meta9 = input.meta) === null || _input$meta9 === void 0 ? void 0 : _input$meta9.call) || "default::list()::::";
+  dataLink: ({
+    setValues,
+    name,
+    onValuesChange,
+    formsValue,
+    input,
+    changeLinking,
+    call,
+    automaticallyLink,
+    inputName,
+    props,
+    onNewSetValue,
+    multiple,
+    updateOptions,
+    repeatValues,
+    repeatIndex,
+    value,
+    unique,
+    address,
+    addressData = {},
+    getFromLinking
+  }, {
+    form,
+    groupFormId,
+    setAddress,
+    isHighlighted,
+    changeInputMeta,
+    meta,
+    inputMeta,
+    forms
+  }) => {
+    if (input?.meta?.optionsView?.editInputType === "ajaxSelect") {
+      const currentValue = groupFormId ? formsValue[groupFormId]?.[name] : formsValue[name];
+      input?.meta?.optionsView?.call || input?.meta?.call || "default::list()::::";
       return /*#__PURE__*/jsxRuntime.jsx(AjaxSelect$1, {
         size: "medium",
         input: input,
@@ -41134,7 +41089,9 @@ const inputTypeComponent = {
             const selectedValue = data.find(v => v.value === ev);
             if (address && selectedValue) {
               dot__default["default"].str(address, selectedValue.label, addressData);
-              setAddress(_objectSpread2({}, addressData));
+              setAddress({
+                ...addressData
+              });
             }
           }
         },
@@ -41144,149 +41101,188 @@ const inputTypeComponent = {
         isDataLink: true
       });
     }
-    const isSingle = (input === null || input === void 0 || (_input$meta10 = input.meta) === null || _input$meta10 === void 0 ? void 0 : _input$meta10.maxRepeat) === 1;
-    const formData = groupFormId ? isSingle ? (formsValue[groupFormId] || {})[name] ? [_objectSpread2({}, (formsValue[groupFormId] || {})[name])] : [] : getArray((formsValue[groupFormId] || {})[name] || []).map(v => _objectSpread2({}, v)) : isSingle ? formsValue[name] ? [_objectSpread2({}, formsValue[name])] : [] : (formsValue[name] || []).map(v => _objectSpread2({}, v));
+    const isSingle = input?.meta?.maxRepeat === 1;
+    const formData = groupFormId ? isSingle ? (formsValue[groupFormId] || {})[name] ? [{
+      ...(formsValue[groupFormId] || {})[name]
+    }] : [] : getArray((formsValue[groupFormId] || {})[name] || []).map(v => ({
+      ...v
+    })) : isSingle ? formsValue[name] ? [{
+      ...formsValue[name]
+    }] : [] : (formsValue[name] || []).map(v => ({
+      ...v
+    }));
     const onUpdate = (val, i) => {
       const _val = isSingle ? {
         [name]: val
       } : {
-        [name]: formData === null || formData === void 0 ? void 0 : formData.map((d, j) => i === j ? val : d)
+        [name]: formData?.map((d, j) => i === j ? val : d)
       };
       if (groupFormId) {
-        const _defaultData = (form === null || form === void 0 ? void 0 : form.getFieldValue(groupFormId)) || {};
-        const _newData = _objectSpread2(_objectSpread2({}, _defaultData), _val);
-        onValuesChange(_newData, _objectSpread2(_objectSpread2({}, formsValue), {}, {
+        const _defaultData = form?.getFieldValue(groupFormId) || {};
+        const _newData = {
+          ..._defaultData,
+          ..._val
+        };
+        onValuesChange(_newData, {
+          ...formsValue,
           [groupFormId]: _newData
-        }));
-        form === null || form === void 0 || form.setFieldValue(groupFormId, _newData);
-        setValues(_objectSpread2(_objectSpread2({}, formsValue), {}, {
+        });
+        form?.setFieldValue(groupFormId, _newData);
+        setValues({
+          ...formsValue,
           [groupFormId]: _newData
-        }));
+        });
         return;
       }
-      onValuesChange(_val, _objectSpread2(_objectSpread2({}, formsValue), _val));
-      form === null || form === void 0 || form.setFieldValue(name, _val[name]);
-      setValues(_objectSpread2(_objectSpread2({}, formsValue), _val));
+      onValuesChange(_val, {
+        ...formsValue,
+        ..._val
+      });
+      form?.setFieldValue(name, _val[name]);
+      setValues({
+        ...formsValue,
+        ..._val
+      });
     };
     return /*#__PURE__*/jsxRuntime.jsx(DataLink, {
       form: input,
       formsValue: formsValue,
       onUpdate: onUpdate,
       isHighlighted: isHighlighted,
-      values: groupFormId ? _objectSpread2(_objectSpread2({}, formsValue[groupFormId] || {}), {}, {
+      values: groupFormId ? {
+        ...(formsValue[groupFormId] || {}),
         meta: {
-          inputs: ((formsValue === null || formsValue === void 0 || (_formsValue$meta = formsValue.meta) === null || _formsValue$meta === void 0 ? void 0 : _formsValue$meta.inputs) || {})[groupFormId]
+          inputs: (formsValue?.meta?.inputs || {})[groupFormId]
         }
-      }) : formsValue,
+      } : formsValue,
       name: name,
       groupFormId: groupFormId,
-      maxRepeat: input === null || input === void 0 || (_input$meta11 = input.meta) === null || _input$meta11 === void 0 ? void 0 : _input$meta11.maxRepeat,
-      remove: _ref45 => {
-        let {
-          key
-        } = _ref45;
+      maxRepeat: input?.meta?.maxRepeat,
+      remove: ({
+        key
+      }) => {
         const _val = isSingle ? {
           [name]: null
         } : {
           [name]: formData.filter((v, i) => i !== key)
         };
         if (groupFormId) {
-          const _defaultData = (form === null || form === void 0 ? void 0 : form.getFieldValue(groupFormId)) || {};
-          const _newData = _objectSpread2(_objectSpread2({}, _defaultData), _val);
-          onValuesChange(_newData, _objectSpread2(_objectSpread2({}, formsValue), {}, {
+          const _defaultData = form?.getFieldValue(groupFormId) || {};
+          const _newData = {
+            ..._defaultData,
+            ..._val
+          };
+          onValuesChange(_newData, {
+            ...formsValue,
             [groupFormId]: _newData
-          }));
-          form === null || form === void 0 || form.setFieldValue(groupFormId, _newData);
-          setValues(_objectSpread2(_objectSpread2({}, formsValue), {}, {
+          });
+          form?.setFieldValue(groupFormId, _newData);
+          setValues({
+            ...formsValue,
             [groupFormId]: _newData
-          }));
+          });
           return;
         }
-        onValuesChange(_val, _objectSpread2(_objectSpread2({}, formsValue), _val));
-        form === null || form === void 0 || form.setFieldValue(name, _val[name]);
-        setValues(_objectSpread2(_objectSpread2({}, formsValue), _val));
+        onValuesChange(_val, {
+          ...formsValue,
+          ..._val
+        });
+        form?.setFieldValue(name, _val[name]);
+        setValues({
+          ...formsValue,
+          ..._val
+        });
       },
       add: val => {
         const _val = isSingle ? {
           [name]: val
         } : {
-          [name]: [...formData, _objectSpread2({}, val)]
+          [name]: [...formData, {
+            ...val
+          }]
         };
         if (groupFormId) {
-          const _defaultData = (form === null || form === void 0 ? void 0 : form.getFieldValue(groupFormId)) || {};
-          const _newData = _objectSpread2(_objectSpread2({}, _defaultData), _val);
-          form === null || form === void 0 || form.setFieldValue(groupFormId, _newData);
-          onValuesChange(_newData, _objectSpread2(_objectSpread2({}, formsValue), {}, {
+          const _defaultData = form?.getFieldValue(groupFormId) || {};
+          const _newData = {
+            ..._defaultData,
+            ..._val
+          };
+          form?.setFieldValue(groupFormId, _newData);
+          onValuesChange(_newData, {
+            ...formsValue,
             [groupFormId]: _newData
-          }));
-          setValues(_objectSpread2(_objectSpread2({}, formsValue), {}, {
+          });
+          setValues({
+            ...formsValue,
             [groupFormId]: _newData
-          }));
+          });
           return;
         }
-        form === null || form === void 0 || form.setFieldValue(name, _val[name]);
-        onValuesChange(_val, _objectSpread2(_objectSpread2({}, formsValue), _val));
-        setValues(_objectSpread2(_objectSpread2({}, formsValue), _val));
+        form?.setFieldValue(name, _val[name]);
+        onValuesChange(_val, {
+          ...formsValue,
+          ..._val
+        });
+        setValues({
+          ...formsValue,
+          ..._val
+        });
       },
       k: name,
       formData: formData
     });
   },
-  internallink: (_ref46, _ref47) => {
-    let {
-      name,
-      inputName,
-      props,
-      value,
-      repeatIndex,
-      repeatValues,
-      formsValue
-    } = _ref46;
-    let {
-      form,
-      inputMeta = {},
-      t
-    } = _ref47;
-    return /*#__PURE__*/jsxRuntime.jsx(Website, _objectSpread2(_objectSpread2({
+  internallink: ({
+    name,
+    inputName,
+    props,
+    value,
+    repeatIndex,
+    repeatValues,
+    formsValue
+  }, {
+    form,
+    inputMeta = {},
+    t
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(Website, {
       allowClear: true,
       disabled: props.disabled || inputMeta.notApplicable || inputMeta.notAvailable,
       placeholder: getMetaPlaceholer(inputMeta, t) || props.placeholder || "www.example.com",
-      initialValue: value
-    }, props), {}, {
+      initialValue: value,
+      ...props,
       onChange: val => updateFormValues(repeatIndex, repeatValues, inputName, val, formsValue, name, form)
-    }));
+    });
   },
-  group: _ref48 => {
-    let {
-      props,
-      groupInputs
-    } = _ref48;
-    return /*#__PURE__*/jsxRuntime.jsx(GroupInput$1, _objectSpread2({
-      groupInputs: groupInputs
-    }, props));
+  group: ({
+    props,
+    groupInputs
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(GroupInput$1, {
+      groupInputs: groupInputs,
+      ...props
+    });
   },
-  groupInputs: (_ref49, _ref50) => {
-    let {
-      props,
-      groupInputs
-    } = _ref49;
-    let {
-      inputMeta
-    } = _ref50;
-    return /*#__PURE__*/jsxRuntime.jsx(GroupInput$1, _objectSpread2({
+  groupInputs: ({
+    props,
+    groupInputs
+  }, {
+    inputMeta
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(GroupInput$1, {
       groupInputs: groupInputs,
-      inputMeta: inputMeta
-    }, props));
+      inputMeta: inputMeta,
+      ...props
+    });
   },
-  radioGroup: _ref51 => {
-    let {
-      props,
-      value,
-      options
-    } = _ref51;
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Radio.Group, _objectSpread2(_objectSpread2({
-      value: value
-    }, props), {}, {
+  radioGroup: ({
+    props,
+    value,
+    options
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Radio.Group, {
+      value: value,
+      ...props,
       children: (options || []).map(o => {
         return /*#__PURE__*/jsxRuntime.jsxs(antd.Radio, {
           value: o.value,
@@ -41299,17 +41295,16 @@ const inputTypeComponent = {
           }) : null]
         }, o.value);
       })
-    }));
+    });
   },
-  checkboxGroup: _ref52 => {
-    let {
-      props,
-      value,
-      options
-    } = _ref52;
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox.Group, _objectSpread2(_objectSpread2({
-      value: value
-    }, props), {}, {
+  checkboxGroup: ({
+    props,
+    value,
+    options
+  }) => {
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox.Group, {
+      value: value,
+      ...props,
       children: (options || []).map(o => {
         return /*#__PURE__*/jsxRuntime.jsxs(antd.Checkbox, {
           value: o.value,
@@ -41322,30 +41317,28 @@ const inputTypeComponent = {
           }) : null]
         }, o.value);
       })
-    }));
+    });
   }
 };
-const GetFormItem = _ref53 => {
-  var _find, _input$meta12, _input$meta13, _input$meta14, _input$meta15, _input$meta16, _input$meta17, _input$meta18, _inputData$value, _input$meta19, _input$meta20, _inputData$commentVal;
-  let {
-    code,
-    inputData,
-    inputId,
-    input,
-    setLoading,
-    values,
-    MainForm,
-    options,
-    plainForms,
-    setValues,
-    alertError,
-    setAddress,
-    inputMeta = {},
-    inputKey,
-    changeInputMeta = () => {},
-    i,
-    isCreate = false
-  } = _ref53;
+const GetFormItem = ({
+  code,
+  inputData,
+  inputId,
+  input,
+  setLoading,
+  values,
+  MainForm,
+  options,
+  plainForms,
+  setValues,
+  alertError,
+  setAddress,
+  inputMeta = {},
+  inputKey,
+  changeInputMeta = () => {},
+  i,
+  isCreate = false
+}) => {
   const {
     t,
     getAppHeader,
@@ -41361,7 +41354,7 @@ const GetFormItem = _ref53 => {
     case "h6":
       return getInputHeadLines(input.type, i, input, values);
     default:
-      const rules = inputMeta !== null && inputMeta !== void 0 && inputMeta.notApplicable || inputMeta !== null && inputMeta !== void 0 && inputMeta.notAvailable ? [] : inputData.rules ? inputData.rules.filter(rule => !Object.keys(rule).includes("accept") && !Object.keys(rule).includes("max")) : [];
+      const rules = inputMeta?.notApplicable || inputMeta?.notAvailable ? [] : inputData.rules ? inputData.rules.filter(rule => !Object.keys(rule).includes("accept") && !Object.keys(rule).includes("max")) : [];
       const requiredRule = rules.find(r => r.required);
       if (requiredRule && input.type === "text") {
         rules.push({
@@ -41370,45 +41363,47 @@ const GetFormItem = _ref53 => {
         });
       }
       const noLabel = ["message"].includes(input.type);
-      let maxRule = (_find = ((inputData === null || inputData === void 0 ? void 0 : inputData.rules) || []).find(rule => rule.max)) === null || _find === void 0 ? void 0 : _find.max;
+      let maxRule = (inputData?.rules || []).find(rule => rule.max)?.max;
       return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
         children: [/*#__PURE__*/jsxRuntime.jsx("div", {
           className: "flex input-cont",
-          children: /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
-            initialValue: inputMeta === null || inputMeta === void 0 ? void 0 : inputMeta.defaultValue
-          }, ["total100", "group"].includes(input.type) ? {} : {
-            name: inputId,
-            fieldKey: inputId,
-            initialValue: inputData.value
-          }), ["upload", "imageUpload", "videoUpload"].includes(input.type) ? {
-            valuePropName: "fileList",
-            getValueFromEvent: e => {
-              if (Array.isArray(e)) {
-                return e;
-              }
-              return e && e.fileList && e.fileList.map(f => {
-                if (f.response) {
-                  return f.response;
+          children: /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+            initialValue: inputMeta?.defaultValue,
+            ...(["total100", "group"].includes(input.type) ? {} : {
+              name: inputId,
+              fieldKey: inputId,
+              initialValue: inputData.value
+            }),
+            ...(["upload", "imageUpload", "videoUpload"].includes(input.type) ? {
+              valuePropName: "fileList",
+              getValueFromEvent: e => {
+                if (Array.isArray(e)) {
+                  return e;
                 }
-                return f;
-              });
-            }
-          } : {}), {}, {
+                return e && e.fileList && e.fileList.map(f => {
+                  if (f.response) {
+                    return f.response;
+                  }
+                  return f;
+                });
+              }
+            } : {}),
             style: input.showOnView === false ? {
               display: "none"
-            } : {}
-          }, ["switch"].includes(input.type) ? {
-            labelCol: {
-              span: 20
-            },
-            style: _objectSpread2(_objectSpread2({}, input.showOnView === false ? {
-              display: "none"
-            } : {}), {}, {
-              flexDirection: "row",
-              justifyContent: "space-between"
-            })
-          } : {}), {}, {
-            className: input.comment ? "flex-1 with-comment i-".concat(input.type) : "i-".concat(input.type, " flex-1"),
+            } : {},
+            ...(["switch"].includes(input.type) ? {
+              labelCol: {
+                span: 20
+              },
+              style: {
+                ...(input.showOnView === false ? {
+                  display: "none"
+                } : {}),
+                flexDirection: "row",
+                justifyContent: "space-between"
+              }
+            } : {}),
+            className: input.comment ? `flex-1 with-comment i-${input.type}` : `i-${input.type} flex-1`,
             "data-id": inputData.name,
             rules: rules,
             required: inputData.rules && inputData.rules instanceof Array && inputData.rules.filter(r => r.required).length > 0 ? true : false
@@ -41419,8 +41414,8 @@ const GetFormItem = _ref53 => {
               children: [/*#__PURE__*/jsxRuntime.jsx("div", {
                 className: "mr-1",
                 children: getInputLabel(input, values)
-              }), !!(input !== null && input !== void 0 && (_input$meta12 = input.meta) !== null && _input$meta12 !== void 0 && _input$meta12.tooltip) && /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-                title: input === null || input === void 0 || (_input$meta13 = input.meta) === null || _input$meta13 === void 0 ? void 0 : _input$meta13.tooltip,
+              }), !!input?.meta?.tooltip && /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+                title: input?.meta?.tooltip,
                 trigger: "hover",
                 children: /*#__PURE__*/jsxRuntime.jsx("div", {
                   className: "flex flex-column justify-content-center",
@@ -41438,7 +41433,7 @@ const GetFormItem = _ref53 => {
                     title: t("Not applicable"),
                     children: /*#__PURE__*/jsxRuntime.jsx("div", {
                       children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
-                        disabled: !(input !== null && input !== void 0 && (_input$meta14 = input.meta) !== null && _input$meta14 !== void 0 && _input$meta14.notApplicable),
+                        disabled: !input?.meta?.notApplicable,
                         className: formatClassname(["default p-0", inputMeta.notApplicable && "primary"]),
                         type: "link",
                         onClick: () => {
@@ -41473,7 +41468,7 @@ const GetFormItem = _ref53 => {
                     title: t("No available information"),
                     children: /*#__PURE__*/jsxRuntime.jsx("div", {
                       children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
-                        disabled: !(input !== null && input !== void 0 && (_input$meta15 = input.meta) !== null && _input$meta15 !== void 0 && _input$meta15.notAvailable),
+                        disabled: !input?.meta?.notAvailable,
                         className: formatClassname(["default p-0", inputMeta.notAvailable && "primary"]),
                         type: "link",
                         onClick: () => {
@@ -41507,14 +41502,14 @@ const GetFormItem = _ref53 => {
                   }), /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
                     title: t("Add comment"),
                     children: /*#__PURE__*/jsxRuntime.jsx("div", {
-                      children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, _objectSpread2(_objectSpread2({
+                      children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
                         type: "link",
-                        disabled: !(input !== null && input !== void 0 && (_input$meta16 = input.meta) !== null && _input$meta16 !== void 0 && _input$meta16.comment)
-                      }, !isShown ? {
-                        className: "default p-0"
-                      } : {
-                        className: "p-0 primary"
-                      }), {}, {
+                        disabled: !input?.meta?.comment,
+                        ...(!isShown ? {
+                          className: "default p-0"
+                        } : {
+                          className: "p-0 primary"
+                        }),
                         onClick: () => {
                           setIsShown(true);
                           changeInputMeta({
@@ -41530,18 +41525,18 @@ const GetFormItem = _ref53 => {
                           width: 16,
                           height: 16
                         })
-                      }))
+                      })
                     })
                   })]
-                }), (_input$meta17 = input.meta) !== null && _input$meta17 !== void 0 && _input$meta17.code ? /*#__PURE__*/jsxRuntime.jsx("div", {
+                }), input.meta?.code ? /*#__PURE__*/jsxRuntime.jsx("div", {
                   className: "code",
                   children: /*#__PURE__*/jsxRuntime.jsx("span", {
-                    children: (_input$meta18 = input.meta) === null || _input$meta18 === void 0 ? void 0 : _input$meta18.code
+                    children: input.meta?.code
                   })
                 }) : code ? /*#__PURE__*/jsxRuntime.jsx("div", {
                   className: "code",
                   children: /*#__PURE__*/jsxRuntime.jsx("span", {
-                    children: "".concat(code, ".").concat(i + 1)
+                    children: `${code}.${i + 1}`
                   })
                 }) : null]
               })
@@ -41561,7 +41556,7 @@ const GetFormItem = _ref53 => {
               getAppHeader,
               getApiBaseUrl
             }) : console.log(input)
-          }))
+          })
         }), alertError ? /*#__PURE__*/jsxRuntime.jsx(antd.Alert, {
           message: alertError.message,
           type: "error",
@@ -41590,10 +41585,10 @@ const GetFormItem = _ref53 => {
             className: "max-char-span",
             children: t("max-char", {
               chars: maxRule,
-              filled: (inputData === null || inputData === void 0 || (_inputData$value = inputData.value) === null || _inputData$value === void 0 ? void 0 : _inputData$value.length) || 0
+              filled: inputData?.value?.length || 0
             })
           })
-        }) : null, (_input$meta19 = input.meta) !== null && _input$meta19 !== void 0 && _input$meta19.comment && isShown ? /*#__PURE__*/jsxRuntime.jsxs("div", {
+        }) : null, input.meta?.comment && isShown ? /*#__PURE__*/jsxRuntime.jsxs("div", {
           className: "input-content dynamic-form-comment",
           children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
             className: "comment-textarea",
@@ -41619,7 +41614,7 @@ const GetFormItem = _ref53 => {
                 },
                 children: /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
                   type: "link",
-                  disabled: !((_input$meta20 = input.meta) !== null && _input$meta20 !== void 0 && _input$meta20.comment),
+                  disabled: !input.meta?.comment,
                   className: "p-0",
                   children: /*#__PURE__*/jsxRuntime.jsx(Icons.DeleteOutlined, {
                     width: 16,
@@ -41650,7 +41645,7 @@ const GetFormItem = _ref53 => {
             className: "max-char-span",
             children: t("max-char", {
               chars: MAX_COMMENTS_LENGTH,
-              filled: (inputData === null || inputData === void 0 || (_inputData$commentVal = inputData.commentValue) === null || _inputData$commentVal === void 0 ? void 0 : _inputData$commentVal.length) || 0
+              filled: inputData?.commentValue?.length || 0
             })
           })]
         }) : null]
@@ -41670,23 +41665,22 @@ function renderRepeatable(options, k, setValues, values, excludedKeys, i, formTi
   const formId = form.dataId || k;
   const allInputs = Object.keys(form.inputs).filter(i => {
     const input = form.inputs[i];
-    return !excludedKeys.includes(i) && !input.excludeFromEdit && showHideInput(input, values, undefined, undefined, setValues, "".concat(formId, ".").concat(i));
+    return !excludedKeys.includes(i) && !input.excludeFromEdit && showHideInput(input, values, undefined, undefined, setValues, `${formId}.${i}`);
   });
   return allInputs.length ? /*#__PURE__*/jsxRuntime.jsxs(React__default["default"].Fragment, {
     children: [getFormTitles(formTitles, formId, i), ['h2', 'h3', 'h4', 'h5', 'h6'].includes(form.type) ? getInputHeadLines(form.type, i, form, values) : /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
       children: [!form.repeatable ? /*#__PURE__*/jsxRuntime.jsx("h3", {
-        className: "".concat(form.titleClass ? form.titleClass : 'title-semibold-4', " mb0 ").concat(i ? 'mt-3' : ''),
+        className: `${form.titleClass ? form.titleClass : 'title-semibold-4'} mb0 ${i ? 'mt-3' : ''}`,
         children: getInputLabel(form, values)
       }) : !form.hideSectionLabel ? /*#__PURE__*/jsxRuntime.jsx("h3", {
-        className: "".concat(form.titleClass ? form.titleClass : 'title-semibold-4', " mb0 ").concat(i ? 'mt-3' : ''),
+        className: `${form.titleClass ? form.titleClass : 'title-semibold-4'} mb0 ${i ? 'mt-3' : ''}`,
         children: form.sectionLabel ? getSectionLabel(form.sectionLabel, values) : form.label ? getInputLabel(form, values) : camelCaseToTitle(k)
       }) : null, /*#__PURE__*/jsxRuntime.jsx(antd.Form.List, {
         name: formId,
-        children: (fields, _ref) => {
-          let {
-            add,
-            remove
-          } = _ref;
+        children: (fields, {
+          add,
+          remove
+        }) => {
           const formData = form.repeatable ? values[formId] || [] : values[formId] ? [values[formId]] : [];
           if (fields.length === 0) {
             const formInputs = form.inputs;
@@ -41737,7 +41731,7 @@ function renderRepeatable(options, k, setValues, values, excludedKeys, i, formTi
                     padding: '0px 5px',
                     color: '#2E90FA'
                   },
-                  children: "#".concat(field.name + 1)
+                  children: `#${field.name + 1}`
                 }), /*#__PURE__*/jsxRuntime.jsx("div", {
                   className: "remove-button-for-repeatable",
                   children: (formData.filter(k => Object.keys(k).length > 0).length >= 1 || fields.length > 1) && (typeof form.canDelete !== 'function' || form.canDelete(Array.isArray(values[formId]) ? values[formId][field.name] || {} : values[formId] || {})) ? /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
@@ -41759,8 +41753,8 @@ function renderRepeatable(options, k, setValues, values, excludedKeys, i, formTi
                   const inputId = input.dataId || inp;
                   const inputValues = Array.isArray(values[formId]) ? values[formId][field.name] || {} : values[formId] || {};
                   const value = inputValues[inputId];
-                  const commentValue = inputValues["".concat(inputId, "Comment")];
-                  const inputData = getData(formId, input, value, commentValue, "".concat(formId, "[").concat(field.name, "].").concat(inputId), "".concat(formId, ".").concat(inputId));
+                  const commentValue = inputValues[`${inputId}Comment`];
+                  const inputData = getData(formId, input, value, commentValue, `${formId}[${field.name}].${inputId}`, `${formId}.${inputId}`);
                   const subtitles = form.subtitles || null;
                   inputData.repeatIndex = field.name;
                   inputData.inputName = inputId;
@@ -41781,59 +41775,64 @@ function renderRepeatable(options, k, setValues, values, excludedKeys, i, formTi
                       message: requiredRule.message || ''
                     });
                   }
-                  return showHideInput(input, values, field.name, inputValues, setValues, "".concat(formId, "[").concat(field.name, "].").concat(inputId)) ? /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {
+                  return showHideInput(input, values, field.name, inputValues, setValues, `${formId}[${field.name}].${inputId}`) ? /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {
                     children: /*#__PURE__*/jsxRuntime.jsxs("div", {
-                      className: form.repeatable ? "inputs" : "",
+                      className: form.repeatable ? `inputs` : "",
                       children: [getSubtitles(subtitles, input.position, values, field.name, inputValues), ['h2', 'h3', 'h4', 'h5', 'h6'].includes(input.type) ? getInputHeadLines(input.type, i, input, values) : /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-                        children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, field), {}, {
-                          required: inputData.rules && inputData.rules instanceof Array && inputData.rules.filter(r => r.required).length > 0 ? true : false
-                        }, ['total100', 'group'].includes(input.type) ? {} : {
-                          name: [field.name, inputId],
-                          fieldKey: [field.fieldKey, inputId],
-                          initialValue: inputData.value
-                        }), ['upload'].includes(input.type) ? {
-                          valuePropName: "fileList",
-                          getValueFromEvent: e => {
-                            if (Array.isArray(e)) {
-                              return e;
-                            }
-                            return e && e.fileList && e.fileList.map(f => {
-                              if (f.response) {
-                                return f.response;
+                        children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+                          ...field,
+                          required: inputData.rules && inputData.rules instanceof Array && inputData.rules.filter(r => r.required).length > 0 ? true : false,
+                          ...(['total100', 'group'].includes(input.type) ? {} : {
+                            name: [field.name, inputId],
+                            fieldKey: [field.fieldKey, inputId],
+                            initialValue: inputData.value
+                          }),
+                          ...(['upload'].includes(input.type) ? {
+                            valuePropName: "fileList",
+                            getValueFromEvent: e => {
+                              if (Array.isArray(e)) {
+                                return e;
                               }
-                              return f;
-                            });
-                          }
-                        } : {}), {}, {
+                              return e && e.fileList && e.fileList.map(f => {
+                                if (f.response) {
+                                  return f.response;
+                                }
+                                return f;
+                              });
+                            }
+                          } : {}),
                           style: input.showOnView === false ? {
                             display: 'none'
-                          } : {}
-                        }, ['switch'].includes(input.type) ? {
-                          labelCol: {
-                            span: 20
-                          },
-                          style: _objectSpread2(_objectSpread2({}, input.showOnView === false ? {
-                            display: 'none'
-                          } : {}), {}, {
-                            flexDirection: 'row',
-                            justifyContent: 'space-between'
-                          })
-                        } : {}), {}, {
+                          } : {},
+                          ...(['switch'].includes(input.type) ? {
+                            labelCol: {
+                              span: 20
+                            },
+                            style: {
+                              ...(input.showOnView === false ? {
+                                display: 'none'
+                              } : {}),
+                              flexDirection: 'row',
+                              justifyContent: 'space-between'
+                            }
+                          } : {}),
                           label: getInputLabel(input, values),
                           rules: rules,
-                          className: input.comment ? "with-comment i-".concat(input.type) : "i-".concat(input.type),
+                          className: input.comment ? `with-comment i-${input.type}` : `i-${input.type}`,
                           extra: input.comment ? /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
                             disabled: inputData.props.disabled,
                             type: "link",
                             onClick: () => {
                               const inputValues = Array.isArray(values[formId]) ? values[formId][field.name] || {} : values[formId] || {};
-                              inputValues["".concat(inputData.inputName, "Comment")] = !inputData.commentValue ? '' : undefined;
+                              inputValues[`${inputData.inputName}Comment`] = !inputData.commentValue ? '' : undefined;
                               if (Array.isArray(values[formId])) {
                                 values[formId][field.name] = inputValues;
                               } else {
                                 values[formId] = inputValues;
                               }
-                              setValues(_objectSpread2({}, values));
+                              setValues({
+                                ...values
+                              });
                             },
                             children: t(!inputData.commentValue ? 'Add Comment' : 'Remove Comment')
                           }) : null,
@@ -41850,9 +41849,9 @@ function renderRepeatable(options, k, setValues, values, excludedKeys, i, formTi
                             getAppHeader,
                             getApiBaseUrl
                           }) : console.log(input)
-                        })), input.comment ? /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
-                          name: [field.name, "".concat(inputData.inputName, "Comment")],
-                          fieldKey: [field.fieldKey, "".concat(inputData.inputName, "Comment")],
+                        }), input.comment ? /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+                          name: [field.name, `${inputData.inputName}Comment`],
+                          fieldKey: [field.fieldKey, `${inputData.inputName}Comment`],
                           initialValue: inputData.commentValue,
                           hidden: !inputData.commentValue,
                           children: inputTypeComponent.comment(inputData, {
@@ -41866,10 +41865,10 @@ function renderRepeatable(options, k, setValues, values, excludedKeys, i, formTi
                         }) : null]
                       })]
                     }, ii)
-                  }, "".concat(i).concat(ii)) : null;
+                  }, `${i}${ii}`) : null;
                 })
               })]
-            }, "".concat(formId, "-").concat(field.name))), form.repeatable ? /*#__PURE__*/jsxRuntime.jsxs(antd.Button, {
+            }, `${formId}-${field.name}`)), form.repeatable ? /*#__PURE__*/jsxRuntime.jsxs(antd.Button, {
               type: "dashed",
               style: {
                 margin: '10px 0px 30px',
@@ -41898,7 +41897,7 @@ const getGrouContent = (form, values, i, formId, excludedKeys, getData, setValue
   const hasLabel = label && (typeof label === 'string' && (label || '').trim() !== '' || typeof label === 'object') ? true : false;
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [hasLabel ? /*#__PURE__*/jsxRuntime.jsx("h3", {
-      className: "".concat(form.titleClass ? form.titleClass : 'title-semibold-4', " ").concat(i ? 'mt-3 mb-1' : ''),
+      className: `${form.titleClass ? form.titleClass : 'title-semibold-4'} ${i ? 'mt-3 mb-1' : ''}`,
       children: label
     }) : null, /*#__PURE__*/jsxRuntime.jsx("div", {
       className: hasLabel ? "mb-4" : "",
@@ -41907,8 +41906,8 @@ const getGrouContent = (form, values, i, formId, excludedKeys, getData, setValue
         const inputId = input.dataId || inp;
         const inputValues = Array.isArray(values[formId]) ? values[formId] || {} : values[formId] || {};
         const value = inputValues[inputId];
-        const commentValue = inputValues["".concat(inputId, "Comment")];
-        const inputData = getData(formId, input, value, commentValue, "".concat(formId, ".").concat(inputId), "".concat(formId, ".").concat(inputId));
+        const commentValue = inputValues[`${inputId}Comment`];
+        const inputData = getData(formId, input, value, commentValue, `${formId}.${inputId}`, `${formId}.${inputId}`);
         const subtitles = form.subtitles || null;
         inputData.repeatIndex = undefined;
         inputData.inputName = inputId;
@@ -41929,58 +41928,62 @@ const getGrouContent = (form, values, i, formId, excludedKeys, getData, setValue
             message: requiredRule.message || ''
           });
         }
-        return showHideInput(input, values, undefined, inputValues, setValues, "".concat(formId, ".").concat(inputId)) ? /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {
+        return showHideInput(input, values, undefined, inputValues, setValues, `${formId}.${inputId}`) ? /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {
           children: /*#__PURE__*/jsxRuntime.jsxs("div", {
             children: [getSubtitles(subtitles, input.position, values, undefined, inputValues), ['h2', 'h3', 'h4', 'h5', 'h6'].includes(input.type) ? getInputHeadLines(input.type, i, input, values) : /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-              children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
-                required: inputData.rules && inputData.rules instanceof Array && inputData.rules.filter(r => r.required).length > 0 ? true : false
-              }, ['total100', 'group'].includes(input.type) ? {} : {
-                name: [formId, inputId],
-                fieldKey: [formId, inputId],
-                initialValue: inputData.value
-              }), ['upload'].includes(input.type) ? {
-                valuePropName: "fileList",
-                getValueFromEvent: e => {
-                  if (Array.isArray(e)) {
-                    return e;
-                  }
-                  return e && e.fileList && e.fileList.map(f => {
-                    if (f.response) {
-                      return f.response;
+              children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+                required: inputData.rules && inputData.rules instanceof Array && inputData.rules.filter(r => r.required).length > 0 ? true : false,
+                ...(['total100', 'group'].includes(input.type) ? {} : {
+                  name: [formId, inputId],
+                  fieldKey: [formId, inputId],
+                  initialValue: inputData.value
+                }),
+                ...(['upload'].includes(input.type) ? {
+                  valuePropName: "fileList",
+                  getValueFromEvent: e => {
+                    if (Array.isArray(e)) {
+                      return e;
                     }
-                    return f;
-                  });
-                }
-              } : {}), {}, {
+                    return e && e.fileList && e.fileList.map(f => {
+                      if (f.response) {
+                        return f.response;
+                      }
+                      return f;
+                    });
+                  }
+                } : {}),
                 style: input.showOnView === false ? {
                   display: 'none'
-                } : {}
-              }, ['switch'].includes(input.type) ? {
-                labelCol: {
-                  span: 20
-                },
-                style: _objectSpread2(_objectSpread2({}, input.showOnView === false ? {
-                  display: 'none'
-                } : {}), {}, {
-                  flexDirection: 'row',
-                  justifyContent: 'space-between'
-                })
-              } : {}), {}, {
+                } : {},
+                ...(['switch'].includes(input.type) ? {
+                  labelCol: {
+                    span: 20
+                  },
+                  style: {
+                    ...(input.showOnView === false ? {
+                      display: 'none'
+                    } : {}),
+                    flexDirection: 'row',
+                    justifyContent: 'space-between'
+                  }
+                } : {}),
                 label: getInputLabel(input, values),
                 rules: rules,
-                className: input.comment ? "with-comment i-".concat(input.type) : "i-".concat(input.type),
+                className: input.comment ? `with-comment i-${input.type}` : `i-${input.type}`,
                 extra: input.comment ? /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
                   disabled: inputData.props.disabled,
                   type: "link",
                   onClick: () => {
                     const inputValues = Array.isArray(values[formId]) ? values[formId] || {} : values[formId] || {};
-                    inputValues["".concat(inputData.inputName, "Comment")] = !inputData.commentValue ? '' : undefined;
+                    inputValues[`${inputData.inputName}Comment`] = !inputData.commentValue ? '' : undefined;
                     if (Array.isArray(values[formId])) {
                       values[formId] = inputValues;
                     } else {
                       values[formId] = inputValues;
                     }
-                    setValues(_objectSpread2({}, values));
+                    setValues({
+                      ...values
+                    });
                   },
                   children: t(!inputData.commentValue ? 'Add Comment' : 'Remove Comment')
                 }) : null,
@@ -41995,9 +41998,9 @@ const getGrouContent = (form, values, i, formId, excludedKeys, getData, setValue
                   getAppHeader,
                   getApiBaseUrl
                 }) : console.log(input)
-              })), input.comment ? /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
-                name: [formId, "".concat(inputData.inputName, "Comment")],
-                fieldKey: [formId, "".concat(inputData.inputName, "Comment")],
+              }), input.comment ? /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+                name: [formId, `${inputData.inputName}Comment`],
+                fieldKey: [formId, `${inputData.inputName}Comment`],
                 initialValue: inputData.commentValue,
                 hidden: !inputData.commentValue,
                 children: inputTypeComponent.comment(inputData, {
@@ -42011,7 +42014,7 @@ const getGrouContent = (form, values, i, formId, excludedKeys, getData, setValue
               }) : null]
             })]
           }, ii)
-        }, "".concat(i).concat(ii)) : null;
+        }, `${i}${ii}`) : null;
       })
     })]
   });
@@ -42050,7 +42053,10 @@ const useCombinedPrefilledValues = (combinedPrefilledValues, values, parentValue
       }
     });
     if (hasChanges) {
-      setValues(prevValues => _objectSpread2(_objectSpread2({}, prevValues), resolvedValues));
+      setValues(prevValues => ({
+        ...prevValues,
+        ...resolvedValues
+      }));
       MainForm.setFieldsValue(resolvedValues);
     }
   }, [values, parentValues, combinedPrefilledValues, setValues, MainForm]);