acud 0.0.69 → 0.0.70

package/dist/acud.js

@@ -1,4 +1,4 @@
-/*! acud v0.0.69 */
+/*! acud v0.0.70 */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory(require("react"), require("react-dom"));
@@ -8570,11 +8570,13 @@ function generatePicker(generateConfig) {
         Object(_babel_runtime_helpers_esm_classCallCheck__WEBPACK_IMPORTED_MODULE_2__["default"])(this, Picker);
 
         _this = _super.call(this, props);
-        _this.pickerRef = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6__["createRef"](); // focus = () => {
-        //     if (this.pickerRef.current) {
-        //         this.pickerRef.current.focus();
-        //     }
-        // };
+        _this.pickerRef = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6__["createRef"]();
+
+        _this.focus = function () {
+          if (_this.pickerRef.current) {
+            _this.pickerRef.current.focus();
+          }
+        };
 
         _this.blur = function () {
           if (_this.pickerRef.current) {
@@ -8851,6 +8853,43 @@ var locale = {
 
 /***/ }),
 
+/***/ "./components/date-picker/locale/zh_CN.tsx":
+/*!*************************************************!*\
+  !*** ./components/date-picker/locale/zh_CN.tsx ***!
+  \*************************************************/
+/*! exports provided: default */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _babel_runtime_helpers_esm_extends__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/helpers/esm/extends */ "./node_modules/@babel/runtime/helpers/esm/extends.js");
+/* harmony import */ var _src_locale_zh_CN__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../src/locale/zh_CN */ "./components/date-picker/src/locale/zh_CN.ts");
+/* harmony import */ var _time_picker_locale_zh_CN__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../time-picker/locale/zh_CN */ "./components/time-picker/locale/zh_CN.tsx");
+
+
+
+var timePickerLocale = _time_picker_locale_zh_CN__WEBPACK_IMPORTED_MODULE_2__["default"].timePickerLocale; // 统一合并为完整的 Locale
+
+var locale = {
+  lang: Object(_babel_runtime_helpers_esm_extends__WEBPACK_IMPORTED_MODULE_0__["default"])({
+    placeholder: '请选择日期',
+    yearPlaceholder: '请选择年份',
+    quarterPlaceholder: '请选择季度',
+    monthPlaceholder: '请选择月份',
+    weekPlaceholder: '请选择周',
+    rangePlaceholder: ['开始日期', '结束日期'],
+    rangeYearPlaceholder: ['开始年份', '结束年份'],
+    rangeMonthPlaceholder: ['开始月份', '结束月份'],
+    rangeWeekPlaceholder: ['开始周', '结束周']
+  }, _src_locale_zh_CN__WEBPACK_IMPORTED_MODULE_1__["default"]),
+  timePickerLocale: Object(_babel_runtime_helpers_esm_extends__WEBPACK_IMPORTED_MODULE_0__["default"])({}, timePickerLocale)
+}; // should add whitespace between char in Button
+
+locale.lang.ok = '确 定';
+/* harmony default export */ __webpack_exports__["default"] = (locale);
+
+/***/ }),
+
 /***/ "./components/date-picker/src/PanelContext.tsx":
 /*!*****************************************************!*\
   !*** ./components/date-picker/src/PanelContext.tsx ***!
@@ -11922,6 +11961,47 @@ var locale = {
 
 /***/ }),
 
+/***/ "./components/date-picker/src/locale/zh_CN.ts":
+/*!****************************************************!*\
+  !*** ./components/date-picker/src/locale/zh_CN.ts ***!
+  \****************************************************/
+/*! exports provided: default */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+var locale = {
+  locale: 'zh_CN',
+  today: '今天',
+  now: '此刻',
+  backToToday: '返回今天',
+  ok: '确定',
+  timeSelect: '选择时间',
+  dateSelect: '选择日期',
+  weekSelect: '选择周',
+  clear: '清除',
+  month: '月',
+  year: '年',
+  previousMonth: '上个月 (翻页上键)',
+  nextMonth: '下个月 (翻页下键)',
+  monthSelect: '选择月份',
+  yearSelect: '选择年份',
+  decadeSelect: '选择年代',
+  yearFormat: 'YYYY年',
+  dayFormat: 'D日',
+  dateFormat: 'YYYY年M月D日',
+  dateTimeFormat: 'YYYY年M月D日 HH时mm分ss秒',
+  previousYear: '上一年 (Control键加左方向键)',
+  nextYear: '下一年 (Control键加右方向键)',
+  previousDecade: '上一年代',
+  nextDecade: '下一年代',
+  previousCentury: '上一世纪',
+  nextCentury: '下一世纪'
+};
+/* harmony default export */ __webpack_exports__["default"] = (locale);
+
+/***/ }),
+
 /***/ "./components/date-picker/src/panels/DatePanel/DateBody.tsx":
 /*!******************************************************************!*\
   !*** ./components/date-picker/src/panels/DatePanel/DateBody.tsx ***!
@@ -21102,8 +21182,10 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _date_picker_locale_zh_CN__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../date-picker/locale/zh_CN */ "./components/date-picker/locale/zh_CN.tsx");
 /* eslint-disable no-template-curly-in-string */
 // import {Locale} from '../locale-provider';
