acud 1.0.7 → 1.0.8

package/dist/acud.js

@@ -1,4 +1,4 @@
-/*! acud v1.0.7 */
+/*! acud v1.0.8 */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory(require("react"), require("react-dom"));
@@ -9717,7 +9717,6 @@ function PickerPanel(props) {
       var now = generateConfig.getNow();
       if (!date) return now; // When value is null and set showTime
 
-      // When value is null and set showTime
       if (!mergedValue && showTime) {
         if (Object(_babel_runtime_helpers_esm_typeof__WEBPACK_IMPORTED_MODULE_2__["default"])(showTime) === 'object') {
           return Object(_utils_timeUtil__WEBPACK_IMPORTED_MODULE_23__["setDateTime"])(generateConfig, date, showTime.defaultValue || now);
@@ -10355,7 +10354,6 @@ function InnerRangePicker(props) {
       } // Fill disabled unit
 
 
-      // Fill disabled unit
       for (var i = 0; i < 2; i += 1) {
         if (mergedDisabled[i] && !Object(_utils_miscUtil__WEBPACK_IMPORTED_MODULE_15__["getValue"])(postValues, i) && !Object(_utils_miscUtil__WEBPACK_IMPORTED_MODULE_15__["getValue"])(allowEmpty, i)) {
           postValues = Object(_utils_miscUtil__WEBPACK_IMPORTED_MODULE_15__["updateValues"])(postValues, generateConfig.getNow(), i);
@@ -25425,7 +25423,8 @@ var Pagination = function Pagination(_a) {
       mini: isSmall
     }, 'rtl', direction === 'rtl'), className);
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2__["createElement"](_rc_pagination__WEBPACK_IMPORTED_MODULE_7__["default"], Object(_babel_runtime_helpers_esm_extends__WEBPACK_IMPORTED_MODULE_0__["default"])({
-      showSizeChanger: showSizeChanger
+      showSizeChanger: showSizeChanger,
+      locale: _locale_zh_CN__WEBPACK_IMPORTED_MODULE_6__["default"]
     }, restProps, {
       prefixCls: prefixCls,
       selectPrefixCls: selectPrefixCls
@@ -25433,8 +25432,7 @@ var Pagination = function Pagination(_a) {
       className: extendedClassName,
       selectComponentClass: showSizeChanger ? _select__WEBPACK_IMPORTED_MODULE_8__["default"] : undefined,
       Option: Option,
-      showQuickJumper: showQuickJumper,
-      locale: _locale_zh_CN__WEBPACK_IMPORTED_MODULE_6__["default"]
+      showQuickJumper: showQuickJumper
     }));
   };
 
@@ -47154,7 +47152,6 @@ function RawList(props, ref) {
     } // Always use virtual scroll bar in avoid shaking
 
 
-    // Always use virtual scroll bar in avoid shaking
     if (!inVirtual) {
       return {
         scrollHeight: ((_a = fillerInnerRef.current) === null || _a === void 0 ? void 0 : _a.offsetHeight) || 0,
@@ -47176,14 +47173,12 @@ function RawList(props, ref) {
       var cacheHeight = heights.get(key);
       var currentItemBottom = itemTop + (cacheHeight === undefined ? itemHeight : cacheHeight); // Check item top in the range
 
-      // Check item top in the range
       if (currentItemBottom >= scrollTop && startIndex === undefined) {
         startIndex = i;
         startOffset = itemTop;
       } // Check item bottom in the range. We will render additional one item for motion usage
 
 
-      // Check item bottom in the range. We will render additional one item for motion usage
       if (currentItemBottom > scrollTop + height && endIndex === undefined) {
         endIndex = i;
       }
@@ -47194,9 +47189,6 @@ function RawList(props, ref) {
     /* istanbul ignore next */
 
 
-    // Fallback to normal if not match. This code should never reach
-
-    /* istanbul ignore next */
     if (startIndex === undefined) {
       startIndex = 0;
       startOffset = 0;
@@ -47207,7 +47199,6 @@ function RawList(props, ref) {
     } // Give cache to improve scroll experience
 
 
-    // Give cache to improve scroll experience
     endIndex = Math.min(endIndex + 1, mergedData.length);
     return {
       scrollHeight: itemTop,
@@ -48926,6 +48917,372 @@ function _possibleConstructorReturn(self, call) {
 
 /***/ }),
 
+/***/ "./node_modules/@babel/runtime/helpers/esm/regeneratorRuntime.js":
+/*!***********************************************************************!*\
+  !*** ./node_modules/@babel/runtime/helpers/esm/regeneratorRuntime.js ***!
+  \***********************************************************************/
+/*! exports provided: default */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return _regeneratorRuntime; });
+/* harmony import */ var _typeof_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./typeof.js */ "./node_modules/@babel/runtime/helpers/esm/typeof.js");
+
+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,
+      $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 generator._invoke = function (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);
+        }
+      };
+    }(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" == Object(_typeof_js__WEBPACK_IMPORTED_MODULE_0__["default"])(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;
+
+    this._invoke = function (method, arg) {
+      function callInvokeWithMethodAndArg() {
+        return new PromiseImpl(function (resolve, reject) {
+          invoke(method, arg, resolve, reject);
+        });
+      }
+
+      return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg();
+    };
+  }
+
+  function maybeInvokeDelegate(delegate, context) {
+    var method = delegate.iterator[context.method];
+
+    if (undefined === method) {
+      if (context.delegate = null, "throw" === context.method) {
+        if (delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel;
+        context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method");
+      }
+
+      return 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, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), 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 (object) {
+    var 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;
+}
+
+/***/ }),
+
 /***/ "./node_modules/@babel/runtime/helpers/esm/setPrototypeOf.js":
 /*!*******************************************************************!*\
   !*** ./node_modules/@babel/runtime/helpers/esm/setPrototypeOf.js ***!
@@ -85639,7 +85996,7 @@ return arrayTreeFilter;
 __webpack_require__.r(__webpack_exports__);
 /* WEBPACK VAR INJECTION */(function(process) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return Schema; });
 function _extends() {
-  _extends = Object.assign || function (target) {
+  _extends = Object.assign ? Object.assign.bind() : function (target) {
     for (var i = 1; i < arguments.length; i++) {
       var source = arguments[i];
 
@@ -85652,7 +86009,6 @@ function _extends() {
 
     return target;
   };
-
   return _extends.apply(this, arguments);
 }
 
@@ -85664,18 +86020,17 @@ function _inheritsLoose(subClass, superClass) {
 }
 
 function _getPrototypeOf(o) {
-  _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
+  _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) {
     return o.__proto__ || Object.getPrototypeOf(o);
   };
   return _getPrototypeOf(o);
 }
 
 function _setPrototypeOf(o, p) {
-  _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
+  _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
     o.__proto__ = p;
     return o;
   };
-
   return _setPrototypeOf(o, p);
 }
 
@@ -85694,7 +86049,7 @@ function _isNativeReflectConstruct() {
 
 function _construct(Parent, args, Class) {
   if (_isNativeReflectConstruct()) {
-    _construct = Reflect.construct;
+    _construct = Reflect.construct.bind();
   } else {
     _construct = function _construct(Parent, args, Class) {
       var a = [null];
@@ -86044,12 +86399,62 @@ var whitespace = function whitespace(rule, value, source, errors, options) {
   }
 };
 
+// https://github.com/kevva/url-regex/blob/master/index.js
+var urlReg;
+var getUrlRegex = (function () {
+  if (urlReg) {
+    return urlReg;
+  }
+
+  var word = '[a-fA-F\\d:]';
+
+  var b = function b(options) {
+    return options && options.includeBoundaries ? "(?:(?<=\\s|^)(?=" + word + ")|(?<=" + word + ")(?=\\s|$))" : '';
+  };
+
+  var v4 = '(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}';
+  var v6seg = '[a-fA-F\\d]{1,4}';
+  var v6 = ("\n(?:\n(?:" + v6seg + ":){7}(?:" + v6seg + "|:)|                                    // 1:2:3:4:5:6:7::  1:2:3:4:5:6:7:8\n(?:" + v6seg + ":){6}(?:" + v4 + "|:" + v6seg + "|:)|                             // 1:2:3:4:5:6::    1:2:3:4:5:6::8   1:2:3:4:5:6::8  1:2:3:4:5:6::1.2.3.4\n(?:" + v6seg + ":){5}(?::" + v4 + "|(?::" + v6seg + "){1,2}|:)|                   // 1:2:3:4:5::      1:2:3:4:5::7:8   1:2:3:4:5::8    1:2:3:4:5::7:1.2.3.4\n(?:" + v6seg + ":){4}(?:(?::" + v6seg + "){0,1}:" + v4 + "|(?::" + v6seg + "){1,3}|:)| // 1:2:3:4::        1:2:3:4::6:7:8   1:2:3:4::8      1:2:3:4::6:7:1.2.3.4\n(?:" + v6seg + ":){3}(?:(?::" + v6seg + "){0,2}:" + v4 + "|(?::" + v6seg + "){1,4}|:)| // 1:2:3::          1:2:3::5:6:7:8   1:2:3::8        1:2:3::5:6:7:1.2.3.4\n(?:" + v6seg + ":){2}(?:(?::" + v6seg + "){0,3}:" + v4 + "|(?::" + v6seg + "){1,5}|:)| // 1:2::            1:2::4:5:6:7:8   1:2::8          1:2::4:5:6:7:1.2.3.4\n(?:" + v6seg + ":){1}(?:(?::" + v6seg + "){0,4}:" + v4 + "|(?::" + v6seg + "){1,6}|:)| // 1::              1::3:4:5:6:7:8   1::8            1::3:4:5:6:7:1.2.3.4\n(?::(?:(?::" + v6seg + "){0,5}:" + v4 + "|(?::" + v6seg + "){1,7}|:))             // ::2:3:4:5:6:7:8  ::2:3:4:5:6:7:8  ::8             ::1.2.3.4\n)(?:%[0-9a-zA-Z]{1,})?                                             // %eth0            %1\n").replace(/\s*\/\/.*$/gm, '').replace(/\n/g, '').trim(); // Pre-compile only the exact regexes because adding a global flag make regexes stateful
+
+  var v46Exact = new RegExp("(?:^" + v4 + "$)|(?:^" + v6 + "$)");
+  var v4exact = new RegExp("^" + v4 + "$");
+  var v6exact = new RegExp("^" + v6 + "$");
+
+  var ip = function ip(options) {
+    return options && options.exact ? v46Exact : new RegExp("(?:" + b(options) + v4 + b(options) + ")|(?:" + b(options) + v6 + b(options) + ")", 'g');
+  };
+
+  ip.v4 = function (options) {
+    return options && options.exact ? v4exact : new RegExp("" + b(options) + v4 + b(options), 'g');
+  };
+
+  ip.v6 = function (options) {
+    return options && options.exact ? v6exact : new RegExp("" + b(options) + v6 + b(options), 'g');
+  };
+
+  var protocol = "(?:(?:[a-z]+:)?//)";
+  var auth = '(?:\\S+(?::\\S*)?@)?';
+  var ipv4 = ip.v4().source;
+  var ipv6 = ip.v6().source;
+  var host = "(?:(?:[a-z\\u00a1-\\uffff0-9][-_]*)*[a-z\\u00a1-\\uffff0-9]+)";
+  var domain = "(?:\\.(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)*";
+  var tld = "(?:\\.(?:[a-z\\u00a1-\\uffff]{2,}))";
+  var port = '(?::\\d{2,5})?';
+  var path = '(?:[/?#][^\\s"]*)?';
+  var regex = "(?:" + protocol + "|www\\.)" + auth + "(?:localhost|" + ipv4 + "|" + ipv6 + "|" + host + domain + tld + ")" + port + path;
+  urlReg = new RegExp("(?:^" + regex + "$)", 'i');
+  return urlReg;
+});
+
 /* eslint max-len:0 */
 
 var pattern$2 = {
   // http://emailregex.com/
   email: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+\.)+[a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]{2,}))$/,
-  url: new RegExp("^(?!mailto:)(?:(?:http|https|ftp)://|//)(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))|localhost)(?::\\d{2,5})?(?:(/|\\?|#)[^\\s]*)?$", 'i'),
+  // url: new RegExp(
+  //   '^(?!mailto:)(?:(?:http|https|ftp)://|//)(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))|localhost)(?::\\d{2,5})?(?:(/|\\?|#)[^\\s]*)?$',
+  //   'i',
+  // ),
   hex: /^#?([a-f0-9]{6}|[a-f0-9]{3})$/i
 };
 var types = {
@@ -86093,7 +86498,7 @@ var types = {
     return typeof value === 'string' && value.length <= 320 && !!value.match(pattern$2.email);
   },
   url: function url(value) {
-    return typeof value === 'string' && value.length <= 2048 && !!value.match(pattern$2.url);
+    return typeof value === 'string' && value.length <= 2048 && !!value.match(getUrlRegex());
   },
   hex: function hex(value) {
     return typeof value === 'string' && !!value.match(pattern$2.hex);
@@ -86839,9 +87244,12 @@ var Schema = /*#__PURE__*/function () {
         } catch (error) {
           console.error == null ? void 0 : console.error(error); // rethrow to report error
 
-          setTimeout(function () {
-            throw error;
-          }, 0);
+          if (!options.suppressValidatorError) {
+            setTimeout(function () {
+              throw error;
+            }, 0);
+          }
+
           cb(error.message);
         }
 
@@ -113340,7 +113748,7 @@ module.exports = words;
 /***/ (function(module, exports) {
 
 //! moment.js
-//! version : 2.29.3
+//! version : 2.29.4
 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors
 //! license : MIT
 //! momentjs.com
@@ -115795,7 +116203,7 @@ module.exports = words;
     function preprocessRFC2822(s) {
         // Remove comments and folding whitespace and replace multiple-spaces with a single space
         return s
-            .replace(/\([^)]*\)|[\n\t]/g, ' ')
+            .replace(/\([^()]*\)|[\n\t]/g, ' ')
             .replace(/(\s\s+)/g, ' ')
             .replace(/^\s\s*/, '')
             .replace(/\s\s*$/, '');
@@ -118976,7 +119384,7 @@ module.exports = words;
 
     //! moment.js
 
-    hooks.version = '2.29.3';
+    hooks.version = '2.29.4';
 
     setHookCallback(createLocal);
 
@@ -119696,6 +120104,11 @@ var Collapse = /*#__PURE__*/function (_React$Component) {
         return child;
       }
 
+      Object.keys(props).forEach(function (propName) {
+        if (typeof props[propName] === 'undefined') {
+          delete props[propName];
+        }
+      });
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["cloneElement"](child, props);
     };
 
@@ -119830,7 +120243,7 @@ var CollapsePanel = /*#__PURE__*/function (_React$Component) {
 
     _this = _super.call.apply(_super, [this].concat(args));
 
-    _this.handleItemClick = function () {
+    _this.onItemClick = function () {
       var _this$props = _this.props,
           onItemClick = _this$props.onItemClick,
           panelKey = _this$props.panelKey;
@@ -119842,8 +120255,39 @@ var CollapsePanel = /*#__PURE__*/function (_React$Component) {
 
     _this.handleKeyPress = function (e) {
       if (e.key === 'Enter' || e.keyCode === 13 || e.which === 13) {
-        _this.handleItemClick();
+        _this.onItemClick();
+      }
+    };
+
+    _this.renderIcon = function () {
+      var _this$props2 = _this.props,
+          showArrow = _this$props2.showArrow,
+          expandIcon = _this$props2.expandIcon,
+          prefixCls = _this$props2.prefixCls,
+          collapsible = _this$props2.collapsible;
+
+      if (!showArrow) {
+        return null;
       }
+
+      var iconNode = typeof expandIcon === 'function' ? expandIcon(_this.props) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6__["createElement"]("i", {
+        className: "arrow"
+      });
+      return iconNode && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6__["createElement"]("div", {
+        className: "".concat(prefixCls, "-expand-icon"),
+        onClick: collapsible === 'header' ? _this.onItemClick : null
+      }, iconNode);
+    };
+
+    _this.renderTitle = function () {
+      var _this$props3 = _this.props,
+          header = _this$props3.header,
+          prefixCls = _this$props3.prefixCls,
+          collapsible = _this$props3.collapsible;
+      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6__["createElement"]("span", {
+        className: "".concat(prefixCls, "-header-text"),
+        onClick: collapsible === 'header' ? _this.onItemClick : null
+      }, header);
     };
 
     return _this;
@@ -119857,57 +120301,37 @@ var CollapsePanel = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _classNames,
-          _classNames2,
-          _this2 = this;
+      var _classNames, _classNames2;
 
-      var _this$props2 = this.props,
-          className = _this$props2.className,
-          id = _this$props2.id,
-          style = _this$props2.style,
-          prefixCls = _this$props2.prefixCls,
-          header = _this$props2.header,
-          headerClass = _this$props2.headerClass,
-          children = _this$props2.children,
-          isActive = _this$props2.isActive,
-          showArrow = _this$props2.showArrow,
-          destroyInactivePanel = _this$props2.destroyInactivePanel,
-          accordion = _this$props2.accordion,
-          forceRender = _this$props2.forceRender,
-          openMotion = _this$props2.openMotion,
-          expandIcon = _this$props2.expandIcon,
-          extra = _this$props2.extra,
-          collapsible = _this$props2.collapsible;
+      var _this$props4 = this.props,
+          className = _this$props4.className,
+          id = _this$props4.id,
+          style = _this$props4.style,
+          prefixCls = _this$props4.prefixCls,
+          headerClass = _this$props4.headerClass,
+          children = _this$props4.children,
+          isActive = _this$props4.isActive,
+          destroyInactivePanel = _this$props4.destroyInactivePanel,
+          accordion = _this$props4.accordion,
+          forceRender = _this$props4.forceRender,
+          openMotion = _this$props4.openMotion,
+          extra = _this$props4.extra,
+          collapsible = _this$props4.collapsible;
       var disabled = collapsible === 'disabled';
       var collapsibleHeader = collapsible === 'header';
-      var headerCls = classnames__WEBPACK_IMPORTED_MODULE_7___default()("".concat(prefixCls, "-header"), (_classNames = {}, Object(_babel_runtime_helpers_esm_defineProperty__WEBPACK_IMPORTED_MODULE_1__["default"])(_classNames, headerClass, headerClass), Object(_babel_runtime_helpers_esm_defineProperty__WEBPACK_IMPORTED_MODULE_1__["default"])(_classNames, "".concat(prefixCls, "-header-collapsible-only"), collapsibleHeader), _classNames));
-      var itemCls = classnames__WEBPACK_IMPORTED_MODULE_7___default()((_classNames2 = {}, Object(_babel_runtime_helpers_esm_defineProperty__WEBPACK_IMPORTED_MODULE_1__["default"])(_classNames2, "".concat(prefixCls, "-item"), true), Object(_babel_runtime_helpers_esm_defineProperty__WEBPACK_IMPORTED_MODULE_1__["default"])(_classNames2, "".concat(prefixCls, "-item-active"), isActive), Object(_babel_runtime_helpers_esm_defineProperty__WEBPACK_IMPORTED_MODULE_1__["default"])(_classNames2, "".concat(prefixCls, "-item-disabled"), disabled), _classNames2), className);
-      var icon = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6__["createElement"]("i", {
-        className: "arrow"
-      });
+      var itemCls = classnames__WEBPACK_IMPORTED_MODULE_7___default()((_classNames = {}, Object(_babel_runtime_helpers_esm_defineProperty__WEBPACK_IMPORTED_MODULE_1__["default"])(_classNames, "".concat(prefixCls, "-item"), true), Object(_babel_runtime_helpers_esm_defineProperty__WEBPACK_IMPORTED_MODULE_1__["default"])(_classNames, "".concat(prefixCls, "-item-active"), isActive), Object(_babel_runtime_helpers_esm_defineProperty__WEBPACK_IMPORTED_MODULE_1__["default"])(_classNames, "".concat(prefixCls, "-item-disabled"), disabled), _classNames), className);
+      var headerCls = classnames__WEBPACK_IMPORTED_MODULE_7___default()("".concat(prefixCls, "-header"), (_classNames2 = {}, Object(_babel_runtime_helpers_esm_defineProperty__WEBPACK_IMPORTED_MODULE_1__["default"])(_classNames2, headerClass, headerClass), Object(_babel_runtime_helpers_esm_defineProperty__WEBPACK_IMPORTED_MODULE_1__["default"])(_classNames2, "".concat(prefixCls, "-header-collapsible-only"), collapsibleHeader), _classNames2));
       /** header 节点属性 */
 
       var headerProps = {
         className: headerCls,
         'aria-expanded': isActive,
+        'aria-disabled': disabled,
         onKeyPress: this.handleKeyPress
       };
 
-      if (showArrow && typeof expandIcon === 'function') {
-        icon = expandIcon(this.props);
-      }
-
-      if (collapsibleHeader) {
-        icon = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6__["createElement"]("span", {
-          style: {
-            cursor: 'pointer'
-          },
-          onClick: function onClick() {
-            return _this2.handleItemClick();
-          }
-        }, icon);
-      } else {
-        headerProps.onClick = this.handleItemClick;
+      if (!collapsibleHeader) {
+        headerProps.onClick = this.onItemClick;
         headerProps.role = accordion ? 'tab' : 'button';
         headerProps.tabIndex = disabled ? -1 : 0;
       }
@@ -119917,10 +120341,7 @@ var CollapsePanel = /*#__PURE__*/function (_React$Component) {
         className: itemCls,
         style: style,
         id: id
-      }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6__["createElement"]("div", headerProps, showArrow && icon, collapsibleHeader ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6__["createElement"]("span", {
-        onClick: this.handleItemClick,
-        className: "".concat(prefixCls, "-header-text")
-      }, header) : header, ifExtraExist && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6__["createElement"]("div", {
+      }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6__["createElement"]("div", headerProps, this.renderIcon(), this.renderTitle(), ifExtraExist && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6__["createElement"]("div", {
         className: "".concat(prefixCls, "-extra")
       }, extra)), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6__["createElement"](rc_motion__WEBPACK_IMPORTED_MODULE_8__["default"], Object(_babel_runtime_helpers_esm_extends__WEBPACK_IMPORTED_MODULE_0__["default"])({
         visible: isActive,
@@ -122290,18 +122711,18 @@ function WrapperField(_ref5) {
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HOOK_MARK", function() { return HOOK_MARK; });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "react");
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var rc_util_es_warning__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! rc-util/es/warning */ "./node_modules/rc-util/es/warning.js");
+/* harmony import */ var rc_util_es_warning__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! rc-util/es/warning */ "./node_modules/rc-util/es/warning.js");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react */ "react");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
 
 
 var HOOK_MARK = 'RC_FORM_INTERNAL_HOOKS'; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 var warningFunc = function warningFunc() {
-  Object(rc_util_es_warning__WEBPACK_IMPORTED_MODULE_1__["default"])(false, 'Can not find FormContext. Please make sure you wrap Field under Form.');
+  Object(rc_util_es_warning__WEBPACK_IMPORTED_MODULE_0__["default"])(false, 'Can not find FormContext. Please make sure you wrap Field under Form.');
 };
 
-var Context = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createContext"]({
+var Context = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__["createContext"]({
   getFieldValue: warningFunc,
   getFieldsValue: warningFunc,
   getFieldError: warningFunc,
@@ -122313,6 +122734,7 @@ var Context = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createContext"]({
   isFieldsValidating: warningFunc,
   resetFields: warningFunc,
   setFields: warningFunc,
+  setFieldValue: warningFunc,
   setFieldsValue: warningFunc,
   validateFields: warningFunc,
   submit: warningFunc,
@@ -122867,15 +123289,15 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _babel_runtime_helpers_esm_toConsumableArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @babel/runtime/helpers/esm/toConsumableArray */ "./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js");
 /* harmony import */ var _babel_runtime_helpers_esm_createClass__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @babel/runtime/helpers/esm/createClass */ "./node_modules/@babel/runtime/helpers/esm/createClass.js");
 /* harmony import */ var _babel_runtime_helpers_esm_classCallCheck__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @babel/runtime/helpers/esm/classCallCheck */ "./node_modules/@babel/runtime/helpers/esm/classCallCheck.js");
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! react */ "react");
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_6__);
-/* harmony import */ var rc_util_es_warning__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! rc-util/es/warning */ "./node_modules/rc-util/es/warning.js");
+/* harmony import */ var rc_util_es_warning__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! rc-util/es/warning */ "./node_modules/rc-util/es/warning.js");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! react */ "react");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_7__);
 /* harmony import */ var _FieldContext__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./FieldContext */ "./node_modules/rc-field-form/es/FieldContext.js");
 /* harmony import */ var _utils_asyncUtil__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./utils/asyncUtil */ "./node_modules/rc-field-form/es/utils/asyncUtil.js");
-/* harmony import */ var _utils_NameMap__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./utils/NameMap */ "./node_modules/rc-field-form/es/utils/NameMap.js");
+/* harmony import */ var _utils_cloneDeep__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./utils/cloneDeep */ "./node_modules/rc-field-form/es/utils/cloneDeep.js");
 /* harmony import */ var _utils_messages__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./utils/messages */ "./node_modules/rc-field-form/es/utils/messages.js");
-/* harmony import */ var _utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./utils/valueUtil */ "./node_modules/rc-field-form/es/utils/valueUtil.js");
-/* harmony import */ var _utils_cloneDeep__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./utils/cloneDeep */ "./node_modules/rc-field-form/es/utils/cloneDeep.js");
+/* harmony import */ var _utils_NameMap__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./utils/NameMap */ "./node_modules/rc-field-form/es/utils/NameMap.js");
+/* harmony import */ var _utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./utils/valueUtil */ "./node_modules/rc-field-form/es/utils/valueUtil.js");
 
 
 
