acud 1.2.17 → 1.2.18

package/es/cascader/Menus.d.ts

@@ -33,8 +33,8 @@ interface MenusState {
     menuScrollOpen: boolean;
     activeValue?: (string | number)[];
 }
-declare type MenusType = Record<number, HTMLLIElement>;
-declare type MenuItemsType = Record<number, HTMLLIElement>;
+type MenusType = Record<number, HTMLLIElement>;
+type MenuItemsType = Record<number, HTMLLIElement>;
 declare class Menus extends React.Component<MenusProps, MenusState> {
     menuWrap: HTMLLIElement;
     menus: MenusType;
@@ -45,8 +45,8 @@ declare class Menus extends React.Component<MenusProps, MenusState> {
     componentDidUpdate(prevProps: MenusProps): void;
     isStatusOption(statusValue: any[], option: any, menuIndex: any): boolean;
     getFieldName(name: any): any;
-    getOption(option: CascaderOption, menuIndex: number): JSX.Element;
-    getCheckAllOption(menuIndex: number): JSX.Element;
+    getOption(option: CascaderOption, menuIndex: number): React.JSX.Element;
+    getCheckAllOption(menuIndex: number): React.JSX.Element;
     getActiveOptions(values?: CascaderOption[]): CascaderOption[];
     getShowOptions(): CascaderOption[][];
     delayOnEvent(onEvent: any, ...args: any[]): void;
@@ -59,6 +59,6 @@ declare class Menus extends React.Component<MenusProps, MenusState> {
     handleMenuScroll: (menuIndex: any) => () => void;
     onShowActive: () => void;
     onShowEnd: () => void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 export default Menus;

package/es/cascader/Menus.js

@@ -18,75 +18,57 @@ import Checkbox from '../checkbox';
 import MenuItem from './MenuItem';
 import { getElementStyle, isIncludeArray } from './utils';
 var DEFAULT_MENU_GAP = 4; // 菜单之间默认4px的间距
-
 var Menus = /*#__PURE__*/function (_React$Component) {
   _inherits(Menus, _React$Component);
-
   var _super = _createSuper(Menus);
-
   function Menus(props) {
     var _this;
-
     _classCallCheck(this, Menus);
-
     _this = _super.call(this, props);
     _this.menus = {};
     _this.menuItems = {};
-
     _this.saveMenuWrap = function (menuWrap) {
       _this.menuWrap = menuWrap;
     };
-
     _this.saveMenus = function (menuIndex) {
       return function (menus) {
         _this.menus[menuIndex] = menus;
       };
     };
-
     _this.saveMenuItems = function (index) {
       return function (node) {
         _this.menuItems[index] = node;
       };
     };
-
     _this.handleMenuScroll = function (menuIndex) {
       return function () {
         var _a, _b;
-
         var menuScrollOpen = _this.state.menuScrollOpen;
-
         if (menuScrollOpen) {
           // 当前menu滚动时，取消当前选中项高亮，隐藏子级
           var activeValue = _this.props.activeValue.slice(0, menuIndex);
-
           (_b = (_a = _this.props).onActiveValueSet) === null || _b === void 0 ? void 0 : _b.call(_a, activeValue);
         }
       };
     };
-
     _this.onShowActive = function () {
       _this.scrollActiveItemToView();
-
       window.setTimeout(function () {
         _this.setMenuPosition();
-
         window.setTimeout(function () {
           _this.handleMenuScrollChange(true);
         }, 0);
       }, 0);
     };
-
     _this.onShowEnd = function () {
       _this.handleMenuScrollChange(false);
     };
-
     _this.state = {
       // 默认关闭对menu scroll事件的监听，待scrollActiveItemToView完成后开启
       menuScrollOpen: false
     };
     return _this;
   }
-
   _createClass(Menus, [{
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
@@ -106,73 +88,61 @@ var Menus = /*#__PURE__*/function (_React$Component) {
     key: "getFieldName",
     value: function getFieldName(name) {
       var _this$props = this.props,
-          fieldNames = _this$props.fieldNames,
-          defaultFieldNames = _this$props.defaultFieldNames; // 防止只设置单个属性的名字
-
+        fieldNames = _this$props.fieldNames,
+        defaultFieldNames = _this$props.defaultFieldNames;
+      // 防止只设置单个属性的名字
       return fieldNames[name] || defaultFieldNames[name];
     }
   }, {
     key: "getOption",
     value: function getOption(option, menuIndex) {
       var _this2 = this;
-
       var _this$props2 = this.props,
-          prefixCls = _this$props2.prefixCls,
-          mode = _this$props2.mode,
-          keyword = _this$props2.keyword,
-          value = _this$props2.value,
-          activeValue = _this$props2.activeValue,
-          hoveredValue = _this$props2.hoveredValue,
-          expandTrigger = _this$props2.expandTrigger,
-          expandIcon = _this$props2.expandIcon,
-          loadingIcon = _this$props2.loadingIcon;
+        prefixCls = _this$props2.prefixCls,
+        mode = _this$props2.mode,
+        keyword = _this$props2.keyword,
+        value = _this$props2.value,
+        activeValue = _this$props2.activeValue,
+        hoveredValue = _this$props2.hoveredValue,
+        expandTrigger = _this$props2.expandTrigger,
+        expandIcon = _this$props2.expandIcon,
+        loadingIcon = _this$props2.loadingIcon;
       var isMulti = mode === 'multiple';
-
       var optionValue = function () {
         var value = option[_this2.getFieldName('value')];
-
         return /*#__PURE__*/React.isValidElement(value) ? menuIndex : value;
       }();
-
       var optionKey = [].concat(_toConsumableArray(activeValue.slice(0, menuIndex)), [optionValue]);
       var hasChildren = option[this.getFieldName('children')] && option[this.getFieldName('children')].length > 0;
       var hasLeaf = hasChildren || option.isLeaf === false;
       var onSelect = this.props.onSelect.bind(this, option, menuIndex);
       var onMultiSelect = this.props.onMultiSelect.bind(this, option, menuIndex, optionKey);
       var onItemDoubleClick = this.props.onItemDoubleClick.bind(this, option, menuIndex);
-
       var handleClick = function handleClick(e) {
         isMulti && !hasLeaf ? undefined : onSelect(e);
       };
-
       var handleMultiClick = function handleMultiClick(e) {
         if (activeValue[menuIndex] === optionValue) {
           e.stopPropagation();
         }
       };
-
       var expandProps = {
         onClick: handleClick,
         onDoubleClick: onItemDoubleClick
       };
       var menuItemCls = "".concat(prefixCls, "-menu-item");
-
       if (isMulti) {
         menuItemCls += " ".concat(prefixCls, "-menu-item-multi");
       }
-
       var expandIconNode = null;
-
       if (hasLeaf) {
         menuItemCls += " ".concat(prefixCls, "-menu-item-expand");
-
         if (!option.loading) {
           expandIconNode = /*#__PURE__*/React.createElement("span", {
             className: "".concat(prefixCls, "-menu-item-expand-icon")
           }, expandIcon);
         }
       }
-
       if (expandTrigger === 'hover') {
         expandProps = {
           onMouseEnter: this.delayOnEvent.bind(this, onSelect),
@@ -180,69 +150,56 @@ var Menus = /*#__PURE__*/function (_React$Component) {
           onClick: handleClick
         };
       }
-
       if (this.isStatusOption(hoveredValue, option, menuIndex)) {
         menuItemCls += " ".concat(prefixCls, "-menu-item-hovered");
       }
-
       if (this.isStatusOption(activeValue, option, menuIndex)) {
         expandProps.ref = this.saveMenuItems(menuIndex);
       }
-
       if (!isMulti && this.isStatusOption(value, option, menuIndex)) {
         menuItemCls += " ".concat(prefixCls, "-menu-item-active");
       }
-
       if (option.disabled) {
         menuItemCls += " ".concat(prefixCls, "-menu-item-disabled");
       }
-
       var loadingIconNode = null;
-
       if (option.loading) {
         menuItemCls += " ".concat(prefixCls, "-menu-item-loading");
         loadingIconNode = loadingIcon || null;
       }
-
       var _ref = function () {
-        if (!isMulti) {
-          return {};
-        }
-
-        var checked;
-        var indeterminate;
-
-        if (keyword) {
-          checked = isIncludeArray(value, optionValue);
-        } else if (hasLeaf) {
-          var children = option[_this2.getFieldName('children')];
-
-          var getEnableValues = _this2.props.getEnableValues.bind(_this2);
-
-          var childrenValue = getEnableValues(children);
-          var selectedValue = map(value, function (valueItem) {
-            return valueItem.slice(menuIndex + 1);
-          });
-          checked = !isEmpty(childrenValue) && every(childrenValue, function (valueItem) {
-            return isIncludeArray(selectedValue, valueItem);
-          });
-          indeterminate = !checked && some(childrenValue, function (valueItem) {
-            return isIncludeArray(selectedValue, valueItem);
-          });
-        } else {
-          checked = some(value, function (valueItem) {
-            return valueItem[menuIndex] === optionValue;
-          });
-        }
-
-        return {
-          checked: checked,
-          indeterminate: indeterminate
-        };
-      }(),
-          checked = _ref.checked,
-          indeterminate = _ref.indeterminate;
-
+          if (!isMulti) {
+            return {};
+          }
+          var checked;
+          var indeterminate;
+          if (keyword) {
+            checked = isIncludeArray(value, optionValue);
+          } else if (hasLeaf) {
+            var children = option[_this2.getFieldName('children')];
+            var getEnableValues = _this2.props.getEnableValues.bind(_this2);
+            var childrenValue = getEnableValues(children);
+            var selectedValue = map(value, function (valueItem) {
+              return valueItem.slice(menuIndex + 1);
+            });
+            checked = !isEmpty(childrenValue) && every(childrenValue, function (valueItem) {
+              return isIncludeArray(selectedValue, valueItem);
+            });
+            indeterminate = !checked && some(childrenValue, function (valueItem) {
+              return isIncludeArray(selectedValue, valueItem);
+            });
+          } else {
+            checked = some(value, function (valueItem) {
+              return valueItem[menuIndex] === optionValue;
+            });
+          }
+          return {
+            checked: checked,
+            indeterminate: indeterminate
+          };
+        }(),
+        checked = _ref.checked,
+        indeterminate = _ref.indeterminate;
       var label = option[this.getFieldName('label')];
       var labelContent = /*#__PURE__*/React.createElement("span", {
         className: "".concat(prefixCls, "-menu-item-label")
@@ -270,18 +227,16 @@ var Menus = /*#__PURE__*/function (_React$Component) {
     key: "getCheckAllOption",
     value: function getCheckAllOption(menuIndex) {
       var _this$props3 = this.props,
-          mode = _this$props3.mode,
-          prefixCls = _this$props3.prefixCls,
-          value = _this$props3.value,
-          enableValues = _this$props3.enableValues,
-          _this$props3$withChec = _this$props3.withCheckAll,
-          withCheckAll = _this$props3$withChec === void 0 ? true : _this$props3$withChec;
+        mode = _this$props3.mode,
+        prefixCls = _this$props3.prefixCls,
+        value = _this$props3.value,
+        enableValues = _this$props3.enableValues,
+        _this$props3$withChec = _this$props3.withCheckAll,
+        withCheckAll = _this$props3$withChec === void 0 ? true : _this$props3$withChec;
       var isMulti = mode === 'multiple';
-
       if (!(isMulti && menuIndex === 0) || !withCheckAll) {
         return null;
       }
-
       var checked = value.length > 0 && value.length >= enableValues.length && enableValues.every(function (valueItem) {
         return isIncludeArray(value, valueItem);
       });
@@ -308,7 +263,6 @@ var Menus = /*#__PURE__*/function (_React$Component) {
     key: "getActiveOptions",
     value: function getActiveOptions(values) {
       var _this3 = this;
-
       var options = this.props.options;
       var activeValue = values || this.props.activeValue;
       return arrayTreeFilter(options, function (o, level) {
@@ -321,7 +275,6 @@ var Menus = /*#__PURE__*/function (_React$Component) {
     key: "getShowOptions",
     value: function getShowOptions() {
       var _this4 = this;
-
       var options = this.props.options;
       var result = this.getActiveOptions().map(function (activeOption) {
         return activeOption[_this4.getFieldName('children')];
@@ -335,16 +288,13 @@ var Menus = /*#__PURE__*/function (_React$Component) {
     key: "delayOnEvent",
     value: function delayOnEvent(onEvent) {
       var _this5 = this;
-
       for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
         args[_key - 1] = arguments[_key];
       }
-
       if (this.delayTimer) {
         clearTimeout(this.delayTimer);
         this.delayTimer = null;
       }
-
       if (typeof onEvent === 'function') {
         this.delayTimer = window.setTimeout(function () {
           onEvent.apply(void 0, args);
@@ -356,12 +306,11 @@ var Menus = /*#__PURE__*/function (_React$Component) {
     key: "scrollActiveItemToView",
     value: function scrollActiveItemToView() {
       // scroll into view
-      var optionsLength = this.getShowOptions().length; // eslint-disable-next-line no-plusplus
-
+      var optionsLength = this.getShowOptions().length;
+      // eslint-disable-next-line no-plusplus
       for (var i = 0; i < optionsLength; i++) {
         var menuItem = this.menuItems[i];
         var menuItemParent = menuItem && menuItem.parentElement;
-
         if (menuItemParent) {
           var paddingTop = Number(getElementStyle(menuItemParent).paddingTop.replace('px', ''));
           menuItemParent.scrollTop = menuItem.offsetTop - paddingTop;
@@ -372,29 +321,24 @@ var Menus = /*#__PURE__*/function (_React$Component) {
     key: "setMenuPosition",
     value: function setMenuPosition() {
       var _this6 = this;
-
       var callback = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : function () {};
       var _this$props4 = this.props,
-          menusEdgeBuffer = _this$props4.menusEdgeBuffer,
-          popupPlacement = _this$props4.popupPlacement;
+        menusEdgeBuffer = _this$props4.menusEdgeBuffer,
+        popupPlacement = _this$props4.popupPlacement;
       var menuDirections = [];
       var optionsLength = this.getShowOptions().length;
-
       if (Number(optionsLength) <= 0) {
         return;
       }
-
       var isPlaceTop = ['topLeft', 'topRight'].includes(popupPlacement);
       var clientHeight = document.body.clientHeight;
       var clientWidth = document.body.clientWidth;
-
-      for (var i = 1; i < optionsLength; i++) {
-        var currentMenu = this.menus[i];
-        var prevMenu = this.menus[i - 1]; // 1、计算left并设置
-
+      var _loop = function _loop() {
+        var currentMenu = _this6.menus[i];
+        var prevMenu = _this6.menus[i - 1];
+        // 1、计算left并设置
         var prevMenusWidthSum = 0;
         var prevMenuDir = menuDirections[i - 1] || 'right';
-
         if (prevMenuDir === 'right') {
           // 往右展开时到达边界
           // eslint-disable-next-line max-len
@@ -414,40 +358,34 @@ var Menus = /*#__PURE__*/function (_React$Component) {
             prevMenusWidthSum = prevMenu.offsetLeft - currentMenu.offsetWidth - DEFAULT_MENU_GAP;
             menuDirections[i] = 'left';
           }
-        } // 设置left
-
-
-        currentMenu.style.left = prevMenusWidthSum + 'px'; // 2、计算top/bottom并设置
-
+        }
+        // 设置left
+        currentMenu.style.left = prevMenusWidthSum + 'px';
+        // 2、计算top/bottom并设置
         if (isPlaceTop) {
           var prevMenuBottom = Number(getElementStyle(prevMenu).bottom.replace('px', ''));
           var currentMenuPaddingBottom = Number(getElementStyle(currentMenu).paddingBottom.replace('px', ''));
-          var bottom = prevMenu.offsetHeight + prevMenuBottom + currentMenuPaddingBottom + prevMenu.scrollTop - this.menuItems[i - 1].offsetTop - currentMenu.offsetHeight;
+          var bottom = prevMenu.offsetHeight + prevMenuBottom + currentMenuPaddingBottom + prevMenu.scrollTop - _this6.menuItems[i - 1].offsetTop - currentMenu.offsetHeight;
           currentMenu.style.bottom = (bottom < 0 ? 0 : bottom) + 'px';
         } else {
-          (function () {
-            var prevMenuPaddingTop = Number(getElementStyle(currentMenu).paddingTop.replace('px', ''));
-            var prevMenuTop = Number(getElementStyle(prevMenu).top.replace('px', ''));
-            var prevMenuItemsTopSum = prevMenuTop + _this6.menuItems[i - 1].offsetTop - prevMenu.scrollTop - prevMenuPaddingTop;
-
-            var menuWrapTop = _this6.menuWrap.parentElement.getBoundingClientRect().top;
-
-            var currentMenuHeight = currentMenu.offsetHeight;
-            var currentMenuMaxTop = clientHeight - menuWrapTop - currentMenuHeight - menusEdgeBuffer;
-
-            var currentMenuTop = function () {
-              if (currentMenuMaxTop <= 0) {
-                return 0;
-              }
-
-              return prevMenuItemsTopSum > currentMenuMaxTop ? currentMenuMaxTop : prevMenuItemsTopSum;
-            }();
-
-            currentMenu.style.top = currentMenuTop + 'px';
-          })();
+          var prevMenuPaddingTop = Number(getElementStyle(currentMenu).paddingTop.replace('px', ''));
+          var prevMenuTop = Number(getElementStyle(prevMenu).top.replace('px', ''));
+          var prevMenuItemsTopSum = prevMenuTop + _this6.menuItems[i - 1].offsetTop - prevMenu.scrollTop - prevMenuPaddingTop;
+          var menuWrapTop = _this6.menuWrap.parentElement.getBoundingClientRect().top;
+          var currentMenuHeight = currentMenu.offsetHeight;
+          var currentMenuMaxTop = clientHeight - menuWrapTop - currentMenuHeight - menusEdgeBuffer;
+          var currentMenuTop = function () {
+            if (currentMenuMaxTop <= 0) {
+              return 0;
+            }
+            return prevMenuItemsTopSum > currentMenuMaxTop ? currentMenuMaxTop : prevMenuItemsTopSum;
+          }();
+          currentMenu.style.top = currentMenuTop + 'px';
         }
+      };
+      for (var i = 1; i < optionsLength; i++) {
+        _loop();
       }
-
       if (typeof callback === 'function') {
         callback();
       }
@@ -463,15 +401,14 @@ var Menus = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var _classnames,
-          _this7 = this;
-
+        _this7 = this;
       var _this$props5 = this.props,
-          prefixCls = _this$props5.prefixCls,
-          transitionName = _this$props5.transitionName,
-          visible = _this$props5.visible,
-          dropdownMenuColumnStyle = _this$props5.dropdownMenuColumnStyle,
-          size = _this$props5.size,
-          mode = _this$props5.mode;
+        prefixCls = _this$props5.prefixCls,
+        transitionName = _this$props5.transitionName,
+        visible = _this$props5.visible,
+        dropdownMenuColumnStyle = _this$props5.dropdownMenuColumnStyle,
+        size = _this$props5.size,
+        mode = _this$props5.mode;
       var showOptions = this.getShowOptions();
       var isMulti = mode === 'multiple';
       var sizeCls = classnames((_classnames = {}, _defineProperty(_classnames, "".concat(prefixCls, "-menu-lg"), size === 'large'), _defineProperty(_classnames, "".concat(prefixCls, "-menu-sm"), size === 'small'), _classnames));
@@ -485,9 +422,8 @@ var Menus = /*#__PURE__*/function (_React$Component) {
         onLeaveEnd: this.onShowEnd
       }, function (_ref2) {
         var _classnames2;
-
         var className = _ref2.className,
-            style = _ref2.style;
+          style = _ref2.style;
         var menuClas = classnames("".concat(prefixCls, "-menu"), (_classnames2 = {}, _defineProperty(_classnames2, "".concat(prefixCls, "-menu-multi"), isMulti), _defineProperty(_classnames2, sizeCls, sizeCls), _classnames2));
         return /*#__PURE__*/React.createElement("div", {
           ref: _this7.saveMenuWrap,
@@ -509,10 +445,8 @@ var Menus = /*#__PURE__*/function (_React$Component) {
       });
     }
   }]);
-
   return Menus;
 }(React.Component);
-
 Menus.defaultProps = {
   options: [],
   value: [],

package/es/cascader/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { CascaderValueType, CascaderMultiValueType } from './Cascader';
 import { SizeType } from '../config-provider/SizeContext';
-export declare type CascaderExpandTrigger = 'click' | 'hover';
+export type CascaderExpandTrigger = 'click' | 'hover';
 export interface FieldNamesType {
     value?: string | number;
     label?: string;