@kdcloudjs/kdesign 1.3.1 → 1.3.4

package/lib/cascader/cascader.js

@@ -11,7 +11,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.PopupPlacement = void 0;
+exports.default = exports.CascaderPlacement = void 0;
 
 var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
 
@@ -49,8 +49,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "functi
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var PopupPlacement = (0, _type.tuple)('topLeft', 'topRight', 'bottomLeft', 'bottomRight');
-exports.PopupPlacement = PopupPlacement;
+var CascaderPlacement = (0, _type.tuple)('topLeft', 'topRight', 'bottomLeft', 'bottomRight');
+exports.CascaderPlacement = CascaderPlacement;
 var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _React$useContext = React.useContext(_configProvider.ConfigContext),
       getPrefixCls = _React$useContext.getPrefixCls,
@@ -75,6 +75,7 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
       getPopupContainer = allProps.getPopupContainer,
       defaultPopupVisible = allProps.defaultPopupVisible,
       onPopupVisibleChange = allProps.onPopupVisibleChange,
+      onPopperVisibleChange = allProps.onPopperVisibleChange,
       customPrefixcls = allProps.prefixCls; // className前缀
 
   var prefixCls = getPrefixCls(pkgPrefixCls, 'cascader', customPrefixcls);
@@ -82,14 +83,14 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var triggerRef = React.useRef();
   var mergeRef = ref || pickerRef;
 
-  var _React$useState = React.useState(!!props.popupVisible || defaultPopupVisible),
+  var _React$useState = React.useState(!!props.popperVisible || !!props.popupVisible || defaultPopupVisible),
       _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
       visible = _React$useState2[0],
       setVisible = _React$useState2[1];
 
   React.useEffect(function () {
-    setVisible(!!props.popupVisible);
-  }, [props.popupVisible]);
+    setVisible(!!props.popperVisible || !!props.popupVisible);
+  }, [props.popperVisible, props.popupVisible]);
 
   var _React$useState3 = React.useState([options]),
       _React$useState4 = (0, _slicedToArray2.default)(_React$useState3, 2),
@@ -231,6 +232,7 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var onVisibleChange = function onVisibleChange(visible) {
     setVisible(visible);
     onPopupVisibleChange && onPopupVisibleChange(visible);
+    onPopperVisibleChange && onPopperVisibleChange(visible);
     visible && setSelectedOptions((0, _slice.default)(currentOptions).call(currentOptions, 0));
   };
 
@@ -282,8 +284,8 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
     trigger: 'click',
     getPopupContainer: getPopupContainer,
     prefixCls: "".concat(prefixCls, "-menus"),
-    placement: allProps.popupPlacement,
-    popperClassName: allProps.popupClassName,
+    placement: allProps.popperPlacement || allProps.popupPlacement,
+    popperClassName: allProps.popperClassName || allProps.popupClassName,
     getTriggerElement: function getTriggerElement() {
       return triggerRef.current;
     }

package/lib/checkbox/checkbox.js

@@ -71,11 +71,12 @@ var InternalCheckbox = function InternalCheckbox(props, ref) {
     return (0, _isBoolean.default)(checked) ? checked : defaultChecked;
   };
 
-  var _React$useState = _react.default.useState(getChecked()),
-      _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
-      selected = _React$useState2[0],
-      setSelected = _React$useState2[1];
+  var _useState = (0, _react.useState)(getChecked()),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      selected = _useState2[0],
+      setSelected = _useState2[1];
 
+  var labelRef = (0, _react.useRef)(null);
   (0, _devwarning.default)(CheckboxTypes.indexOf(checkboxType) === -1, 'checkbox', "cannot found checkbox type '".concat(checkboxType, "'"));
   (0, _devwarning.default)(CheckboxSizes.indexOf(size) === -1, 'checkbox', "cannot found size type '".concat(size, "'"));
   var checkboxPrefixCls = getPrefixCls(prefixCls, 'checkbox', customPrefixcls);