@@ -122920,6 +123342,7 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
       isFieldsValidating: _this.isFieldsValidating,
       resetFields: _this.resetFields,
       setFields: _this.setFields,
+      setFieldValue: _this.setFieldValue,
       setFieldsValue: _this.setFieldsValue,
       validateFields: _this.validateFields,
       submit: _this.submit,
@@ -122947,7 +123370,7 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
       };
     }
 
-    Object(rc_util_es_warning__WEBPACK_IMPORTED_MODULE_7__["default"])(false, '`getInternalHooks` is internal usage. Should not call directly.');
+    Object(rc_util_es_warning__WEBPACK_IMPORTED_MODULE_6__["default"])(false, '`getInternalHooks` is internal usage. Should not call directly.');
     return null;
   };
 
@@ -122963,13 +123386,13 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
     if (init) {
       var _this$prevWithoutPres;
 
-      var nextStore = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["setValues"])({}, initialValues, _this.store); // We will take consider prev form unmount fields.
+      var nextStore = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["setValues"])({}, initialValues, _this.store); // We will take consider prev form unmount fields.
       // When the field is not `preserve`, we need fill this with initialValues instead of store.
       // eslint-disable-next-line array-callback-return
 
       (_this$prevWithoutPres = _this.prevWithoutPreserves) === null || _this$prevWithoutPres === void 0 ? void 0 : _this$prevWithoutPres.map(function (_ref) {
         var namePath = _ref.key;
-        nextStore = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["setValue"])(nextStore, namePath, Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["getValue"])(initialValues, namePath));
+        nextStore = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["setValue"])(nextStore, namePath, Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["getValue"])(initialValues, namePath));
       });
       _this.prevWithoutPreserves = null;
 
