iglooform 2.3.18 → 2.3.19

package/es/form/element/index.js

@@ -19,6 +19,16 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -73,9 +83,16 @@ var Element = function Element(_ref) {
         selectValue = config.selectValue,
         shouldRender = config.shouldRender,
         dependField = config.dependField,
-        getOptions = config.getOptions;
+        getOptions = config.getOptions,
+        subscribedFields = config.subscribedFields,
+        disabled = config.disabled,
+        extraLabel = config.extraLabel;
     var dependentField = dependencies || [];
 
+    if (Array.isArray(subscribedFields)) {
+      dependentField.push.apply(dependentField, _toConsumableArray(subscribedFields));
+    }
+
     if (asserts && asserts.length) {
       asserts.forEach(function (_ref2) {
         var field = _ref2.field;
@@ -94,7 +111,7 @@ var Element = function Element(_ref) {
       });
     }
 
-    if (shouldRender || getOptions) {
+    if ((shouldRender || getOptions || typeof extraLabel === 'function') && !Array.isArray(subscribedFields)) {
       dependentField.push('SUBSCRIBE_ALL');
     }
 
@@ -102,6 +119,15 @@ var Element = function Element(_ref) {
       dependentField.push(dependField);
     }
 
+    if (Array.isArray(disabled)) {
+      disabled.forEach(function (_ref4) {
+        var field = _ref4.field;
+        return dependentField.push(field);
+      });
+    } else if (_typeof(disabled) === 'object') {
+      dependentField.push(disabled.field);
+    }
+
     registerDependencies(dependentField, dispatch);
   }, []);
   invariant(type !== 'Pages' && type !== 'Page', "".concat(type, " should not be inner form item"));

package/es/form/pages/index.js

@@ -34,8 +34,10 @@ var useBreakpoint = _Grid.useBreakpoint;
 var Pages = function Pages(_ref) {
   var name = _ref.name,
       parentName = _ref.parentName,
-      _ref$config$elements = _ref.config.elements,
-      elements = _ref$config$elements === void 0 ? [] : _ref$config$elements;
+      _ref$config = _ref.config,
+      _ref$config$elements = _ref$config.elements,
+      elements = _ref$config$elements === void 0 ? [] : _ref$config$elements,
+      subscribedFields = _ref$config.subscribedFields;
 
   var _useState = useState(0),
       _useState2 = _slicedToArray(_useState, 2),
@@ -70,7 +72,7 @@ var Pages = function Pages(_ref) {
     });
 
     if (subscribe) {
-      registerDependencies('SUBSCRIBE_ALL', dispatch);
+      Array.isArray(subscribedFields) ? registerDependencies(subscribedFields, dispatch) : registerDependencies('SUBSCRIBE_ALL', dispatch);
     }
   }, []);
 

package/es/form/steps/index.js

