rsuite 5.23.1 → 5.23.3

package/cjs/utils/treeUtils.d.ts

@@ -2,7 +2,6 @@ import React from 'react';
 import { TreeNodeType, TreeNodesType } from '../CheckTreePicker/utils';
 import { TREE_NODE_DROP_POSITION } from '../utils';
 import { CheckTreePickerProps } from '../CheckTreePicker/CheckTreePicker';
-import { ItemDataType } from '../@types/common';
 import { TreePickerProps } from '../TreePicker/TreePicker';
 import { ListHandle } from '../Windowing';
 declare type PartialTreeProps = Partial<TreePickerProps | CheckTreePickerProps>;
@@ -11,14 +10,14 @@ declare type PartialTreeProps = Partial<TreePickerProps | CheckTreePickerProps>;
  * @param {*} expandItemValues
  * @param {*} parentKeys
  */
-export declare function shouldShowNodeByParentExpanded(expandItemValues?: any[], parentKeys?: any[]): boolean;
+export declare function shouldShowNodeByParentExpanded<T>(expandItemValues?: T[], parentKeys?: T[]): boolean;
 /**
  * flatten tree structure to array
  * @param {*} tree
  * @param {*} childrenKey
  * @param {*} executor
  */
-export declare function flattenTree(tree: any[], childrenKey?: string, executor?: (node: any, index: number) => any): any[];
+export declare function flattenTree<TItem>(tree: TItem[], childrenKey?: string, executor?: (node: any, index: number) => any): TItem[];
 /**
  * get all ancestor nodes of given node
  * @param {*} node
@@ -30,7 +29,7 @@ export declare function getNodeParents(node: any, parentKey?: string, valueKey?:
  * @param node
  * @param valueKey
  */
-export declare function getNodeParentKeys(nodes: TreeNodesType, node: TreeNodeType, valueKey: string): TreeNodeType[];
+export declare function getNodeParentKeys<T>(nodes: TreeNodesType, node: TreeNodeType, valueKey: string): T[];
 export declare function hasVisibleChildren(node: TreeNodeType, childrenKey: string): any;
 /**
  * shallow equal array
@@ -38,7 +37,7 @@ export declare function hasVisibleChildren(node: TreeNodeType, childrenKey: stri
  * @param b
  */
 export declare function compareArray(a: any[], b: any[]): boolean;
-export declare function getDefaultExpandItemValues(data: ItemDataType[], props: Required<Pick<TreePickerProps, 'defaultExpandAll' | 'valueKey' | 'childrenKey' | 'defaultExpandItemValues'>>): any[];
+export declare function getDefaultExpandItemValues<TItem>(data: TItem[], props: Required<Pick<TreePickerProps, 'defaultExpandAll' | 'valueKey' | 'childrenKey' | 'defaultExpandItemValues'>>): any[];
 /**
  * 获取 expandItemValues 的 value
  * @param props
@@ -61,7 +60,10 @@ export declare function createUpdateTreeDataFunction(params: any, { valueKey, ch
     childrenKey: any;
 }): (tree: any[]) => any[];
 export declare function findNodeOfTree(data: any, check: any): any;
-export declare function filterNodesOfTree(data: any, check: any): TreeNodeType[];
+declare type HasChildren<T extends Record<string, unknown>> = T & {
+    children?: readonly HasChildren<T>[];
+};
+export declare function filterNodesOfTree<TItem extends HasChildren<Record<string, unknown>>>(data: readonly TItem[], check: (item: TItem) => boolean): TItem[];
 /**
  * get all focusable items
  * exclude not visible and disabled node
@@ -70,7 +72,7 @@ export declare function filterNodesOfTree(data: any, check: any): TreeNodeType[]
  * @param isSearching - component is in Searching
  * @returns
  */
-export declare const getFocusableItems: (filteredData: ItemDataType[], props: Required<Pick<PartialTreeProps, 'disabledItemValues' | 'valueKey' | 'childrenKey' | 'expandItemValues'>>, isSearching?: boolean) => TreeNodeType[];
+export declare const getFocusableItems: <TItem extends TreeNodeType>(filteredData: TItem[], props: Required<Pick<PartialTreeProps, 'disabledItemValues' | 'valueKey' | 'childrenKey' | 'expandItemValues'>>, isSearching?: boolean) => TItem[];
 /**
  * return all focusable Item and active Element index
  * @param focusItemValue
@@ -150,7 +152,13 @@ export { getTreeActiveNode };
  * toggle tree node
  * @param param0
  */
-export declare function toggleExpand({ node, isExpand, expandItemValues, valueKey }: any): ItemDataType<string | number>[];
+export declare function toggleExpand<T>({ node, isExpand, expandItemValues, valueKey }: ToggleExpandOptions<T>): T[];
+declare type ToggleExpandOptions<T> = {
+    node: Record<string, unknown>;
+    isExpand: boolean;
+    expandItemValues: T[];
+    valueKey: string;
+};
 export declare function getTreeNodeTitle(label: any): string | undefined;
 /**
  * get all children from flattenNodes object by given parent node
@@ -158,12 +166,12 @@ export declare function getTreeNodeTitle(label: any): string | undefined;
  * @param parent
  */
 export declare function getChildrenByFlattenNodes(nodes: TreeNodesType, parent: TreeNodeType): TreeNodeType[];
