iglooform 2.5.49 → 2.5.51

package/es/checkbox/index.js

@@ -42,21 +42,18 @@ import emptyIcon from '../radio/style/empty.svg';
 import './style/index.less'; // add disabled attributes to checkbox options based on mutually exclusion config
 
 var addDisabledAttr = function addDisabledAttr(options, mutuallyExclusions, checkedValues) {
-  if (!mutuallyExclusions || !checkedValues) return options;
-  checkedValues = Array.isArray(checkedValues) ? checkedValues : [checkedValues];
+  if (!mutuallyExclusions || !Object.keys(mutuallyExclusions).length || !(checkedValues === null || checkedValues === void 0 ? void 0 : checkedValues.length)) return options;
   return options.map(function (_ref) {
-    var _checkedValues;
-
     var value = _ref.value,
         rest = _objectWithoutProperties(_ref, _excluded);
 
     return _objectSpread(_objectSpread({}, rest), {}, {
       value: value,
-      disabled: !!value && !!((_checkedValues = checkedValues) === null || _checkedValues === void 0 ? void 0 : _checkedValues.some(function (v) {
+      disabled: !!(value && (checkedValues === null || checkedValues === void 0 ? void 0 : checkedValues.some(function (v) {
         var _mutuallyExclusions$S, _mutuallyExclusions$v;
 
-        return ((_mutuallyExclusions$S = mutuallyExclusions[String(v)]) === null || _mutuallyExclusions$S === void 0 ? void 0 : _mutuallyExclusions$S.includes(String(value))) || ((_mutuallyExclusions$v = mutuallyExclusions[value]) === null || _mutuallyExclusions$v === void 0 ? void 0 : _mutuallyExclusions$v.includes(String(v)));
-      }))
+        return v !== value && (((_mutuallyExclusions$S = mutuallyExclusions[String(v)]) === null || _mutuallyExclusions$S === void 0 ? void 0 : _mutuallyExclusions$S.includes(String(value))) || ((_mutuallyExclusions$v = mutuallyExclusions[value]) === null || _mutuallyExclusions$v === void 0 ? void 0 : _mutuallyExclusions$v.includes(String(v))));
+      })))
     });
   });
 };

package/es/date-picker/index.d.ts

@@ -1,8 +1,11 @@
 import { DatePickerProps, RangePickerProps, MonthPickerProps, WeekPickerProps } from 'antd/es/date-picker';
 import { FC, IglooComponentProps } from '../types';
+import { Moment } from 'moment';
 import './style/index.less';
 export { default as IglooBuddhistDatePicker } from './buddhist';
-declare type Props = DatePickerProps & IglooComponentProps;
+declare type Props = Omit<DatePickerProps, 'value'> & IglooComponentProps & {
+    value?: Moment | null | 0;
+};
 declare const IglooDatePicker: FC<Props>;
 export default IglooDatePicker;
 export declare const IglooRangePicker: FC<RangePickerProps & IglooComponentProps>;

package/es/date-picker/index.js

