rsuite 5.2.0 → 5.2.1

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [5.2.1](https://github.com/rsuite/rsuite/compare/v5.2.0...v5.2.1) (2021-11-12)
+
+### Bug Fixes
+
+- **CheckTree:** root node indeterminate state error ([#2124](https://github.com/rsuite/rsuite/issues/2124)) ([9dac0bc](https://github.com/rsuite/rsuite/commit/9dac0bc0e51b58b46aa85dac8a0348a9d73b2503))
+- **Sidenav:** remove underline on hovered SidenavItem ([#2118](https://github.com/rsuite/rsuite/issues/2118)) ([56f7c3a](https://github.com/rsuite/rsuite/commit/56f7c3ad0f7ab31c7d5aef2fe2cde1661024f034))
+- **Sidenav:** sidenav dropdown item accept as prop ([#2120](https://github.com/rsuite/rsuite/issues/2120)) ([5386999](https://github.com/rsuite/rsuite/commit/538699962dfd46faf41bb377833b0dcd06112039))
+
 # [5.2.0](https://github.com/rsuite/rsuite/compare/v5.1.0...v5.2.0) (2021-11-05)
 
 ### Bug Fixes

package/README.md

@@ -78,7 +78,8 @@ You can go through [full documentation][rsuite-doc-guide] or start with followin
 - [Right-to-left][rsuite-doc-guide-rtl]
 - [Components][rsuite-components-overview]
 
-### Examples
+<details>
+<summary>More examples</summary>
 
 - [Management system][demo-admin]
 - [Use modularized][demo-modular-import]
@@ -96,6 +97,7 @@ You can go through [full documentation][rsuite-doc-guide] or start with followin
 - [Use in UmiJS][demo-umi-app]
 - [Use in Snowpack][demo-snowpack]
 - [Use in Vite][demo-vite]
+</details>
 
 ## Previous major versions
 
@@ -113,53 +115,10 @@ and security fixes are supported until 6.x is in progress.
 
 Detailed changes for each release are documented in the [release notes][release-notes].
 
-## Development
-
-### Test-Driven Development（TDD）
-
-1. Fork `https://github.com/rsuite/rsuite` this repo.
-
-```bash
-$ git clone git@github.com:<YOUR NAME>/rsuite.git
-$ cd rsuite
-```
-
-2. Install it and run
-
-```bash
-$ npm i
-$ npm run tdd
-```
-
-3. Run a single component test case.
-
-```bash
-$ M=Button npm run tdd
-```
-
-### UI-Driven Development
-
-1. Fork `https://github.com/rsuite/rsuite` this repo.
-
-```bash
-$ git clone git@github.com:<YOUR NAME>/rsuite.git
-```
-
-2. Install it and run
-
-```bash
-$ npm i
-$ npm run dev
-```
-
-3. Your show time. Open url http://127.0.0.1:3000/ in browser.
-
 ## Contribution
 
 Make sure you've read the [guidelines][contributing] before you start contributing.
 
-Editor preferences are available in the [.prettierrc][prettierrc] for easy use in common code editors. Read more and download plugins at https://prettier.io/.
-
 ## Supporting React Suite
 
 If you like React Suite, you can show your support by either

package/Sidenav/styles/index.less

@@ -139,6 +139,10 @@
   outline: 0;
   overflow: hidden;
 
+  &:hover {
+    text-decoration: none;
+  }
+
   &:focus-visible,
   &&-focus {
     .focus-ring(slim-inset);

package/cjs/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/cjs/CheckTreePicker/utils.js

@@ -41,18 +41,19 @@ function isEveryChildChecked(nodes, parent) {
   });
 }
 
-function isSomeChildChecked(nodes, parent) {
+function isSomeChildChecked(nodes, parent, childrenKey) {
   if ((0, _isNil2.default)(nodes[parent.refKey])) {
     return false;
   }
 
   var children = (0, _treeUtils.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;
   });
 }
@@ -215,7 +216,7 @@ function getNodeCheckState(_ref) {
     return _utils.CHECK_STATE.CHECK;
   }
 
-  if (isSomeChildChecked(nodes, node)) {
+  if (isSomeChildChecked(nodes, node, childrenKey)) {
     nodes[node.refKey].checkAll = false;
     return _utils.CHECK_STATE.INDETERMINATE;
   }

package/cjs/Dropdown/DropdownItem.js

@@ -41,6 +41,8 @@ var _useInternalId = _interopRequireDefault(require("../utils/useInternalId"));
 
 var _DropdownState = require("./DropdownState");
 
+var _useRenderDropdownItem = require("./useRenderDropdownItem");
+
 /**
  * The <Dropdown.Item> API
  * When used inside <Sidenav>, renders a <TreeviewItem>
@@ -112,15 +114,7 @@ var DropdownItem = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       };
     }
   }, [internalId, selected, dispatch]);
-  var renderDropdownItem = (0, _react.useCallback)(function (ui) {
-    if (Component === 'li') {
-      return ui;
-    }
-
-    return /*#__PURE__*/_react.default.createElement("li", {
-      role: "none presentation"
-    }, ui);
-  }, [Component]);
+  var renderDropdownItem = (0, _useRenderDropdownItem.useRenderDropdownItem)(Component);
 
   if (sidenav !== null && sidenav !== void 0 && sidenav.expanded) {
     return /*#__PURE__*/_react.default.createElement(_SidenavDropdownItem.default, (0, _extends2.default)({
@@ -129,18 +123,18 @@ var DropdownItem = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
   }
 
   if (divider) {
-    return renderDropdownItem( /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
+    return renderDropdownItem((0, _extends2.default)({
       ref: ref,
-      role: "separator",
+      role: 'separator',
       className: merge(prefix('divider'), className)
-    }, restProps)));
+    }, restProps));
   }
 
   if (panel) {
-    return renderDropdownItem( /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
+    return renderDropdownItem((0, _extends2.default)({
       ref: ref,
       className: merge(prefix('panel'), className)
-    }, restProps), children));
+    }, restProps));
   }
 
   if (navbar) {
@@ -195,12 +189,14 @@ var DropdownItem = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       dataAttributes['data-event-key-type'] = typeof eventKey;
     }
 
-    return renderDropdownItem( /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
+    return renderDropdownItem((0, _extends2.default)({
       ref: (0, _utils.mergeRefs)(ref, menuitemRef),
       className: classes
-    }, menuitem, dataAttributes, restProps), icon && /*#__PURE__*/_react.default.cloneElement(icon, {
-      className: prefix('menu-icon')
-    }), children));
+    }, menuitem, dataAttributes, restProps, {
+      children: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, icon && /*#__PURE__*/_react.default.cloneElement(icon, {
+        className: prefix('menu-icon')
+      }), children)
+    }));
   });
 });
 