-export declare function useTreeDrag(): {
-    dragNode: ItemDataType<string | number> | null;
+export declare function useTreeDrag<T>(): {
+    dragNode: T | null;
     dragOverNodeKey: null;
     dragNodeKeys: (string | number)[];
     dropNodePosition: TREE_NODE_DROP_POSITION | null;
-    setDragNode: (node: ItemDataType | null) => void;
+    setDragNode: (node: T | null) => void;
     setDragOverNodeKey: React.Dispatch<React.SetStateAction<null>>;
     setDragNodeKeys: React.Dispatch<React.SetStateAction<(string | number)[]>>;
     setDropNodePosition: React.Dispatch<React.SetStateAction<TREE_NODE_DROP_POSITION | null>>;
@@ -193,7 +201,7 @@ export declare function useFlattenTreeData({ data, labelKey, valueKey, childrenK
     flattenTreeData: (treeData: TreeNodeType[], parent?: TreeNodeType, layer?: any) => never[] | undefined;
     serializeListOnlyParent: (nodes: TreeNodesType, key: string) => (string | number)[];
     unSerializeList: ({ nodes, key, value, cascade, uncheckableItemValues }: UnSerializeListProps) => void;
-    formatVirtualizedTreeData: (nodes: TreeNodesType, data: any[], expandItemValues: ItemDataType[], options: {
+    formatVirtualizedTreeData: (nodes: TreeNodesType, data: any[], expandItemValues: unknown[], options: {
         cascade?: boolean;
         searchKeyword?: string;
     }) => TreeNodeType[];
@@ -205,28 +213,28 @@ export declare function useTreeNodeRefs(): {
     treeNodesRefs: {};
     saveTreeNodeRef: (ref: React.Ref<any>, refKey?: string) => void;
 };
-interface TreeSearchProps {
+interface TreeSearchProps<T> {
     labelKey: string;
     childrenKey: string;
     searchKeyword?: string;
-    data: ItemDataType[];
+    data: T[];
     searchBy?: (keyword: any, label: any, item: any) => boolean;
-    callback?: (keyword: string, data: ItemDataType[], event: React.SyntheticEvent) => void;
+    callback?: (keyword: string, data: T[], event: React.SyntheticEvent) => void;
 }
 /**
  * A hook that handles tree search filter options
  * @param props
  */
-export declare function useTreeSearch<T extends HTMLElement = HTMLInputElement>(props: TreeSearchProps): {
+export declare function useTreeSearch<T>(props: TreeSearchProps<T>): {
     searchKeywordState: string;
-    filteredData: ItemDataType<string | number>[];
-    setFilteredData: (data: ItemDataType[], searchKeyword: string) => void;
+    filteredData: T[];
+    setFilteredData: (data: T[], searchKeyword: string) => void;
     setSearchKeyword: React.Dispatch<React.SetStateAction<string>>;
-    handleSearch: (searchKeyword: string, event: React.ChangeEvent<T>) => void;
+    handleSearch: (searchKeyword: string, event: React.ChangeEvent) => void;
 };
-export declare function useGetTreeNodeChildren(treeData: ItemDataType[], valueKey: string, childrenKey: string): {
-    data: ItemDataType<string | number>[];
-    setData: React.Dispatch<React.SetStateAction<ItemDataType<string | number>[]>>;
+export declare function useGetTreeNodeChildren<T extends Record<string, unknown>>(treeData: T[], valueKey: string, childrenKey: string): {
+    data: T[];
+    setData: React.Dispatch<React.SetStateAction<T[]>>;
     loadingNodeValues: never[];
     loadChildren: (node: any, getChildren: any) => void;
 };

package/dist/rsuite-rtl.css

@@ -2785,9 +2785,6 @@ tbody.rs-anim-collapse.rs-anim-in {
 .rs-btn-toolbar {
   line-height: 0;
 }
-.rs-btn-toolbar > :not(:first-child):not(.rs-btn-block) {
-  margin-right: 10px;
-}
 .rs-picker-subtle .picker-subtle-toggle {
   position: relative;
   z-index: 5;
@@ -7741,8 +7738,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;
@@ -9428,11 +9425,13 @@ textarea.rs-picker-search-input {
   left: 20px;
   top: 20px;
   font-size: 12px;
-  line-height: 1.66666667;
+  color: #8e8e93;
+  color: var(--rs-text-secondary);
+  padding: 0;
+}
+.rs-modal-header .rs-modal-header-close:hover {
   color: #575757;
   color: var(--rs-text-primary);
-  width: 20px;
-  padding: 0 4px;
 }
 .rs-modal-title {
   font-weight: normal;
@@ -15278,7 +15277,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;