rsuite 5.23.1 → 5.23.2

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [5.23.2](https://github.com/rsuite/rsuite/compare/v5.23.1...v5.23.2) (2022-12-09)
+
+### Bug Fixes
+
+- **Form.HelpText:** change font size to 12px ([#2968](https://github.com/rsuite/rsuite/issues/2968)) ([5c3898e](https://github.com/rsuite/rsuite/commit/5c3898ed2726beb81c09accd4d91963849d0dd31))
+- **Nav.Menu:** fix noCaret has No Effect on a Sub-menu ([#2960](https://github.com/rsuite/rsuite/issues/2960)) ([e51fb6b](https://github.com/rsuite/rsuite/commit/e51fb6b593f0221f2ac3288b55658d540db214f9))
+- **pickers:** the focused item should be within the container's viewport ([#2957](https://github.com/rsuite/rsuite/issues/2957)) ([cab5c63](https://github.com/rsuite/rsuite/commit/cab5c63ffde3963c72363adf00531ef3ab9d9e83))
+- **Tooltip:** should use the default text alignment ([#2965](https://github.com/rsuite/rsuite/issues/2965)) ([3280775](https://github.com/rsuite/rsuite/commit/3280775a699a3683b2c45b543fbd8e6576206142))
+
 ## [5.23.1](https://github.com/rsuite/rsuite/compare/v5.23.0...v5.23.1) (2022-12-02)
 
 ### Bug Fixes

package/FormHelpText/styles/index.less

@@ -10,8 +10,8 @@
   color: var(--rs-text-secondary); // lighten the text some for contrast
   //Sometimes help info is more than one line，so height can't set a fixed value
   min-height: @line-height-computed;
-  line-height: @line-height-base;
-  font-size: @font-size-base;
+  line-height: @line-height-small;
+  font-size: @font-size-small;
 
   &-tooltip {
     display: inline-flex;

package/Tooltip/styles/index.less

@@ -16,7 +16,6 @@
   max-width: @tooltip-max-width;
   padding: 2px 10px;
   color: var(--rs-tooltip-text);
-  text-align: center; // TODO: remove align center?
   background-color: var(--rs-tooltip-bg);
   border-radius: @tooltip-border-radius;
   overflow-wrap: break-word;

package/cjs/Menu/Menu.js

@@ -381,6 +381,7 @@ function Menu(_ref) {
   }, [disabled, closeMenu]);
   var rootElementRef = (0, _react.useRef)(null);
   var handleContainerBlur = (0, _react.useCallback)(function (event) {
+    /* istanbul ignore else */
     if ((0, _events.isFocusLeaving)(event)) {
       closeMenu(event, false);
     }

package/cjs/Nav/NavDropdownMenu.d.ts

@@ -17,6 +17,8 @@ export interface NavDropdownMenuProps<T = any> extends StandardProps {
      * @default 'end'
      */
     openDirection?: 'start' | 'end';
+    /** No caret variation */
+    noCaret?: boolean;
     /**
      *  Only used for setting the default expand state when it's a submenu.
      */

package/cjs/Nav/NavDropdownMenu.js

@@ -55,7 +55,8 @@ var NavDropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, re
       children = props.children,
       _props$openDirection = props.openDirection,
       openDirection = _props$openDirection === void 0 ? 'end' : _props$openDirection,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["onToggle", "eventKey", "title", "classPrefix", "children", "openDirection"]);
+      noCaret = props.noCaret,
+      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["onToggle", "eventKey", "title", "classPrefix", "children", "openDirection", "noCaret"]);
 
   var _useCustom = (0, _useCustom2.default)('DropdownMenu'),
       rtl = _useCustom.rtl;
@@ -110,7 +111,7 @@ var NavDropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, re
           "data-event-key-type": typeof eventKey
         }, menuitem, (0, _omit2.default)(menuButtonProps, ['role'])), icon && /*#__PURE__*/_react.default.cloneElement(icon, {
           className: prefix('menu-icon')
-        }), title, /*#__PURE__*/_react.default.createElement(Icon, {
+        }), title, !noCaret && /*#__PURE__*/_react.default.createElement(Icon, {
           className: prefix(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["toggle-icon"])))
         }));
       });
@@ -151,6 +152,7 @@ NavDropdownMenu.propTypes = {
   classPrefix: _propTypes.default.string,
   pullLeft: (0, _deprecatePropType.default)(_propTypes.default.bool, 'Use openDirection="start" instead.'),
   openDirection: _propTypes.default.oneOf(['start', 'end']),
+  noCaret: _propTypes.default.bool,
   title: _propTypes.default.node,
   open: _propTypes.default.bool,
   eventKey: _propTypes.default.any,

package/cjs/Picker/utils.js

@@ -33,6 +33,8 @@ var _treeUtils = require("../utils/treeUtils");
 
 var _utils = require("../utils");
 
+var _domLib = require("dom-lib");
+
 var defaultNodeKeys = {
   valueKey: 'value',
   childrenKey: 'children'
@@ -162,11 +164,51 @@ function onMenuKeyDown(event, events) {
   }
 }
 
+/**
+ * Checks if the element has a vertical scrollbar.
+ */
+function hasVerticalScroll(element) {
+  var scrollHeight = element.scrollHeight,
+      clientHeight = element.clientHeight;
+  return scrollHeight > clientHeight;
+}
+/**
+ * Checks if the element is within the visible area of the container
+ */
+
+
+function isVisible(element, container, direction) {
+  if (!hasVerticalScroll(container)) {
+    return true;
+  }
+
+  var _element$getBoundingC = element.getBoundingClientRect(),
+      top = _element$getBoundingC.top,
+      bottom = _element$getBoundingC.bottom,
+      height = _element$getBoundingC.height;
+
+  var _container$getBoundin = container.getBoundingClientRect(),
+      containerTop = _container$getBoundin.top,
+      containerBottom = _container$getBoundin.bottom;
+
+  if (direction === 'top') {
+    return top + height > containerTop;
+  }
+
+  return bottom - height < containerBottom;
+}
+
+function scrollTo(container, direction, step) {
+  var scrollTop = container.scrollTop;
+  container.scrollTop = direction === 'top' ? scrollTop - step : scrollTop + step;
+}
 /**
  * A hook that manages the focus state of the option.
  * @param defaultFocusItemValue
  * @param props
  */
+
+
 var useFocusItemValue = function useFocusItemValue(defaultFocusItemValue, props) {
   var _props$valueKey = props.valueKey,
       valueKey = _props$valueKey === void 0 ? 'value' : _props$valueKey,
@@ -190,11 +232,23 @@ var useFocusItemValue = function useFocusItemValue(defaultFocusItemValue, props)
   var _useState3 = (0, _react.useState)([]),
       keys = _useState3[0],
       setKeys = _useState3[1];
+
+  var getScrollContainer = (0, _react.useCallback)(function () {
+    var menu = (0, _isFunction.default)(target) ? target() : target; // For Cascader and MutiCascader
+
+    var subMenu = menu === null || menu === void 0 ? void 0 : menu.querySelector("[data-layer=\"" + layer + "\"]");
+
+    if (subMenu) {
+      return subMenu;
+    } // For SelectPicker、CheckPicker、Autocomplete、InputPicker、TagPicker
+
+
+    return menu === null || menu === void 0 ? void 0 : menu.querySelector('[role="listbox"]');
+  }, [layer, target]);
   /**
    * Get the elements visible in all options.
    */
 
-
   var getFocusableMenuItems = (0, _react.useCallback)(function () {
     if (!target) {
       return [];
@@ -251,28 +305,50 @@ var useFocusItemValue = function useFocusItemValue(defaultFocusItemValue, props)
 
     callback(items, -1);
   }, [focusItemValue, getFocusableMenuItems, valueKey]);
+  var scrollListItem = (0, _react.useCallback)(function (direction, itemValue, willOverflow) {
+    var container = getScrollContainer();
+    var item = container === null || container === void 0 ? void 0 : container.querySelector("[data-key=\"" + itemValue + "\"]");
+
+    if (willOverflow && container) {
+      var scrollHeight = container.scrollHeight,
+          clientHeight = container.clientHeight;
+      container.scrollTop = direction === 'top' ? scrollHeight - clientHeight : 0;
+      return;
+    }
+
+    if (item && container) {
+      if (!isVisible(item, container, direction)) {
+        var height = (0, _domLib.getHeight)(item);
+        scrollTo(container, direction, height);
+      }
+    }
+  }, [getScrollContainer]);
   var focusNextMenuItem = (0, _react.useCallback)(function (event) {
     findFocusItemIndex(function (items, index) {
-      var nextIndex = index + 2 > items.length ? 0 : index + 1;
+      var willOverflow = index + 2 > items.length;
+      var nextIndex = willOverflow ? 0 : index + 1;
       var focusItem = items[nextIndex];
 
       if (!(0, _isUndefined.default)(focusItem)) {
         setFocusItemValue(focusItem[valueKey]);
         callback === null || callback === void 0 ? void 0 : callback(focusItem[valueKey], event);
+        scrollListItem('bottom', focusItem[valueKey], willOverflow);
       }
     });
-  }, [callback, findFocusItemIndex, valueKey]);
+  }, [callback, findFocusItemIndex, scrollListItem, valueKey]);
   var focusPrevMenuItem = (0, _react.useCallback)(function (event) {
     findFocusItemIndex(function (items, index) {
-      var nextIndex = index === 0 ? items.length - 1 : index - 1;
+      var willOverflow = index === 0;
+      var nextIndex = willOverflow ? items.length - 1 : index - 1;
       var focusItem = items[nextIndex];
 
       if (!(0, _isUndefined.default)(focusItem)) {
         setFocusItemValue(focusItem[valueKey]);
         callback === null || callback === void 0 ? void 0 : callback(focusItem[valueKey], event);
+        scrollListItem('top', focusItem[valueKey], willOverflow);
       }
     });
-  }, [callback, findFocusItemIndex, valueKey]);
+  }, [callback, findFocusItemIndex, scrollListItem, valueKey]);
   var getSubMenuKeys = (0, _react.useCallback)(function (nextLayer) {
     var menu = (0, _isFunction.default)(target) ? target() : target;
     var subMenu = menu === null || menu === void 0 ? void 0 : menu.querySelector("[data-layer=\"" + nextLayer + "\"]");

package/dist/rsuite-rtl.css

@@ -7741,8 +7741,8 @@ label:hover .rs-checkbox-wrapper .rs-checkbox-inner::before {
   color: #8e8e93;
   color: var(--rs-text-secondary);
   min-height: 20px;
-  line-height: 1.42857143;
-  font-size: 14px;
+  line-height: 1.66666667;
+  font-size: 12px;
 }
 .rs-form-help-text-tooltip {
   display: -webkit-inline-box;
@@ -15278,7 +15278,6 @@ textarea.rs-picker-menu .rs-picker-search-bar .rs-picker-search-bar-input {
   padding: 2px 10px;
   color: #fff;
   color: var(--rs-tooltip-text);
-  text-align: center;
   background-color: #272c36;
   background-color: var(--rs-tooltip-bg);
   border-radius: 4px;