rsuite 5.2.0 → 5.2.1

package/esm/CheckTreePicker/utils.d.ts

@@ -19,7 +19,7 @@ export interface TreeNodesType {
     [key: string]: TreeNodeType;
 }
 export declare function isEveryChildChecked(nodes: TreeNodesType, parent: TreeNodeType): boolean;
-export declare function isSomeChildChecked(nodes: TreeNodesType, parent: TreeNodeType): boolean;
+export declare function isSomeChildChecked(nodes: TreeNodesType, parent: TreeNodeType, childrenKey: string): boolean;
 export declare function isSomeNodeHasChildren(data: any[], childrenKey: string): boolean;
 /**
  * is all siblings nodes is uncheckable

package/esm/CheckTreePicker/utils.js

@@ -18,18 +18,19 @@ export function isEveryChildChecked(nodes, parent) {
     return nodes[child.refKey].check;
   });
 }
-export function isSomeChildChecked(nodes, parent) {
+export function isSomeChildChecked(nodes, parent, childrenKey) {
   if (_isNil(nodes[parent.refKey])) {
     return false;
   }
 
   var children = getChildrenByFlattenNodes(nodes, parent);
+  return children.some(function (child) {
+    var _child$childrenKey;
 
-  if (!children.length) {
-    return nodes[parent.refKey].check;
-  }
+    if ((child === null || child === void 0 ? void 0 : (_child$childrenKey = child[childrenKey]) === null || _child$childrenKey === void 0 ? void 0 : _child$childrenKey.length) > 0) {
+      return isSomeChildChecked(nodes, child, childrenKey);
+    }
 
-  return children.some(function (child) {
     return nodes[child.refKey].check;
   });
 }
@@ -184,7 +185,7 @@ export function getNodeCheckState(_ref) {
     return CHECK_STATE.CHECK;
   }
 
-  if (isSomeChildChecked(nodes, node)) {
+  if (isSomeChildChecked(nodes, node, childrenKey)) {
     nodes[node.refKey].checkAll = false;
     return CHECK_STATE.INDETERMINATE;
   }

package/esm/Dropdown/DropdownItem.js

@@ -15,6 +15,7 @@ import SafeAnchor from '../SafeAnchor';
 import NavContext from '../Nav/NavContext';
 import useInternalId from '../utils/useInternalId';
 import { DropdownActionType } from './DropdownState';
+import { useRenderDropdownItem } from './useRenderDropdownItem';
 
 /**
  * The <Dropdown.Item> API
@@ -88,15 +89,7 @@ var DropdownItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
       };
     }
   }, [internalId, selected, dispatch]);
-  var renderDropdownItem = useCallback(function (ui) {
-    if (Component === 'li') {
-      return ui;
-    }
-
-    return /*#__PURE__*/React.createElement("li", {
-      role: "none presentation"
-    }, ui);
-  }, [Component]);
+  var renderDropdownItem = useRenderDropdownItem(Component);
 
   if (sidenav !== null && sidenav !== void 0 && sidenav.expanded) {
     return /*#__PURE__*/React.createElement(SidenavDropdownItem, _extends({
@@ -105,18 +98,18 @@ var DropdownItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }
 
   if (divider) {
-    return renderDropdownItem( /*#__PURE__*/React.createElement(Component, _extends({
+    return renderDropdownItem(_extends({
       ref: ref,
-      role: "separator",
+      role: 'separator',
       className: merge(prefix('divider'), className)
-    }, restProps)));
+    }, restProps));
   }
 
   if (panel) {
-    return renderDropdownItem( /*#__PURE__*/React.createElement(Component, _extends({
+    return renderDropdownItem(_extends({
       ref: ref,
       className: merge(prefix('panel'), className)
-    }, restProps), children));
+    }, restProps));
   }
 
   if (navbar) {
@@ -172,12 +165,14 @@ var DropdownItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
       dataAttributes['data-event-key-type'] = typeof eventKey;
     }
 
-    return renderDropdownItem( /*#__PURE__*/React.createElement(Component, _extends({
+    return renderDropdownItem(_extends({
       ref: mergeRefs(ref, menuitemRef),
       className: classes
-    }, menuitem, dataAttributes, restProps), icon && /*#__PURE__*/React.cloneElement(icon, {
-      className: prefix('menu-icon')
-    }), children));
+    }, menuitem, dataAttributes, restProps, {
+      children: /*#__PURE__*/React.createElement(React.Fragment, null, icon && /*#__PURE__*/React.cloneElement(icon, {
+        className: prefix('menu-icon')
+      }), children)
+    }));
   });
 });
 DropdownItem.displayName = 'Dropdown.Item';