@@ -122978,10 +123401,10 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
   };
 
   this.destroyForm = function () {
-    var prevWithoutPreserves = new _utils_NameMap__WEBPACK_IMPORTED_MODULE_10__["default"]();
+    var prevWithoutPreserves = new _utils_NameMap__WEBPACK_IMPORTED_MODULE_12__["default"]();
 
     _this.getFieldEntities(true).forEach(function (entity) {
-      if (!entity.isPreserve()) {
+      if (!_this.isMergedPreserve(entity.isPreserve())) {
         prevWithoutPreserves.set(entity.getNamePath(), true);
       }
     });
@@ -122990,9 +123413,9 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
   };
 
   this.getInitialValue = function (namePath) {
-    var initValue = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["getValue"])(_this.initialValues, namePath); // Not cloneDeep when without `namePath`
+    var initValue = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["getValue"])(_this.initialValues, namePath); // Not cloneDeep when without `namePath`
 
-    return namePath.length ? Object(_utils_cloneDeep__WEBPACK_IMPORTED_MODULE_13__["default"])(initValue) : initValue;
+    return namePath.length ? Object(_utils_cloneDeep__WEBPACK_IMPORTED_MODULE_10__["default"])(initValue) : initValue;
   };
 
   this.setCallbacks = function (callbacks) {
@@ -123040,7 +123463,7 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
         _this.timeoutId = null;
 
         if (!_this.formHooked) {
-          Object(rc_util_es_warning__WEBPACK_IMPORTED_MODULE_7__["default"])(false, 'Instance created by `useForm` is not connected to any Form element. Forget to pass `form` prop?');
+          Object(rc_util_es_warning__WEBPACK_IMPORTED_MODULE_6__["default"])(false, 'Instance created by `useForm` is not connected to any Form element. Forget to pass `form` prop?');
         }
       });
     }
@@ -123064,7 +123487,7 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
 
   this.getFieldsMap = function () {
     var pure = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-    var cache = new _utils_NameMap__WEBPACK_IMPORTED_MODULE_10__["default"]();
+    var cache = new _utils_NameMap__WEBPACK_IMPORTED_MODULE_12__["default"]();
 
     _this.getFieldEntities(pure).forEach(function (field) {
       var namePath = field.getNamePath();
@@ -123082,9 +123505,9 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
     var cache = _this.getFieldsMap(true);
 
     return nameList.map(function (name) {
-      var namePath = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["getNamePath"])(name);
+      var namePath = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["getNamePath"])(name);
       return cache.get(namePath) || {
-        INVALIDATE_NAME_PATH: Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["getNamePath"])(name)
+        INVALIDATE_NAME_PATH: Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["getNamePath"])(name)
       };
     });
   };
@@ -123119,14 +123542,14 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
         }
       }
     });
-    return Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["cloneByNamePathList"])(_this.store, filteredNameList.map(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["getNamePath"]));
+    return Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["cloneByNamePathList"])(_this.store, filteredNameList.map(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["getNamePath"]));
   };
 
   this.getFieldValue = function (name) {
     _this.warningUnhooked();
 
-    var namePath = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["getNamePath"])(name);
-    return Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["getValue"])(_this.store, namePath);
+    var namePath = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["getNamePath"])(name);
+    return Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["getValue"])(_this.store, namePath);
   };
 
   this.getFieldsError = function (nameList) {
@@ -123144,7 +123567,7 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
       }
 
       return {
-        name: Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["getNamePath"])(nameList[index]),
+        name: Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["getNamePath"])(nameList[index]),
         errors: [],
         warnings: []
       };
@@ -123154,7 +123577,7 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
   this.getFieldError = function (name) {
     _this.warningUnhooked();
 
-    var namePath = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["getNamePath"])(name);
+    var namePath = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["getNamePath"])(name);
 
     var fieldError = _this.getFieldsError([namePath])[0];
 
@@ -123164,7 +123587,7 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
   this.getFieldWarning = function (name) {
     _this.warningUnhooked();
 
-    var namePath = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["getNamePath"])(name);
+    var namePath = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["getNamePath"])(name);
 
     var fieldError = _this.getFieldsError([namePath])[0];
 
