iglooform 2.5.52 → 3.0.0-alpha

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

@@ -1,8 +1,9 @@
+import { PropsWithChildren } from 'react';
 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;
+export declare const compareOptions: (newOptions: any[], oldOptions?: any[]) => boolean;
 export declare const compareSelected: (newValue: any | any[], oldValue: any | any[]) => boolean;
 declare type Options = SelectProps<SelectValue>['options'];
 export interface HOCProps extends IglooComponentProps {
@@ -23,6 +24,6 @@ export interface ComponentProps extends IglooComponentProps {
     options?: Options;
     clearWhenOptionsUpdated?: boolean;
 }
-export declare function optionsHOC<T>(Component: FC<T>): FC<HOCProps & T>;
+export declare function optionsHOC<T>(Component: FC<T>): FC<PropsWithChildren<HOCProps & T>>;
 export declare function previewSelectedOptions(options: Options, value: any): any;
 export {};

package/lib/utils/option-utils.js

@@ -6,134 +6,95 @@ Object.defineProperty(exports, "__esModule", {
 exports.compareSelected = exports.compareOptions = void 0;
 exports.optionsHOC = optionsHOC;
 exports.previewSelectedOptions = previewSelectedOptions;
-
-var _jsxRuntime = require("react/jsx-runtime");
-
 var _react = require("react");
-
 var _formContext = _interopRequireDefault(require("../form-context"));
-
 var _invariant = _interopRequireDefault(require("invariant"));
-
+var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["options", "optionGroups", "getOptions", "datasourceFilters", "datasourceKey", "dependField", "children", "onSearch"];
-
 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 _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 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 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 _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 = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) 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; }
-
 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); }
-
 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 || newOption.extraInfo !== originOption.extraInfo) {
         return true;
       }
     }
   }
-
   return false;
 };
-
 exports.compareOptions = compareOptions;
-
 var compareSelected = function compareSelected(newValue, oldValue) {
   if (_typeof(newValue) !== _typeof(oldValue)) {
     return true;
   }
-
   if (Array.isArray(newValue) && Array.isArray(oldValue)) {
     if (newValue.length !== oldValue.length) {
       return true;
     }
-
     return !newValue.every(function (v) {
       return oldValue.find(function (ov) {
         return v === ov;
       });
     });
   }
-
   return newValue !== oldValue;
 };
-
 exports.compareSelected = compareSelected;
-
 function optionsHOC(Component) {
   return function (props) {
     var options = props.options,
-        optionGroups = props.optionGroups,
-        getOptions = props.getOptions,
-        datasourceFilters = props.datasourceFilters,
-        datasourceKey = props.datasourceKey,
-        dependField = props.dependField,
-        children = props.children,
-        _onSearch = props.onSearch,
-        rest = _objectWithoutProperties(props, _excluded);
-
+      optionGroups = props.optionGroups,
+      getOptions = props.getOptions,
+      datasourceFilters = props.datasourceFilters,
+      datasourceKey = props.datasourceKey,
+      dependField = props.dependField,
+      children = props.children,
+      _onSearch = props.onSearch,
+      rest = _objectWithoutProperties(props, _excluded);
     var _useState = (0, _react.useState)(false),
-        _useState2 = _slicedToArray(_useState, 2),
-        updating = _useState2[0],
-        setUpdating = _useState2[1];
-
+      _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];
-
+      _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];
-
+      _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;
-
+      selectDatasourceApi = _useContext.selectDatasourceApi;
     var getFormInstance = rest.getFormInstance;
     var form = typeof getFormInstance === 'function' && getFormInstance();
     var dependFieldValue = form && dependField && form.getFieldValue(dependField);
@@ -142,7 +103,6 @@ function optionsHOC(Component) {
       if (!Array.isArray(optionsFromGetOptions)) {
         return;
       }
-
       if (compareOptions(optionsFromGetOptions, optionsRef.current)) {
         optionsRef.current = optionsFromGetOptions;
         setOptions(optionsFromGetOptions);
@@ -154,130 +114,105 @@ function optionsHOC(Component) {
       if (Array.isArray(optionsFromGetOptions)) {
         return;
       }
-
       setUpdating(true);
-
       var calcOptions = /*#__PURE__*/function () {
-        var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+        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 = 28;
-                    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);
+          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));
                   }
-
-                  if (datasourceFilters) {
-                    query = dependFieldValue ? "".concat(query, "&") : query;
-                    query += datasourceFilters.map(function (f) {
-                      return "filter=".concat(f);
-                    }).join('&');
-                  }
-
-                  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();
-              }
+                });
+                return _context.abrupt("return", _options2);
+              case 9:
+                if (!(selectDatasourceApi && datasourceKey)) {
+                  _context.next = 28;
+                  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);
+                }
+                if (datasourceFilters) {
+                  query = dependFieldValue ? "".concat(query, "&") : query;
+                  query += datasourceFilters.map(function (f) {
+                    return "filter=".concat(f);
+                  }).join('&');
+                }
+                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 _ref.apply(this, arguments);
         };
       }();
-
       calcOptions().then(function (newOptions) {
         if (compareOptions(newOptions, optionsRef.current)) {
           setOptions(newOptions);
           optionsRef.current = newOptions;
         }
-
         setUpdating(false);
       });
     }, [options, optionsFromGetOptions, optionGroups, dependFieldValue, searchKey]);