@@ -62,7 +62,7 @@ var IglooDatePicker = function IglooDatePicker(_ref) {
       setFocus = _useState2[1];
 
   return _jsx(_DatePicker, _objectSpread(_objectSpread({}, omit(props, formMethods)), {}, {
-    value: moment(value),
+    value: value || value === 0 ? moment(value) : undefined,
     placeholder: placeholder || dateFormater,
     format: format || dateFormater,
     inputReadOnly: true,
@@ -89,7 +89,7 @@ IglooDatePicker.formItemPropsHandler = function (_ref2) {
       return moment(value).format(format || dateFormater);
     },
     valueFormater: function valueFormater(value) {
-      return +moment(value);
+      return value ? +moment(value) : value;
     },
     'element-allowClear': false
   };

package/es/form/element/index.js

@@ -91,7 +91,8 @@ var Element = function Element(_ref) {
         subscribedFields = config.subscribedFields,
         disabled = config.disabled,
         extraLabel = config.extraLabel,
-        requiredAsserts = config.requiredAsserts;
+        requiredAsserts = config.requiredAsserts,
+        shouldRenderCode = config.shouldRenderCode;
     var dependentField = dependencies || [];
 
     if (Array.isArray(subscribedFields)) {
@@ -123,7 +124,7 @@ var Element = function Element(_ref) {
       });
     }
 
-    if ((shouldRender || getOptions || typeof extraLabel === 'function') && !Array.isArray(subscribedFields)) {
+    if ((shouldRender || shouldRenderCode || getOptions || typeof extraLabel === 'function') && !Array.isArray(subscribedFields)) {
       dependentField.push('SUBSCRIBE_ALL');
     }
 

package/es/form/hsteps/index.js

@@ -32,7 +32,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useState, useContext, useEffect, useReducer, useRef } from 'react';
 import HStep from '../hstep';
-import { calcNamePath, getRuleValidation } from '../../utils/form-utils';
+import { calcNamePath, getRuleValidation, calcShouldRender } from '../../utils/form-utils';
 import FormContext from '../../form-context';
 import StepContext from '../../form-step-context';
 import './style/index.less';
@@ -105,26 +105,45 @@ var HSteps = function HSteps(_ref) {
   useEffect(function () {
     var subscribe = elements.some(function (_ref2) {
       var shouldRender = _ref2.shouldRender,
-          getButtonDisabledState = _ref2.getButtonDisabledState;
-      return Boolean(shouldRender) || Boolean(getButtonDisabledState);
+          getButtonDisabledState = _ref2.getButtonDisabledState,
+          shouldRenderCode = _ref2.shouldRenderCode;
+      return Boolean(shouldRender) || Boolean(getButtonDisabledState) || Boolean(shouldRenderCode);
     });
 
     if (subscribe) {
       Array.isArray(subscribedFields) ? registerDependencies(subscribedFields, dispatch) : registerDependencies('SUBSCRIBE_ALL', dispatch);
     }
+
+    var dependentField = [];
+    elements.forEach(function (_ref3) {
+      var asserts = _ref3.asserts;
+      if (!(asserts === null || asserts === void 0 ? void 0 : asserts.length)) return;
+      asserts.forEach(function (_ref4) {
+        var field = _ref4.field;
+        return dependentField.push(field);
+      });
+    });
+    dependentField.length && registerDependencies(dependentField, dispatch);
   }, []);
   useEffect(function () {
     if (currentStep === undefined || currentStep === current) return;
     setCurrent(currentStep);
   }, [currentStep]);
-  var renderElements = elements.filter(function (step) {
-    invariant(step.type === 'Step', 'Child of steps should be Step');
-    invariant(!step.validationRule || getRuleValidationApi, 'Please provide getRuleValidationApi in Form props');
-    return typeof step.shouldRender !== 'function' || step.shouldRender(form);
+  var renderElements = elements.filter(function (_ref5) {
+    var type = _ref5.type,
+        curName = _ref5.name,
+        validationRule = _ref5.validationRule,
+        dependencies = _ref5.dependencies,
+        asserts = _ref5.asserts,
+        shouldRender = _ref5.shouldRender,
+        shouldRenderCode = _ref5.shouldRenderCode;
+    invariant(type === 'Step', 'Child of steps should be Step');
+    invariant(!validationRule || getRuleValidationApi, 'Please provide getRuleValidationApi in Form props');
+    return calcShouldRender(calcNamePath(calcNamePath(parentName, name), curName), dependencies, asserts, shouldRender, shouldRenderCode, form);
   });
 
   var handleNext = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var _allFields$filter;
 
       var allFields, allValues, _renderElements$curre, currentName, handleNext, validationRule, namePath, fields, _iterator, _step, collapseSection, res, errors;
@@ -137,11 +156,11 @@ var HSteps = function HSteps(_ref) {
               allValues = form === null || form === void 0 ? void 0 : form.getFieldsValue(true);
               _renderElements$curre = renderElements[current], currentName = _renderElements$curre.name, handleNext = _renderElements$curre.handleNext, validationRule = _renderElements$curre.validationRule;
               namePath = calcNamePath(name, currentName);
-              fields = allFields === null || allFields === void 0 ? void 0 : (_allFields$filter = allFields.filter(function (_ref4) {
-                var name = _ref4.name;
+              fields = allFields === null || allFields === void 0 ? void 0 : (_allFields$filter = allFields.filter(function (_ref7) {
+                var name = _ref7.name;
                 return name.join().startsWith(namePath === null || namePath === void 0 ? void 0 : namePath.join());
-              })) === null || _allFields$filter === void 0 ? void 0 : _allFields$filter.map(function (_ref5) {
-                var name = _ref5.name;
+              })) === null || _allFields$filter === void 0 ? void 0 : _allFields$filter.map(function (_ref8) {
+                var name = _ref8.name;
                 return name;
               });
               _context.prev = 5;
@@ -245,7 +264,7 @@ var HSteps = function HSteps(_ref) {
     }));
 
     return function handleNext() {
-      return _ref3.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 
@@ -392,14 +411,14 @@ var HSteps = function HSteps(_ref) {
               margin: 0
             },
             children: _jsx(Confirmation, {})
-          }), confirmations && Object.entries(confirmations).map(function (_ref6) {
-            var _ref7 = _slicedToArray(_ref6, 2),
-                key = _ref7[0],
-                _ref7$ = _ref7[1],
-                required = _ref7$.required,
-                _ref7$$confirmation = _ref7$.confirmation,
-                confirmation = _ref7$$confirmation === void 0 ? {} : _ref7$$confirmation,
-                requiredMessage = _ref7$.requiredMessage;
+          }), confirmations && Object.entries(confirmations).map(function (_ref9) {
+            var _ref10 = _slicedToArray(_ref9, 2),
+                key = _ref10[0],
+                _ref10$ = _ref10[1],
+                required = _ref10$.required,
+                _ref10$$confirmation = _ref10$.confirmation,
+                confirmation = _ref10$$confirmation === void 0 ? {} : _ref10$$confirmation,
+                requiredMessage = _ref10$.requiredMessage;
 
             return _jsx(_Form.Item, {
               name: calcNamePath(parentName, key),

package/es/form/steps/index.js

@@ -19,7 +19,7 @@ import { useState, useContext, useEffect, useReducer, useRef } from 'react';
 import invariant from 'invariant';
 import classnames from 'classnames';
 import Step from '../step';
-import { calcNamePath, getRuleValidation } from '../../utils/form-utils';
+import { calcNamePath, getRuleValidation, calcShouldRender } from '../../utils/form-utils';
 import FormContext from '../../form-context';
 import StepContext from '../../form-step-context';
 import { LocaleContext } from '../../locale';
@@ -74,24 +74,41 @@ var Steps = function Steps(_ref) {
   useEffect(function () {
     var subscribe = elements.some(function (_ref2) {
       var shouldRender = _ref2.shouldRender,
-          getButtonDisabledState = _ref2.getButtonDisabledState;
-      return Boolean(shouldRender) || Boolean(getButtonDisabledState);
+          getButtonDisabledState = _ref2.getButtonDisabledState,
+          shouldRenderCode = _ref2.shouldRenderCode;
+      return Boolean(shouldRender) || Boolean(getButtonDisabledState) || Boolean(shouldRenderCode);
     });
 
     if (subscribe) {
       Array.isArray(subscribedFields) ? registerDependencies(subscribedFields, dispatch) : registerDependencies('SUBSCRIBE_ALL', dispatch);
     }
+
+    var dependentField = [];
+    elements.forEach(function (_ref3) {
+      var asserts = _ref3.asserts;
+      if (!(asserts === null || asserts === void 0 ? void 0 : asserts.length)) return;
+      asserts.forEach(function (_ref4) {
+        var field = _ref4.field;
+        return dependentField.push(field);
+      });
+    });
+    dependentField.length && registerDependencies(dependentField, dispatch);
   }, []);
   useEffect(function () {
     if (currentStep === undefined || currentStep === current) return;
     setCurrent(currentStep);
   }, [currentStep]);
-  var renderElements = elements.filter(function (step) {
-    return typeof step.shouldRender !== 'function' || step.shouldRender(form);
+  var renderElements = elements.filter(function (_ref5) {
+    var curName = _ref5.name,
+        dependencies = _ref5.dependencies,
+        asserts = _ref5.asserts,
+        shouldRender = _ref5.shouldRender,
+        shouldRenderCode = _ref5.shouldRenderCode;
+    return calcShouldRender(calcNamePath(calcNamePath(parentName, name), curName), dependencies, asserts, shouldRender, shouldRenderCode, form);
   });
 
   var handleNext = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var _allFields$filter;
 
       var allFields, allValues, _renderElements$curre, currentName, handleNext, validationRule, namePath, fields, res, errors;
@@ -104,11 +121,11 @@ var Steps = function Steps(_ref) {
               allValues = form === null || form === void 0 ? void 0 : form.getFieldsValue(true);
               _renderElements$curre = renderElements[current], currentName = _renderElements$curre.name, handleNext = _renderElements$curre.handleNext, validationRule = _renderElements$curre.validationRule;
               namePath = calcNamePath(name, currentName);
-              fields = allFields === null || allFields === void 0 ? void 0 : (_allFields$filter = allFields.filter(function (_ref4) {
-                var name = _ref4.name;
+              fields = allFields === null || allFields === void 0 ? void 0 : (_allFields$filter = allFields.filter(function (_ref7) {
+                var name = _ref7.name;
                 return name.join().startsWith(namePath === null || namePath === void 0 ? void 0 : namePath.join());
-              })) === null || _allFields$filter === void 0 ? void 0 : _allFields$filter.map(function (_ref5) {
-                var name = _ref5.name;
+              })) === null || _allFields$filter === void 0 ? void 0 : _allFields$filter.map(function (_ref8) {
+                var name = _ref8.name;
                 return name;
               });
               _context.prev = 5;
@@ -199,7 +216,7 @@ var Steps = function Steps(_ref) {
     }));
 
     return function handleNext() {
-      return _ref3.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 

package/es/free-form/step/index.d.ts

@@ -16,7 +16,6 @@ export interface StepProps extends FormItemConfig {
     editButtonLabel?: string;
     disableEditButton?: boolean;
     buttonText?: string;
-    validationRule?: string;
 }
 declare const Step: FC<StepProps>;
 export default Step;

package/es/free-form/step/index.js

@@ -33,7 +33,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useContext, useState, useRef, useEffect, useMemo, useReducer, cloneElement, isValidElement } from 'react';
 import { LocaleContext } from '../../locale';
 import Button from '../../button';
-import { calcNamePath, getRuleValidation } from '../../utils/form-utils';
+import { calcNamePath, getRuleValidation, calcShouldRender } from '../../utils/form-utils';
 import FormContext from '../../form-context';
 import invariant from 'invariant';
 import './style/index.less';
@@ -63,7 +63,10 @@ var Step = function Step(_ref) {
       shouldRender = _ref.shouldRender,
       subscribedFields = _ref.subscribedFields,
       buttonText = _ref.buttonText,
-      validationRule = _ref.validationRule;
+      validationRule = _ref.validationRule,
+      asserts = _ref.asserts,
+      dependencies = _ref.dependencies,
+      shouldRenderCode = _ref.shouldRenderCode;
 
   var _useContext = useContext(LocaleContext),
       formatMessage = _useContext.formatMessage,
@@ -98,6 +101,14 @@ var Step = function Step(_ref) {
     if (shouldRender || getButtonDisabledState) {
       registerDependencies(Array.isArray(subscribedFields) ? subscribedFields : 'SUBSCRIBE_ALL', dispatch);
     }
+
+    if (asserts === null || asserts === void 0 ? void 0 : asserts.length) {
+      var dependentField = asserts.map(function (_ref2) {
+        var field = _ref2.field;
+        return field;
+      });
+      registerDependencies(dependentField, dispatch);
+    }
   }, []);
   var pName = useMemo(function () {
     return calcNamePath(parentName, name);
@@ -150,7 +161,7 @@ var Step = function Step(_ref) {
   };
 
   var handleNext = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var _allFields$filter;
 
       var allFields, allValues, fields, res, errors;
@@ -160,11 +171,11 @@ var Step = function Step(_ref) {
             case 0:
               allFields = (form === null || form === void 0 ? void 0 : form.getFieldsError()) || [];
               allValues = form === null || form === void 0 ? void 0 : form.getFieldsValue(true);
-              fields = allFields === null || allFields === void 0 ? void 0 : (_allFields$filter = allFields.filter(function (_ref3) {
-                var name = _ref3.name;
-                return name.join().startsWith(pName === null || pName === void 0 ? void 0 : pName.join());
-              })) === null || _allFields$filter === void 0 ? void 0 : _allFields$filter.map(function (_ref4) {
+              fields = allFields === null || allFields === void 0 ? void 0 : (_allFields$filter = allFields.filter(function (_ref4) {
                 var name = _ref4.name;
+                return name.join().startsWith(pName === null || pName === void 0 ? void 0 : pName.join());
+              })) === null || _allFields$filter === void 0 ? void 0 : _allFields$filter.map(function (_ref5) {
+                var name = _ref5.name;
                 return name;
               });
               _context.prev = 3;
@@ -249,11 +260,11 @@ var Step = function Step(_ref) {
     }));
 
     return function handleNext() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
 
-  if (typeof shouldRender === 'function' && !shouldRender(form)) {
+  if (!calcShouldRender(pName, dependencies, asserts, shouldRender, shouldRenderCode, form)) {
     return null;
   }
 

package/es/types.d.ts

@@ -123,6 +123,7 @@ export interface FormItemExtraConfig extends FormItemProps {
     maxLength?: number;
     idType?: 'KTP' | 'NIK';
     validationRule?: string;
+    shouldRenderCode?: string;
     [key: string]: any;
 }
 export interface FormItemConfig extends FormItemExtraConfig {

package/es/utils/form-utils.d.ts

@@ -50,7 +50,7 @@ export declare const calcFormItemProps: (config: FormItemConfig, extraProps: For
     elementProps: {
         [key: string]: any;
     };
-    display: boolean;
+    display: any;
     previewFormater: ((value: any, form?: FormInstance<any> | undefined) => any) | undefined;
 };
 export declare const calcDisabled: (disabled?: boolean | FormItemAssert | FormItemAssert[] | undefined, form?: FormInstance<any> | undefined) => boolean;
@@ -72,5 +72,5 @@ export declare const calcSelectValue: (selectValue?: FormItemSelectValue[] | und
     value: any;
     disabled: boolean | undefined;
 };
-export declare const calcShouldRender: (dependencies?: NamePath[], asserts?: FormItemAssert[], shouldRender?: ((form?: FormInstance<any> | undefined) => boolean) | undefined, form?: FormInstance<any> | undefined) => boolean;
-export declare const getRuleValidation: (url: string, rule: string | string[], values?: any, lang?: string | undefined) => Promise<any>;
+export declare const calcShouldRender: (name: NamePath, dependencies?: NamePath[], asserts?: FormItemAssert[], shouldRender?: ((form?: FormInstance<any> | undefined) => boolean) | undefined, shouldRenderCode?: string | undefined, form?: FormInstance<any> | undefined) => any;
+export declare const getRuleValidation: (url: string, rule: string | string[], values?: any, lang?: string) => Promise<any>;

package/es/utils/form-utils.js

@@ -1,4 +1,4 @@
-var _excluded = ["type", "name", "required", "requiredAsserts", "showOptional", "rules", "initialValue", "normalize", "mergeRules", "getValueFromEvent", "getValueProps", "extra", "help", "label", "previewLabel", "extraLabel", "copyValue", "selectValue", "span", "halfRow", "fullRow", "valuePropName", "dependencies", "asserts", "messageVariables", "requiredMessage", "previewFormater", "disabled", "ignore", "shouldRender", "valueFormater", "antdDependencies", "dateLimitationType", "absoluteRangeEnd", "absoluteRangeStart", "relativeRangeStart", "relativeRangeEnd", "validationCode"],
+var _excluded = ["type", "name", "required", "requiredAsserts", "showOptional", "rules", "initialValue", "normalize", "mergeRules", "getValueFromEvent", "getValueProps", "extra", "help", "label", "previewLabel", "extraLabel", "copyValue", "selectValue", "span", "halfRow", "fullRow", "valuePropName", "dependencies", "asserts", "messageVariables", "requiredMessage", "previewFormater", "disabled", "ignore", "shouldRender", "valueFormater", "antdDependencies", "dateLimitationType", "absoluteRangeEnd", "absoluteRangeStart", "relativeRangeStart", "relativeRangeEnd", "validationCode", "shouldRenderCode"],
     _excluded2 = ["initialValue", "normalize", "rules", "extra", "help", "getValueFromEvent", "span", "valuePropName", "fullRow", "halfRow", "messageVariables", "requiredMessage", "previewFormater", "valueFormater", "required", "requiredMark", "className"];
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -207,6 +207,7 @@ export var calcFormItemProps = function calcFormItemProps(config, extraProps, fo
       relativeRangeEnd = config.relativeRangeEnd,
       _config$validationCod = config.validationCode,
       validationCode = _config$validationCod === void 0 ? [] : _config$validationCod,
+      shouldRenderCode = config.shouldRenderCode,
       rest = _objectWithoutProperties(config, _excluded);
 
   invariant(nameProp !== undefined || type === 'Divider' || type === 'Section' || type === 'Typography' || !type, "name property is required for form item config (type: ".concat(type, ")"));
@@ -428,7 +429,7 @@ export var calcFormItemProps = function calcFormItemProps(config, extraProps, fo
       dependencies: antdDependencies
     },
     elementProps: elementProps,
-    display: !ignore && calcShouldRender(dependencies, asserts, shouldRender, form),
+    display: !ignore && calcShouldRender(name, dependencies, asserts, shouldRender, shouldRenderCode, form),
     previewFormater: previewFormater || extraPreviewFormater
   };
 };
@@ -514,11 +515,12 @@ export var calcSelectValue = function calcSelectValue(selectValue, form) {
     selected: false
   };
 };
-export var calcShouldRender = function calcShouldRender() {
-  var dependencies = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  var asserts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  var shouldRender = arguments.length > 2 ? arguments[2] : undefined;
-  var form = arguments.length > 3 ? arguments[3] : undefined;
+export var calcShouldRender = function calcShouldRender(name) {
+  var dependencies = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var asserts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  var shouldRender = arguments.length > 3 ? arguments[3] : undefined;
+  var shouldRenderCode = arguments.length > 4 ? arguments[4] : undefined;
+  var form = arguments.length > 5 ? arguments[5] : undefined;
   if (!form) return true;
 
   var _iterator3 = _createForOfIteratorHelper(dependencies),
@@ -538,6 +540,26 @@ export var calcShouldRender = function calcShouldRender() {
     _iterator3.f();
   }
 
+  if (typeof shouldRender === 'function') {
+    return shouldRender(form);
+  }
+
+  if (shouldRenderCode) {
+    var fn = eval(shouldRenderCode);
+
+    if (typeof fn === 'function') {
+      try {
+        var value = form.getFieldValue(name);
+        var values = form.getFieldsValue(true);
+        return fn(value, values, {
+          moment: moment
+        });
+      } catch (_unused2) {
+        return false;
+      }
+    }
+  }
+
   var _iterator4 = _createForOfIteratorHelper(asserts),
       _step4;
 
@@ -553,23 +575,23 @@ export var calcShouldRender = function calcShouldRender() {
     _iterator4.f();
   }
 
-  if (typeof shouldRender === 'function' && !shouldRender(form)) {
-    return false;
-  }
-
   return true;
 };
 export var getRuleValidation = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(url, rule, values, lang) {
-    var _lang, _lang$split;
-
-    var res, json, _ref4, conclusion, details;
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(url, rule, values) {
+    var lang,
+        res,
+        json,
+        _ref4,
+        conclusion,
+        details,
+        _args = arguments;
 
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            lang = ((_lang = lang) === null || _lang === void 0 ? void 0 : (_lang$split = _lang.split('-')) === null || _lang$split === void 0 ? void 0 : _lang$split[0]) || 'en';
+            lang = _args.length > 3 && _args[3] !== undefined ? _args[3] : 'en-US';
             _context.next = 3;
             return fetch("".concat(url, "?lang=").concat(lang), {
               method: 'post',
@@ -624,7 +646,7 @@ export var getRuleValidation = /*#__PURE__*/function () {
     }, _callee);
   }));
 
-  return function getRuleValidation(_x, _x2, _x3, _x4) {
+  return function getRuleValidation(_x, _x2, _x3) {
     return _ref3.apply(this, arguments);
   };
 }();

package/lib/checkbox/index.js

@@ -67,21 +67,18 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 // add disabled attributes to checkbox options based on mutually exclusion config
 var addDisabledAttr = function addDisabledAttr(options, mutuallyExclusions, checkedValues) {
-  if (!mutuallyExclusions || !checkedValues) return options;
-  checkedValues = Array.isArray(checkedValues) ? checkedValues : [checkedValues];
+  if (!mutuallyExclusions || !Object.keys(mutuallyExclusions).length || !(checkedValues === null || checkedValues === void 0 ? void 0 : checkedValues.length)) return options;
   return options.map(function (_ref) {
-    var _checkedValues;
-
     var value = _ref.value,
         rest = _objectWithoutProperties(_ref, _excluded);
 
     return _objectSpread(_objectSpread({}, rest), {}, {
       value: value,
-      disabled: !!value && !!((_checkedValues = checkedValues) === null || _checkedValues === void 0 ? void 0 : _checkedValues.some(function (v) {
+      disabled: !!(value && (checkedValues === null || checkedValues === void 0 ? void 0 : checkedValues.some(function (v) {
         var _mutuallyExclusions$S, _mutuallyExclusions$v;
 
-        return ((_mutuallyExclusions$S = mutuallyExclusions[String(v)]) === null || _mutuallyExclusions$S === void 0 ? void 0 : _mutuallyExclusions$S.includes(String(value))) || ((_mutuallyExclusions$v = mutuallyExclusions[value]) === null || _mutuallyExclusions$v === void 0 ? void 0 : _mutuallyExclusions$v.includes(String(v)));
-      }))
+        return v !== value && (((_mutuallyExclusions$S = mutuallyExclusions[String(v)]) === null || _mutuallyExclusions$S === void 0 ? void 0 : _mutuallyExclusions$S.includes(String(value))) || ((_mutuallyExclusions$v = mutuallyExclusions[value]) === null || _mutuallyExclusions$v === void 0 ? void 0 : _mutuallyExclusions$v.includes(String(v))));
+      })))
     });
   });
 };

package/lib/date-picker/index.d.ts

@@ -1,8 +1,11 @@
 import { DatePickerProps, RangePickerProps, MonthPickerProps, WeekPickerProps } from 'antd/es/date-picker';
 import { FC, IglooComponentProps } from '../types';
+import { Moment } from 'moment';
 import './style/index.less';
 export { default as IglooBuddhistDatePicker } from './buddhist';
-declare type Props = DatePickerProps & IglooComponentProps;
+declare type Props = Omit<DatePickerProps, 'value'> & IglooComponentProps & {
+    value?: Moment | null | 0;
+};
 declare const IglooDatePicker: FC<Props>;
 export default IglooDatePicker;
 export declare const IglooRangePicker: FC<RangePickerProps & IglooComponentProps>;

package/lib/date-picker/index.js

@@ -89,7 +89,7 @@ var IglooDatePicker = function IglooDatePicker(_ref) {
       setFocus = _useState2[1];
 
   return (0, _jsxRuntime.jsx)(_datePicker.default, _objectSpread(_objectSpread({}, (0, _omit.default)(props, _formMethods.default)), {}, {
-    value: (0, _moment.default)(value),
+    value: value || value === 0 ? (0, _moment.default)(value) : undefined,
     placeholder: placeholder || dateFormater,
     format: format || dateFormater,
     inputReadOnly: true,
@@ -116,7 +116,7 @@ IglooDatePicker.formItemPropsHandler = function (_ref2) {
       return (0, _moment.default)(value).format(format || dateFormater);
     },
     valueFormater: function valueFormater(value) {
-      return +(0, _moment.default)(value);
+      return value ? +(0, _moment.default)(value) : value;
     },
     'element-allowClear': false
   };

package/lib/form/element/index.js

@@ -121,7 +121,8 @@ var Element = function Element(_ref) {
         subscribedFields = config.subscribedFields,
         disabled = config.disabled,
         extraLabel = config.extraLabel,
-        requiredAsserts = config.requiredAsserts;
+        requiredAsserts = config.requiredAsserts,
+        shouldRenderCode = config.shouldRenderCode;
     var dependentField = dependencies || [];
 
     if (Array.isArray(subscribedFields)) {
@@ -153,7 +154,7 @@ var Element = function Element(_ref) {
       });
     }
 
-    if ((shouldRender || getOptions || typeof extraLabel === 'function') && !Array.isArray(subscribedFields)) {
+    if ((shouldRender || shouldRenderCode || getOptions || typeof extraLabel === 'function') && !Array.isArray(subscribedFields)) {
       dependentField.push('SUBSCRIBE_ALL');
     }
 

package/lib/form/hsteps/index.js

@@ -134,26 +134,45 @@ var HSteps = function HSteps(_ref) {
   (0, _react.useEffect)(function () {
     var subscribe = elements.some(function (_ref2) {
       var shouldRender = _ref2.shouldRender,
-          getButtonDisabledState = _ref2.getButtonDisabledState;
-      return Boolean(shouldRender) || Boolean(getButtonDisabledState);
+          getButtonDisabledState = _ref2.getButtonDisabledState,
+          shouldRenderCode = _ref2.shouldRenderCode;
+      return Boolean(shouldRender) || Boolean(getButtonDisabledState) || Boolean(shouldRenderCode);
     });
 
     if (subscribe) {
       Array.isArray(subscribedFields) ? registerDependencies(subscribedFields, dispatch) : registerDependencies('SUBSCRIBE_ALL', dispatch);
     }
+
+    var dependentField = [];
+    elements.forEach(function (_ref3) {
+      var asserts = _ref3.asserts;
+      if (!(asserts === null || asserts === void 0 ? void 0 : asserts.length)) return;
+      asserts.forEach(function (_ref4) {
+        var field = _ref4.field;
+        return dependentField.push(field);
+      });
+    });
+    dependentField.length && registerDependencies(dependentField, dispatch);
   }, []);
   (0, _react.useEffect)(function () {
     if (currentStep === undefined || currentStep === current) return;
     setCurrent(currentStep);
   }, [currentStep]);
-  var renderElements = elements.filter(function (step) {
-    (0, _invariant.default)(step.type === 'Step', 'Child of steps should be Step');
-    (0, _invariant.default)(!step.validationRule || getRuleValidationApi, 'Please provide getRuleValidationApi in Form props');
-    return typeof step.shouldRender !== 'function' || step.shouldRender(form);
+  var renderElements = elements.filter(function (_ref5) {
+    var type = _ref5.type,
+        curName = _ref5.name,
+        validationRule = _ref5.validationRule,
+        dependencies = _ref5.dependencies,
+        asserts = _ref5.asserts,
+        shouldRender = _ref5.shouldRender,
+        shouldRenderCode = _ref5.shouldRenderCode;
+    (0, _invariant.default)(type === 'Step', 'Child of steps should be Step');
+    (0, _invariant.default)(!validationRule || getRuleValidationApi, 'Please provide getRuleValidationApi in Form props');
+    return (0, _formUtils.calcShouldRender)((0, _formUtils.calcNamePath)((0, _formUtils.calcNamePath)(parentName, name), curName), dependencies, asserts, shouldRender, shouldRenderCode, form);
   });
 
   var handleNext = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var _allFields$filter;
 
       var allFields, allValues, _renderElements$curre, currentName, handleNext, validationRule, namePath, fields, _iterator, _step, collapseSection, res, errors;
@@ -166,11 +185,11 @@ var HSteps = function HSteps(_ref) {
               allValues = form === null || form === void 0 ? void 0 : form.getFieldsValue(true);
               _renderElements$curre = renderElements[current], currentName = _renderElements$curre.name, handleNext = _renderElements$curre.handleNext, validationRule = _renderElements$curre.validationRule;
               namePath = (0, _formUtils.calcNamePath)(name, currentName);
-              fields = allFields === null || allFields === void 0 ? void 0 : (_allFields$filter = allFields.filter(function (_ref4) {
-                var name = _ref4.name;
+              fields = allFields === null || allFields === void 0 ? void 0 : (_allFields$filter = allFields.filter(function (_ref7) {
+                var name = _ref7.name;
                 return name.join().startsWith(namePath === null || namePath === void 0 ? void 0 : namePath.join());
-              })) === null || _allFields$filter === void 0 ? void 0 : _allFields$filter.map(function (_ref5) {
-                var name = _ref5.name;
+              })) === null || _allFields$filter === void 0 ? void 0 : _allFields$filter.map(function (_ref8) {
+                var name = _ref8.name;
                 return name;
               });
               _context.prev = 5;
@@ -274,7 +293,7 @@ var HSteps = function HSteps(_ref) {
     }));
 
     return function handleNext() {
-      return _ref3.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 
@@ -421,14 +440,14 @@ var HSteps = function HSteps(_ref) {
               margin: 0
             },
             children: (0, _jsxRuntime.jsx)(_confirmation.default, {})
-          }), confirmations && Object.entries(confirmations).map(function (_ref6) {
-            var _ref7 = _slicedToArray(_ref6, 2),
-                key = _ref7[0],
-                _ref7$ = _ref7[1],
-                required = _ref7$.required,
-                _ref7$$confirmation = _ref7$.confirmation,
-                confirmation = _ref7$$confirmation === void 0 ? {} : _ref7$$confirmation,
-                requiredMessage = _ref7$.requiredMessage;
+          }), confirmations && Object.entries(confirmations).map(function (_ref9) {
+            var _ref10 = _slicedToArray(_ref9, 2),
+                key = _ref10[0],
+                _ref10$ = _ref10[1],
+                required = _ref10$.required,
+                _ref10$$confirmation = _ref10$.confirmation,
+                confirmation = _ref10$$confirmation === void 0 ? {} : _ref10$$confirmation,
+                requiredMessage = _ref10$.requiredMessage;
 
             return (0, _jsxRuntime.jsx)(_form.default.Item, {
               name: (0, _formUtils.calcNamePath)(parentName, key),

package/lib/form/steps/index.js

@@ -92,24 +92,41 @@ var Steps = function Steps(_ref) {
   (0, _react.useEffect)(function () {
     var subscribe = elements.some(function (_ref2) {
       var shouldRender = _ref2.shouldRender,
-          getButtonDisabledState = _ref2.getButtonDisabledState;
-      return Boolean(shouldRender) || Boolean(getButtonDisabledState);
+          getButtonDisabledState = _ref2.getButtonDisabledState,
+          shouldRenderCode = _ref2.shouldRenderCode;
+      return Boolean(shouldRender) || Boolean(getButtonDisabledState) || Boolean(shouldRenderCode);
     });
 
     if (subscribe) {
       Array.isArray(subscribedFields) ? registerDependencies(subscribedFields, dispatch) : registerDependencies('SUBSCRIBE_ALL', dispatch);
     }
+
+    var dependentField = [];
+    elements.forEach(function (_ref3) {
+      var asserts = _ref3.asserts;
+      if (!(asserts === null || asserts === void 0 ? void 0 : asserts.length)) return;
+      asserts.forEach(function (_ref4) {
+        var field = _ref4.field;
+        return dependentField.push(field);
+      });
+    });
+    dependentField.length && registerDependencies(dependentField, dispatch);
   }, []);
   (0, _react.useEffect)(function () {
     if (currentStep === undefined || currentStep === current) return;
     setCurrent(currentStep);
   }, [currentStep]);
-  var renderElements = elements.filter(function (step) {
-    return typeof step.shouldRender !== 'function' || step.shouldRender(form);
+  var renderElements = elements.filter(function (_ref5) {
+    var curName = _ref5.name,
+        dependencies = _ref5.dependencies,
+        asserts = _ref5.asserts,
+        shouldRender = _ref5.shouldRender,
+        shouldRenderCode = _ref5.shouldRenderCode;
+    return (0, _formUtils.calcShouldRender)((0, _formUtils.calcNamePath)((0, _formUtils.calcNamePath)(parentName, name), curName), dependencies, asserts, shouldRender, shouldRenderCode, form);
   });
 
   var handleNext = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var _allFields$filter;
 
       var allFields, allValues, _renderElements$curre, currentName, handleNext, validationRule, namePath, fields, res, errors;
@@ -122,11 +139,11 @@ var Steps = function Steps(_ref) {
               allValues = form === null || form === void 0 ? void 0 : form.getFieldsValue(true);
               _renderElements$curre = renderElements[current], currentName = _renderElements$curre.name, handleNext = _renderElements$curre.handleNext, validationRule = _renderElements$curre.validationRule;
               namePath = (0, _formUtils.calcNamePath)(name, currentName);
-              fields = allFields === null || allFields === void 0 ? void 0 : (_allFields$filter = allFields.filter(function (_ref4) {
-                var name = _ref4.name;
+              fields = allFields === null || allFields === void 0 ? void 0 : (_allFields$filter = allFields.filter(function (_ref7) {
+                var name = _ref7.name;
                 return name.join().startsWith(namePath === null || namePath === void 0 ? void 0 : namePath.join());
-              })) === null || _allFields$filter === void 0 ? void 0 : _allFields$filter.map(function (_ref5) {
-                var name = _ref5.name;
+              })) === null || _allFields$filter === void 0 ? void 0 : _allFields$filter.map(function (_ref8) {
+                var name = _ref8.name;
                 return name;
               });
               _context.prev = 5;
@@ -217,7 +234,7 @@ var Steps = function Steps(_ref) {
     }));
 
     return function handleNext() {
-      return _ref3.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 

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

@@ -16,7 +16,6 @@ export interface StepProps extends FormItemConfig {
     editButtonLabel?: string;
     disableEditButton?: boolean;
     buttonText?: string;
-    validationRule?: string;
 }
 declare const Step: FC<StepProps>;
 export default Step;

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

@@ -87,7 +87,10 @@ var Step = function Step(_ref) {
       shouldRender = _ref.shouldRender,
       subscribedFields = _ref.subscribedFields,
       buttonText = _ref.buttonText,
-      validationRule = _ref.validationRule;
+      validationRule = _ref.validationRule,
+      asserts = _ref.asserts,
+      dependencies = _ref.dependencies,
+      shouldRenderCode = _ref.shouldRenderCode;
 
   var _useContext = (0, _react.useContext)(_locale.LocaleContext),
       formatMessage = _useContext.formatMessage,
@@ -122,6 +125,14 @@ var Step = function Step(_ref) {
     if (shouldRender || getButtonDisabledState) {
       registerDependencies(Array.isArray(subscribedFields) ? subscribedFields : 'SUBSCRIBE_ALL', dispatch);
     }
+
+    if (asserts === null || asserts === void 0 ? void 0 : asserts.length) {
+      var dependentField = asserts.map(function (_ref2) {
+        var field = _ref2.field;
+        return field;
+      });
+      registerDependencies(dependentField, dispatch);
+    }
   }, []);
   var pName = (0, _react.useMemo)(function () {
     return (0, _formUtils.calcNamePath)(parentName, name);
@@ -174,7 +185,7 @@ var Step = function Step(_ref) {
   };
 
   var handleNext = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var _allFields$filter;
 
       var allFields, allValues, fields, res, errors;
@@ -184,11 +195,11 @@ var Step = function Step(_ref) {
             case 0:
               allFields = (form === null || form === void 0 ? void 0 : form.getFieldsError()) || [];
               allValues = form === null || form === void 0 ? void 0 : form.getFieldsValue(true);
-              fields = allFields === null || allFields === void 0 ? void 0 : (_allFields$filter = allFields.filter(function (_ref3) {
-                var name = _ref3.name;
-                return name.join().startsWith(pName === null || pName === void 0 ? void 0 : pName.join());
-              })) === null || _allFields$filter === void 0 ? void 0 : _allFields$filter.map(function (_ref4) {
+              fields = allFields === null || allFields === void 0 ? void 0 : (_allFields$filter = allFields.filter(function (_ref4) {
                 var name = _ref4.name;
+                return name.join().startsWith(pName === null || pName === void 0 ? void 0 : pName.join());
+              })) === null || _allFields$filter === void 0 ? void 0 : _allFields$filter.map(function (_ref5) {
+                var name = _ref5.name;
                 return name;
               });
               _context.prev = 3;
@@ -273,11 +284,11 @@ var Step = function Step(_ref) {
     }));
 
     return function handleNext() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
 
-  if (typeof shouldRender === 'function' && !shouldRender(form)) {
+  if (!(0, _formUtils.calcShouldRender)(pName, dependencies, asserts, shouldRender, shouldRenderCode, form)) {
     return null;
   }
 

package/lib/types.d.ts

@@ -123,6 +123,7 @@ export interface FormItemExtraConfig extends FormItemProps {
     maxLength?: number;
     idType?: 'KTP' | 'NIK';
     validationRule?: string;
+    shouldRenderCode?: string;
     [key: string]: any;
 }
 export interface FormItemConfig extends FormItemExtraConfig {

package/lib/utils/form-utils.d.ts

@@ -50,7 +50,7 @@ export declare const calcFormItemProps: (config: FormItemConfig, extraProps: For
     elementProps: {
         [key: string]: any;
     };
-    display: boolean;
+    display: any;
     previewFormater: ((value: any, form?: FormInstance<any> | undefined) => any) | undefined;
 };
 export declare const calcDisabled: (disabled?: boolean | FormItemAssert | FormItemAssert[] | undefined, form?: FormInstance<any> | undefined) => boolean;
@@ -72,5 +72,5 @@ export declare const calcSelectValue: (selectValue?: FormItemSelectValue[] | und
     value: any;
     disabled: boolean | undefined;
 };
-export declare const calcShouldRender: (dependencies?: NamePath[], asserts?: FormItemAssert[], shouldRender?: ((form?: FormInstance<any> | undefined) => boolean) | undefined, form?: FormInstance<any> | undefined) => boolean;
-export declare const getRuleValidation: (url: string, rule: string | string[], values?: any, lang?: string | undefined) => Promise<any>;
+export declare const calcShouldRender: (name: NamePath, dependencies?: NamePath[], asserts?: FormItemAssert[], shouldRender?: ((form?: FormInstance<any> | undefined) => boolean) | undefined, shouldRenderCode?: string | undefined, form?: FormInstance<any> | undefined) => any;
+export declare const getRuleValidation: (url: string, rule: string | string[], values?: any, lang?: string) => Promise<any>;

package/lib/utils/form-utils.js

@@ -15,7 +15,7 @@ var _formattedMessage = _interopRequireDefault(require("../locale/formatted-mess
 
 var _moment = _interopRequireDefault(require("moment"));
 
-var _excluded = ["type", "name", "required", "requiredAsserts", "showOptional", "rules", "initialValue", "normalize", "mergeRules", "getValueFromEvent", "getValueProps", "extra", "help", "label", "previewLabel", "extraLabel", "copyValue", "selectValue", "span", "halfRow", "fullRow", "valuePropName", "dependencies", "asserts", "messageVariables", "requiredMessage", "previewFormater", "disabled", "ignore", "shouldRender", "valueFormater", "antdDependencies", "dateLimitationType", "absoluteRangeEnd", "absoluteRangeStart", "relativeRangeStart", "relativeRangeEnd", "validationCode"],
+var _excluded = ["type", "name", "required", "requiredAsserts", "showOptional", "rules", "initialValue", "normalize", "mergeRules", "getValueFromEvent", "getValueProps", "extra", "help", "label", "previewLabel", "extraLabel", "copyValue", "selectValue", "span", "halfRow", "fullRow", "valuePropName", "dependencies", "asserts", "messageVariables", "requiredMessage", "previewFormater", "disabled", "ignore", "shouldRender", "valueFormater", "antdDependencies", "dateLimitationType", "absoluteRangeEnd", "absoluteRangeStart", "relativeRangeStart", "relativeRangeEnd", "validationCode", "shouldRenderCode"],
     _excluded2 = ["initialValue", "normalize", "rules", "extra", "help", "getValueFromEvent", "span", "valuePropName", "fullRow", "halfRow", "messageVariables", "requiredMessage", "previewFormater", "valueFormater", "required", "requiredMark", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -226,6 +226,7 @@ var calcFormItemProps = function calcFormItemProps(config, extraProps, form, par
       relativeRangeEnd = config.relativeRangeEnd,
       _config$validationCod = config.validationCode,
       validationCode = _config$validationCod === void 0 ? [] : _config$validationCod,
+      shouldRenderCode = config.shouldRenderCode,
       rest = _objectWithoutProperties(config, _excluded);
 
   (0, _invariant.default)(nameProp !== undefined || type === 'Divider' || type === 'Section' || type === 'Typography' || !type, "name property is required for form item config (type: ".concat(type, ")"));
@@ -447,7 +448,7 @@ var calcFormItemProps = function calcFormItemProps(config, extraProps, form, par
       dependencies: antdDependencies
     },
     elementProps: elementProps,
-    display: !ignore && calcShouldRender(dependencies, asserts, shouldRender, form),
+    display: !ignore && calcShouldRender(name, dependencies, asserts, shouldRender, shouldRenderCode, form),
     previewFormater: previewFormater || extraPreviewFormater
   };
 };
@@ -545,11 +546,12 @@ var calcSelectValue = function calcSelectValue(selectValue, form) {
 
 exports.calcSelectValue = calcSelectValue;
 
-var calcShouldRender = function calcShouldRender() {
-  var dependencies = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  var asserts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  var shouldRender = arguments.length > 2 ? arguments[2] : undefined;
-  var form = arguments.length > 3 ? arguments[3] : undefined;
+var calcShouldRender = function calcShouldRender(name) {
+  var dependencies = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var asserts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  var shouldRender = arguments.length > 3 ? arguments[3] : undefined;
+  var shouldRenderCode = arguments.length > 4 ? arguments[4] : undefined;
+  var form = arguments.length > 5 ? arguments[5] : undefined;
   if (!form) return true;
 
   var _iterator3 = _createForOfIteratorHelper(dependencies),
@@ -569,6 +571,26 @@ var calcShouldRender = function calcShouldRender() {
     _iterator3.f();
   }
 
+  if (typeof shouldRender === 'function') {
+    return shouldRender(form);
+  }
+
+  if (shouldRenderCode) {
+    var fn = eval(shouldRenderCode);
+
+    if (typeof fn === 'function') {
+      try {
+        var value = form.getFieldValue(name);
+        var values = form.getFieldsValue(true);
+        return fn(value, values, {
+          moment: _moment.default
+        });
+      } catch (_unused2) {
+        return false;
+      }
+    }
+  }
+
   var _iterator4 = _createForOfIteratorHelper(asserts),
       _step4;
 
@@ -584,26 +606,26 @@ var calcShouldRender = function calcShouldRender() {
     _iterator4.f();
   }
 
-  if (typeof shouldRender === 'function' && !shouldRender(form)) {
-    return false;
-  }
-
   return true;
 };
 
 exports.calcShouldRender = calcShouldRender;
 
 var getRuleValidation = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(url, rule, values, lang) {
-    var _lang, _lang$split;
-
-    var res, json, _ref4, conclusion, details;
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(url, rule, values) {
+    var lang,
+        res,
+        json,
+        _ref4,
+        conclusion,
+        details,
+        _args = arguments;
 
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            lang = ((_lang = lang) === null || _lang === void 0 ? void 0 : (_lang$split = _lang.split('-')) === null || _lang$split === void 0 ? void 0 : _lang$split[0]) || 'en';
+            lang = _args.length > 3 && _args[3] !== undefined ? _args[3] : 'en-US';
             _context.next = 3;
             return fetch("".concat(url, "?lang=").concat(lang), {
               method: 'post',
@@ -658,7 +680,7 @@ var getRuleValidation = /*#__PURE__*/function () {
     }, _callee);
   }));
 
-  return function getRuleValidation(_x, _x2, _x3, _x4) {
+  return function getRuleValidation(_x, _x2, _x3) {
     return _ref3.apply(this, arguments);
   };
 }();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iglooform",
-  "version": "2.5.49",
+  "version": "2.5.51",
   "scripts": {
     "start": "dumi dev",
     "build-dev": "dumi build",