@@ -123187,14 +123610,14 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
       namePathList = null;
     } else if (args.length === 1) {
       if (Array.isArray(arg0)) {
-        namePathList = arg0.map(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["getNamePath"]);
+        namePathList = arg0.map(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["getNamePath"]);
         isAllFieldsTouched = false;
       } else {
         namePathList = null;
         isAllFieldsTouched = arg0;
       }
     } else {
-      namePathList = arg0.map(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["getNamePath"]);
+      namePathList = arg0.map(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["getNamePath"]);
       isAllFieldsTouched = arg1;
     }
 
@@ -123210,7 +123633,7 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
     } // Generate a nest tree for validate
 
 
-    var map = new _utils_NameMap__WEBPACK_IMPORTED_MODULE_10__["default"]();
+    var map = new _utils_NameMap__WEBPACK_IMPORTED_MODULE_12__["default"]();
     namePathList.forEach(function (shortNamePath) {
       map.set(shortNamePath, []);
     });
@@ -123256,10 +123679,10 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
       });
     }
 
-    var namePathList = nameList.map(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["getNamePath"]);
+    var namePathList = nameList.map(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["getNamePath"]);
     return fieldEntities.some(function (testField) {
       var fieldNamePath = testField.getNamePath();
-      return Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["containsNamePath"])(namePathList, fieldNamePath) && testField.isFieldValidating();
+      return Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["containsNamePath"])(namePathList, fieldNamePath) && testField.isFieldValidating();
     });
   };
 
@@ -123272,7 +123695,7 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
   this.resetWithFieldInitialValue = function () {
     var info = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     // Create cache
-    var cache = new _utils_NameMap__WEBPACK_IMPORTED_MODULE_10__["default"]();
+    var cache = new _utils_NameMap__WEBPACK_IMPORTED_MODULE_12__["default"]();
 
     var fieldEntities = _this.getFieldEntities(true);
 
@@ -123301,19 +123724,19 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
 
           if (formInitialValue !== undefined) {
             // Warning if conflict with form initialValues and do not modify value
-            Object(rc_util_es_warning__WEBPACK_IMPORTED_MODULE_7__["default"])(false, "Form already set 'initialValues' with path '".concat(namePath.join('.'), "'. Field can not overwrite it."));
+            Object(rc_util_es_warning__WEBPACK_IMPORTED_MODULE_6__["default"])(false, "Form already set 'initialValues' with path '".concat(namePath.join('.'), "'. Field can not overwrite it."));
           } else {
             var records = cache.get(namePath);
 
             if (records && records.size > 1) {
               // Warning if multiple field set `initialValue`and do not modify value
-              Object(rc_util_es_warning__WEBPACK_IMPORTED_MODULE_7__["default"])(false, "Multiple Field with path '".concat(namePath.join('.'), "' set 'initialValue'. Can not decide which one to pick."));
+              Object(rc_util_es_warning__WEBPACK_IMPORTED_MODULE_6__["default"])(false, "Multiple Field with path '".concat(namePath.join('.'), "' set 'initialValue'. Can not decide which one to pick."));
             } else if (records) {
               var originValue = _this.getFieldValue(namePath); // Set `initialValue`
 
 
               if (!info.skipExist || originValue === undefined) {
-                _this.updateStore(Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["setValue"])(_this.store, namePath, Object(_babel_runtime_helpers_esm_toConsumableArray__WEBPACK_IMPORTED_MODULE_3__["default"])(records)[0].value));
+                _this.updateStore(Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["setValue"])(_this.store, namePath, Object(_babel_runtime_helpers_esm_toConsumableArray__WEBPACK_IMPORTED_MODULE_3__["default"])(records)[0].value));
               }
             }
           }
@@ -123351,7 +123774,7 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
     var prevStore = _this.store;
 
     if (!nameList) {
-      _this.updateStore(Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["setValues"])({}, _this.initialValues));
+      _this.updateStore(Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["setValues"])({}, _this.initialValues));
 
       _this.resetWithFieldInitialValue();
 
@@ -123365,11 +123788,11 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
     } // Reset by `nameList`
 
 
-    var namePathList = nameList.map(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["getNamePath"]);
+    var namePathList = nameList.map(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["getNamePath"]);
     namePathList.forEach(function (namePath) {
       var initialValue = _this.getInitialValue(namePath);
 
-      _this.updateStore(Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["setValue"])(_this.store, namePath, initialValue));
+      _this.updateStore(Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["setValue"])(_this.store, namePath, initialValue));
     });
 
     _this.resetWithFieldInitialValue({
@@ -123393,11 +123816,11 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
           errors = fieldData.errors,
           data = Object(_babel_runtime_helpers_esm_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2__["default"])(fieldData, _excluded);
 
-      var namePath = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["getNamePath"])(name);
+      var namePath = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["getNamePath"])(name);
       namePathList.push(namePath); // Value
 
       if ('value' in data) {
-        _this.updateStore(Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["setValue"])(_this.store, namePath, data.value));
+        _this.updateStore(Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["setValue"])(_this.store, namePath, data.value));
       }
 
       _this.notifyObservers(prevStore, [namePath], {
@@ -123434,14 +123857,19 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
 
     if (initialValue !== undefined) {
       var namePath = entity.getNamePath();
-      var prevValue = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["getValue"])(_this.store, namePath);
+      var prevValue = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["getValue"])(_this.store, namePath);
 
       if (prevValue === undefined) {
-        _this.updateStore(Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["setValue"])(_this.store, namePath, initialValue));
+        _this.updateStore(Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["setValue"])(_this.store, namePath, initialValue));
       }
     }
   };
 
+  this.isMergedPreserve = function (fieldPreserve) {
+    var mergedPreserve = fieldPreserve !== undefined ? fieldPreserve : _this.preserve;
+    return mergedPreserve !== null && mergedPreserve !== void 0 ? mergedPreserve : true;
+  };
+
   this.registerField = function (entity) {
     _this.fieldEntities.push(entity);
 
@@ -123471,19 +123899,17 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
         return item !== entity;
       }); // Clean up store value if not preserve
 
-      var mergedPreserve = preserve !== undefined ? preserve : _this.preserve;
-
-      if (mergedPreserve === false && (!isListField || subNamePath.length > 1)) {
+      if (!_this.isMergedPreserve(preserve) && (!isListField || subNamePath.length > 1)) {
         var defaultValue = isListField ? undefined : _this.getInitialValue(namePath);
 
         if (namePath.length && _this.getFieldValue(namePath) !== defaultValue && _this.fieldEntities.every(function (field) {
           return (// Only reset when no namePath exist
-            !Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["matchNamePath"])(field.getNamePath(), namePath)
+            !Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["matchNamePath"])(field.getNamePath(), namePath)
           );
         })) {
           var _prevStore = _this.store;
 
-          _this.updateStore(Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["setValue"])(_prevStore, namePath, defaultValue, true)); // Notify that field is unmount
+          _this.updateStore(Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["setValue"])(_prevStore, namePath, defaultValue, true)); // Notify that field is unmount
 
 
           _this.notifyObservers(_prevStore, [namePath], {
@@ -123559,10 +123985,10 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
   };
 
   this.updateValue = function (name, value) {
-    var namePath = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["getNamePath"])(name);
+    var namePath = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["getNamePath"])(name);
     var prevStore = _this.store;
 
-    _this.updateStore(Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["setValue"])(_this.store, namePath, value));
+    _this.updateStore(Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["setValue"])(_this.store, namePath, value));
 
     _this.notifyObservers(prevStore, [namePath], {
       type: 'valueUpdate',
@@ -123578,7 +124004,7 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
     var onValuesChange = _this.callbacks.onValuesChange;
 
     if (onValuesChange) {
-      var changedValues = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["cloneByNamePathList"])(_this.store, [namePath]);
+      var changedValues = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["cloneByNamePathList"])(_this.store, [namePath]);
       onValuesChange(changedValues, _this.getFieldsValue());
     }
 
@@ -123591,7 +124017,7 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
     var prevStore = _this.store;
 
     if (store) {
-      var nextStore = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["setValues"])(_this.store, store);
+      var nextStore = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["setValues"])(_this.store, store);
 
       _this.updateStore(nextStore);
     }
@@ -123604,10 +124030,17 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
     _this.notifyWatch();
   };
 
+  this.setFieldValue = function (name, value) {
+    _this.setFields([{
+      name: name,
+      value: value
+    }]);
+  };
+
   this.getDependencyChildrenFields = function (rootNamePath) {
     var children = new Set();
     var childrenFields = [];
-    var dependencies2fields = new _utils_NameMap__WEBPACK_IMPORTED_MODULE_10__["default"]();
+    var dependencies2fields = new _utils_NameMap__WEBPACK_IMPORTED_MODULE_12__["default"]();
     /**
      * Generate maps
      * Can use cache to save perf if user report performance issue with this
@@ -123616,7 +124049,7 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
     _this.getFieldEntities().forEach(function (field) {
       var dependencies = field.props.dependencies;
       (dependencies || []).forEach(function (dependency) {
-        var dependencyNamePath = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["getNamePath"])(dependency);
+        var dependencyNamePath = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["getNamePath"])(dependency);
         dependencies2fields.update(dependencyNamePath, function () {
           var fields = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Set();
           fields.add(field);
@@ -123655,7 +124088,7 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
 
 
       if (filedErrors) {
-        var cache = new _utils_NameMap__WEBPACK_IMPORTED_MODULE_10__["default"]();
+        var cache = new _utils_NameMap__WEBPACK_IMPORTED_MODULE_12__["default"]();
         filedErrors.forEach(function (_ref4) {
           var name = _ref4.name,
               errors = _ref4.errors;
@@ -123669,7 +124102,7 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
 
       var changedFields = fields.filter(function (_ref5) {
         var fieldName = _ref5.name;
-        return Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["containsNamePath"])(namePathList, fieldName);
+        return Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["containsNamePath"])(namePathList, fieldName);
       });
       onFieldsChange(changedFields, fields);
     }
@@ -123679,7 +124112,7 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
     _this.warningUnhooked();
 
     var provideNameList = !!nameList;
-    var namePathList = provideNameList ? nameList.map(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["getNamePath"]) : []; // Collect result in promise list
+    var namePathList = provideNameList ? nameList.map(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["getNamePath"]) : []; // Collect result in promise list
 
     var promiseList = [];
 
@@ -123713,7 +124146,7 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
 
       var fieldNamePath = field.getNamePath(); // Add field validate rule in to promise list
 
-      if (!provideNameList || Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_12__["containsNamePath"])(namePathList, fieldNamePath)) {
+      if (!provideNameList || Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_13__["containsNamePath"])(namePathList, fieldNamePath)) {
         var promise = field.validateRules(Object(_babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_1__["default"])({
           validateMessages: Object(_babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_1__["default"])(Object(_babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_1__["default"])({}, _utils_messages__WEBPACK_IMPORTED_MODULE_11__["defaultValidateMessages"]), _this.validateMessages)
         }, options)); // Wrap promise with field
@@ -123822,9 +124255,9 @@ var FormStore = /*#__PURE__*/Object(_babel_runtime_helpers_esm_createClass__WEBP
 });
 
 function useForm(form) {
-  var formRef = react__WEBPACK_IMPORTED_MODULE_6__["useRef"]();
+  var formRef = react__WEBPACK_IMPORTED_MODULE_7__["useRef"]();
 
-  var _React$useState = react__WEBPACK_IMPORTED_MODULE_6__["useState"]({}),
+  var _React$useState = react__WEBPACK_IMPORTED_MODULE_7__["useState"]({}),
       _React$useState2 = Object(_babel_runtime_helpers_esm_slicedToArray__WEBPACK_IMPORTED_MODULE_0__["default"])(_React$useState, 2),
       forceUpdate = _React$useState2[1];
 
@@ -123853,11 +124286,12 @@ function useForm(form) {
 /*!***************************************************!*\
   !*** ./node_modules/rc-field-form/es/useWatch.js ***!
   \***************************************************/
-/*! exports provided: default */
+/*! exports provided: stringify, default */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "stringify", function() { return stringify; });
 /* harmony import */ var _babel_runtime_helpers_esm_slicedToArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/helpers/esm/slicedToArray */ "./node_modules/@babel/runtime/helpers/esm/slicedToArray.js");
 /* harmony import */ var ___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! . */ "./node_modules/rc-field-form/es/index.js");
 /* harmony import */ var rc_util_es_warning__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! rc-util/es/warning */ "./node_modules/rc-util/es/warning.js");
