iglooform 2.5.2 → 2.5.3

package/lib/select/attached-select.js

@@ -25,27 +25,18 @@ var _checkbox = _interopRequireDefault(require("../checkbox"));
 
 var _localeContext = _interopRequireDefault(require("../locale/locale-context"));
 
-var _formContext = _interopRequireDefault(require("../form-context"));
-
 var _button = _interopRequireDefault(require("../button"));
 
 var _input = _interopRequireDefault(require("../input"));
 
 require("./style");
 
-var _invariant = _interopRequireDefault(require("invariant"));
+var _optionUtils = require("../utils/option-utils");
 
-var _excluded = ["value", "className", "placeholder", "onDropdownVisibleChange", "showSearch", "filterOption", "optionFilterProp", "multiple", "options", "clearWhenOptionsUpdated"],
-    _excluded2 = ["options", "optionGroups", "getOptions", "datasourceKey", "dependField", "children"];
+var _excluded = ["value", "className", "placeholder", "onDropdownVisibleChange", "showSearch", "filterOption", "optionFilterProp", "multiple", "options", "clearWhenOptionsUpdated"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
-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); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -81,25 +72,6 @@ var Option = _select.default.Option,
 exports.OptGroup = OptGroup;
 exports.Option = Option;
 
-var compareOptions = function compareOptions(newOptions, oldOptions) {
-  if ((oldOptions === null || oldOptions === void 0 ? void 0 : oldOptions.length) !== newOptions.length) {
-    return true;
-  }
-
-  if (Array.isArray(oldOptions)) {
-    for (var i = 0; i < oldOptions.length; i++) {
-      var newOption = oldOptions[i];
-      var originOption = newOptions[i];
-
-      if (newOption.label !== originOption.label || newOption.value !== originOption.value) {
-        return true;
-      }
-    }
-  }
-
-  return false;
-};
-
 var IglooSelect = function IglooSelect(_ref) {
   var valueProp = _ref.value,
       className = _ref.className,
@@ -134,43 +106,38 @@ var IglooSelect = function IglooSelect(_ref) {
       displayOptions = _useState6[0],
       setDisplay = _useState6[1];
 
-  var _useState7 = (0, _react.useState)(options),
-      _useState8 = _slicedToArray(_useState7, 2),
-      originOptions = _useState8[0],
-      setOrigin = _useState8[1];
-
+  var originOptions = (0, _react.useRef)(options);
   (0, _react.useEffect)(function () {
     typeof rest.onChange === 'function' && valueProp !== selected && rest.onChange(selected, selectedOptions);
   }, [selected]);
   (0, _react.useEffect)(function () {
-    setSelected(valueProp);
+    valueProp !== selected && setSelected(valueProp);
   }, [valueProp]);
-  (0, _react.useEffect)(function () {
-    setDisplay(options);
-    setOrigin(options);
-  }, [options]);
   (0, _react.useEffect)(function () {
     var setFieldValue = rest.setFieldValue;
 
-    if (clearWhenOptionsUpdated && compareOptions(options, originOptions)) {
-      typeof setFieldValue === 'function' && setFieldValue();
-    }
-  }, [options, originOptions]);
-  (0, _react.useEffect)(function () {
-    var setFieldValue = rest.setFieldValue;
-    var foundValue = options.find(function (option) {
-      return Array.isArray(valueProp) ? valueProp.includes(option.value) : option.value === valueProp;
-    });
+    if ((0, _optionUtils.compareOptions)(options, originOptions.current)) {
+      if (clearWhenOptionsUpdated) {
+        typeof setFieldValue === 'function' && setFieldValue();
+      } else {
+        var foundValue = options.find(function (option) {
+          return Array.isArray(valueProp) ? valueProp.includes(option.value) : option.value === valueProp;
+        });
+
+        if (!foundValue && valueProp !== undefined) {
+          typeof setFieldValue === 'function' && setFieldValue();
+        }
+      }
 
-    if (!foundValue && valueProp !== undefined) {
-      typeof setFieldValue === 'function' && setFieldValue();
+      setDisplay(options);
+      originOptions.current = options;
     }
-  }, [valueProp, options]);
+  }, [options]);
 
-  var _useState9 = (0, _react.useState)(false),
-      _useState10 = _slicedToArray(_useState9, 2),
-      dropVisible = _useState10[0],
-      setDropVisible = _useState10[1];
+  var _useState7 = (0, _react.useState)(false),
+      _useState8 = _slicedToArray(_useState7, 2),
+      dropVisible = _useState8[0],
+      setDropVisible = _useState8[1];
 
   var handleDropDownVisibleChange = function handleDropDownVisibleChange(open) {
     typeof onDropdownVisibleChange === 'function' && onDropdownVisibleChange(open);
@@ -361,152 +328,14 @@ var IglooSelect = function IglooSelect(_ref) {
   });
 };
 