@@ -29,7 +29,8 @@ var Steps = function Steps(_ref) {
       _ref$config$elements = _ref$config.elements,
       elements = _ref$config$elements === void 0 ? [] : _ref$config$elements,
       _ref$config$showLastI = _ref$config.showLastIndex,
-      showLastIndex = _ref$config$showLastI === void 0 ? true : _ref$config$showLastI;
+      showLastIndex = _ref$config$showLastI === void 0 ? true : _ref$config$showLastI,
+      subscribedFields = _ref$config.subscribedFields;
 
   var _useState = useState(0),
       _useState2 = _slicedToArray(_useState, 2),
@@ -65,7 +66,7 @@ var Steps = function Steps(_ref) {
     });
 
     if (subscribe) {
-      registerDependencies('SUBSCRIBE_ALL', dispatch);
+      Array.isArray(subscribedFields) ? registerDependencies(subscribedFields, dispatch) : registerDependencies('SUBSCRIBE_ALL', dispatch);
     }
   }, []);
   var renderElements = elements.filter(function (step) {

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

@@ -4,7 +4,6 @@ import './style/index.less';
 interface ElementProps extends FormItemConfig {
     parentName?: FormItemName;
     preview?: boolean;
-    disabled?: boolean;
     setShowStepButton?: (showButton: boolean) => void;
 }
 declare const Element: FC<ElementProps>;

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

@@ -18,6 +18,16 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -67,9 +77,15 @@ var Element = function Element(props) {
         selectValue = props.selectValue,
         shouldRender = props.shouldRender,
         dependField = props.dependField,
-        getOptions = props.getOptions;
+        getOptions = props.getOptions,
+        subscribedFields = props.subscribedFields,
+        extraLabel = props.extraLabel;
     var dependentField = dependencies || [];
 
+    if (Array.isArray(subscribedFields)) {
+      dependentField.push.apply(dependentField, _toConsumableArray(subscribedFields));
+    }
+
     if (asserts && asserts.length) {
       asserts.forEach(function (_ref) {
         var field = _ref.field;
@@ -88,7 +104,7 @@ var Element = function Element(props) {
       });
     }
 
-    if (shouldRender || getOptions) {
+    if ((shouldRender || getOptions || typeof extraLabel === 'function') && !Array.isArray(subscribedFields)) {
       dependentField.push('SUBSCRIBE_ALL');
     }
 
@@ -96,6 +112,15 @@ var Element = function Element(props) {
       dependentField.push(dependField);
     }
 
+    if (Array.isArray(disabled)) {
+      disabled.forEach(function (_ref3) {
+        var field = _ref3.field;
+        return dependentField.push(field);
+      });
+    } else if (_typeof(disabled) === 'object') {
+      dependentField.push(disabled.field);
+    }
+
     registerDependencies(dependentField, dispatch);
   }, []);
   var extraConfig = useMemo(function () {

package/es/types.d.ts

@@ -86,6 +86,7 @@ export interface FormItemExtraConfig extends FormItemProps {
     disableEditButton?: boolean;
     hidePreviewDivider?: boolean;
     valueFormater?: (value: any) => any;
+    subscribedFields?: FormItemName[];
     [key: string]: any;
 }
 export interface FormItemConfig extends FormItemExtraConfig {

package/es/utils/form-methods.js

@@ -1 +1 @@
-export default ['containerRef', 'setFieldError', 'setFieldValue', 'setShowStepButton', 'locales', 'getFormInstance', 'hideWhenPreview', 'validateField'];
+export default ['containerRef', 'setFieldError', 'setFieldValue', 'setShowStepButton', 'locales', 'getFormInstance', 'hideWhenPreview', 'validateField', 'subscribedFields'];

package/lib/form/element/index.js

@@ -58,6 +58,16 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -101,9 +111,16 @@ var Element = function Element(_ref) {
         selectValue = config.selectValue,
         shouldRender = config.shouldRender,
         dependField = config.dependField,
-        getOptions = config.getOptions;
+        getOptions = config.getOptions,
+        subscribedFields = config.subscribedFields,
+        disabled = config.disabled,
+        extraLabel = config.extraLabel;
     var dependentField = dependencies || [];
 
+    if (Array.isArray(subscribedFields)) {
+      dependentField.push.apply(dependentField, _toConsumableArray(subscribedFields));
+    }
+
     if (asserts && asserts.length) {
       asserts.forEach(function (_ref2) {
         var field = _ref2.field;
@@ -122,7 +139,7 @@ var Element = function Element(_ref) {
       });
     }
 
-    if (shouldRender || getOptions) {
+    if ((shouldRender || getOptions || typeof extraLabel === 'function') && !Array.isArray(subscribedFields)) {
       dependentField.push('SUBSCRIBE_ALL');
     }
 
@@ -130,6 +147,15 @@ var Element = function Element(_ref) {
       dependentField.push(dependField);
     }
 
+    if (Array.isArray(disabled)) {
+      disabled.forEach(function (_ref4) {
+        var field = _ref4.field;
+        return dependentField.push(field);
+      });
+    } else if (_typeof(disabled) === 'object') {
+      dependentField.push(disabled.field);
+    }
+
     registerDependencies(dependentField, dispatch);
   }, []);
   (0, _invariant.default)(type !== 'Pages' && type !== 'Page', "".concat(type, " should not be inner form item"));

package/lib/form/pages/index.js

@@ -56,8 +56,10 @@ var useBreakpoint = _grid.default.useBreakpoint;
 var Pages = function Pages(_ref) {
   var name = _ref.name,
       parentName = _ref.parentName,
-      _ref$config$elements = _ref.config.elements,
-      elements = _ref$config$elements === void 0 ? [] : _ref$config$elements;
+      _ref$config = _ref.config,
+      _ref$config$elements = _ref$config.elements,
+      elements = _ref$config$elements === void 0 ? [] : _ref$config$elements,
+      subscribedFields = _ref$config.subscribedFields;
 
   var _useState = (0, _react.useState)(0),
       _useState2 = _slicedToArray(_useState, 2),
@@ -92,7 +94,7 @@ var Pages = function Pages(_ref) {
     });
 
     if (subscribe) {
-      registerDependencies('SUBSCRIBE_ALL', dispatch);
+      Array.isArray(subscribedFields) ? registerDependencies(subscribedFields, dispatch) : registerDependencies('SUBSCRIBE_ALL', dispatch);
     }
   }, []);
 

package/lib/form/steps/index.js

@@ -44,7 +44,8 @@ var Steps = function Steps(_ref) {
       _ref$config$elements = _ref$config.elements,
       elements = _ref$config$elements === void 0 ? [] : _ref$config$elements,
       _ref$config$showLastI = _ref$config.showLastIndex,
-      showLastIndex = _ref$config$showLastI === void 0 ? true : _ref$config$showLastI;
+      showLastIndex = _ref$config$showLastI === void 0 ? true : _ref$config$showLastI,
+      subscribedFields = _ref$config.subscribedFields;
 
   var _useState = (0, _react.useState)(0),
       _useState2 = _slicedToArray(_useState, 2),
@@ -80,7 +81,7 @@ var Steps = function Steps(_ref) {
     });
 
     if (subscribe) {
-      registerDependencies('SUBSCRIBE_ALL', dispatch);
+      Array.isArray(subscribedFields) ? registerDependencies(subscribedFields, dispatch) : registerDependencies('SUBSCRIBE_ALL', dispatch);
     }
   }, []);
   var renderElements = elements.filter(function (step) {

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

@@ -4,7 +4,6 @@ import './style/index.less';
 interface ElementProps extends FormItemConfig {
     parentName?: FormItemName;
     preview?: boolean;
-    disabled?: boolean;
     setShowStepButton?: (showButton: boolean) => void;
 }
 declare const Element: FC<ElementProps>;

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

@@ -51,6 +51,16 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -92,9 +102,15 @@ var Element = function Element(props) {
         selectValue = props.selectValue,
         shouldRender = props.shouldRender,
         dependField = props.dependField,
-        getOptions = props.getOptions;
+        getOptions = props.getOptions,
+        subscribedFields = props.subscribedFields,
+        extraLabel = props.extraLabel;
     var dependentField = dependencies || [];
 
+    if (Array.isArray(subscribedFields)) {
+      dependentField.push.apply(dependentField, _toConsumableArray(subscribedFields));
+    }
+
     if (asserts && asserts.length) {
       asserts.forEach(function (_ref) {
         var field = _ref.field;
@@ -113,7 +129,7 @@ var Element = function Element(props) {
       });
     }
 
-    if (shouldRender || getOptions) {
+    if ((shouldRender || getOptions || typeof extraLabel === 'function') && !Array.isArray(subscribedFields)) {
       dependentField.push('SUBSCRIBE_ALL');
     }
 
@@ -121,6 +137,15 @@ var Element = function Element(props) {
       dependentField.push(dependField);
     }
 
+    if (Array.isArray(disabled)) {
+      disabled.forEach(function (_ref3) {
+        var field = _ref3.field;
+        return dependentField.push(field);
+      });
+    } else if (_typeof(disabled) === 'object') {
+      dependentField.push(disabled.field);
+    }
+
     registerDependencies(dependentField, dispatch);
   }, []);
   var extraConfig = (0, _react.useMemo)(function () {

package/lib/types.d.ts

@@ -86,6 +86,7 @@ export interface FormItemExtraConfig extends FormItemProps {
     disableEditButton?: boolean;
     hidePreviewDivider?: boolean;
     valueFormater?: (value: any) => any;
+    subscribedFields?: FormItemName[];
     [key: string]: any;
 }
 export interface FormItemConfig extends FormItemExtraConfig {

package/lib/utils/form-methods.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _default = ['containerRef', 'setFieldError', 'setFieldValue', 'setShowStepButton', 'locales', 'getFormInstance', 'hideWhenPreview', 'validateField'];
+var _default = ['containerRef', 'setFieldError', 'setFieldValue', 'setShowStepButton', 'locales', 'getFormInstance', 'hideWhenPreview', 'validateField', 'subscribedFields'];
 exports.default = _default;

package/package.json

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