rsuite 5.69.0 → 5.70.0

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+# [5.70.0](https://github.com/rsuite/rsuite/compare/v5.69.0...v5.70.0) (2024-08-24)
+
+
+### Bug Fixes
+
+* **Cascader,MultiCascader:** fix `locale` property can't override global config ([#3928](https://github.com/rsuite/rsuite/issues/3928)) ([31abca8](https://github.com/rsuite/rsuite/commit/31abca88daa88a4ba10f886de98db0f9cb57ced1))
+* **MultiCascadeTree,MultiCascader:** fix parent node is not in a mixed state when searching ([#3931](https://github.com/rsuite/rsuite/issues/3931)) ([5ec0be5](https://github.com/rsuite/rsuite/commit/5ec0be5bcd6fc4f00b457e4c452c7c56225314c9))
+* **Table:** fix border style when rowSpan is used ([#3940](https://github.com/rsuite/rsuite/issues/3940)) ([9677303](https://github.com/rsuite/rsuite/commit/9677303e007dc94474ca16e3a32b638bd8c0c05b))
+* **TreePicker,MultiCascader:** fix not focusing on the search box when typing characters ([#3930](https://github.com/rsuite/rsuite/issues/3930)) ([4f3b8e3](https://github.com/rsuite/rsuite/commit/4f3b8e37eabdefea277f14034647f43826244c03))
+* use useLayoutEffect instead of useEffect in useEventCallback ([#3921](https://github.com/rsuite/rsuite/issues/3921)) ([6396b3e](https://github.com/rsuite/rsuite/commit/6396b3e6d3692f76850409a5d3d1bd60aea40788))
+
+
+
 # [5.69.0](https://github.com/rsuite/rsuite/compare/v5.68.1...v5.69.0) (2024-08-09)
 
 

package/README.md

@@ -64,7 +64,7 @@ More guides on how to get started are available [here](https://rsuitejs.com/guid
 
 ## Documentation
 
-It's the https://rsuitejs.com website for the latest version of React Suite. For older versions head over here
+It's the https://rsuitejs.com website for the latest version of React Suite. For older versions head over here:
 
 - [4.x documentation](https://v4.rsuitejs.com/)
 - [3.x documentation](https://v3.rsuitejs.com/)
@@ -119,7 +119,7 @@ These great services help us to build and maintain the project.
 
 ## Supporting React Suite
 
-If you like React Suite, you can show your support by either
+If you like React Suite, you can show your support by:
 
 - Starring this repo
 - [Leaving a comment here][issues-11] if you are using React Suite in your project (like we do :smile:)

package/Table/styles/index.css

@@ -467,7 +467,7 @@
   border-right: 1px solid #f2f2f5;
   border-right: 1px solid var(--rs-table-border-color);
 }
-.rs-table-row:not(.rs-table-row-rowspan) {
+.rs-table:not(.rs-table-has-rowspan) .rs-table-row {
   border-bottom: 1px solid #f2f2f5;
   border-bottom: 1px solid var(--rs-table-border-color);
 }

package/Table/styles/index.less

@@ -340,7 +340,7 @@
   }
 }
 
-.rs-table-row:not(.rs-table-row-rowspan) {
+.rs-table:not(.rs-table-has-rowspan) .rs-table-row {
   border-bottom: 1px solid var(--rs-table-border-color);
 }
 

package/cjs/CascadeTree/CascadeTree.js

@@ -13,7 +13,7 @@ var _hooks = require("../internals/hooks");
 var _TreeView = _interopRequireDefault(require("./TreeView"));
 var _SearchView = _interopRequireDefault(require("./SearchView"));
 var _hooks2 = require("./hooks");
-var _excluded = ["as", "data", "defaultValue", "className", "classPrefix", "childrenKey", "valueKey", "labelKey", "value", "disabledItemValues", "columnWidth", "columnHeight", "searchable", "renderTreeNode", "renderColumn", "onSelect", "onSearch", "onChange", "getChildren"];
+var _excluded = ["as", "data", "defaultValue", "className", "classPrefix", "childrenKey", "valueKey", "labelKey", "locale", "value", "disabledItemValues", "columnWidth", "columnHeight", "searchable", "renderTreeNode", "renderColumn", "onSelect", "onSearch", "onChange", "getChildren"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
@@ -36,6 +36,7 @@ var CascadeTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     valueKey = _props$valueKey === void 0 ? 'value' : _props$valueKey,
     _props$labelKey = props.labelKey,
     labelKey = _props$labelKey === void 0 ? 'label' : _props$labelKey,
+    locale = props.locale,
     valueProp = props.value,
     _props$disabledItemVa = props.disabledItemValues,
     disabledItemValues = _props$disabledItemVa === void 0 ? [] : _props$disabledItemVa,
@@ -152,6 +153,7 @@ var CascadeTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     searchKeyword: searchKeyword,
     valueKey: valueKey,
     labelKey: labelKey,
+    locale: locale,
     parentMap: parentMap,
     disabledItemValues: disabledItemValues,
     onSelect: handleSearchRowSelect,

package/cjs/CascadeTree/SearchView.d.ts

@@ -8,6 +8,7 @@ interface SearchViewProps<T> extends WithAsProps {
     data: ItemDataType<T>[];
     focusItemValue?: T | null;
     disabledItemValues: any[];
+    locale?: Record<string, string>;
     renderSearchItem?: (label: React.ReactNode, items: ItemDataType<T>[]) => React.ReactNode;
     onSelect: (item: ItemDataType<T>, items: ItemDataType<T>[], event: React.MouseEvent) => void;
     onSearch: (value: string, event: React.ChangeEvent<HTMLInputElement>) => void;

package/cjs/CascadeTree/SearchView.js

@@ -11,7 +11,7 @@ var _hooks = require("../internals/hooks");
 var _utils = require("../internals/Tree/utils");
 var _SearchBox = _interopRequireDefault(require("../internals/SearchBox"));
 var _Highlight = _interopRequireDefault(require("../Highlight"));
-var _excluded = ["as", "classPrefix", "className", "searchKeyword", "labelKey", "valueKey", "parentMap", "data", "focusItemValue", "disabledItemValues", "inputRef", "renderSearchItem", "onSearch", "onSelect"];
+var _excluded = ["as", "classPrefix", "className", "searchKeyword", "labelKey", "locale", "valueKey", "parentMap", "data", "focusItemValue", "disabledItemValues", "inputRef", "renderSearchItem", "onSearch", "onSelect"];
 function SearchView(props) {
   var _props$as = props.as,
     Component = _props$as === void 0 ? 'div' : _props$as,
@@ -20,6 +20,7 @@ function SearchView(props) {
     className = props.className,
     searchKeyword = props.searchKeyword,
     labelKey = props.labelKey,
+    overrideLocale = props.locale,
     valueKey = props.valueKey,
     parentMap = props.parentMap,
     data = props.data,
@@ -36,7 +37,7 @@ function SearchView(props) {
     withClassPrefix = _useClassNames.withClassPrefix,
     rootPrefix = _useClassNames.rootPrefix;
   var classes = merge(className, withClassPrefix());
-  var _useCustom = (0, _hooks.useCustom)('Picker'),
+  var _useCustom = (0, _hooks.useCustom)('Picker', overrideLocale),
     locale = _useCustom.locale;
   var renderSearchRow = function renderSearchRow(item, key) {
     var items = (0, _utils.getPathTowardsItem)(item, function (item) {

package/cjs/CascadeTree/types.d.ts

@@ -10,7 +10,7 @@ export interface CascadeColumn<T> {
     parentItem?: ItemDataType<T>;
     layer?: number;
 }
-export interface CascadeTreeProps<T, V = T> extends WithAsProps, DataProps<ItemDataType<T>> {
+export interface CascadeTreeProps<T, V = T, L = any> extends WithAsProps, DataProps<ItemDataType<T>> {
     /**
      * Initial value
      */
@@ -35,6 +35,10 @@ export interface CascadeTreeProps<T, V = T> extends WithAsProps, DataProps<ItemD
      * Whether dispaly search input box
      */
     searchable?: boolean;
+    /**
+     * A collection of localized strings.
+     */
+    locale?: Partial<L>;
     /**
      * Custom render columns
      */

package/cjs/Cascader/Cascader.d.ts

@@ -3,7 +3,7 @@ import type { CascadeTreeProps } from '../CascadeTree/types';
 import { PickerLocale } from '../locales';
 import { PickerHandle, PickerToggleProps } from '../internals/Picker';
 import { ItemDataType, DataItemValue, FormControlPickerProps } from '../internals/types';
-export interface CascaderProps<T = DataItemValue> extends FormControlPickerProps<T, PickerLocale, ItemDataType<T>>, CascadeTreeProps<T>, Pick<PickerToggleProps, 'label' | 'caretAs' | 'loading'> {
+export interface CascaderProps<T = DataItemValue> extends FormControlPickerProps<T, PickerLocale, ItemDataType<T>>, CascadeTreeProps<T, T, PickerLocale>, Pick<PickerToggleProps, 'label' | 'caretAs' | 'loading'> {
     /**
      * The panel is displayed directly when the component is initialized
      * @deprecated Use CascadeTree instead

package/cjs/Cascader/Cascader.js

@@ -335,6 +335,7 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       searchKeyword: searchKeyword,
       valueKey: valueKey,
       labelKey: labelKey,
+      locale: locale,
       parentMap: parentMap,
       disabledItemValues: disabledItemValues,
       focusItemValue: focusItemValue,

package/cjs/MultiCascadeTree/MultiCascadeTree.d.ts

@@ -5,5 +5,5 @@ import type { MultiCascadeTreeProps } from './types';
  * The `MultiCascadeTree` component is used to select multiple values from cascading options.
  * @see https://rsuitejs.com/components/multi-cascade-tree/
  */
-declare const MultiCascadeTree: React.ForwardRefExoticComponent<MultiCascadeTreeProps<DataItemValue, DataItemValue[]> & React.RefAttributes<unknown>>;
+declare const MultiCascadeTree: React.ForwardRefExoticComponent<MultiCascadeTreeProps<DataItemValue, DataItemValue[], any> & React.RefAttributes<unknown>>;
 export default MultiCascadeTree;

package/cjs/MultiCascadeTree/MultiCascadeTree.js

@@ -11,7 +11,7 @@ var _TreeView = _interopRequireDefault(require("./TreeView"));
 var _hooks = require("./hooks");
 var _hooks2 = require("../internals/hooks");
 var _SearchView = _interopRequireDefault(require("./SearchView"));
-var _excluded = ["as", "data", "defaultValue", "className", "classPrefix", "value", "valueKey", "labelKey", "childrenKey", "disabledItemValues", "cascade", "columnWidth", "columnHeight", "searchable", "uncheckableItemValues", "getChildren", "renderColumn", "renderTreeNode", "onSelect", "onCheck", "onChange", "onSearch"];
+var _excluded = ["as", "data", "defaultValue", "className", "classPrefix", "value", "valueKey", "labelKey", "locale", "childrenKey", "disabledItemValues", "cascade", "columnWidth", "columnHeight", "searchable", "uncheckableItemValues", "getChildren", "renderColumn", "renderTreeNode", "onSelect", "onCheck", "onChange", "onSearch"];
 var emptyArray = [];
 
 /**
@@ -32,6 +32,7 @@ var MultiCascadeTree = /*#__PURE__*/_react.default.forwardRef(function (props, r
     valueKey = _props$valueKey === void 0 ? 'value' : _props$valueKey,
     _props$labelKey = props.labelKey,
     labelKey = _props$labelKey === void 0 ? 'label' : _props$labelKey,
+    locale = props.locale,
     _props$childrenKey = props.childrenKey,
     childrenKey = _props$childrenKey === void 0 ? 'children' : _props$childrenKey,
     _props$disabledItemVa = props.disabledItemValues,
@@ -99,11 +100,13 @@ var MultiCascadeTree = /*#__PURE__*/_react.default.forwardRef(function (props, r
     ref: ref,
     className: classes
   }, rest), searchable && /*#__PURE__*/_react.default.createElement(_SearchView.default, {
+    cascade: cascade,
     data: items,
     value: value,
     searchKeyword: searchKeyword,
     valueKey: valueKey,
     labelKey: labelKey,
+    locale: locale,
     childrenKey: childrenKey,
     disabledItemValues: disabledItemValues,
     onCheck: handleCheck,

package/cjs/MultiCascadeTree/SearchView.d.ts

@@ -9,6 +9,7 @@ interface SearchViewProps<T> extends WithAsProps {
     data: ItemDataType<T>[];
     disabledItemValues: any[];
     cascade?: boolean;
+    locale?: Record<string, string>;
     onSearch: (value: string, event: React.ChangeEvent<HTMLInputElement>) => void;
     onCheck: (item: ItemDataType<T>, event: React.SyntheticEvent, checked: boolean) => void;
     inputRef?: React.RefObject<HTMLInputElement>;

package/cjs/MultiCascadeTree/SearchView.js

@@ -12,7 +12,7 @@ var _SearchBox = _interopRequireDefault(require("../internals/SearchBox"));
 var _Checkbox = _interopRequireDefault(require("../Checkbox"));
 var _Highlight = _interopRequireDefault(require("../Highlight"));
 var _utils = require("./utils");
-var _excluded = ["as", "classPrefix", "className", "searchKeyword", "childrenKey", "labelKey", "valueKey", "value", "data", "disabledItemValues", "inputRef", "cascade", "onSearch", "onCheck"];
+var _excluded = ["as", "classPrefix", "className", "searchKeyword", "childrenKey", "labelKey", "valueKey", "value", "data", "disabledItemValues", "inputRef", "cascade", "locale", "onSearch", "onCheck"];
 function SearchView(props) {
   var _props$as = props.as,
     Component = _props$as === void 0 ? 'div' : _props$as,
@@ -28,6 +28,7 @@ function SearchView(props) {
     disabledItemValues = props.disabledItemValues,
     inputRef = props.inputRef,
     cascade = props.cascade,
+    overrideLocale = props.locale,
     onSearch = props.onSearch,
     onCheck = props.onCheck,
     rest = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
@@ -37,7 +38,7 @@ function SearchView(props) {
     withClassPrefix = _useClassNames.withClassPrefix,
     rootPrefix = _useClassNames.rootPrefix;
   var classes = merge(className, withClassPrefix());
-  var _useCustom = (0, _hooks.useCustom)('Picker'),
+  var _useCustom = (0, _hooks.useCustom)('Picker', overrideLocale),
     locale = _useCustom.locale;
   var renderSearchRow = function renderSearchRow(item, key) {
     var _extends2;

package/cjs/MultiCascadeTree/types.d.ts

@@ -6,7 +6,7 @@ export interface ItemKeys {
     labelKey: string;
     childrenKey: string;
 }
-export interface MultiCascadeTreeProps<T, V = T[]> extends WithAsProps, CascadeTreeProps<T, V> {
+export interface MultiCascadeTreeProps<T, V = T[], L = any> extends WithAsProps, CascadeTreeProps<T, V> {
     /**
      * When set to true, selecting a child node will update the state of the parent node.
      */
@@ -19,6 +19,10 @@ export interface MultiCascadeTreeProps<T, V = T[]> extends WithAsProps, CascadeT
      * Set the option value for the check box not to be rendered
      */
     uncheckableItemValues?: T[];
+    /**
+     * A collection of localized strings.
+     */
+    locale?: Partial<L>;
     /**
      * Called after the checkbox state changes.
      */

package/cjs/MultiCascader/MultiCascader.d.ts

@@ -3,7 +3,7 @@ import { PickerLocale } from '../locales';
 import { PickerComponent, PickerToggleProps } from '../internals/Picker';
 import { FormControlPickerProps, ItemDataType, DataItemValue } from '../internals/types';
 import type { MultiCascadeTreeProps } from '../MultiCascadeTree';
-export interface MultiCascaderProps<T extends DataItemValue> extends FormControlPickerProps<T[], PickerLocale, ItemDataType<T>, T>, MultiCascadeTreeProps<T, T[]>, Pick<PickerToggleProps, 'loading'> {
+export interface MultiCascaderProps<T extends DataItemValue> extends FormControlPickerProps<T[], PickerLocale, ItemDataType<T>, T>, MultiCascadeTreeProps<T, T[], PickerLocale>, Pick<PickerToggleProps, 'loading'> {
     /**
      * A picker that can be counted
      */

package/cjs/MultiCascader/MultiCascader.js

@@ -273,6 +273,8 @@ var MultiCascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       target: trigger,
       onKeyDown: onPickerKeyDown
     }, searchable && /*#__PURE__*/_react.default.createElement(_SearchView.default, {
+      locale: locale,
+      cascade: cascade,
       data: items,
       value: value,
       searchKeyword: searchKeyword,
@@ -280,6 +282,7 @@ var MultiCascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       labelKey: labelKey,
       childrenKey: childrenKey,
       disabledItemValues: disabledItemValues,
+      inputRef: searchInput,
       onCheck: handleCheck,
       onSearch: handleSearch
     }), !searchKeyword && /*#__PURE__*/_react.default.createElement(_TreeView.default, {

package/cjs/TreePicker/TreePicker.js

@@ -223,6 +223,7 @@ var TreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     searchable: searchable,
     searchKeyword: searchKeyword,
     searchBy: searchBy,
+    searchInputRef: searchInput,
     loadingNodeValues: loadingNodeValues,
     flattenedNodes: flattenedNodes,
     listProps: listProps,

package/cjs/internals/hooks/useEventCallback.js

@@ -1,17 +1,24 @@
 'use client';
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports.default = void 0;
 exports.useEventCallback = useEventCallback;
 var _react = require("react");
+var _useIsomorphicLayoutEffect = _interopRequireDefault(require("./useIsomorphicLayoutEffect"));
 /**
  * https://github.com/facebook/react/issues/14099#issuecomment-440013892
  * @param {function} fn
  */
 function useEventCallback(fn) {
   var ref = (0, _react.useRef)(fn);
-  (0, _react.useEffect)(function () {
+  /**
+   * use useLayoutEffect instead of useEffect.
+   * useLayoutEffect is earlier than useEffect, sometimes we use setState and then use callback immediately,
+   * However the state in callback is not the latest, because useEffect is not triggered.
+   */
+  (0, _useIsomorphicLayoutEffect.default)(function () {
     ref.current = fn;
   });
   return (0, _react.useCallback)(function () {

package/dist/rsuite-no-reset-rtl.css

@@ -14106,7 +14106,7 @@ textarea.rs-inline-edit-sm .rs-plaintext {
   border-left: 1px solid #f2f2f5;
   border-left: 1px solid var(--rs-table-border-color);
 }
-.rs-table-row:not(.rs-table-row-rowspan) {
+.rs-table:not(.rs-table-has-rowspan) .rs-table-row {
   border-bottom: 1px solid #f2f2f5;
   border-bottom: 1px solid var(--rs-table-border-color);
 }