-var AttachedSelect = function AttachedSelect(_ref11) {
-  var options = _ref11.options,
-      optionGroups = _ref11.optionGroups,
-      getOptions = _ref11.getOptions,
-      datasourceKey = _ref11.datasourceKey,
-      dependField = _ref11.dependField,
-      children = _ref11.children,
-      rest = _objectWithoutProperties(_ref11, _excluded2);
-
-  var _useState11 = (0, _react.useState)(),
-      _useState12 = _slicedToArray(_useState11, 2),
-      _options = _useState12[0],
-      setOptions = _useState12[1];
-
-  var _useContext2 = (0, _react.useContext)(_formContext.default),
-      selectDatasourceApi = _useContext2.selectDatasourceApi;
-
-  var getFormInstance = rest.getFormInstance;
-  var form = typeof getFormInstance === 'function' && getFormInstance();
-  var dependFieldValue = form && dependField && form.getFieldValue(dependField);
-  var optionsFromGetOptions = typeof getOptions === 'function' && form && getOptions(form);
-  (0, _invariant.default)(datasourceKey && selectDatasourceApi || !datasourceKey, 'Please provide selectDatasourceApi in Form props');
-  (0, _react.useEffect)(function () {
-    var calcOptions = /*#__PURE__*/function () {
-      var _ref12 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-        var _options2, query, api, rst, _yield$rst$json, data;
-
-        return regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                if (!Array.isArray(options)) {
-                  _context.next = 2;
-                  break;
-                }
-
-                return _context.abrupt("return", options);
-
-              case 2:
-                if (!(Array.isArray(children) || _typeof(children) === 'object')) {
-                  _context.next = 4;
-                  break;
-                }
-
-                return _context.abrupt("return", Array.isArray(children) ? children.map(function (child) {
-                  return {
-                    label: child.props.children,
-                    value: child.props.value
-                  };
-                }) : [{
-                  label: children.props.children,
-                  value: children.props.value
-                }]);
-
-              case 4:
-                if (!Array.isArray(optionsFromGetOptions)) {
-                  _context.next = 6;
-                  break;
-                }
-
-                return _context.abrupt("return", optionsFromGetOptions);
-
-              case 6:
-                if (!optionGroups) {
-                  _context.next = 11;
-                  break;
-                }
-
-                if (!dependFieldValue) {
-                  _context.next = 11;
-                  break;
-                }
-
-                _options2 = [];
-                optionGroups.forEach(function (_ref13) {
-                  var parentKey = _ref13.parentKey,
-                      _ref13$options = _ref13.options,
-                      options = _ref13$options === void 0 ? [] : _ref13$options;
-
-                  if (Array.isArray(dependFieldValue) ? dependFieldValue.includes(parentKey) : parentKey === dependFieldValue) {
-                    _options2.push.apply(_options2, _toConsumableArray(options));
-                  }
-                });
-                return _context.abrupt("return", _options2);
-
-              case 11:
-                if (!(selectDatasourceApi && datasourceKey)) {
-                  _context.next = 28;
-                  break;
-                }
-
-                query = Array.isArray(dependFieldValue) ? dependFieldValue.map(function (v) {
-                  return "parent=".concat(v);
-                }).join('&') : dependFieldValue ? "parent=".concat(dependFieldValue) : '';
-                api = "".concat(selectDatasourceApi, "/").concat(datasourceKey);
-                _context.prev = 14;
-                _context.next = 17;
-                return fetch(query ? "".concat(api, "?").concat(query) : api);
-
-              case 17:
-                rst = _context.sent;
-                _context.next = 20;
-                return rst.json();
-
-              case 20:
-                _yield$rst$json = _context.sent;
-                data = _yield$rst$json.data;
-                return _context.abrupt("return", data || []);
-
-              case 25:
-                _context.prev = 25;
-                _context.t0 = _context["catch"](14);
-                return _context.abrupt("return", []);
-
-              case 28:
-                return _context.abrupt("return", []);
-
-              case 29:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, null, [[14, 25]]);
-      }));
-
-      return function calcOptions() {
-        return _ref12.apply(this, arguments);
-      };
-    }();
-
-    calcOptions().then(function (newOptions) {
-      if (compareOptions(newOptions, _options || [])) {
-        setOptions(newOptions);
-      }
-    });
-  }, [options, optionGroups, dependFieldValue, optionsFromGetOptions, _options]);
-  return _options ? (0, _jsxRuntime.jsx)(IglooSelect, _objectSpread({
-    options: _options
-  }, rest)) : null;
-};
+var AttachedSelect = Object.assign((0, _optionUtils.optionsHOC)(IglooSelect), {
+  Option: Option,
+  OptGroup: OptGroup
+});
 
 AttachedSelect.formItemPropsHandler = function (config) {
   return {};
 };
 