package/cjs/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/cjs/Dropdown/useRenderDropdownItem.js

@@ -0,0 +1,26 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+exports.__esModule = true;
+exports.useRenderDropdownItem = useRenderDropdownItem;
+
+var _react = _interopRequireWildcard(require("react"));
+
+function useRenderDropdownItem(Component) {
+  return (0, _react.useCallback)(function (props, OverrideComponent) {
+    if (Component === 'li') {
+      if (OverrideComponent) {
+        return /*#__PURE__*/_react.default.createElement("li", {
+          role: "none presentation"
+        }, /*#__PURE__*/_react.default.createElement(OverrideComponent, props));
+      }
+
+      return /*#__PURE__*/_react.default.createElement(Component, props);
+    }
+
+    return /*#__PURE__*/_react.default.createElement("li", {
+      role: "none presentation"
+    }, /*#__PURE__*/_react.default.createElement(Component, props));
+  }, [Component]);
+}

package/cjs/Sidenav/SidenavDropdownItem.js

@@ -29,6 +29,8 @@ var _NavContext = _interopRequireDefault(require("../Nav/NavContext"));
 
 var _DropdownContext = _interopRequireDefault(require("../Dropdown/DropdownContext"));
 
+var _useRenderDropdownItem = require("../Dropdown/useRenderDropdownItem");
+
 /**
  * Tree View Node
  * @see https://www.w3.org/TR/wai-aria-practices-1.2/#TreeView
@@ -78,34 +80,39 @@ var SidenavDropdownItem = /*#__PURE__*/_react.default.forwardRef(function (props
   var menuitemEventHandlers = {
     onClick: (0, _utils.createChainedFunction)(handleClick, onClick)
   };
+  var renderDropdownItem = (0, _useRenderDropdownItem.useRenderDropdownItem)(Component);
 
   if (divider) {
-    return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
+    return renderDropdownItem((0, _extends2.default)({
       ref: ref,
-      role: "separator",
+      role: 'separator',
       style: style,
       className: merge(prefix('divider'), className)
     }, rest));
   }
 
   if (panel) {
-    return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
+    return renderDropdownItem((0, _extends2.default)({
       ref: ref,
-      role: "none presentation",
+      role: 'none presentation',
       style: style,
       className: merge(prefix('panel'), className)
-    }, rest), children);
+    }, rest, {
+      children: children
+    }));
   }
 
-  return /*#__PURE__*/_react.default.createElement(_SafeAnchor.default, (0, _extends2.default)({
+  return renderDropdownItem((0, _extends2.default)({
     ref: ref
   }, rest, {
     style: style,
     className: classes,
-    "aria-current": selected || undefined
-  }, menuitemEventHandlers), icon && /*#__PURE__*/_react.default.cloneElement(icon, {
-    className: prefix('menu-icon')
-  }), children, /*#__PURE__*/_react.default.createElement(_Ripple.default, null));
+    'aria-current': selected || undefined
+  }, menuitemEventHandlers, {
+    children: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, icon && /*#__PURE__*/_react.default.cloneElement(icon, {
+      className: prefix('menu-icon')
+    }), children, /*#__PURE__*/_react.default.createElement(_Ripple.default, null))
+  }), _SafeAnchor.default);
 });
 
 SidenavDropdownItem.displayName = 'Sidenav.Dropdown.Item';

package/dist/rsuite-rtl.css

@@ -12565,6 +12565,9 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
   outline: 0;
   overflow: hidden;
 }
+.rs-sidenav-item:hover {
+  text-decoration: none;
+}
 .rs-sidenav-item:focus-visible,
 .rs-sidenav-item.rs-sidenav-item-focus {
   -webkit-box-shadow: inset var(--rs-state-focus-shadow-slim);