@kdcloudjs/kdesign 1.3.2 → 1.3.5

package/es/_utils/usePopper.d.ts

@@ -15,6 +15,7 @@ export interface PopperProps {
     mouseEnterDelay?: number;
     mouseLeaveDelay?: number;
     defaultVisible?: boolean;
+    autoPlacement?: boolean;
     popperClassName?: string;
     placement?: PlacementType;
     popperStyle?: React.CSSProperties;

package/es/_utils/usePopper.js

@@ -150,6 +150,8 @@ function usePopper(locatorElement, popperElement, props) {
       mouseLeaveDelay = _props$mouseLeaveDela === void 0 ? 0.1 : _props$mouseLeaveDela,
       _props$defaultVisible = props.defaultVisible,
       defaultVisible = _props$defaultVisible === void 0 ? false : _props$defaultVisible,
+      _props$autoPlacement = props.autoPlacement,
+      autoPlacement = _props$autoPlacement === void 0 ? true : _props$autoPlacement,
       _props$getTriggerElem = props.getTriggerElement,
       getTriggerElement = _props$getTriggerElem === void 0 ? function (locatorNode) {
     return locatorNode;
@@ -287,36 +289,38 @@ function usePopper(locatorElement, popperElement, props) {
       var currentPos = trigger === 'contextMenu' ? mousePos : locatorPos;
       var _currentPlacement = placement;
 
-      if (top - gap - popperHeight <= 5 && bottom + gap + popperHeight < document.body.clientHeight - 5) {
-        _currentPlacement = _currentPlacement.replace('top', 'bottom');
-      }
+      if (autoPlacement) {
+        if (top - gap - popperHeight <= 5 && bottom + gap + popperHeight < document.body.clientHeight - 5) {
+          _currentPlacement = _currentPlacement.replace('top', 'bottom');
+        }
 
-      if (bottom + gap + popperHeight >= document.body.clientHeight - 5 && top - gap - popperHeight > 5) {
-        _currentPlacement = _currentPlacement.replace('bottom', 'top');
-      }
+        if (bottom + gap + popperHeight >= document.body.clientHeight - 5 && top - gap - popperHeight > 5) {
+          _currentPlacement = _currentPlacement.replace('bottom', 'top');
+        }
 
-      if (left + popperWidth >= document.body.clientWidth - 5 && right - popperWidth > 5) {
-        _currentPlacement = _currentPlacement.replace('Left', 'Right');
-      }
+        if (left + popperWidth >= document.body.clientWidth - 5 && right - popperWidth > 5) {
+          _currentPlacement = _currentPlacement.replace('Left', 'Right');
+        }
 
-      if (right - popperWidth <= 5 && left + popperWidth < document.body.clientWidth - 5) {
-        _currentPlacement = _currentPlacement.replace('Right', 'Left');
-      }
+        if (right - popperWidth <= 5 && left + popperWidth < document.body.clientWidth - 5) {
+          _currentPlacement = _currentPlacement.replace('Right', 'Left');
+        }
 
-      if (top + popperHeight >= document.body.clientHeight - 5 && bottom - popperHeight > 5) {
-        _currentPlacement = _currentPlacement.replace('Top', 'Bottom');
-      }
+        if (top + popperHeight >= document.body.clientHeight - 5 && bottom - popperHeight > 5) {
+          _currentPlacement = _currentPlacement.replace('Top', 'Bottom');
+        }
 
-      if (bottom - popperHeight <= 5 && top + popperHeight < document.body.clientHeight - 5) {
-        _currentPlacement = _currentPlacement.replace('Bottom', 'Top');
-      }
+        if (bottom - popperHeight <= 5 && top + popperHeight < document.body.clientHeight - 5) {
+          _currentPlacement = _currentPlacement.replace('Bottom', 'Top');
+        }
 
-      if (left - gap - popperWidth <= 5 && right + gap + popperWidth < document.body.clientWidth - 5) {
-        _currentPlacement = _currentPlacement.replace('left', 'right');
-      }
+        if (left - gap - popperWidth <= 5 && right + gap + popperWidth < document.body.clientWidth - 5) {
+          _currentPlacement = _currentPlacement.replace('left', 'right');
+        }
 
-      if (right + gap + popperWidth >= document.body.clientWidth - 5 && left - gap - popperWidth > 5) {
-        _currentPlacement = _currentPlacement.replace('right', 'left');
+        if (right + gap + popperWidth >= document.body.clientWidth - 5 && left - gap - popperWidth > 5) {
+          _currentPlacement = _currentPlacement.replace('right', 'left');
+        }
       }
 
       var leftLeft = currentPos.left - popperWidth - gap;
@@ -429,7 +433,7 @@ function usePopper(locatorElement, popperElement, props) {
       setArrowPos(_arrowPos);
       setCurrentPlacement(_currentPlacement);
     }
-  }, [locatorRef, popperRef, container, trigger, mousePos, placement, gap, arrowOffset, arrowSize, arrowWidth]);
+  }, [locatorRef, popperRef, container, trigger, mousePos, placement, gap, arrowOffset, arrowSize, arrowWidth, autoPlacement]);
   useEffect(function () {
     if (canAlign) {
       alignPopper();
@@ -444,7 +448,7 @@ function usePopper(locatorElement, popperElement, props) {
 
   var popperContainerStyle = _extends(_extends(_extends({
     position: 'absolute'
-  }, popperStyle), align), arrow ? arrowStyle : {});
+  }, align), arrow ? arrowStyle : {}), popperStyle);
 
   var popperProps = {
     ref: popperRef,

package/es/anchor/anchor.js

@@ -320,7 +320,9 @@ var InternalAnchor = function InternalAnchor(props, ref) {
     !isLocked && setOptionShow(visible);
   };
 
-  var popperProps = _extends(_extends({}, anchorProps), {
+  var popperProps = _extends(_extends({
+    autoPlacement: false
+  }, anchorProps), {
     prefixCls: anchorPrefixCls,
     defaultVisible: optionShow,
     visible: optionShow,
@@ -328,6 +330,22 @@ var InternalAnchor = function InternalAnchor(props, ref) {
     onVisibleChange: handleVisibleChange
   });
 
+  var fixedRef = React.useRef(null);
+
+  if (type === 'advanced' && isLocked) {
+    if (fixedRef.current) {
+      var _fixedRef$current$get = fixedRef.current.getBoundingClientRect(),
+          left = _fixedRef$current$get.left,
+          top = _fixedRef$current$get.top;
+
+      popperProps.popperStyle = {
+        position: 'fixed',
+        left: left,
+        top: top
+      };
+    }
+  }
+
   var addChildrenProps = function addChildrenProps(linksChildren) {
     var _context4;
 
@@ -456,6 +474,7 @@ var InternalAnchor = function InternalAnchor(props, ref) {
       type: "lock-solid"
     });
     return /*#__PURE__*/React.createElement("div", {
+      ref: fixedRef,
       className: anchorAdvancedClass,
       style: dropdownStyle
     }, lockedIcon !== false && /*#__PURE__*/React.createElement("span", {

package/es/base-data/style/index.css

@@ -222,6 +222,7 @@
 }
 .kd-baseData-dropdown-options {
   height: var(--kd-c-base-data-dropdown-options-sizing-height, 32px);
+  cursor: pointer;
 }
 .kd-baseData-dropdown-options:hover {
   background: var(--kd-c-base-data-color-background-hover, var(--kd-g-color-hover, #f5f5f5));

package/es/base-data/style/index.less

@@ -115,6 +115,7 @@
 
     &-options {
       height: @base-data-dropdown-options-height;
+      cursor: pointer;
 
       &:hover {
         background: @base-data-hover-bg;

package/es/button/group.js

@@ -111,7 +111,8 @@ var InternalButtonGroup = function InternalButtonGroup(props, ref) {
 
   var popperProps = _extends(_extends({
     placement: 'bottomLeft',
-    trigger: 'click'
+    trigger: 'click',
+    gap: 0
   }, buttonGoupProps), {
     prefixCls: btnGroupPrefixCls,
     defaultVisible: optionShow,

package/es/button/style/index.css

@@ -354,35 +354,36 @@
 .kd-btn-group-basic-icon {
   margin-left: 4px;
 }
-.kd-btn-group-trigger .kd-btn-primary {
-  background: var(--kd-c-button-group-trigger-color-background, #4367c1);
+.kd-btn-group-similar .kd-btn-group-trigger .kd-btn {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  margin-left: -1px;
 }
-.kd-btn-group-trigger .kd-btn-primary:hover {
-  background: var(--kd-c-button-group-trigger-color-background-hover, #4c74da);
-  border-color: var(--kd-c-button-group-trigger-color-background-hover, #4c74da);
+.kd-btn-group-similar .kd-btn-group-trigger .kd-btn-primary {
+  background: var(--kd-c-button-group-trigger-color-background, var(--kd-g-color-theme-7, #375cca));
 }
-.kd-btn-group-trigger .kd-btn-primary:active {
-  background: var(--kd-c-button-group-trigger-color-background-active, #3B5AA9);
+.kd-btn-group-similar .kd-btn-group-trigger .kd-btn-primary:hover {
+  background: var(--kd-c-button-group-trigger-color-background-hover, var(--kd-g-color-theme-6, #5582f3));
+  border-color: var(--kd-c-button-group-trigger-color-background-hover, var(--kd-g-color-theme-6, #5582f3));
 }
-.kd-btn-group-trigger .kd-btn-primary:disabled {
-  background: var(--kd-c-button-group-trigger-color-background-disabled, #95a4c8) !important;
+.kd-btn-group-similar .kd-btn-group-trigger .kd-btn-primary:active {
+  background: var(--kd-c-button-group-trigger-color-background-active, var(--kd-g-color-theme-8, #1f3ba1));
 }
-.kd-btn-group-trigger .kd-btn {
-  margin-left: -1px;
+.kd-btn-group-similar .kd-btn-group-trigger .kd-btn-primary:disabled {
+  background: var(--kd-c-button-group-trigger-color-background-disabled, var(--kd-g-color-theme-5, #87adff)) !important;
+}
+.kd-btn-group-similar > .kd-btn:first-child {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+.kd-btn-group-similar > .kd-btn:first-child:hover {
+  z-index: 1;
 }
 .kd-btn-group .kd-btn-size-small,
 .kd-btn-group .kd-btn-size-middle,
 .kd-btn-group .kd-btn-size-large {
   min-width: unset;
 }
-.kd-btn-group .kd-btn:first-child {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-.kd-btn-group .kd-btn:last-child {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
 .kd-btn-group .kd-dropdown-menu {
   padding: 0;
 }

package/es/button/style/index.less

@@ -259,25 +259,37 @@
     }
   }
 
-  &-trigger {
-    .@{btn-prefix-cls}-primary {
-      background: @btn-group-trigger-color-background;
-      &:hover {
-        background: @btn-group-trigger-color-background-hover;
-        border-color: @btn-group-trigger-color-background-hover;
-      }
-
-      &:active {
-        background: @btn-group-trigger-color-background-active;
-      }
-
-      &:disabled {
-        background: @btn-group-trigger-color-background-disabled !important;
+  &-similar {
+    .@{btn-prefix-cls}-group-trigger {
+      .@{btn-prefix-cls} {
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+        margin-left: -1px;
+        &-primary {
+          background: @btn-group-trigger-color-background;
+          &:hover {
+            background: @btn-group-trigger-color-background-hover;
+            border-color: @btn-group-trigger-color-background-hover;
+          }
+  
+          &:active {
+            background: @btn-group-trigger-color-background-active;
+          }
+  
+          &:disabled {
+            background: @btn-group-trigger-color-background-disabled !important;
+          }
+        }
       }
     }
-
-    .@{btn-prefix-cls} {
-      margin-left: -1px;
+    &>.@{btn-prefix-cls} {
+      &:first-child {
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+        &:hover {
+          z-index: 1;
+        }
+      }
     }
   }
 
@@ -287,16 +299,6 @@
     &-size-large {
       min-width: unset;
     }
-
-    &:first-child {
-      border-top-right-radius: 0;
-      border-bottom-right-radius: 0;
-    }
-
-    &:last-child {
-      border-top-left-radius: 0;
-      border-bottom-left-radius: 0;
-    }
   }
 
   .@{kd-prefix}-dropdown {

package/es/button/style/token.less

@@ -61,10 +61,10 @@
 @btn-group-dropdown-item-border-color: var(~'@{button-custom-prefix}-group-dropdown-item-border-color', #E5E5E5); // 集合按钮 下拉边框颜色
 @btn-group-dropdown-item-color-background-hover: var(~'@{button-custom-prefix}-group-dropdown-item-color-background-hover', #F5F5F5); // 集合按钮 下拉hover背景颜色
 @btn-group-dropdown-color-background: var(~'@{button-custom-prefix}-group-dropdown-color-background', #fff); // 集合按钮 下拉菜单背景颜色
-@btn-group-trigger-color-background: var(~'@{button-custom-prefix}-group-trigger-color-background', #4367c1);
-@btn-group-trigger-color-background-hover: var(~'@{button-custom-prefix}-group-trigger-color-background-hover', #4c74da);
-@btn-group-trigger-color-background-active: var(~'@{button-custom-prefix}-group-trigger-color-background-active', #3B5AA9);
-@btn-group-trigger-color-background-disabled: var(~'@{button-custom-prefix}-group-trigger-color-background-disabled', #95a4c8);
+@btn-group-trigger-color-background: var(~'@{button-custom-prefix}-group-trigger-color-background', @color-theme-7);
+@btn-group-trigger-color-background-hover: var(~'@{button-custom-prefix}-group-trigger-color-background-hover', @color-theme-6);
+@btn-group-trigger-color-background-active: var(~'@{button-custom-prefix}-group-trigger-color-background-active', @color-theme-8);
+@btn-group-trigger-color-background-disabled: var(~'@{button-custom-prefix}-group-trigger-color-background-disabled', @color-theme-5);
 
 // font
 @btn-g-font-weight: var(~'@{button-custom-prefix}-font-weight', @font-weight-light);

package/es/checkbox/checkbox.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
-import React, { useCallback, useContext, useEffect } from 'react';
+import React, { useCallback, useContext, useEffect, useState, useRef } from 'react';
 import classNames from 'classnames';
 import ConfigContext from '../config-provider/ConfigContext';
 import { getCompProps } from '../_utils';
@@ -39,11 +39,12 @@ var InternalCheckbox = function InternalCheckbox(props, ref) {
     return isBoolean(checked) ? checked : defaultChecked;
   };
 
-  var _React$useState = React.useState(getChecked()),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      selected = _React$useState2[0],
-      setSelected = _React$useState2[1];
+  var _useState = useState(getChecked()),
+      _useState2 = _slicedToArray(_useState, 2),
+      selected = _useState2[0],
+      setSelected = _useState2[1];
 
+  var labelRef = useRef(null);
   devWarning(CheckboxTypes.indexOf(checkboxType) === -1, 'checkbox', "cannot found checkbox type '".concat(checkboxType, "'"));
   devWarning(CheckboxSizes.indexOf(size) === -1, 'checkbox', "cannot found size type '".concat(size, "'"));
   var checkboxPrefixCls = getPrefixCls(prefixCls, 'checkbox', customPrefixcls);
@@ -70,14 +71,21 @@ var InternalCheckbox = function InternalCheckbox(props, ref) {
   useEffect(function () {
     isBoolean(checked) && checked !== selected && setSelected(checked);
   }, [checked, selected]);
+  useEffect(function () {
+    var handleRepeatClick = function handleRepeatClick(e) {
+      var element = e.target;
 
-  var handleRepeatClick = function handleRepeatClick(e) {
-    var element = e.target;
+      if (element.tagName !== 'INPUT') {
+        e.stopPropagation();
+      }
+    };
 
-    if (element.tagName !== 'INPUT') {
-      e.stopPropagation();
-    }
-  };
+    labelRef.current.addEventListener('click', handleRepeatClick);
+    return function () {
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+      labelRef.current.removeEventListener('click', handleRepeatClick);
+    };
+  }, []);
 
   var getDefaultCheckbox = function getDefaultCheckbox() {
     var _context19, _context20;
@@ -88,7 +96,7 @@ var InternalCheckbox = function InternalCheckbox(props, ref) {
       React.createElement("label", {
         className: getRootClassName,
         style: style,
-        onClick: handleRepeatClick
+        ref: labelRef
       }, /*#__PURE__*/React.createElement("span", {
         className: checkedWrapperClassName
       }, selected && /*#__PURE__*/React.createElement("span", {

package/es/config-provider/compDefaultProps.d.ts

@@ -132,7 +132,6 @@ declare const compDefaultProps: {
         mode: string;
         defaultOpen: boolean;
         showArrow: boolean;
-        showSearch: boolean;
     };
     Image: {
         preview: boolean;

package/es/config-provider/compDefaultProps.js

@@ -137,8 +137,7 @@ var compDefaultProps = {
     borderType: 'underline',
     mode: 'single',
     defaultOpen: false,
-    showArrow: true,
-    showSearch: false
+    showArrow: true
   },
   Image: {
     preview: true

package/es/form/Field.js

@@ -98,7 +98,8 @@ var Field = function Field(props) {
       getInternalHooks = fieldContext.getInternalHooks,
       vertical = fieldContext.vertical,
       getDefaultValue = fieldContext.getDefaultValue,
-      local = fieldContext.local;
+      local = fieldContext.local,
+      formDisabled = fieldContext.disabled;
 
   var _getInternalHooks = getInternalHooks(INTERNAL_HOOK_KEY),
       registerField = _getInternalHooks.registerField,
@@ -264,17 +265,17 @@ var Field = function Field(props) {
         chDisabled = _ch$props.disabled,
         chDefaultValue = _ch$props.defaultValue;
 
-    var onChange = function onChange(evt) {
+    var onChange = function onChange() {
       if (chValue === undefined) {
-        setFieldValue(getInputValueFormProp(evt));
+        setFieldValue(getInputValueFormProp(arguments.length <= 0 ? undefined : arguments[0]));
       }
 
       if (typeof faChange === 'function') {
-        faChange(evt);
+        faChange.apply(void 0, arguments);
       }
 
       if (typeof chChange === 'function') {
-        chChange(evt);
+        chChange.apply(void 0, arguments);
       }
     };
 
@@ -292,7 +293,7 @@ var Field = function Field(props) {
     return _extends(_extends({}, rest), (_extends3 = {
       onChange: onChange,
       defaultValue: defaultValue
-    }, _defineProperty(_extends3, innerValuePropName, fieldValue), _defineProperty(_extends3, "disabled", chDisabled || faDisabled), _extends3));
+    }, _defineProperty(_extends3, innerValuePropName, fieldValue), _defineProperty(_extends3, "disabled", chDisabled !== undefined ? chDisabled : faDisabled !== undefined ? faDisabled : formDisabled), _extends3));
   };
 
   return /*#__PURE__*/React.createElement("div", {

package/es/form/Form.d.ts

@@ -4,6 +4,7 @@ declare type BaseFormProps = Omit<React.FormHTMLAttributes<HTMLFormElement>, 'on
 export interface FormProps<Values = any> extends BaseFormProps {
     children?: React.ReactNode;
     defaultValues?: Store;
+    disabled?: boolean;
     className?: string;
     form?: FormInstance<Values>;
     labelAlign?: LabelAlign;

package/es/form/Form.js

@@ -52,7 +52,8 @@ var Form = function Form(props, ref) {
       onFinish = formProps.onFinish,
       onFinishFailed = formProps.onFinishFailed,
       onValuesChange = formProps.onValuesChange,
-      restProps = __rest(formProps, ["children", "defaultValues", "className", "form", "labelAlign", "labelWidth", "layout", "name", "prefixCls", "wrapperWidth", "onFinish", "onFinishFailed", "onValuesChange"]);
+      disabled = formProps.disabled,
+      restProps = __rest(formProps, ["children", "defaultValues", "className", "form", "labelAlign", "labelWidth", "layout", "name", "prefixCls", "wrapperWidth", "onFinish", "onFinishFailed", "onValuesChange", "disabled"]);
 
   var formPrefixCls = getPrefixCls(prefixCls, 'form', customizePrefixCls);
   var formClassName = classnames((_classnames = {}, _defineProperty(_classnames, "".concat(formPrefixCls), true), _defineProperty(_classnames, _concatInstanceProperty(_context = "".concat(formPrefixCls, "-")).call(_context, layout), true), _classnames), className);
@@ -90,6 +91,7 @@ var Form = function Form(props, ref) {
       labelWidth: labelWidth,
       wrapperWidth: wrapperWidth,
       local: formLang,
+      disabled: disabled,
       vertical: layout === 'vertical'
     });
   }, [formInstance, labelAlign, labelWidth, wrapperWidth, layout, formLang]);

package/es/form/interface.d.ts

@@ -34,6 +34,7 @@ export interface InternalFormInstance extends FormInstance {
     labelAlign?: LabelAlign;
     wrapperWidth?: string | number;
     vertical?: boolean;
+    disabled?: boolean;
     local?: InnerLocale;
     getInternalHooks: (key: string) => InternalHooks | null;
 }

package/es/menu/menu.d.ts

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 import { MenuMode, MenuTheme, TriggerSubMenuAction, SubMenuChangeEventHandler } from './interface';
 import MenuItem from './menuItem';
 import SubMenu from './subMenu';

package/es/menu/menu.js

@@ -1,10 +1,11 @@
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
+import _toConsumableArray from "@babel/runtime-corejs3/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
 import _Object$getOwnPropertySymbols from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols";
-import _spliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/splice";
-import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
+import _Set from "@babel/runtime-corejs3/core-js-stable/set";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
+import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 
 var __rest = this && this.__rest || function (s, e) {
   var t = {};
@@ -19,7 +20,7 @@ var __rest = this && this.__rest || function (s, e) {
   return t;
 };
 
-import * as React from 'react';
+import React, { useEffect } from 'react';
 import { toArray } from '../_utils/react-children';
 import { ConfigContext } from '../config-provider';
 import { getCompProps } from '../_utils';
@@ -32,6 +33,8 @@ var isFunction = function isFunction(fn) {
   return fn && typeof fn === 'function';
 };
 
+var openSubMenuSet = new _Set();
+
 var Menu = function Menu(props) {
   var _context2, _classNames;
 
@@ -42,6 +45,9 @@ var Menu = function Menu(props) {
       pkgPrefixCls = _React$useContext.prefixCls,
       userDefaultProps = _React$useContext.compDefaultProps;
 
+  var userSelectedKey = props.selectedKey,
+      userOpenKeys = props.openKeys;
+
   var _b = getCompProps('Menu', userDefaultProps, props),
       customPrefixcls = _b.prefixCls,
       mode = _b.mode,
@@ -57,30 +63,48 @@ var Menu = function Menu(props) {
       restProps = __rest(_b, ["prefixCls", "mode", "inlineIndent", "forceSubMenuRender", "additionalTools", "onClick", "onOpenChange", "children", "className", "theme", "collapsed"]);
 
   var prefixCls = getPrefixCls(pkgPrefixCls, 'menu', customPrefixcls);
-  devWarning(['inline', 'vertical', undefined].indexOf(mode) === -1, 'menu', "cannot found menu mode '".concat(mode, "'"));
-  var defaultSelectedKey = ('selectedKey' in restProps ? restProps.selectedKey : restProps.defaultSelectedKey) || '';
-  var defaultOpenKeys = ('openKeys' in restProps ? restProps.openKeys : restProps.defaultOpenKeys) || []; // const [collapsed, setCollapsed] = React.useState<boolean | undefined>(restProps.collapsed)
+  devWarning(['inline', 'vertical', undefined].indexOf(mode) === -1, 'menu', "cannot found menu mode '".concat(mode, "'")); // const [collapsed, setCollapsed] = React.useState<boolean | undefined>(restProps.collapsed)
 
-  var _React$useState = React.useState(defaultSelectedKey),
+  var _React$useState = React.useState(''),
       _React$useState2 = _slicedToArray(_React$useState, 2),
       selectedKey = _React$useState2[0],
       setSelectedKey = _React$useState2[1];
 
-  var _React$useState3 = React.useState(defaultOpenKeys),
+  var _React$useState3 = React.useState([]),
       _React$useState4 = _slicedToArray(_React$useState3, 2),
       openKeys = _React$useState4[0],
-      setOpenKeys = _React$useState4[1]; // triggerSubMenuAction内嵌模式固定为click，即该值设置只对垂直模式有效
-
+      setOpenKeys = _React$useState4[1];
 
   if (mode === 'inline') {
     restProps.triggerSubMenuAction = 'click';
-  } // React.useEffect(() => {
+  }
+
+  useEffect(function () {
+    setOpenKeys([]);
+    setSelectedKey('');
+    openSubMenuSet.clear();
+  }, [mode]);
+  useEffect(function () {
+    if (userSelectedKey !== undefined) {
+      setSelectedKey(userSelectedKey);
+    }
+  }, [userSelectedKey]);
+  useEffect(function () {
+    if (userOpenKeys !== undefined && Array.isArray(userOpenKeys)) {
+      setOpenKeys(userOpenKeys);
+      openSubMenuSet.clear();
+      userOpenKeys.forEach(function (d) {
+        openSubMenuSet.add(d);
+      });
+    }
+  }, [userOpenKeys]); // React.useEffect(() => {
   //   setCollapsed(restProps.collapsed)
   // }, [restProps.collapsed])
 
-
   var handleOnClick = function handleOnClick(info) {
-    setSelectedKey(info.key);
+    if (userSelectedKey === undefined) {
+      setSelectedKey(info.key);
+    }
 
     if (mode !== 'inline' && openKeys.length > 0) {
       setOpenKeys([]);
@@ -102,18 +126,24 @@ var Menu = function Menu(props) {
   }; // 子菜单展开关闭的回调
 
 
-  var handleOnOpenChange = function handleOnOpenChange(openKey) {
-    var index = openKeys.indexOf(openKey);
+  var handleOnOpenChange = function handleOnOpenChange(openKey, isAdd) {
+    var clean = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
 
-    if (index > -1) {
-      _spliceInstanceProperty(openKeys).call(openKeys, index, 1);
-
-      setOpenKeys(openKeys);
+    if (clean) {
+      openSubMenuSet.clear();
     } else {
-      setOpenKeys(_concatInstanceProperty(openKeys).call(openKeys, openKey));
+      if (isAdd) {
+        openSubMenuSet.add(openKey);
+      } else {
+        openSubMenuSet.delete(openKey);
+      }
+    }
+
+    if (userOpenKeys === undefined) {
+      setOpenKeys(_toConsumableArray(openSubMenuSet));
     }
 
-    onOpenChange && onOpenChange(openKey);
+    onOpenChange && onOpenChange(_toConsumableArray(openSubMenuSet));
   };
 
   var renderMenu = function renderMenu() {
@@ -129,11 +159,14 @@ var Menu = function Menu(props) {
         mode: mode,
         openKeys: openKeys,
         selectedKey: selectedKey,
+        theme: theme,
         triggerSubMenuAction: restProps.triggerSubMenuAction,
         forceSubMenuRender: forceSubMenuRender,
         handleOnOpenChange: handleOnOpenChange,
         handleOnClick: handleOnClick,
-        inlineIndent: inlineIndent
+        inlineIndent: inlineIndent,
+        userOpenKeys: userOpenKeys,
+        userSelectedKey: userSelectedKey
       });
     }));
   };

package/es/menu/menuItem.d.ts

@@ -6,5 +6,6 @@ export interface MenuItemProps extends React.HTMLAttributes<HTMLElement> {
     children?: React.ReactNode;
     style?: React.CSSProperties;
 }
+export declare const MENU_ITEM_CONTAINER_NAME = "menu-item-content-container";
 declare const MenuItem: React.ForwardRefExoticComponent<MenuItemProps & React.RefAttributes<unknown>>;
 export default MenuItem;