@@ -123871,7 +124305,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-
 function stringify(value) {
   try {
     return JSON.stringify(value);
@@ -123922,6 +124355,7 @@ function useWatch() {
       var nextValueStr = stringify(newValue); // Compare stringify in case it's nest object
 
       if (valueStrRef.current !== nextValueStr) {
+        valueStrRef.current = nextValueStr;
         setValue(newValue);
       }
     }); // TODO: We can improve this perf in future
@@ -124235,8 +124669,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "validateRules", function() { return validateRules; });
 /* harmony import */ var _babel_runtime_helpers_esm_toConsumableArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/helpers/esm/toConsumableArray */ "./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js");
 /* harmony import */ var _babel_runtime_helpers_esm_defineProperty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/runtime/helpers/esm/defineProperty */ "./node_modules/@babel/runtime/helpers/esm/defineProperty.js");
-/* harmony import */ var _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime/regenerator */ "./node_modules/@babel/runtime/regenerator/index.js");
-/* harmony import */ var _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _babel_runtime_helpers_esm_regeneratorRuntime__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime/helpers/esm/regeneratorRuntime */ "./node_modules/@babel/runtime/helpers/esm/regeneratorRuntime.js");
 /* harmony import */ var _babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @babel/runtime/helpers/esm/objectSpread2 */ "./node_modules/@babel/runtime/helpers/esm/objectSpread2.js");
 /* harmony import */ var _babel_runtime_helpers_esm_asyncToGenerator__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @babel/runtime/helpers/esm/asyncToGenerator */ "./node_modules/@babel/runtime/helpers/esm/asyncToGenerator.js");
 /* harmony import */ var async_validator__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! async-validator */ "./node_modules/async-validator/dist-web/index.js");