-AttachedSelect.Option = Option;
-AttachedSelect.OptGroup = OptGroup;
 var _default = AttachedSelect;
 exports.default = _default;

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

@@ -0,0 +1,24 @@
+import { FC, IglooComponentProps } from '../types';
+import { FormInstance } from 'antd/es/form';
+import { NamePath } from 'antd/es/form/interface';
+import { SelectProps, SelectValue } from 'antd/es/select';
+export declare const compareOptions: (newOptions: any[], oldOptions?: any[] | undefined) => boolean;
+declare type Options = SelectProps<SelectValue>['options'];
+export interface HOCProps extends IglooComponentProps {
+    options?: Options;
+    getOptions?: (form: FormInstance) => any[];
+    optionGroups?: {
+        parentKey: string;
+        options: Options;
+    }[];
+    datasourceKey?: string;
+    datasourceApi?: string;
+    dependField?: NamePath;
+    passCompareOptions?: boolean;
+}
+export interface ComponentProps extends IglooComponentProps {
+    options?: Options;
+    clearWhenOptionsUpdated?: boolean;
+}
+export declare function optionsHOC<T>(Component: FC<T>): FC<HOCProps & T>;
+export {};

package/lib/utils/option-utils.js

@@ -0,0 +1,250 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.compareOptions = void 0;
+exports.optionsHOC = optionsHOC;
+
+var _jsxRuntime = require("react/jsx-runtime");
+
+var _react = require("react");
+
+var _formContext = _interopRequireDefault(require("../form-context"));
+
+var _invariant = _interopRequireDefault(require("invariant"));
+
+var _excluded = ["options", "optionGroups", "getOptions", "datasourceKey", "dependField", "children"];
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+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 _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 _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+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); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+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."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+var compareOptions = function compareOptions(newOptions, oldOptions) {
+  if (!Array.isArray(oldOptions)) {
+    return true;
+  }
+
+  if ((oldOptions === null || oldOptions === void 0 ? void 0 : oldOptions.length) !== newOptions.length) {
+    return true;
+  }
+
+  if (Array.isArray(oldOptions)) {
+    for (var i = 0; i < oldOptions.length; i++) {
+      var newOption = oldOptions[i];
+      var originOption = newOptions[i];
+
+      if (newOption.label !== originOption.label || newOption.value !== originOption.value) {
+        return true;
+      }
+    }
+  }
+
+  return false;
+};
+
+exports.compareOptions = compareOptions;
+
+function optionsHOC(Component) {
+  return function (props) {
+    var options = props.options,
+        optionGroups = props.optionGroups,
+        getOptions = props.getOptions,
+        datasourceKey = props.datasourceKey,
+        dependField = props.dependField,
+        children = props.children,
+        rest = _objectWithoutProperties(props, _excluded);
+
+    var _useState = (0, _react.useState)(false),
+        _useState2 = _slicedToArray(_useState, 2),
+        updating = _useState2[0],
+        setUpdating = _useState2[1];
+
+    var _useState3 = (0, _react.useState)(),
+        _useState4 = _slicedToArray(_useState3, 2),
+        _options = _useState4[0],
+        setOptions = _useState4[1];
+
+    var _useState5 = (0, _react.useState)(),
+        _useState6 = _slicedToArray(_useState5, 2),
+        searchKey = _useState6[0],
+        setSearchKey = _useState6[1];
+
+    var optionsRef = (0, _react.useRef)(_options);
+
+    var _useContext = (0, _react.useContext)(_formContext.default),
+        selectDatasourceApi = _useContext.selectDatasourceApi;
+
+    var getFormInstance = rest.getFormInstance;
+    var form = typeof getFormInstance === 'function' && getFormInstance();
+    var dependFieldValue = form && dependField && form.getFieldValue(dependField);
+    var optionsFromGetOptions = typeof getOptions === 'function' && form && getOptions(form);
+    (0, _react.useEffect)(function () {
+      if (!Array.isArray(optionsFromGetOptions)) {
+        return;
+      }
+
+      if (compareOptions(optionsFromGetOptions, optionsRef.current)) {
+        optionsRef.current = optionsFromGetOptions;
+        setOptions(optionsFromGetOptions);
+      }
+    }, [optionsFromGetOptions]);
+    (0, _invariant.default)(datasourceKey && selectDatasourceApi || !datasourceKey, 'Please provide selectDatasourceApi in Form props');
+    (0, _react.useEffect)(function () {
+      setUpdating(true);
+
+      var calcOptions = /*#__PURE__*/function () {
+        var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+          var _options2, query, api, rst, _yield$rst$json, data;
+
+          return regeneratorRuntime.wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  if (!Array.isArray(options)) {
+                    _context.next = 2;
+                    break;
+                  }
+
+                  return _context.abrupt("return", options);
+
+                case 2:
+                  if (!(Array.isArray(children) || _typeof(children) === 'object')) {
+                    _context.next = 4;
+                    break;
+                  }
+
+                  return _context.abrupt("return", Array.isArray(children) ? children.map(function (child) {
+                    return {
+                      label: child.props.children,
+                      value: child.props.value
+                    };
+                  }) : [{
+                    label: children.props.children,
+                    value: children.props.value
+                  }]);
+
+                case 4:
+                  if (!optionGroups) {
+                    _context.next = 9;
+                    break;
+                  }
+
+                  if (!dependFieldValue) {
+                    _context.next = 9;
+                    break;
+                  }
+
+                  _options2 = [];
+                  optionGroups.forEach(function (_ref2) {
+                    var parentKey = _ref2.parentKey,
+                        _ref2$options = _ref2.options,
+                        options = _ref2$options === void 0 ? [] : _ref2$options;
+
+                    if (Array.isArray(dependFieldValue) ? dependFieldValue.includes(parentKey) : parentKey === dependFieldValue) {
+                      _options2.push.apply(_options2, _toConsumableArray(options));
+                    }
+                  });
+                  return _context.abrupt("return", _options2);
+
+                case 9:
+                  if (!(selectDatasourceApi && datasourceKey)) {
+                    _context.next = 27;
+                    break;
+                  }
+
+                  query = Array.isArray(dependFieldValue) ? dependFieldValue.map(function (v) {
+                    return "parent=".concat(v);
+                  }).join('&') : dependFieldValue ? "parent=".concat(dependFieldValue) : '';
+
+                  if (searchKey) {
+                    query += "&search_keyword=".concat(searchKey);
+                  }
+
+                  api = "".concat(selectDatasourceApi, "/").concat(datasourceKey);
+                  _context.prev = 13;
+                  _context.next = 16;
+                  return fetch(query ? "".concat(api, "?").concat(query) : api);
+
+                case 16:
+                  rst = _context.sent;
+                  _context.next = 19;
+                  return rst.json();
+
+                case 19:
+                  _yield$rst$json = _context.sent;
+                  data = _yield$rst$json.data;
+                  return _context.abrupt("return", data || []);
+
+                case 24:
+                  _context.prev = 24;
+                  _context.t0 = _context["catch"](13);
+                  return _context.abrupt("return", []);
+
+                case 27:
+                  return _context.abrupt("return", []);
+
+                case 28:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee, null, [[13, 24]]);
+        }));
+
+        return function calcOptions() {
+          return _ref.apply(this, arguments);
+        };
+      }();
+
+      calcOptions().then(function (newOptions) {
+        if (compareOptions(newOptions, optionsRef.current)) {
+          setOptions(newOptions);
+          optionsRef.current = newOptions;
+        }
+
+        setUpdating(false);
+      });
+    }, [options, optionGroups, dependFieldValue, searchKey]);
+    return _options ? (0, _jsxRuntime.jsx)(Component, _objectSpread(_objectSpread({
+      options: _options
+    }, rest), {}, {
+      onSearch: setSearchKey,
+      optionsUpdating: updating
+    })) : null;
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iglooform",
-  "version": "2.5.2",
+  "version": "2.5.3",
   "scripts": {
     "start": "dumi dev",
     "build-dev": "dumi build",
@@ -16,7 +16,8 @@
     "extract:zh": "locale=zh-CN formatjs extract 'src/**/*.ts*' --out-file src/locale/zh-CN/messages.json --format compile.js",
     "extract:vi": "locale=vi-VN formatjs extract 'src/**/*.ts*' --out-file src/locale/vi-VN/messages.json --format compile.js",
     "extract:th": "locale=th-TH formatjs extract 'src/**/*.ts*' --out-file src/locale/th-TH/messages.json --format compile.js",
-    "extract": "yarn extract:en && yarn extract:id && yarn extract:zh && yarn extract:vi && yarn extract:th",
+    "extract:zh-TW": "locale=zh-TW formatjs extract 'src/**/*.ts*' --out-file src/locale/zh-TW/messages.json --format compile.js",
+    "extract": "yarn extract:en && yarn extract:id && yarn extract:zh && yarn extract:vi && yarn extract:th && yarn extract:zh-TW",
     "preinstall": "rm -rf src/.umi && rm -rf src/.umi-production"
   },
   "main": "./lib/index.js",