package/esm/Dropdown/useRenderDropdownItem.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare function useRenderDropdownItem(Component: React.ElementType): (props: any, OverrideComponent?: React.ElementType) => JSX.Element;

package/esm/Dropdown/useRenderDropdownItem.js

@@ -0,0 +1,18 @@
+import React, { useCallback } from 'react';
+export function useRenderDropdownItem(Component) {
+  return useCallback(function (props, OverrideComponent) {
+    if (Component === 'li') {
+      if (OverrideComponent) {
+        return /*#__PURE__*/React.createElement("li", {
+          role: "none presentation"
+        }, /*#__PURE__*/React.createElement(OverrideComponent, props));
+      }
+
+      return /*#__PURE__*/React.createElement(Component, props);
+    }
+
+    return /*#__PURE__*/React.createElement("li", {
+      role: "none presentation"
+    }, /*#__PURE__*/React.createElement(Component, props));
+  }, [Component]);
+}

package/esm/Sidenav/SidenavDropdownItem.js

@@ -9,6 +9,7 @@ import Ripple from '../Ripple';
 import SafeAnchor from '../SafeAnchor';
 import NavContext from '../Nav/NavContext';
 import DropdownContext from '../Dropdown/DropdownContext';
+import { useRenderDropdownItem } from '../Dropdown/useRenderDropdownItem';
 
 /**
  * Tree View Node
@@ -59,34 +60,39 @@ var SidenavDropdownItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var menuitemEventHandlers = {
     onClick: createChainedFunction(handleClick, onClick)
   };
+  var renderDropdownItem = useRenderDropdownItem(Component);
 
   if (divider) {
-    return /*#__PURE__*/React.createElement(Component, _extends({
+    return renderDropdownItem(_extends({
       ref: ref,
-      role: "separator",
+      role: 'separator',
       style: style,
       className: merge(prefix('divider'), className)
     }, rest));
   }
 
   if (panel) {
-    return /*#__PURE__*/React.createElement(Component, _extends({
+    return renderDropdownItem(_extends({
       ref: ref,
-      role: "none presentation",
+      role: 'none presentation',
       style: style,
       className: merge(prefix('panel'), className)
-    }, rest), children);
+    }, rest, {
+      children: children
+    }));
   }
 
-  return /*#__PURE__*/React.createElement(SafeAnchor, _extends({
+  return renderDropdownItem(_extends({
     ref: ref
   }, rest, {
     style: style,
     className: classes,
-    "aria-current": selected || undefined
-  }, menuitemEventHandlers), icon && /*#__PURE__*/React.cloneElement(icon, {
-    className: prefix('menu-icon')
-  }), children, /*#__PURE__*/React.createElement(Ripple, null));
+    'aria-current': selected || undefined
+  }, menuitemEventHandlers, {
+    children: /*#__PURE__*/React.createElement(React.Fragment, null, icon && /*#__PURE__*/React.cloneElement(icon, {
+      className: prefix('menu-icon')
+    }), children, /*#__PURE__*/React.createElement(Ripple, null))
+  }), SafeAnchor);
 });
 SidenavDropdownItem.displayName = 'Sidenav.Dropdown.Item';
 SidenavDropdownItem.propTypes = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsuite",
-  "version": "5.2.0",
+  "version": "5.2.1",
   "description": "A suite of react components",
   "main": "cjs/index.js",
   "module": "esm/index.js",