@@ -124281,9 +124714,9 @@ function validateRule(_x, _x2, _x3, _x4, _x5) {
 
 
 function _validateRule() {
-  _validateRule = Object(_babel_runtime_helpers_esm_asyncToGenerator__WEBPACK_IMPORTED_MODULE_4__["default"])( /*#__PURE__*/_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_2___default.a.mark(function _callee2(name, value, rule, options, messageVariables) {
+  _validateRule = Object(_babel_runtime_helpers_esm_asyncToGenerator__WEBPACK_IMPORTED_MODULE_4__["default"])( /*#__PURE__*/Object(_babel_runtime_helpers_esm_regeneratorRuntime__WEBPACK_IMPORTED_MODULE_2__["default"])().mark(function _callee2(name, value, rule, options, messageVariables) {
     var cloneRule, originValidator, subRuleField, validator, messages, result, subResults, kv, fillVariableResult;
-    return _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_2___default.a.wrap(function _callee2$(_context2) {
+    return Object(_babel_runtime_helpers_esm_regeneratorRuntime__WEBPACK_IMPORTED_MODULE_2__["default"])().wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
@@ -124459,9 +124892,9 @@ function validateRules(namePath, value, rules, options, validateFirst, messageVa
   if (validateFirst === true) {
     // >>>>> Validate by serialization
     summaryPromise = new Promise( /*#__PURE__*/function () {
-      var _ref3 = Object(_babel_runtime_helpers_esm_asyncToGenerator__WEBPACK_IMPORTED_MODULE_4__["default"])( /*#__PURE__*/_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_2___default.a.mark(function _callee(resolve, reject) {
+      var _ref3 = Object(_babel_runtime_helpers_esm_asyncToGenerator__WEBPACK_IMPORTED_MODULE_4__["default"])( /*#__PURE__*/Object(_babel_runtime_helpers_esm_regeneratorRuntime__WEBPACK_IMPORTED_MODULE_2__["default"])().mark(function _callee(resolve, reject) {
         var i, rule, errors;
-        return _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_2___default.a.wrap(function _callee$(_context) {
+        return Object(_babel_runtime_helpers_esm_regeneratorRuntime__WEBPACK_IMPORTED_MODULE_2__["default"])().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -124540,8 +124973,8 @@ function finishOnAllFailed(_x8) {
 }
 
 function _finishOnAllFailed() {
-  _finishOnAllFailed = Object(_babel_runtime_helpers_esm_asyncToGenerator__WEBPACK_IMPORTED_MODULE_4__["default"])( /*#__PURE__*/_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_2___default.a.mark(function _callee3(rulePromises) {
-    return _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_2___default.a.wrap(function _callee3$(_context3) {
+  _finishOnAllFailed = Object(_babel_runtime_helpers_esm_asyncToGenerator__WEBPACK_IMPORTED_MODULE_4__["default"])( /*#__PURE__*/Object(_babel_runtime_helpers_esm_regeneratorRuntime__WEBPACK_IMPORTED_MODULE_2__["default"])().mark(function _callee3(rulePromises) {
+    return Object(_babel_runtime_helpers_esm_regeneratorRuntime__WEBPACK_IMPORTED_MODULE_2__["default"])().wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
@@ -124568,9 +125001,9 @@ function finishOnFirstFailed(_x9) {
 }
 
 function _finishOnFirstFailed() {
-  _finishOnFirstFailed = Object(_babel_runtime_helpers_esm_asyncToGenerator__WEBPACK_IMPORTED_MODULE_4__["default"])( /*#__PURE__*/_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_2___default.a.mark(function _callee4(rulePromises) {
+  _finishOnFirstFailed = Object(_babel_runtime_helpers_esm_asyncToGenerator__WEBPACK_IMPORTED_MODULE_4__["default"])( /*#__PURE__*/Object(_babel_runtime_helpers_esm_regeneratorRuntime__WEBPACK_IMPORTED_MODULE_2__["default"])().mark(function _callee4(rulePromises) {
     var count;
-    return _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_2___default.a.wrap(function _callee4$(_context4) {
+    return Object(_babel_runtime_helpers_esm_regeneratorRuntime__WEBPACK_IMPORTED_MODULE_2__["default"])().wrap(function _callee4$(_context4) {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
@@ -127901,7 +128334,7 @@ var BaseSelect = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["forwardRef"](f
     var _triggerRef$current2;
 
     return [containerRef.current, (_triggerRef$current2 = triggerRef.current) === null || _triggerRef$current2 === void 0 ? void 0 : _triggerRef$current2.getPopupElement()];
-  }, triggerOpen, onToggleOpen); // ============================ Context =============================
+  }, triggerOpen, onToggleOpen, !!customizeRawInputElement); // ============================ Context =============================
 
   var baseSelectContext = react__WEBPACK_IMPORTED_MODULE_7__["useMemo"](function () {
     return Object(_babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_5__["default"])(Object(_babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_5__["default"])({}, props), {}, {
@@ -128426,7 +128859,7 @@ var OptionList = function OptionList(_, ref) {
     if (group) {
       var _data$title;
 
-      var groupTitle = (_data$title = data.title) !== null && _data$title !== void 0 ? _data$title : isTitleType(label) && label;
+      var groupTitle = (_data$title = data.title) !== null && _data$title !== void 0 ? _data$title : isTitleType(label) ? label.toString() : undefined;
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5__["createElement"]("div", {
         className: classnames__WEBPACK_IMPORTED_MODULE_10___default()(itemPrefixCls, "".concat(itemPrefixCls, "-group")),
         title: groupTitle
@@ -128507,23 +128940,23 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _babel_runtime_helpers_esm_slicedToArray__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @babel/runtime/helpers/esm/slicedToArray */ "./node_modules/@babel/runtime/helpers/esm/slicedToArray.js");
 /* harmony import */ var _babel_runtime_helpers_esm_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @babel/runtime/helpers/esm/objectWithoutProperties */ "./node_modules/@babel/runtime/helpers/esm/objectWithoutProperties.js");
 /* harmony import */ var _babel_runtime_helpers_esm_typeof__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @babel/runtime/helpers/esm/typeof */ "./node_modules/@babel/runtime/helpers/esm/typeof.js");
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! react */ "react");
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_7__);
+/* harmony import */ var rc_util_es_hooks_useMergedState__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! rc-util/es/hooks/useMergedState */ "./node_modules/rc-util/es/hooks/useMergedState.js");
 /* harmony import */ var rc_util_es_warning__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! rc-util/es/warning */ "./node_modules/rc-util/es/warning.js");
-/* harmony import */ var rc_util_es_hooks_useMergedState__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! rc-util/es/hooks/useMergedState */ "./node_modules/rc-util/es/hooks/useMergedState.js");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! react */ "react");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_9__);
 /* harmony import */ var _BaseSelect__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./BaseSelect */ "./node_modules/rc-select/es/BaseSelect.js");
-/* harmony import */ var _OptionList__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./OptionList */ "./node_modules/rc-select/es/OptionList.js");
-/* harmony import */ var _Option__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./Option */ "./node_modules/rc-select/es/Option.js");
-/* harmony import */ var _OptGroup__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./OptGroup */ "./node_modules/rc-select/es/OptGroup.js");
+/* harmony import */ var _hooks_useCache__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./hooks/useCache */ "./node_modules/rc-select/es/hooks/useCache.js");
+/* harmony import */ var _hooks_useFilterOptions__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./hooks/useFilterOptions */ "./node_modules/rc-select/es/hooks/useFilterOptions.js");
+/* harmony import */ var _hooks_useId__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./hooks/useId */ "./node_modules/rc-select/es/hooks/useId.js");
 /* harmony import */ var _hooks_useOptions__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./hooks/useOptions */ "./node_modules/rc-select/es/hooks/useOptions.js");
-/* harmony import */ var _SelectContext__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./SelectContext */ "./node_modules/rc-select/es/SelectContext.js");
-/* harmony import */ var _hooks_useId__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./hooks/useId */ "./node_modules/rc-select/es/hooks/useId.js");
-/* harmony import */ var _hooks_useRefFunc__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./hooks/useRefFunc */ "./node_modules/rc-select/es/hooks/useRefFunc.js");
-/* harmony import */ var _utils_valueUtil__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./utils/valueUtil */ "./node_modules/rc-select/es/utils/valueUtil.js");
-/* harmony import */ var _utils_warningPropsUtil__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ./utils/warningPropsUtil */ "./node_modules/rc-select/es/utils/warningPropsUtil.js");
+/* harmony import */ var _hooks_useRefFunc__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./hooks/useRefFunc */ "./node_modules/rc-select/es/hooks/useRefFunc.js");
+/* harmony import */ var _OptGroup__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./OptGroup */ "./node_modules/rc-select/es/OptGroup.js");
+/* harmony import */ var _Option__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./Option */ "./node_modules/rc-select/es/Option.js");
+/* harmony import */ var _OptionList__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./OptionList */ "./node_modules/rc-select/es/OptionList.js");
+/* harmony import */ var _SelectContext__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ./SelectContext */ "./node_modules/rc-select/es/SelectContext.js");
 /* harmony import */ var _utils_commonUtil__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ./utils/commonUtil */ "./node_modules/rc-select/es/utils/commonUtil.js");
-/* harmony import */ var _hooks_useFilterOptions__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ./hooks/useFilterOptions */ "./node_modules/rc-select/es/hooks/useFilterOptions.js");
-/* harmony import */ var _hooks_useCache__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ./hooks/useCache */ "./node_modules/rc-select/es/hooks/useCache.js");
+/* harmony import */ var _utils_valueUtil__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ./utils/valueUtil */ "./node_modules/rc-select/es/utils/valueUtil.js");
+/* harmony import */ var _utils_warningPropsUtil__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ./utils/warningPropsUtil */ "./node_modules/rc-select/es/utils/warningPropsUtil.js");
 
 
 
@@ -128585,7 +129018,7 @@ function isRawValue(value) {
   return !value || Object(_babel_runtime_helpers_esm_typeof__WEBPACK_IMPORTED_MODULE_6__["default"])(value) !== 'object';
 }
 
-var Select = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["forwardRef"](function (props, ref) {
+var Select = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9__["forwardRef"](function (props, ref) {
   var id = props.id,
       mode = props.mode,
       _props$prefixCls = props.prefixCls,
@@ -128620,10 +129053,10 @@ var Select = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["forwardRef"](funct
       onChange = props.onChange,
       restProps = Object(_babel_runtime_helpers_esm_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_5__["default"])(props, _excluded);
 
-  var mergedId = Object(_hooks_useId__WEBPACK_IMPORTED_MODULE_16__["default"])(id);
+  var mergedId = Object(_hooks_useId__WEBPACK_IMPORTED_MODULE_13__["default"])(id);
   var multiple = Object(_BaseSelect__WEBPACK_IMPORTED_MODULE_10__["isMultiple"])(mode);
   var childrenAsData = !!(!options && children);
-  var mergedFilterOption = react__WEBPACK_IMPORTED_MODULE_7__["useMemo"](function () {
+  var mergedFilterOption = react__WEBPACK_IMPORTED_MODULE_9__["useMemo"](function () {
     if (filterOption === undefined && mode === 'combobox') {
       return false;
     }
@@ -128631,14 +129064,14 @@ var Select = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["forwardRef"](funct
     return filterOption;
   }, [filterOption, mode]); // ========================= FieldNames =========================
 
-  var mergedFieldNames = react__WEBPACK_IMPORTED_MODULE_7__["useMemo"](function () {
-    return Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_18__["fillFieldNames"])(fieldNames, childrenAsData);
+  var mergedFieldNames = react__WEBPACK_IMPORTED_MODULE_9__["useMemo"](function () {
+    return Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_21__["fillFieldNames"])(fieldNames, childrenAsData);
   },
   /* eslint-disable react-hooks/exhaustive-deps */
   [// We stringify fieldNames to avoid unnecessary re-renders.
   JSON.stringify(fieldNames), childrenAsData]); // =========================== Search ===========================
 
-  var _useMergedState = Object(rc_util_es_hooks_useMergedState__WEBPACK_IMPORTED_MODULE_9__["default"])('', {
+  var _useMergedState = Object(rc_util_es_hooks_useMergedState__WEBPACK_IMPORTED_MODULE_7__["default"])('', {
     value: searchValue !== undefined ? searchValue : inputValue,
     postState: function postState(search) {
       return search || '';
@@ -128654,7 +129087,7 @@ var Select = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["forwardRef"](funct
       labelOptions = parsedOptions.labelOptions,
       mergedOptions = parsedOptions.options; // ========================= Wrap Value =========================
 
-  var convert2LabelValues = react__WEBPACK_IMPORTED_MODULE_7__["useCallback"](function (draftValues) {
+  var convert2LabelValues = react__WEBPACK_IMPORTED_MODULE_9__["useCallback"](function (draftValues) {
     // Convert to array
     var valueList = Object(_utils_commonUtil__WEBPACK_IMPORTED_MODULE_20__["toArray"])(draftValues); // Convert to labelInValue type
 
@@ -128702,7 +129135,7 @@ var Select = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["forwardRef"](funct
     });
   }, [mergedFieldNames, optionLabelProp, valueOptions]); // =========================== Values ===========================
 
-  var _useMergedState3 = Object(rc_util_es_hooks_useMergedState__WEBPACK_IMPORTED_MODULE_9__["default"])(defaultValue, {
+  var _useMergedState3 = Object(rc_util_es_hooks_useMergedState__WEBPACK_IMPORTED_MODULE_7__["default"])(defaultValue, {
     value: value
   }),
       _useMergedState4 = Object(_babel_runtime_helpers_esm_slicedToArray__WEBPACK_IMPORTED_MODULE_4__["default"])(_useMergedState3, 2),
@@ -128710,7 +129143,7 @@ var Select = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["forwardRef"](funct
       setInternalValue = _useMergedState4[1]; // Merged value with LabelValueType
 
 
-  var rawLabeledValues = react__WEBPACK_IMPORTED_MODULE_7__["useMemo"](function () {
+  var rawLabeledValues = react__WEBPACK_IMPORTED_MODULE_9__["useMemo"](function () {
     var _values$;
 
     var values = convert2LabelValues(internalValue); // combobox no need save value when it's empty
@@ -128722,12 +129155,12 @@ var Select = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["forwardRef"](funct
     return values;
   }, [internalValue, convert2LabelValues, mode]); // Fill label with cache to avoid option remove
 
-  var _useCache = Object(_hooks_useCache__WEBPACK_IMPORTED_MODULE_22__["default"])(rawLabeledValues, valueOptions),
+  var _useCache = Object(_hooks_useCache__WEBPACK_IMPORTED_MODULE_11__["default"])(rawLabeledValues, valueOptions),
       _useCache2 = Object(_babel_runtime_helpers_esm_slicedToArray__WEBPACK_IMPORTED_MODULE_4__["default"])(_useCache, 2),
       mergedValues = _useCache2[0],
       getMixedOption = _useCache2[1];
 
-  var displayValues = react__WEBPACK_IMPORTED_MODULE_7__["useMemo"](function () {
+  var displayValues = react__WEBPACK_IMPORTED_MODULE_9__["useMemo"](function () {
     // `null` need show as placeholder instead
     // https://github.com/ant-design/ant-design/issues/25057
     if (!mode && mergedValues.length === 1) {
@@ -128748,12 +129181,12 @@ var Select = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["forwardRef"](funct
   }, [mode, mergedValues]);
   /** Convert `displayValues` to raw value type set */
 
-  var rawValues = react__WEBPACK_IMPORTED_MODULE_7__["useMemo"](function () {
+  var rawValues = react__WEBPACK_IMPORTED_MODULE_9__["useMemo"](function () {
     return new Set(mergedValues.map(function (val) {
       return val.value;
     }));
   }, [mergedValues]);
-  react__WEBPACK_IMPORTED_MODULE_7__["useEffect"](function () {
+  react__WEBPACK_IMPORTED_MODULE_9__["useEffect"](function () {
     if (mode === 'combobox') {
       var _mergedValues$;
 
@@ -128766,14 +129199,14 @@ var Select = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["forwardRef"](funct
   }, [mergedValues]); // ======================= Display Option =======================
   // Create a placeholder item if not exist in `options`
 
-  var createTagOption = Object(_hooks_useRefFunc__WEBPACK_IMPORTED_MODULE_17__["default"])(function (val, label) {
+  var createTagOption = Object(_hooks_useRefFunc__WEBPACK_IMPORTED_MODULE_15__["default"])(function (val, label) {
     var _ref;
 
     var mergedLabel = label !== null && label !== void 0 ? label : val;
     return _ref = {}, Object(_babel_runtime_helpers_esm_defineProperty__WEBPACK_IMPORTED_MODULE_2__["default"])(_ref, mergedFieldNames.value, val), Object(_babel_runtime_helpers_esm_defineProperty__WEBPACK_IMPORTED_MODULE_2__["default"])(_ref, mergedFieldNames.label, mergedLabel), _ref;
   }); // Fill tag as option if mode is `tags`
 
-  var filledTagOptions = react__WEBPACK_IMPORTED_MODULE_7__["useMemo"](function () {
+  var filledTagOptions = react__WEBPACK_IMPORTED_MODULE_9__["useMemo"](function () {
     if (mode !== 'tags') {
       return mergedOptions;
     } // >>> Tag mode
@@ -128799,9 +129232,9 @@ var Select = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["forwardRef"](funct
 
     return cloneOptions;
   }, [createTagOption, mergedOptions, valueOptions, mergedValues, mode]);
-  var filteredOptions = Object(_hooks_useFilterOptions__WEBPACK_IMPORTED_MODULE_21__["default"])(filledTagOptions, mergedFieldNames, mergedSearchValue, mergedFilterOption, optionFilterProp); // Fill options with search value if needed
+  var filteredOptions = Object(_hooks_useFilterOptions__WEBPACK_IMPORTED_MODULE_12__["default"])(filledTagOptions, mergedFieldNames, mergedSearchValue, mergedFilterOption, optionFilterProp); // Fill options with search value if needed
 
-  var filledSearchOptions = react__WEBPACK_IMPORTED_MODULE_7__["useMemo"](function () {
+  var filledSearchOptions = react__WEBPACK_IMPORTED_MODULE_9__["useMemo"](function () {
     if (mode !== 'tags' || !mergedSearchValue || filteredOptions.some(function (item) {
       return item[optionFilterProp || 'value'] === mergedSearchValue;
     })) {
@@ -128811,7 +129244,7 @@ var Select = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["forwardRef"](funct
 
     return [createTagOption(mergedSearchValue)].concat(Object(_babel_runtime_helpers_esm_toConsumableArray__WEBPACK_IMPORTED_MODULE_1__["default"])(filteredOptions));
   }, [createTagOption, optionFilterProp, mode, filteredOptions, mergedSearchValue]);
-  var orderedFilteredOptions = react__WEBPACK_IMPORTED_MODULE_7__["useMemo"](function () {
+  var orderedFilteredOptions = react__WEBPACK_IMPORTED_MODULE_9__["useMemo"](function () {
     if (!filterSort) {
       return filledSearchOptions;
     }
@@ -128820,8 +129253,8 @@ var Select = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["forwardRef"](funct
       return filterSort(a, b);
     });
   }, [filledSearchOptions, filterSort]);
-  var displayOptions = react__WEBPACK_IMPORTED_MODULE_7__["useMemo"](function () {
-    return Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_18__["flattenOptions"])(orderedFilteredOptions, {
+  var displayOptions = react__WEBPACK_IMPORTED_MODULE_9__["useMemo"](function () {
+    return Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_21__["flattenOptions"])(orderedFilteredOptions, {
       fieldNames: mergedFieldNames,
       childrenAsData: childrenAsData
     });
@@ -128841,7 +129274,7 @@ var Select = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["forwardRef"](funct
         return v.value;
       });
       var returnOptions = labeledValues.map(function (v) {
-        return Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_18__["injectPropsWithOption"])(getMixedOption(v.value));
+        return Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_21__["injectPropsWithOption"])(getMixedOption(v.value));
       });
       onChange( // Value
       multiple ? returnValues : returnValues[0], // Option
@@ -128850,18 +129283,18 @@ var Select = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["forwardRef"](funct
   }; // ======================= Accessibility ========================
 
 
-  var _React$useState = react__WEBPACK_IMPORTED_MODULE_7__["useState"](null),
+  var _React$useState = react__WEBPACK_IMPORTED_MODULE_9__["useState"](null),
       _React$useState2 = Object(_babel_runtime_helpers_esm_slicedToArray__WEBPACK_IMPORTED_MODULE_4__["default"])(_React$useState, 2),
       activeValue = _React$useState2[0],
       setActiveValue = _React$useState2[1];
 
-  var _React$useState3 = react__WEBPACK_IMPORTED_MODULE_7__["useState"](0),
+  var _React$useState3 = react__WEBPACK_IMPORTED_MODULE_9__["useState"](0),
       _React$useState4 = Object(_babel_runtime_helpers_esm_slicedToArray__WEBPACK_IMPORTED_MODULE_4__["default"])(_React$useState3, 2),
       accessibilityIndex = _React$useState4[0],
       setAccessibilityIndex = _React$useState4[1];
 
   var mergedDefaultActiveFirstOption = defaultActiveFirstOption !== undefined ? defaultActiveFirstOption : mode !== 'combobox';
-  var onActiveValue = react__WEBPACK_IMPORTED_MODULE_7__["useCallback"](function (active, index) {
+  var onActiveValue = react__WEBPACK_IMPORTED_MODULE_9__["useCallback"](function (active, index) {
     var _ref2 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
         _ref2$source = _ref2.source,
         source = _ref2$source === void 0 ? 'keyboard' : _ref2$source;
@@ -128882,7 +129315,7 @@ var Select = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["forwardRef"](funct
         label: option === null || option === void 0 ? void 0 : option[mergedFieldNames.label],
         value: val,
         key: (_option$key2 = option === null || option === void 0 ? void 0 : option.key) !== null && _option$key2 !== void 0 ? _option$key2 : val
-      } : val, Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_18__["injectPropsWithOption"])(option)];
+      } : val, Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_21__["injectPropsWithOption"])(option)];
     };
 
     if (selected && onSelect) {
@@ -128903,7 +129336,7 @@ var Select = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["forwardRef"](funct
   }; // Used for OptionList selection
 
 
-  var onInternalSelect = Object(_hooks_useRefFunc__WEBPACK_IMPORTED_MODULE_17__["default"])(function (val, info) {
+  var onInternalSelect = Object(_hooks_useRefFunc__WEBPACK_IMPORTED_MODULE_15__["default"])(function (val, info) {
     var cloneValues; // Single mode always trigger select only with option list
 
     var mergedSelect = multiple ? info.selected : true;
@@ -128986,7 +129419,7 @@ var Select = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["forwardRef"](funct
   }; // ========================== Context ===========================
 
 
-  var selectContext = react__WEBPACK_IMPORTED_MODULE_7__["useMemo"](function () {
+  var selectContext = react__WEBPACK_IMPORTED_MODULE_9__["useMemo"](function () {
     var realVirtual = virtual !== false && dropdownMatchSelectWidth !== false;
     return Object(_babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_3__["default"])(Object(_babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_3__["default"])({}, parsedOptions), {}, {
       flattenOptions: displayOptions,
@@ -129004,15 +129437,16 @@ var Select = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["forwardRef"](funct
   }, [parsedOptions, displayOptions, onActiveValue, mergedDefaultActiveFirstOption, onInternalSelect, menuItemSelectedIcon, rawValues, mergedFieldNames, virtual, dropdownMatchSelectWidth, listHeight, listItemHeight, childrenAsData]); // ========================== Warning ===========================
 
   if (true) {
-    Object(_utils_warningPropsUtil__WEBPACK_IMPORTED_MODULE_19__["default"])(props);
+    Object(_utils_warningPropsUtil__WEBPACK_IMPORTED_MODULE_22__["default"])(props);
+    Object(_utils_warningPropsUtil__WEBPACK_IMPORTED_MODULE_22__["warningNullOptions"])(mergedOptions, mergedFieldNames);
   } // ==============================================================
   // ==                          Render                          ==
   // ==============================================================
 
 
-  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["createElement"](_SelectContext__WEBPACK_IMPORTED_MODULE_15__["default"].Provider, {
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9__["createElement"](_SelectContext__WEBPACK_IMPORTED_MODULE_19__["default"].Provider, {
     value: selectContext
-  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["createElement"](_BaseSelect__WEBPACK_IMPORTED_MODULE_10__["default"], Object(_babel_runtime_helpers_esm_extends__WEBPACK_IMPORTED_MODULE_0__["default"])({}, restProps, {
+  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9__["createElement"](_BaseSelect__WEBPACK_IMPORTED_MODULE_10__["default"], Object(_babel_runtime_helpers_esm_extends__WEBPACK_IMPORTED_MODULE_0__["default"])({}, restProps, {
     // >>> MISC
     id: mergedId,
     prefixCls: prefixCls,
@@ -129028,7 +129462,7 @@ var Select = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7__["forwardRef"](funct
     onSearchSplit: onInternalSearchSplit,
     dropdownMatchSelectWidth: dropdownMatchSelectWidth // >>> OptionList
     ,
-    OptionList: _OptionList__WEBPACK_IMPORTED_MODULE_11__["default"],
+    OptionList: _OptionList__WEBPACK_IMPORTED_MODULE_18__["default"],
     emptyOptions: !displayOptions.length // >>> Accessibility
     ,
     activeValue: activeValue,
@@ -129041,8 +129475,8 @@ if (true) {
 }
 
 var TypedSelect = Select;
-TypedSelect.Option = _Option__WEBPACK_IMPORTED_MODULE_12__["default"];
-TypedSelect.OptGroup = _OptGroup__WEBPACK_IMPORTED_MODULE_13__["default"];
+TypedSelect.Option = _Option__WEBPACK_IMPORTED_MODULE_17__["default"];
+TypedSelect.OptGroup = _OptGroup__WEBPACK_IMPORTED_MODULE_16__["default"];
 /* harmony default export */ __webpack_exports__["default"] = (TypedSelect);
 
 /***/ }),
@@ -129228,6 +129662,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
 /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var rc_util_es_ref__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! rc-util/es/ref */ "./node_modules/rc-util/es/ref.js");
+/* harmony import */ var rc_util_es_warning__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! rc-util/es/warning */ "./node_modules/rc-util/es/warning.js");
+
 
 
 
@@ -129265,6 +129701,7 @@ var Input = function Input(_ref, ref) {
       onOriginCompositionStart = originProps.onCompositionStart,
       onOriginCompositionEnd = originProps.onCompositionEnd,
       style = originProps.style;
+  Object(rc_util_es_warning__WEBPACK_IMPORTED_MODULE_4__["warning"])(!('maxLength' in inputNode.props), "Passing 'maxLength' to input element directly may not work because input in BaseSelect is controlled.");
   inputNode = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__["cloneElement"](inputNode, Object(_babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_0__["default"])(Object(_babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_0__["default"])(Object(_babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_0__["default"])({
     type: 'search'
   }, originProps), {}, {
@@ -129368,6 +129805,12 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+function itemKey(value) {
+  var _value$key;
+
+  return (_value$key = value.key) !== null && _value$key !== void 0 ? _value$key : value.value;
+}
+
 var onPreventMouseDown = function onPreventMouseDown(event) {
   event.preventDefault();
   event.stopPropagation();
@@ -129531,7 +129974,7 @@ var SelectSelector = function SelectSelector(props) {
     renderItem: renderItem,
     renderRest: renderRest,
     suffix: inputNode,
-    itemKey: "key",
+    itemKey: itemKey,
     maxCount: maxTagCount
   });
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2__["createElement"](react__WEBPACK_IMPORTED_MODULE_2__["Fragment"], null, selectionNode, !values.length && !inputValue && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2__["createElement"]("span", {
@@ -130386,14 +130829,22 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "react");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
 
-function useSelectTriggerControl(elements, open, triggerOpen) {
+function useSelectTriggerControl(elements, open, triggerOpen, customizedTrigger) {
   var propsRef = react__WEBPACK_IMPORTED_MODULE_0__["useRef"](null);
   propsRef.current = {
     open: open,
-    triggerOpen: triggerOpen
+    triggerOpen: triggerOpen,
+    customizedTrigger: customizedTrigger
   };
   react__WEBPACK_IMPORTED_MODULE_0__["useEffect"](function () {
     function onGlobalMouseDown(event) {
+      var _propsRef$current;
+
+      // If trigger is customized, Trigger will take control of popupVisible
+      if ((_propsRef$current = propsRef.current) === null || _propsRef$current === void 0 ? void 0 : _propsRef$current.customizedTrigger) {
+        return;
+      }
+
       var target = event.target;
 
       if (target.shadowRoot && event.composed) {
@@ -130742,19 +131193,20 @@ function getSeparatedContent(text, tokens) {
 /*!*************************************************************!*\
   !*** ./node_modules/rc-select/es/utils/warningPropsUtil.js ***!
   \*************************************************************/
-/*! exports provided: default */
+/*! exports provided: warningNullOptions, default */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "warningNullOptions", function() { return warningNullOptions; });
 /* harmony import */ var _babel_runtime_helpers_esm_typeof__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/helpers/esm/typeof */ "./node_modules/@babel/runtime/helpers/esm/typeof.js");
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react */ "react");
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var rc_util_es_Children_toArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! rc-util/es/Children/toArray */ "./node_modules/rc-util/es/Children/toArray.js");
 /* harmony import */ var rc_util_es_warning__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! rc-util/es/warning */ "./node_modules/rc-util/es/warning.js");
-/* harmony import */ var rc_util_es_Children_toArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! rc-util/es/Children/toArray */ "./node_modules/rc-util/es/Children/toArray.js");
-/* harmony import */ var _legacyUtil__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./legacyUtil */ "./node_modules/rc-select/es/utils/legacyUtil.js");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react */ "react");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _BaseSelect__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../BaseSelect */ "./node_modules/rc-select/es/BaseSelect.js");
 /* harmony import */ var _commonUtil__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./commonUtil */ "./node_modules/rc-select/es/utils/commonUtil.js");
-/* harmony import */ var _BaseSelect__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../BaseSelect */ "./node_modules/rc-select/es/BaseSelect.js");
+/* harmony import */ var _legacyUtil__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./legacyUtil */ "./node_modules/rc-select/es/utils/legacyUtil.js");
 
 
 
@@ -130779,9 +131231,9 @@ function warningProps(props) {
       value = props.value,
       inputValue = props.inputValue,
       optionLabelProp = props.optionLabelProp;
-  var multiple = Object(_BaseSelect__WEBPACK_IMPORTED_MODULE_6__["isMultiple"])(mode);
+  var multiple = Object(_BaseSelect__WEBPACK_IMPORTED_MODULE_4__["isMultiple"])(mode);
   var mergedShowSearch = showSearch !== undefined ? showSearch : multiple || mode === 'combobox';
-  var mergedOptions = options || Object(_legacyUtil__WEBPACK_IMPORTED_MODULE_4__["convertChildrenToData"])(children); // `tags` should not set option as disabled
+  var mergedOptions = options || Object(_legacyUtil__WEBPACK_IMPORTED_MODULE_6__["convertChildrenToData"])(children); // `tags` should not set option as disabled
 
   Object(rc_util_es_warning__WEBPACK_IMPORTED_MODULE_2__["default"])(mode !== 'tags' || mergedOptions.every(function (opt) {
     return !opt.disabled;
@@ -130826,8 +131278,8 @@ function warningProps(props) {
 
   if (children) {
     var invalidateChildType = null;
-    Object(rc_util_es_Children_toArray__WEBPACK_IMPORTED_MODULE_3__["default"])(children).some(function (node) {
-      if (! /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__["isValidElement"](node) || !node.type) {
+    Object(rc_util_es_Children_toArray__WEBPACK_IMPORTED_MODULE_1__["default"])(children).some(function (node) {
+      if (! /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["isValidElement"](node) || !node.type) {
         return false;
       }
 
@@ -130838,8 +131290,8 @@ function warningProps(props) {
       }
 
       if (type.isSelectOptGroup) {
-        var allChildrenValid = Object(rc_util_es_Children_toArray__WEBPACK_IMPORTED_MODULE_3__["default"])(node.props.children).every(function (subNode) {
-          if (! /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__["isValidElement"](subNode) || !node.type || subNode.type.isSelectOption) {
+        var allChildrenValid = Object(rc_util_es_Children_toArray__WEBPACK_IMPORTED_MODULE_1__["default"])(node.props.children).every(function (subNode) {
+          if (! /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["isValidElement"](subNode) || !node.type || subNode.type.isSelectOption) {
             return true;
           }
 
@@ -130864,8 +131316,32 @@ function warningProps(props) {
 
     Object(rc_util_es_warning__WEBPACK_IMPORTED_MODULE_2__["default"])(inputValue === undefined, '`inputValue` is deprecated, please use `searchValue` instead.');
   }
-}
+} // value in Select option should not be null
+// note: OptGroup has options too
+
+
+function warningNullOptions(options, fieldNames) {
+  if (options) {
+    var recursiveOptions = function recursiveOptions(optionsList) {
+      var inGroup = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
 
+      for (var i = 0; i < optionsList.length; i++) {
+        var option = optionsList[i];
+
+        if (option[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value] === null) {
+          Object(rc_util_es_warning__WEBPACK_IMPORTED_MODULE_2__["default"])(false, '`value` in Select options should not be `null`.');
+          return true;
+        }
+
+        if (!inGroup && Array.isArray(option[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.options]) && recursiveOptions(option[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.options], true)) {
+          break;
+        }
+      }
+    };
+
+    recursiveOptions(options);
+  }
+}
 /* harmony default export */ __webpack_exports__["default"] = (warningProps);
 
 /***/ }),
@@ -139032,7 +139508,8 @@ var MobilePopupInner = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2__["forwardR
       popupStyle = _props$mobile.popupStyle,
       _props$mobile$popupMo = _props$mobile.popupMotion,
       popupMotion = _props$mobile$popupMo === void 0 ? {} : _props$mobile$popupMo,
-      popupRender = _props$mobile.popupRender;
+      popupRender = _props$mobile.popupRender,
+      onClick = props.onClick;
   var elementRef = react__WEBPACK_IMPORTED_MODULE_2__["useRef"](); // ========================= Refs =========================
 
   react__WEBPACK_IMPORTED_MODULE_2__["useImperativeHandle"](ref, function () {
@@ -139072,6 +139549,7 @@ var MobilePopupInner = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2__["forwardR
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2__["createElement"]("div", {
       ref: motionRef,
       className: mergedClassName,
+      onClick: onClick,
       style: Object(_babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_1__["default"])(Object(_babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_1__["default"])({}, motionStyle), mergedStyle)
     }, childNode);
   });
@@ -139133,7 +139611,8 @@ var PopupInner = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["forwardRef"](f
       onMouseEnter = props.onMouseEnter,
       onMouseLeave = props.onMouseLeave,
       onMouseDown = props.onMouseDown,
-      onTouchStart = props.onTouchStart;
+      onTouchStart = props.onTouchStart,
+      onClick = props.onClick;
   var alignRef = Object(react__WEBPACK_IMPORTED_MODULE_3__["useRef"])();
   var elementRef = Object(react__WEBPACK_IMPORTED_MODULE_3__["useRef"])();
 
@@ -139314,6 +139793,7 @@ var PopupInner = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["forwardRef"](f
       onMouseLeave: onMouseLeave,
       onMouseDownCapture: onMouseDown,
       onTouchStartCapture: onTouchStart,
+      onClick: onClick,
       style: Object(_babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_1__["default"])(Object(_babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_1__["default"])({}, motionStyle), mergedStyle)
     }, childNode));
   });
@@ -139462,8 +139942,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/regenerator */ "./node_modules/@babel/runtime/regenerator/index.js");
-/* harmony import */ var _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _babel_runtime_helpers_esm_regeneratorRuntime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/helpers/esm/regeneratorRuntime */ "./node_modules/@babel/runtime/helpers/esm/regeneratorRuntime.js");
 /* harmony import */ var _babel_runtime_helpers_esm_asyncToGenerator__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/runtime/helpers/esm/asyncToGenerator */ "./node_modules/@babel/runtime/helpers/esm/asyncToGenerator.js");
 /* harmony import */ var _babel_runtime_helpers_esm_slicedToArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime/helpers/esm/slicedToArray */ "./node_modules/@babel/runtime/helpers/esm/slicedToArray.js");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react */ "react");
@@ -139529,9 +140008,9 @@ var StatusQueue = ['measure', 'alignPre', 'align', null, 'motion'];
     }
 
     if (status) {
-      rafRef.current = Object(rc_util_es_raf__WEBPACK_IMPORTED_MODULE_4__["default"])( /*#__PURE__*/Object(_babel_runtime_helpers_esm_asyncToGenerator__WEBPACK_IMPORTED_MODULE_1__["default"])( /*#__PURE__*/_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.mark(function _callee() {
+      rafRef.current = Object(rc_util_es_raf__WEBPACK_IMPORTED_MODULE_4__["default"])( /*#__PURE__*/Object(_babel_runtime_helpers_esm_asyncToGenerator__WEBPACK_IMPORTED_MODULE_1__["default"])( /*#__PURE__*/Object(_babel_runtime_helpers_esm_regeneratorRuntime__WEBPACK_IMPORTED_MODULE_0__["default"])().mark(function _callee() {
         var index, nextStatus;
-        return _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.wrap(function _callee$(_context) {
+        return Object(_babel_runtime_helpers_esm_regeneratorRuntime__WEBPACK_IMPORTED_MODULE_0__["default"])().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -139890,7 +140369,8 @@ function generateTrigger(PortalComponent) {
             stretch = _this$props2.stretch,
             alignPoint = _this$props2.alignPoint,
             mobile = _this$props2.mobile,
-            forceRender = _this$props2.forceRender;
+            forceRender = _this$props2.forceRender,
+            onPopupClick = _this$props2.onPopupClick;
         var _this$state = _this.state,
             popupVisible = _this$state.popupVisible,
             point = _this$state.point;
@@ -139932,7 +140412,8 @@ function generateTrigger(PortalComponent) {
           ref: _this.popupRef,
           motion: popupMotion,
           mobile: mobile,
-          forceRender: forceRender
+          forceRender: forceRender,
+          onClick: onPopupClick
         }), typeof popup === 'function' ? popup() : popup);
       };