@@ -102,14 +103,21 @@ var InternalCheckbox = function InternalCheckbox(props, ref) {
   (0, _react.useEffect)(function () {
     (0, _isBoolean.default)(checked) && checked !== selected && setSelected(checked);
   }, [checked, selected]);
+  (0, _react.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;
@@ -120,7 +128,7 @@ var InternalCheckbox = function InternalCheckbox(props, ref) {
       _react.default.createElement("label", {
         className: getRootClassName,
         style: style,
-        onClick: handleRepeatClick
+        ref: labelRef
       }, /*#__PURE__*/_react.default.createElement("span", {
         className: checkedWrapperClassName
       }, selected && /*#__PURE__*/_react.default.createElement("span", {

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

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

package/lib/config-provider/compDefaultProps.js

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

package/lib/form/Field.js

@@ -23,6 +23,8 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/hel
 
 var _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
 
+var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
+
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
 
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
@@ -89,8 +91,30 @@ var generateEventHandler = function generateEventHandler(handler, validateTrigge
   return eventHandler;
 };
 
+var INNER_VALUE_PROPS_LIST = [{
+  name: 'Radio',
+  propName: 'checked'
+}, {
+  name: 'Checkbox',
+  propName: 'checked'
+}, {
+  name: 'Switch',
+  propName: 'checked'
+}, {
+  name: 'Upload',
+  propName: 'fileList'
+}, {
+  name: 'Transfer',
+  propName: 'targetKey'
+}, {
+  name: 'RangePicker',
+  propName: 'ranges'
+}];
+
 var Field = function Field(props) {
-  var _classnames, _context2;
+  var _classnames;
+
+  var _a;
 
   (0, _devwarning.default)(! /*#__PURE__*/_react.default.isValidElement(props.children), 'Form.Item', 'Children of Form.Item is not a valid element');
   (0, _devwarning.default)(!props.name, 'Form.Item', 'Form.Item must have a name');
@@ -135,8 +159,29 @@ var Field = function Field(props) {
       wrapperWidth = props.wrapperWidth,
       validateTrigger = props.validateTrigger,
       defaultValue = props.defaultValue,
-      _props$valuePropName = props.valuePropName,
-      valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName;
+      valuePropName = props.valuePropName;
+  var childrenNode = null;
+  var innerValuePropName = 'value';
+  var childrenArray = (0, _reactChildren.toArray)(children);
+
+  if (childrenArray.length) {
+    (0, _devwarning.default)(childrenArray.length > 1, 'Form.Item', 'Form.Item must have only child');
+    childrenNode = childrenArray[0];
+  }
+
+  var innerDisplayName = (_a = childrenNode === null || childrenNode === void 0 ? void 0 : childrenNode.type) === null || _a === void 0 ? void 0 : _a.displayName;
+
+  if (valuePropName !== undefined) {
+    innerValuePropName = valuePropName;
+  } else if (innerDisplayName) {
+    var filter = (0, _filter.default)(INNER_VALUE_PROPS_LIST).call(INNER_VALUE_PROPS_LIST, function (item) {
+      return innerDisplayName === item.name;
+    });
+
+    if (filter.length) {
+      innerValuePropName = filter[0].propName;
+    }
+  }
 
   var onStoreChange = function onStoreChange(stores, _namePathList, source) {
     var prev = stores.prev,
@@ -216,8 +261,8 @@ var Field = function Field(props) {
 
     var inputValue;
 
-    if (Object.prototype.hasOwnProperty.call(evt, 'target') && (0, _includes.default)(FormEventValuePropNames).call(FormEventValuePropNames, valuePropName)) {
-      inputValue = (_a = evt.target) === null || _a === void 0 ? void 0 : _a[valuePropName];
+    if (Object.prototype.hasOwnProperty.call(evt, 'target') && (0, _includes.default)(FormEventValuePropNames).call(FormEventValuePropNames, innerValuePropName)) {
+      inputValue = (_a = evt.target) === null || _a === void 0 ? void 0 : _a[innerValuePropName];
     } else {
       inputValue = evt;
     }
@@ -256,7 +301,7 @@ var Field = function Field(props) {
 
     var _ch$props = ch.props,
         chChange = _ch$props.onChange,
-        chValue = _ch$props[valuePropName],
+        chValue = _ch$props[innerValuePropName],
         chDisabled = _ch$props.disabled,
         chDefaultValue = _ch$props.defaultValue;
 
@@ -288,7 +333,7 @@ var Field = function Field(props) {
     return (0, _extends5.default)((0, _extends5.default)({}, rest), (_extends3 = {
       onChange: onChange,
       defaultValue: defaultValue
-    }, (0, _defineProperty2.default)(_extends3, valuePropName, fieldValue), (0, _defineProperty2.default)(_extends3, "disabled", chDisabled || faDisabled), _extends3));
+    }, (0, _defineProperty2.default)(_extends3, innerValuePropName, fieldValue), (0, _defineProperty2.default)(_extends3, "disabled", chDisabled || faDisabled), _extends3));
   };
 
   return /*#__PURE__*/_react.default.createElement("div", {
@@ -301,10 +346,10 @@ var Field = function Field(props) {
   }), /*#__PURE__*/_react.default.createElement(_FieldWrapper.default, {
     width: wrapperWidth,
     validateMessage: validateMessage
-  }, (0, _map.default)(_context2 = (0, _reactChildren.toArray)(children)).call(_context2, function (child, index) {
+  }, (0, _map.default)(childrenArray).call(childrenArray, function (child, index) {
     var keys = mergeProps((0, _extends5.default)((0, _extends5.default)((0, _defineProperty2.default)({
       disabled: disabled
-    }, valuePropName, value), trigger), {
+    }, innerValuePropName, value), trigger), {
       key: index
     }), child);
     return child ? /*#__PURE__*/_react.default.cloneElement(child, keys) : child;

package/lib/grid/row.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-declare type Align = 'top' | 'middle' | 'bottom';
+declare type Align = 'top' | 'middle' | 'bottom' | 'stretch';
 declare type Justify = 'start' | 'end' | 'center' | 'space-around' | 'space-between';
 interface gutterObject {
     xs?: number;

package/lib/icon/interface.js

@@ -13,7 +13,7 @@ var _type = require("../_utils/type");
 
 var BaseIcon = ['arrow-up', 'arrow-down', 'arrow-left', 'arrow-right', 'first', 'last', 'double-arrow-left', 'double-arrow-right', 'push-down', 'put-top', 'put-bottom', 'put-on', 'put-off', 'switch-up', 'switch-down', 'all-border', 'top-border', 'right-border', 'bottom-border', 'left-border', 'left-extension', 'right-extension', 'left-unfold', 'right-unfold', 'unfoldmenu', 'foldmenu', 'enlarge', 'expand', 'close-full-screen', 'split', 'back', 'arrow', 'no-border', 'border', 'rough-border', 'align-left', 'align-right', 'align-center', 'vertical-center', 'delete-indentation', 'equal', 'greater-equal', 'not-equal', 'male', 'female', 'copy', 'print', 'lock', 'scanning', 'like', 'project', 'user-info', 'shutdown', 'image', 'delete-line', 'add-line', 'job-info', 'detect', 'cancel', 'stop', 'cell', 'fixed-shrink', 'attachment', 'location', 'reduce', 'resign-report', 'forbid', 'education', 'unlock', 'contract', 'filter', 'more', 'operating-element', 'fail', 'edit', 'have-attachment', 'hide', 'preview', 'unfold-all', 'wrap', 'filter-switch', 'qualification-info', 'cn', 'en', 'git', 'reset', 'preview-view', 'unfold', 'comment', 'shoppingcart', 'add-child', 'save', 'detail', 'table-setting', 'edit-view', 'edit-border', 'hyperlink', 'code', 'import', 'address', 'analysis', 'share', 'chart', 'fixed-window', 'order', 'phone', 'classify', 'feedback', 'menu', 'voice', 'search-border', 'material', 'finish', 'more-info', 'fixed', 'change', 'copy-code', 'return', 'qrcode', 'counterclockwise', 'list', 'switch', 'task-process', 'add', 'delete', 'add-word', 'two-window', 'spin', 'ordered-list', 'cooperation', 'quit', 'shrink', 'zoom', 'graffiti', 'experience', 'medical-report', 'bankcard', 'yunzhijia', 'customize', 'refresh', 'search', 'loadding', 'loadding-circle', 'right', 'close', 'upload', 'download', 'upload-cloud', 'waiting', 'warning', 'exclamatory', 'tips', 'setting', 'chart-display', 'date', 'more-item', 'international', 'little-k', 'bellOutlined', 'sigma'];
 exports.BaseIcon = BaseIcon;
-var SolidIcon = ['arrow-up-solid', 'arrow-right-solid', 'arrow-down-solid', 'arrow-left-solid', 'left-unfold-solid', 'right-unfold-solid', 'unlock-solid', 'multiply', 'division-solid', 'title-solid', 'communication-solid', 'fixed-solid', 'more-info-solid', 'timezone-solid', 'mosaic-solid', 'strike-solid', 'lock-solid', 'filter-solid', 'person-solid', 'bold-solid', 'delete-solid', 'processing-solid', 'tips-solid', 'quote-solid', 'oblique-solid', 'sun-solid', 'underline-solid', 'font-background-solid', 'eliminate-solid', 'font-color-solid', 'fx', 'refresh-solid', 'right-solid', 'location-solid', 'add-solid', 'warning-solid', 'close-solid', 'right-bold', 'close-bold', 'workbench', 'star', 'notice'];
+var SolidIcon = ['arrow-up-solid', 'arrow-right-solid', 'arrow-down-solid', 'arrow-left-solid', 'left-unfold-solid', 'right-unfold-solid', 'unlock-solid', 'multiply', 'division-solid', 'title-solid', 'communication-solid', 'fixed-solid', 'more-info-solid', 'timezone-solid', 'mosaic-solid', 'strike-solid', 'lock-solid', 'filter-solid', 'person-solid', 'bold-solid', 'delete-solid', 'processing-solid', 'tips-solid', 'quote-solid', 'oblique-solid', 'sun-solid', 'underline-solid', 'font-background-solid', 'eliminate-solid', 'font-color-solid', 'fx', 'refresh-solid', 'right-solid', 'location-solid', 'add-solid', 'warning-solid', 'close-solid', 'right-bold', 'close-bold', 'workbench', 'star', 'notice', 'dashboard'];
 exports.SolidIcon = SolidIcon;
 
 var IconTypes = _type.tuple.apply(void 0, (0, _concat.default)(BaseIcon).call(BaseIcon, SolidIcon));

package/lib/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/lib/menu/menu.js

@@ -17,17 +17,19 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/he
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
 
 var _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
 
-var _splice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/splice"));
-
-var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
+var _set = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set"));
 
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
 
-var React = _interopRequireWildcard(require("react"));
+var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
+
+var _react = _interopRequireWildcard(require("react"));
 
 var _reactChildren = require("../_utils/react-children");
 
@@ -64,16 +66,21 @@ var isFunction = function isFunction(fn) {
   return fn && typeof fn === 'function';
 };
 
+var openSubMenuSet = new _set.default();
+
 var Menu = function Menu(props) {
   var _context2, _classNames;
 
   var _a;
 
-  var _React$useContext = React.useContext(_configProvider.ConfigContext),
+  var _React$useContext = _react.default.useContext(_configProvider.ConfigContext),
       getPrefixCls = _React$useContext.getPrefixCls,
       pkgPrefixCls = _React$useContext.prefixCls,
       userDefaultProps = _React$useContext.compDefaultProps;
 
+  var userSelectedKey = props.selectedKey,
+      userOpenKeys = props.openKeys;
+
   var _b = (0, _utils.getCompProps)('Menu', userDefaultProps, props),
       customPrefixcls = _b.prefixCls,
       mode = _b.mode,
@@ -89,20 +96,35 @@ 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);
-  (0, _devwarning.default)(['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)
+  (0, _devwarning.default)(['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.default.useState(''),
       _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
       selectedKey = _React$useState2[0],
       setSelectedKey = _React$useState2[1];
 
-  var _React$useState3 = React.useState(defaultOpenKeys),
+  var _React$useState3 = _react.default.useState([]),
       _React$useState4 = (0, _slicedToArray2.default)(_React$useState3, 2),
       openKeys = _React$useState4[0],
-      setOpenKeys = _React$useState4[1]; // triggerSubMenuAction内嵌模式固定为click，即该值设置只对垂直模式有效
+      setOpenKeys = _React$useState4[1];
 
+  (0, _react.useEffect)(function () {
+    if (userSelectedKey !== undefined) {
+      setSelectedKey(userSelectedKey);
+    }
+  }, [userSelectedKey]);
+  (0, _react.useEffect)(function () {
+    if (userOpenKeys !== undefined) {
+      setOpenKeys(userOpenKeys);
+    }
+  }, [userOpenKeys]);
+  (0, _react.useEffect)(function () {
+    if (Array.isArray(userOpenKeys)) {
+      userOpenKeys.forEach(function (d) {
+        openSubMenuSet.add(d);
+      });
+    }
+  }, []); // triggerSubMenuAction内嵌模式固定为click，即该值设置只对垂直模式有效
 
   if (mode === 'inline') {
     restProps.triggerSubMenuAction = 'click';
@@ -112,7 +134,9 @@ var Menu = function Menu(props) {
 
 
   var handleOnClick = function handleOnClick(info) {
-    setSelectedKey(info.key);
+    if (userSelectedKey === undefined) {
+      setSelectedKey(info.key);
+    }
 
     if (mode !== 'inline' && openKeys.length > 0) {
       setOpenKeys([]);
@@ -134,37 +158,47 @@ 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) {
-      (0, _splice.default)(openKeys).call(openKeys, index, 1);
-      setOpenKeys(openKeys);
+    if (clean) {
+      openSubMenuSet.clear();
     } else {
-      setOpenKeys((0, _concat.default)(openKeys).call(openKeys, openKey));
+      if (isAdd) {
+        openSubMenuSet.add(openKey);
+      } else {
+        openSubMenuSet.delete(openKey);
+      }
+    }
+
+    if (userOpenKeys === undefined) {
+      setOpenKeys((0, _toConsumableArray2.default)(openSubMenuSet));
     }
 
-    onOpenChange && onOpenChange(openKey);
+    onOpenChange && onOpenChange((0, _toConsumableArray2.default)(openSubMenuSet));
   };
 
   var renderMenu = function renderMenu() {
     var _context;
 
-    return /*#__PURE__*/React.createElement("ul", null, (0, _map.default)(_context = (0, _reactChildren.toArray)(children)).call(_context, function (item, i) {
+    return /*#__PURE__*/_react.default.createElement("ul", null, (0, _map.default)(_context = (0, _reactChildren.toArray)(children)).call(_context, function (item, i) {
       if (!item) return;
       var key = (item === null || item === void 0 ? void 0 : item.key) || i;
-      return /*#__PURE__*/React.cloneElement(item, {
+      return /*#__PURE__*/_react.default.cloneElement(item, {
         key: key,
         keyValue: key,
         collapsed: collapsed,
         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
       });
     }));
   };
@@ -177,7 +211,7 @@ var Menu = function Menu(props) {
     onMouseLeave: handleMouseLeaveMenu,
     onMouseEnter: handleMouseEnterMenu
   };
-  return /*#__PURE__*/React.createElement("div", (0, _extends2.default)({
+  return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
     className: (0, _classnames.default)(prefixCls, className, (_classNames = {}, (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-inline"), mode === 'inline'), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-vertical"), mode !== 'inline'), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-collapsed"), collapsed), (0, _defineProperty2.default)(_classNames, (0, _concat.default)(_context2 = "".concat(prefixCls, "-")).call(_context2, theme === 'light' ? 'light' : 'dark'), true), _classNames)),
     role: "menu",
     style: style

package/lib/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;

package/lib/menu/menuItem.js

@@ -11,7 +11,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.MENU_ITEM_CONTAINER_NAME = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 
@@ -48,13 +48,8 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   return t;
 };
 
-var renderItemChildren = function renderItemChildren(children) {
-  if (typeof children === 'string') {
-    return /*#__PURE__*/React.createElement("span", null, children);
-  }
-
-  return (0, _util.renderReactNodeFunction)(children);
-};
+var MENU_ITEM_CONTAINER_NAME = 'menu-item-content-container';
+exports.MENU_ITEM_CONTAINER_NAME = MENU_ITEM_CONTAINER_NAME;
 
 var InternalMenuItem = function InternalMenuItem(props, ref) {
   var _classNames;
@@ -89,9 +84,20 @@ var InternalMenuItem = function InternalMenuItem(props, ref) {
   var prefixCls = getPrefixCls(pkgPrefixCls, 'menu-item', customPrefixcls);
   var menuItemRef = ref || /*#__PURE__*/React.createRef();
 
+  var renderItemChildren = function renderItemChildren(children) {
+    if (typeof children === 'string') {
+      return /*#__PURE__*/React.createElement("span", {
+        className: MENU_ITEM_CONTAINER_NAME
+      }, children);
+    }
+
+    return /*#__PURE__*/React.createElement("div", {
+      className: MENU_ITEM_CONTAINER_NAME
+    }, typeof children === 'function' ? children() : children);
+  };
+
   var preventClick = function preventClick() {
-    if (disabled || mode === 'inline') return true;
-    return false;
+    return !!(disabled || mode === 'inline');
   };
 
   var handleOnMouseEnter = function handleOnMouseEnter(e) {