@@ -42,7 +43,6 @@
     "invariant": "^2.2.4",
     "lodash.debounce": "^4.0.8",
     "omit.js": "^2.0.2",
-    "react": "^16.12.0",
     "react-json-view": "^1.19.1",
     "react-pdf": "^5.7.2"
   },
@@ -57,23 +57,24 @@
     "@umijs/plugin-antd": "^0.8.0",
     "@umijs/plugin-esbuild": "^1.3.1",
     "@umijs/test": "^3.0.5",
-    "antd-dayjs-webpack-plugin": "^1.0.6",
     "babel-plugin-import": "^1.13.3",
-    "dayjs": "^1.10.3",
     "dumi": "^v1.1.0-rc.5",
     "father-build": "^1.19.1",
     "gh-pages": "^3.0.0",
     "lint-staged": "^10.0.7",
-    "moment": "^2.29.1",
     "prettier": "^1.19.1",
     "url-loader": "^4.1.1",
     "vfile-message": "^2.0.4",
     "yorkie": "^2.0.0"
   },
   "peerDependencies": {
-    "@ant-design/icons": "^4.2.2",
-    "antd": "^4.6.5",
-    "dayjs": "^1.10.3"
+    "@ant-design/icons": ">=4.0.0",
+    "antd": ">=4.6.5",
+    "antd-dayjs-webpack-plugin": ">=1.0.0",
+    "dayjs": ">=1.0.0",
+    "moment": ">=2.0.0",
+    "react": ">16.9.0",
+    "react-dom": ">=16.9.0"
   },
   "license": "MIT"
 }