+
 var typeTemplate = '${label}不是一个有效的${type}'; // const localeValues: Locale = {
 
 var localeValues = {
@@ -21112,6 +21194,7 @@ var localeValues = {
   global: {
     placeholder: '请选择'
   },
+  DatePicker: _date_picker_locale_zh_CN__WEBPACK_IMPORTED_MODULE_0__["default"],
   Table: {
     filterTitle: '筛选',
     filterConfirm: '确定',
@@ -40809,6 +40892,32 @@ var locale = {
 
 /***/ }),
 
+/***/ "./components/time-picker/locale/zh_CN.tsx":
+/*!*************************************************!*\
+  !*** ./components/time-picker/locale/zh_CN.tsx ***!
+  \*************************************************/
+/*! exports provided: default */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+var locale = {
+  lang: {
+    locale: 'zh_CN',
+    now: '此刻',
+    ok: '确定',
+    timeSelect: '选择时间',
+    clear: '清除'
+  },
+  timePickerLocale: {
+    placeholder: '请选择时间',
+    rangePlaceholder: ['开始时间', '结束时间']
+  }
+};
+/* harmony default export */ __webpack_exports__["default"] = (locale);
+
+/***/ }),
+
 /***/ "./components/time-picker/style/index.less":
 /*!*************************************************!*\
   !*** ./components/time-picker/style/index.less ***!
@@ -41615,8 +41724,8 @@ function ToastDom(props) {
       onClose = _props$onClose === void 0 ? null : _props$onClose;
 
   var _useState = Object(react__WEBPACK_IMPORTED_MODULE_3__["useState"])(null),
-      _useState2 = Object(_babel_runtime_helpers_esm_slicedToArray__WEBPACK_IMPORTED_MODULE_2__["default"])(_useState, 1),
-      setTimerID = _useState2[0];
+      _useState2 = Object(_babel_runtime_helpers_esm_slicedToArray__WEBPACK_IMPORTED_MODULE_2__["default"])(_useState, 2),
+      setTimerID = _useState2[1];
 
   var _useState3 = Object(react__WEBPACK_IMPORTED_MODULE_3__["useState"])(countdown),
       _useState4 = Object(_babel_runtime_helpers_esm_slicedToArray__WEBPACK_IMPORTED_MODULE_2__["default"])(_useState3, 2),
@@ -85512,16 +85621,7 @@ var Schema = /*#__PURE__*/function () {
       if (rule.asyncValidator) {
         res = rule.asyncValidator(rule, data.value, cb, data.source, options);
       } else if (rule.validator) {
-        try {
-          res = rule.validator(rule, data.value, cb, data.source, options);
-        } catch (error) {
-          console.error == null ? void 0 : console.error(error); // rethrow to report error
-
-          setTimeout(function () {
-            throw error;
-          }, 0);
-          cb(error.message);
-        }
+        res = rule.validator(rule, data.value, cb, data.source, options);
 
         if (res === true) {
           cb();
@@ -86034,8 +86134,8 @@ function getClientPosition(elem) {
   // 但测试发现，这样反而会导致当 html 和 body 有边距/边框样式时，获取的值不正确
   // 此外，ie6 会忽略 html 的 margin 值，幸运地是没有谁会去设置 html 的 margin
 
-  x = Math.floor(box.left);
-  y = Math.floor(box.top); // In IE, most of the time, 2 extra pixels are added to the top and left
+  x = box.left;
+  y = box.top; // In IE, most of the time, 2 extra pixels are added to the top and left
   // due to the implicit 2-pixel inset border.  In IE6/7 quirks mode and
   // IE6 standards mode, this border can be overridden by setting the
   // document element's border to zero -- thus, we cannot rely on the
@@ -86442,7 +86542,7 @@ function getWH(elem, name, ex) {
   }
 
   var which = name === 'width' ? ['Left', 'Right'] : ['Top', 'Bottom'];
-  var borderBoxValue = name === 'width' ? Math.floor(elem.getBoundingClientRect().width) : Math.floor(elem.getBoundingClientRect().height);
+  var borderBoxValue = name === 'width' ? elem.getBoundingClientRect().width : elem.getBoundingClientRect().height;
   var isBorderBox = isBorderBoxFn(elem);
   var cssBoxValue = 0;
 
@@ -117292,8 +117392,6 @@ __webpack_require__.r(__webpack_exports__);
   }
 
   function trigger(force) {
-    cancelTrigger();
-
     if (!calledRef.current || force === true) {
       if (callback() === false) {
         // Not delay since callback cancelled self
@@ -117301,10 +117399,12 @@ __webpack_require__.r(__webpack_exports__);
       }
 
       calledRef.current = true;
+      cancelTrigger();
       timeoutRef.current = window.setTimeout(function () {
         calledRef.current = false;
       }, buffer);
     } else {
+      cancelTrigger();
       timeoutRef.current = window.setTimeout(function () {
         calledRef.current = false;
         trigger();
@@ -121726,14 +121826,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-function stringify(value) {
-  try {
-    return JSON.stringify(value);
-  } catch (err) {
-    return Math.random();
-  }
-}
-
 function useWatch() {
   var dependencies = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var form = arguments.length > 1 ? arguments[1] : undefined;
@@ -121743,11 +121835,8 @@ function useWatch() {
       value = _useState2[0],
       setValue = _useState2[1];
 
-  var valueStr = Object(react__WEBPACK_IMPORTED_MODULE_4__["useMemo"])(function () {
-    return stringify(value);
-  }, [value]);
-  var valueStrRef = Object(react__WEBPACK_IMPORTED_MODULE_4__["useRef"])(valueStr);
-  valueStrRef.current = valueStr;
+  var valueCacheRef = Object(react__WEBPACK_IMPORTED_MODULE_4__["useRef"])();
+  valueCacheRef.current = value;
   var fieldContext = Object(react__WEBPACK_IMPORTED_MODULE_4__["useContext"])(___WEBPACK_IMPORTED_MODULE_1__["FieldContext"]);
   var formInstance = form || fieldContext;
   var isValidForm = formInstance && formInstance._init; // Warning if not exist form instance
@@ -121773,9 +121862,8 @@ function useWatch() {
 
     var cancelRegister = registerWatch(function (store) {
       var newValue = Object(_utils_valueUtil__WEBPACK_IMPORTED_MODULE_5__["getValue"])(store, namePathRef.current);
-      var nextValueStr = stringify(newValue); // Compare stringify in case it's nest object
 
-      if (valueStrRef.current !== nextValueStr) {
+      if (valueCacheRef.current !== newValue) {
         setValue(newValue);
       }
     }); // TODO: We can improve this perf in future
@@ -122123,8 +122211,6 @@ function replaceMessage(template, kv) {
   });
 }
 
-var CODE_LOGIC_ERROR = 'CODE_LOGIC_ERROR';
-
 function validateRule(_x, _x2, _x3, _x4, _x5) {
   return _validateRule.apply(this, arguments);
 }
@@ -122136,7 +122222,7 @@ 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) {
-    var cloneRule, originValidator, subRuleField, validator, messages, result, subResults, kv, fillVariableResult;
+    var cloneRule, subRuleField, validator, messages, result, subResults, kv, fillVariableResult;
     return _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_2___default.a.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
@@ -122145,21 +122231,7 @@ function _validateRule() {
             // https://github.com/react-component/field-form/issues/316
             // https://github.com/react-component/field-form/issues/313
 
-            delete cloneRule.ruleIndex;
-
-            if (cloneRule.validator) {
-              originValidator = cloneRule.validator;
-
-              cloneRule.validator = function () {
-                try {
-                  return originValidator.apply(void 0, arguments);
-                } catch (error) {
-                  console.error(error);
-                  return Promise.reject(CODE_LOGIC_ERROR);
-                }
-              };
-            } // We should special handle array validate
-
+            delete cloneRule.ruleIndex; // We should special handle array validate
 
             subRuleField = null;
 
@@ -122172,49 +122244,52 @@ function _validateRule() {
             messages = Object(_valueUtil__WEBPACK_IMPORTED_MODULE_9__["setValues"])({}, _messages__WEBPACK_IMPORTED_MODULE_8__["defaultValidateMessages"], options.validateMessages);
             validator.messages(messages);
             result = [];
-            _context2.prev = 9;
-            _context2.next = 12;
+            _context2.prev = 8;
+            _context2.next = 11;
             return Promise.resolve(validator.validate(Object(_babel_runtime_helpers_esm_defineProperty__WEBPACK_IMPORTED_MODULE_1__["default"])({}, name, value), Object(_babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_3__["default"])({}, options)));
 
-          case 12:
-            _context2.next = 17;
+          case 11:
+            _context2.next = 16;
             break;
 
-          case 14:
-            _context2.prev = 14;
-            _context2.t0 = _context2["catch"](9);
+          case 13:
+            _context2.prev = 13;
+            _context2.t0 = _context2["catch"](8);
 
             if (_context2.t0.errors) {
               result = _context2.t0.errors.map(function (_ref4, index) {
                 var message = _ref4.message;
-                var mergedMessage = message === CODE_LOGIC_ERROR ? messages.default : message;
-                return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6__["isValidElement"](mergedMessage) ?
-                /*#__PURE__*/
-                // Wrap ReactNode with `key`
-                react__WEBPACK_IMPORTED_MODULE_6__["cloneElement"](mergedMessage, {
-                  key: "error_".concat(index)
-                }) : mergedMessage;
+                return (// Wrap ReactNode with `key`
+
+                  /*#__PURE__*/
+                  react__WEBPACK_IMPORTED_MODULE_6__["isValidElement"](message) ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6__["cloneElement"](message, {
+                    key: "error_".concat(index)
+                  }) : message
+                );
               });
+            } else {
+              console.error(_context2.t0);
+              result = [messages.default];
             }
 
-          case 17:
+          case 16:
             if (!(!result.length && subRuleField)) {
-              _context2.next = 22;
+              _context2.next = 21;
               break;
             }
 
-            _context2.next = 20;
+            _context2.next = 19;
             return Promise.all(value.map(function (subValue, i) {
               return validateRule("".concat(name, ".").concat(i), subValue, subRuleField, options, messageVariables);
             }));
 
-          case 20:
+          case 19:
             subResults = _context2.sent;
             return _context2.abrupt("return", subResults.reduce(function (prev, errors) {
               return [].concat(Object(_babel_runtime_helpers_esm_toConsumableArray__WEBPACK_IMPORTED_MODULE_0__["default"])(prev), Object(_babel_runtime_helpers_esm_toConsumableArray__WEBPACK_IMPORTED_MODULE_0__["default"])(errors));
             }, []));
 
-          case 22:
+          case 21:
             // Replace message with variables
             kv = Object(_babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_3__["default"])(Object(_babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_3__["default"])({}, rule), {}, {
               name: name,
@@ -122229,12 +122304,12 @@ function _validateRule() {
             });
             return _context2.abrupt("return", fillVariableResult);
 
-          case 25:
+          case 24:
           case "end":
             return _context2.stop();
         }
       }
-    }, _callee2, null, [[9, 14]]);
+    }, _callee2, null, [[8, 13]]);
   }));
   return _validateRule.apply(this, arguments);
 }
@@ -124659,12 +124734,7 @@ function Overflow(props, ref) {
       }
 
       for (var i = 0; i < len; i += 1) {
-        var currentItemWidth = getItemWidth(i); // Fully will always render
-
-        if (fullySSR) {
-          currentItemWidth = currentItemWidth || 0;
-        } // Break since data not ready
-
+        var currentItemWidth = getItemWidth(i); // Break since data not ready
 
         if (currentItemWidth === undefined) {
           updateDisplayCount(i - 1, true);
@@ -128611,16 +128681,11 @@ var RefNodeList = function RefNodeList(props, ref) {
   var _React$useState9 = react__WEBPACK_IMPORTED_MODULE_3__["useState"](null),
       _React$useState10 = Object(_babel_runtime_helpers_esm_slicedToArray__WEBPACK_IMPORTED_MODULE_1__["default"])(_React$useState9, 2),
       motionType = _React$useState10[0],
-      setMotionType = _React$useState10[1]; // When motion end but data change, this will makes data back to previous one
-
-
-  var dataRef = react__WEBPACK_IMPORTED_MODULE_3__["useRef"](data);
-  dataRef.current = data;
+      setMotionType = _React$useState10[1];
 
   function onMotionEnd() {
-    var latestData = dataRef.current;
-    setPrevData(latestData);
-    setTransitionData(latestData);
+    setPrevData(data);
+    setTransitionData(data);
     setTransitionRange([]);
     setMotionType(null);
     onListChangeEnd();
@@ -129181,56 +129246,24 @@ var Tree = /*#__PURE__*/function (_React$Component) {
       _this.currentMouseOverDroppableNodeKey = null;
     };
 
-    _this.triggerExpandActionExpand = function (e, treeNode) {
-      var _this$state5 = _this.state,
-          expandedKeys = _this$state5.expandedKeys,
-          flattenNodes = _this$state5.flattenNodes;
-      var expanded = treeNode.expanded,
-          key = treeNode.key;
-      var node = flattenNodes.filter(function (nodeItem) {
-        return nodeItem.key === key;
-      })[0];
-      var eventNode = Object(_utils_treeUtil__WEBPACK_IMPORTED_MODULE_17__["convertNodePropsToEventData"])(Object(_babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_3__["default"])(Object(_babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_3__["default"])({}, Object(_utils_treeUtil__WEBPACK_IMPORTED_MODULE_17__["getTreeNodeProps"])(key, _this.getTreeNodeRequiredProps())), {}, {
-        data: node.data
-      }));
-
-      _this.setExpandedKeys(expanded ? Object(_util__WEBPACK_IMPORTED_MODULE_16__["arrDel"])(expandedKeys, key) : Object(_util__WEBPACK_IMPORTED_MODULE_16__["arrAdd"])(expandedKeys, key));
-
-      _this.onNodeExpand(e, eventNode);
-    };
-
     _this.onNodeClick = function (e, treeNode) {
-      var _this$props3 = _this.props,
-          onClick = _this$props3.onClick,
-          expandAction = _this$props3.expandAction;
-
-      if (expandAction === 'click') {
-        _this.triggerExpandActionExpand(e, treeNode);
-      }
-
+      var onClick = _this.props.onClick;
       onClick === null || onClick === void 0 ? void 0 : onClick(e, treeNode);
     };
 
     _this.onNodeDoubleClick = function (e, treeNode) {
-      var _this$props4 = _this.props,
-          onDoubleClick = _this$props4.onDoubleClick,
-          expandAction = _this$props4.expandAction;
-
-      if (expandAction === 'doubleClick') {
-        _this.triggerExpandActionExpand(e, treeNode);
-      }
-
+      var onDoubleClick = _this.props.onDoubleClick;
       onDoubleClick === null || onDoubleClick === void 0 ? void 0 : onDoubleClick(e, treeNode);
     };
 
     _this.onNodeSelect = function (e, treeNode) {
       var selectedKeys = _this.state.selectedKeys;
-      var _this$state6 = _this.state,
-          keyEntities = _this$state6.keyEntities,
-          fieldNames = _this$state6.fieldNames;
-      var _this$props5 = _this.props,
-          onSelect = _this$props5.onSelect,
-          multiple = _this$props5.multiple;
+      var _this$state5 = _this.state,
+          keyEntities = _this$state5.keyEntities,
+          fieldNames = _this$state5.fieldNames;
+      var _this$props3 = _this.props,
+          onSelect = _this$props3.onSelect,
+          multiple = _this$props3.multiple;
       var selected = treeNode.selected;
       var key = treeNode[fieldNames.key];
       var targetSelected = !selected; // Update selected keys
@@ -129266,13 +129299,13 @@ var Tree = /*#__PURE__*/function (_React$Component) {
     };
 
     _this.onNodeCheck = function (e, treeNode, checked) {
-      var _this$state7 = _this.state,
-          keyEntities = _this$state7.keyEntities,
-          oriCheckedKeys = _this$state7.checkedKeys,
-          oriHalfCheckedKeys = _this$state7.halfCheckedKeys;
-      var _this$props6 = _this.props,
-          checkStrictly = _this$props6.checkStrictly,
-          onCheck = _this$props6.onCheck;
+      var _this$state6 = _this.state,
+          keyEntities = _this$state6.keyEntities,
+          oriCheckedKeys = _this$state6.checkedKeys,
+          oriHalfCheckedKeys = _this$state6.halfCheckedKeys;
+      var _this$props4 = _this.props,
+          checkStrictly = _this$props4.checkStrictly,
+          onCheck = _this$props4.onCheck;
       var key = treeNode.key; // Prepare trigger arguments
 
       var checkedObj;
@@ -129358,9 +129391,9 @@ var Tree = /*#__PURE__*/function (_React$Component) {
               loadedKeys = _ref$loadedKeys === void 0 ? [] : _ref$loadedKeys,
               _ref$loadingKeys = _ref.loadingKeys,
               loadingKeys = _ref$loadingKeys === void 0 ? [] : _ref$loadingKeys;
-          var _this$props7 = _this.props,
-              loadData = _this$props7.loadData,
-              onLoad = _this$props7.onLoad;
+          var _this$props5 = _this.props,
+              loadData = _this$props5.loadData,
+              onLoad = _this$props5.onLoad;
 
           if (!loadData || loadedKeys.indexOf(key) !== -1 || loadingKeys.indexOf(key) !== -1) {
             return null;
@@ -129481,16 +129514,16 @@ var Tree = /*#__PURE__*/function (_React$Component) {
     };
 
     _this.getTreeNodeRequiredProps = function () {
-      var _this$state8 = _this.state,
-          expandedKeys = _this$state8.expandedKeys,
-          selectedKeys = _this$state8.selectedKeys,
-          loadedKeys = _this$state8.loadedKeys,
-          loadingKeys = _this$state8.loadingKeys,
-          checkedKeys = _this$state8.checkedKeys,
-          halfCheckedKeys = _this$state8.halfCheckedKeys,
-          dragOverNodeKey = _this$state8.dragOverNodeKey,
-          dropPosition = _this$state8.dropPosition,
-          keyEntities = _this$state8.keyEntities;
+      var _this$state7 = _this.state,
+          expandedKeys = _this$state7.expandedKeys,
+          selectedKeys = _this$state7.selectedKeys,
+          loadedKeys = _this$state7.loadedKeys,
+          loadingKeys = _this$state7.loadingKeys,
+          checkedKeys = _this$state7.checkedKeys,
+          halfCheckedKeys = _this$state7.halfCheckedKeys,
+          dragOverNodeKey = _this$state7.dragOverNodeKey,
+          dropPosition = _this$state7.dropPosition,
+          keyEntities = _this$state7.keyEntities;
       return {
         expandedKeys: expandedKeys || [],
         selectedKeys: selectedKeys || [],
@@ -129505,9 +129538,9 @@ var Tree = /*#__PURE__*/function (_React$Component) {
     };
 
     _this.setExpandedKeys = function (expandedKeys) {
-      var _this$state9 = _this.state,
-          treeData = _this$state9.treeData,
-          fieldNames = _this$state9.fieldNames;
+      var _this$state8 = _this.state,
+          treeData = _this$state8.treeData,
+          fieldNames = _this$state8.fieldNames;
       var flattenNodes = Object(_utils_treeUtil__WEBPACK_IMPORTED_MODULE_17__["flattenTreeData"])(treeData, expandedKeys, fieldNames);
 
       _this.setUncontrolledState({
@@ -129518,12 +129551,12 @@ var Tree = /*#__PURE__*/function (_React$Component) {
 
     _this.onNodeExpand = function (e, treeNode) {
       var expandedKeys = _this.state.expandedKeys;
-      var _this$state10 = _this.state,
-          listChanging = _this$state10.listChanging,
-          fieldNames = _this$state10.fieldNames;
-      var _this$props8 = _this.props,
-          onExpand = _this$props8.onExpand,
-          loadData = _this$props8.loadData;
+      var _this$state9 = _this.state,
+          listChanging = _this$state9.listChanging,
+          fieldNames = _this$state9.fieldNames;
+      var _this$props6 = _this.props,
+          onExpand = _this$props6.onExpand,
+          loadData = _this$props6.loadData;
       var expanded = treeNode.expanded;
       var key = treeNode[fieldNames.key]; // Do nothing when motion is in progress
 
@@ -129607,9 +129640,9 @@ var Tree = /*#__PURE__*/function (_React$Component) {
     };
 
     _this.getActiveItem = function () {
-      var _this$state11 = _this.state,
-          activeKey = _this$state11.activeKey,
-          flattenNodes = _this$state11.flattenNodes;
+      var _this$state10 = _this.state,
+          activeKey = _this$state10.activeKey,
+          flattenNodes = _this$state10.flattenNodes;
 
       if (activeKey === null) {
         return null;
@@ -129622,9 +129655,9 @@ var Tree = /*#__PURE__*/function (_React$Component) {
     };
 
     _this.offsetActiveKey = function (offset) {
-      var _this$state12 = _this.state,
-          flattenNodes = _this$state12.flattenNodes,
-          activeKey = _this$state12.activeKey;
+      var _this$state11 = _this.state,
+          flattenNodes = _this$state11.flattenNodes,
+          activeKey = _this$state11.activeKey;
       var index = flattenNodes.findIndex(function (_ref3) {
         var key = _ref3.key;
         return key === activeKey;
@@ -129647,14 +129680,14 @@ var Tree = /*#__PURE__*/function (_React$Component) {
     };
 
     _this.onKeyDown = function (event) {
-      var _this$state13 = _this.state,
-          activeKey = _this$state13.activeKey,
-          expandedKeys = _this$state13.expandedKeys,
-          checkedKeys = _this$state13.checkedKeys;
-      var _this$props9 = _this.props,
-          onKeyDown = _this$props9.onKeyDown,
-          checkable = _this$props9.checkable,
-          selectable = _this$props9.selectable; // >>>>>>>>>> Direction
+      var _this$state12 = _this.state,
+          activeKey = _this$state12.activeKey,
+          expandedKeys = _this$state12.expandedKeys,
+          checkedKeys = _this$state12.checkedKeys;
+      var _this$props7 = _this.props,
+          onKeyDown = _this$props7.onKeyDown,
+          checkable = _this$props7.checkable,
+          selectable = _this$props7.selectable; // >>>>>>>>>> Direction
 
       switch (event.which) {
         case rc_util_es_KeyCode__WEBPACK_IMPORTED_MODULE_11__["default"].UP:
@@ -129814,47 +129847,47 @@ var Tree = /*#__PURE__*/function (_React$Component) {
     value: function render() {
       var _classNames;
 
-      var _this$state14 = this.state,
-          focused = _this$state14.focused,
-          flattenNodes = _this$state14.flattenNodes,
-          keyEntities = _this$state14.keyEntities,
-          draggingNodeKey = _this$state14.draggingNodeKey,
-          activeKey = _this$state14.activeKey,
-          dropLevelOffset = _this$state14.dropLevelOffset,
-          dropContainerKey = _this$state14.dropContainerKey,
-          dropTargetKey = _this$state14.dropTargetKey,
-          dropPosition = _this$state14.dropPosition,
-          dragOverNodeKey = _this$state14.dragOverNodeKey,
-          indent = _this$state14.indent;
-      var _this$props10 = this.props,
-          prefixCls = _this$props10.prefixCls,
-          className = _this$props10.className,
-          style = _this$props10.style,
-          showLine = _this$props10.showLine,
-          focusable = _this$props10.focusable,
-          _this$props10$tabInde = _this$props10.tabIndex,
-          tabIndex = _this$props10$tabInde === void 0 ? 0 : _this$props10$tabInde,
-          selectable = _this$props10.selectable,
-          showIcon = _this$props10.showIcon,
-          icon = _this$props10.icon,
-          switcherIcon = _this$props10.switcherIcon,
-          draggable = _this$props10.draggable,
-          checkable = _this$props10.checkable,
-          checkStrictly = _this$props10.checkStrictly,
-          disabled = _this$props10.disabled,
-          motion = _this$props10.motion,
-          loadData = _this$props10.loadData,
-          filterTreeNode = _this$props10.filterTreeNode,
-          height = _this$props10.height,
-          itemHeight = _this$props10.itemHeight,
-          virtual = _this$props10.virtual,
-          titleRender = _this$props10.titleRender,
-          dropIndicatorRender = _this$props10.dropIndicatorRender,
-          onContextMenu = _this$props10.onContextMenu,
-          onScroll = _this$props10.onScroll,
-          direction = _this$props10.direction,
-          rootClassName = _this$props10.rootClassName,
-          rootStyle = _this$props10.rootStyle;
+      var _this$state13 = this.state,
+          focused = _this$state13.focused,
+          flattenNodes = _this$state13.flattenNodes,
+          keyEntities = _this$state13.keyEntities,
+          draggingNodeKey = _this$state13.draggingNodeKey,
+          activeKey = _this$state13.activeKey,
+          dropLevelOffset = _this$state13.dropLevelOffset,
+          dropContainerKey = _this$state13.dropContainerKey,
+          dropTargetKey = _this$state13.dropTargetKey,
+          dropPosition = _this$state13.dropPosition,
+          dragOverNodeKey = _this$state13.dragOverNodeKey,
+          indent = _this$state13.indent;
+      var _this$props8 = this.props,
+          prefixCls = _this$props8.prefixCls,
+          className = _this$props8.className,
+          style = _this$props8.style,
+          showLine = _this$props8.showLine,
+          focusable = _this$props8.focusable,
+          _this$props8$tabIndex = _this$props8.tabIndex,
+          tabIndex = _this$props8$tabIndex === void 0 ? 0 : _this$props8$tabIndex,
+          selectable = _this$props8.selectable,
+          showIcon = _this$props8.showIcon,
+          icon = _this$props8.icon,
+          switcherIcon = _this$props8.switcherIcon,
+          draggable = _this$props8.draggable,
+          checkable = _this$props8.checkable,
+          checkStrictly = _this$props8.checkStrictly,
+          disabled = _this$props8.disabled,
+          motion = _this$props8.motion,
+          loadData = _this$props8.loadData,
+          filterTreeNode = _this$props8.filterTreeNode,
+          height = _this$props8.height,
+          itemHeight = _this$props8.itemHeight,
+          virtual = _this$props8.virtual,
+          titleRender = _this$props8.titleRender,
+          dropIndicatorRender = _this$props8.dropIndicatorRender,
+          onContextMenu = _this$props8.onContextMenu,
+          onScroll = _this$props8.onScroll,
+          direction = _this$props8.direction,
+          rootClassName = _this$props8.rootClassName,
+          rootStyle = _this$props8.rootStyle;
       var domProps = Object(rc_util_es_pickAttrs__WEBPACK_IMPORTED_MODULE_13__["default"])(this.props, {
         aria: true,
         data: true
@@ -130087,8 +130120,7 @@ Tree.defaultProps = {
   dropIndicatorRender: _DropIndicator__WEBPACK_IMPORTED_MODULE_21__["default"],
   allowDrop: function allowDrop() {
     return true;
-  },
-  expandAction: false
+  }
 };
 Tree.TreeNode = _TreeNode__WEBPACK_IMPORTED_MODULE_19__["default"];
 /* harmony default export */ __webpack_exports__["default"] = (Tree);
@@ -131974,27 +132006,13 @@ var PopupInner = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["forwardRef"](f
       status = _useVisibleStatus2[0],
       goNextStatus = _useVisibleStatus2[1]; // ======================== Aligns ========================
 
-  /**
-   * `alignedClassName` may modify `source` size,
-   * which means one time align may not move to the correct position at once.
-   *
-   * We will reset `alignTimes` for each status switch to `alignPre`
-   * and let `rc-align` to align for multiple times to ensure get final stable place.
-   * Currently we mark `alignTimes < 2` repeat align, it will increase if user report for align issue.
-   */
-
 
-  var _useState3 = Object(react__WEBPACK_IMPORTED_MODULE_3__["useState"])(0),
+  var _useState3 = Object(react__WEBPACK_IMPORTED_MODULE_3__["useState"])(null),
       _useState4 = Object(_babel_runtime_helpers_esm_slicedToArray__WEBPACK_IMPORTED_MODULE_2__["default"])(_useState3, 2),
-      alignTimes = _useState4[0],
-      setAlignTimes = _useState4[1];
+      alignInfo = _useState4[0],
+      setAlignInfo = _useState4[1];
 
-  var prepareResolveRef = Object(react__WEBPACK_IMPORTED_MODULE_3__["useRef"])();
-  Object(rc_util_es_hooks_useLayoutEffect__WEBPACK_IMPORTED_MODULE_5__["default"])(function () {
-    if (status === 'alignPre') {
-      setAlignTimes(0);
-    }
-  }, [status]); // `target` on `rc-align` can accept as a function to get the bind element or a point.
+  var prepareResolveRef = Object(react__WEBPACK_IMPORTED_MODULE_3__["useRef"])(); // `target` on `rc-align` can accept as a function to get the bind element or a point.
   // ref: https://www.npmjs.com/package/rc-align
 
   function getAlignTarget() {
@@ -132016,12 +132034,9 @@ var PopupInner = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["forwardRef"](f
 
     if (alignedClassName !== nextAlignedClassName) {
       setAlignedClassName(nextAlignedClassName);
-    } // We will retry multi times to make sure that the element has been align in the right position.
-
+    }
 
-    setAlignTimes(function (val) {
-      return val + 1;
-    });
+    setAlignInfo(matchAlign);
 
     if (status === 'align') {
       onAlign === null || onAlign === void 0 ? void 0 : onAlign(popupDomNode, matchAlign);
@@ -132030,9 +132045,10 @@ var PopupInner = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["forwardRef"](f
 
 
   Object(rc_util_es_hooks_useLayoutEffect__WEBPACK_IMPORTED_MODULE_5__["default"])(function () {
-    if (status === 'align') {
-      // Repeat until not more align needed
-      if (alignTimes < 2) {
+    if (alignInfo && status === 'align') {
+      var nextAlignedClassName = getClassNameFromAlign(alignInfo); // Repeat until not more align needed
+
+      if (alignedClassName !== nextAlignedClassName) {
         forceAlign();
       } else {
         goNextStatus(function () {
@@ -132042,7 +132058,7 @@ var PopupInner = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["forwardRef"](f
         });
       }
     }
-  }, [alignTimes]); // ======================== Motion ========================
+  }, [alignInfo]); // ======================== Motion ========================
 
   var motion = Object(_babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_1__["default"])({}, Object(_utils_legacyUtil__WEBPACK_IMPORTED_MODULE_9__["getMotion"])(props));
 
@@ -132080,9 +132096,7 @@ var PopupInner = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["forwardRef"](f
   var mergedStyle = Object(_babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_1__["default"])(Object(_babel_runtime_helpers_esm_objectSpread2__WEBPACK_IMPORTED_MODULE_1__["default"])({}, stretchStyle), {}, {
     zIndex: zIndex,
     opacity: status === 'motion' || status === 'stable' || !visible ? undefined : 0,
-    // Cannot interact with disappearing elements
-    // https://github.com/ant-design/ant-design/issues/35051#issuecomment-1101340714
-    pointerEvents: !visible && status !== 'stable' ? 'none' : undefined
+    pointerEvents: status === 'stable' ? undefined : 'none'
   }, style); // Align status
 
 
@@ -132290,7 +132304,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var StatusQueue = ['measure', 'alignPre', 'align', null, 'motion'];
+var StatusQueue = ['measure', 'align', null, 'motion'];
 /* harmony default export */ __webpack_exports__["default"] = (function (visible, doMeasure) {
   var _useState = Object(rc_util_es_hooks_useState__WEBPACK_IMPORTED_MODULE_5__["default"])(null),
       _useState2 = Object(_babel_runtime_helpers_esm_slicedToArray__WEBPACK_IMPORTED_MODULE_2__["default"])(_useState, 2),
@@ -136249,19 +136263,16 @@ var ScrollBar = /*#__PURE__*/function (_React$Component) {
     };
 
     _this.removeEvents = function () {
-      var _this$scrollbarRef$cu;
-
       window.removeEventListener('mousemove', _this.onMouseMove);
       window.removeEventListener('mouseup', _this.onMouseUp);
-      (_this$scrollbarRef$cu = _this.scrollbarRef.current) === null || _this$scrollbarRef$cu === void 0 ? void 0 : _this$scrollbarRef$cu.removeEventListener('touchstart', _this.onScrollbarTouchStart);
 
-      if (_this.thumbRef.current) {
-        _this.thumbRef.current.removeEventListener('touchstart', _this.onMouseDown);
+      _this.scrollbarRef.current.removeEventListener('touchstart', _this.onScrollbarTouchStart);
 
-        _this.thumbRef.current.removeEventListener('touchmove', _this.onMouseMove);
+      _this.thumbRef.current.removeEventListener('touchstart', _this.onMouseDown);
 
-        _this.thumbRef.current.removeEventListener('touchend', _this.onMouseUp);
-      }
+      _this.thumbRef.current.removeEventListener('touchmove', _this.onMouseMove);
+
+      _this.thumbRef.current.removeEventListener('touchend', _this.onMouseUp);
 
       rc_util_es_raf__WEBPACK_IMPORTED_MODULE_2__["default"].cancel(_this.moveRaf);
     };