-    return _options ? (0, _jsxRuntime.jsx)(Component, _objectSpread(_objectSpread({
+    return _options ? /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, _objectSpread(_objectSpread({
       options: _options
     }, rest), {}, {
       onSearch: function onSearch(e) {
@@ -288,10 +223,8 @@ function optionsHOC(Component) {
     })) : null;
   };
 }
-
 function previewSelectedOptions(options, value) {
   var _value = [value].flat();
-
   var replaceLabel = _value.reduce(function (strArr, selectedValue, index) {
     var matched = options === null || options === void 0 ? void 0 : options.filter(function (originOption) {
       return originOption.value === selectedValue;
@@ -299,6 +232,5 @@ function previewSelectedOptions(options, value) {
     if (matched && matched[0]) strArr[index] = matched[0].label;
     return strArr;
   }, _value);
-
   return replaceLabel.join(',');
 }

package/lib/utils/tools.js

@@ -5,43 +5,32 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.classifyType = classifyType;
 exports.parseFileSize = void 0;
-
 var parseFileSize = function parseFileSize(size) {
   switch (true) {
     case size === undefined:
       return '';
-
     case size < 1000:
       return "".concat(size, "B");
-
     case size < 1000000:
       return "".concat(Number(size / 1000).toFixed(2), "KB");
-
     case size < 1000000000:
       return "".concat(Number(size / 1000000).toFixed(2), "MB");
-
     case size < 1000000000000:
       return "".concat(Number(size / 1000000000).toFixed(2), "GB");
-
     default:
       return ">1000GB";
   }
 };
-
 exports.parseFileSize = parseFileSize;
-
 function classifyType(type) {
   if (type.includes('image')) {
     return 'image';
   }
-
   if (type.includes('video')) {
     return 'video';
   }
-
   if (type.includes('pdf')) {
     return 'pdf';
   }
-
   return 'unknown';
 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "iglooform",
-  "version": "2.5.52",
+  "version": "3.0.0-alpha",
   "scripts": {
     "start": "dumi dev",
     "build-dev": "dumi build",
     "build-staging": "dumi build",
     "build-production": "dumi build",
-    "build-lib": "father-build",
+    "build-lib": "father build",
     "release": "npm run build-lib && npm publish",
     "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
     "test": "umi-test",
@@ -35,11 +35,13 @@
     ]
   },
   "dependencies": {
+    "@types/react-dom": "^18.2.7",
     "@umijs/hooks": "^1.9.3",
+    "antd": "^5.0.0",
     "aws-sdk": "^2.966.0",
     "classnames": "^2.2.6",
     "iglooicon": "^1.0.0",
-    "iglootheme": "^1.0.1",
+    "iglootheme": "^2.0.0",
     "invariant": "^2.2.4",
     "lodash.debounce": "^4.0.8",
     "omit.js": "^2.0.2",
@@ -47,34 +49,29 @@
     "react-pdf": "^5.7.2"
   },
   "devDependencies": {
+    "@emotion/react": "^11.11.1",
     "@formatjs/cli": "^4.2.8",
-    "@svgr/cli": "^5.5.0",
     "@types/classnames": "^2.2.11",
     "@types/invariant": "^2.2.34",
     "@types/lodash.debounce": "^4.0.6",
+    "@types/react": "^18.2.14",
     "@types/react-pdf": "^5.0.9",
-    "@types/vfile-message": "^2.0.0",
-    "@umijs/plugin-antd": "^0.8.0",
-    "@umijs/plugin-esbuild": "^1.3.1",
+    "@umijs/plugins": "^4.0.72",
     "@umijs/test": "^3.0.5",
-    "babel-plugin-import": "^1.13.3",
-    "dumi": "^v1.1.0-rc.5",
-    "father-build": "^1.19.1",
-    "gh-pages": "^3.0.0",
+    "antd-token-previewer": "^2.0.0-alpha.10",
+    "dumi": "^2.0.0",
+    "father": "^4.0.0",
     "lint-staged": "^10.0.7",
-    "prettier": "^1.19.1",
+    "prettier": "^3.0.0",
     "url-loader": "^4.1.1",
-    "vfile-message": "^2.0.4",
     "yorkie": "^2.0.0"
   },
   "peerDependencies": {
     "@ant-design/icons": ">=4.0.0",
-    "antd": ">=4.6.5",
-    "antd-dayjs-webpack-plugin": ">=1.0.0",
+    "antd": ">=5.0.0",
     "dayjs": ">=1.0.0",
-    "moment": ">=2.0.0",
-    "react": ">16.9.0",
-    "react-dom": ">=16.9.0"
+    "react": ">18.0.0",
+    "react-dom": ">=18.0.0"
   },
   "license": "MIT"
 }

package/lib/global.less

@@ -1,63 +0,0 @@
-@import '~iglootheme/lib/font.less';
-@import '~iglootheme/lib/brand-font.less';
-
-.__dumi-default-previewer-demo {
-  overflow: scroll;
-}
-
-.icon-block {
-  text-align: center;
-  width: 200px;
-  font-size: 24px;
-  color: #666666;
-  border-radius: 3px;
-  padding: 16px;
-  cursor: pointer;
-
-  &:hover {
-    background: @primary-color;
-    color: #ffffff;
-
-    .ant-card-meta-description {
-      color: #ffffff;
-    }
-  }
-}
-
-.logo-block {
-  text-align: center;
-  width: 200px;
-  font-size: 36px;
-  color: #666666;
-  border-radius: 3px;
-  padding: 16px;
-  cursor: pointer;
-}
-
-.icon-description {
-  font-size: 16px;
-}
-
-.ant-card-cover {
-  display: flex;
-  justify-content: center;
-
-  & > * {
-    width: auto;
-  }
-}
-
-* {
-  font-family: Roboto;
-}
-
-.static-img {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.static-url {
-  display: flex;
-  align-items: center;
-}