Merge branch 'master' into fix/search-cause-all-load-data

Author: afc163

.github/dependabot.yml

@@ -4,45 +4,3 @@ updates:
   directory: "/"
   schedule:
     interval: daily
-    time: "21:00"
-  open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: rc-trigger
-    versions:
-    - 5.2.1
-    - 5.2.2
-    - 5.2.3
-    - 5.2.4
-    - 5.2.5
-  - dependency-name: "@types/react"
-    versions:
-    - 17.0.0
-    - 17.0.1
-    - 17.0.2
-    - 17.0.3
-  - dependency-name: np
-    versions:
-    - 7.2.0
-    - 7.3.0
-    - 7.4.0
-  - dependency-name: "@types/react-dom"
-    versions:
-    - 17.0.0
-    - 17.0.1
-    - 17.0.2
-  - dependency-name: typescript
-    versions:
-    - 4.1.3
-    - 4.1.4
-    - 4.1.5
-    - 4.2.2
-    - 4.2.3
-  - dependency-name: react
-    versions:
-    - 17.0.1
-  - dependency-name: rc-dialog
-    versions:
-    - 8.5.1
-  - dependency-name: react-dom
-    versions:
-    - 17.0.0

.gitignore

@@ -23,11 +23,11 @@ node_modules
 dist
 *.css
 build
-lib/*
+lib
 coverage
 yarn.lock
 package-lock.json
-es/*
+es
 # dumi
 .dumi/tmp
 .dumi/tmp-test

.husky/pre-commit

@@ -0,0 +1 @@
+lint-staged

examples/form.tsx

@@ -21,7 +21,7 @@ const errorStyle = {
 };
 
 class TreeSelectInput extends Component<{
-  onChange?: Function;
+  onChange?: (value: string[]) => void;
   style: React.CSSProperties;
 }> {
   onChange = (value, ...args) => {
@@ -105,11 +105,7 @@ const Demo = () => {
             >
               {(control, { errors }) => (
                 <div>
-                  <TreeSelectInput
-                    {...tProps}
-                    {...control}
-                    style={{ width: 300 }}
-                  />
+                  <TreeSelectInput {...tProps} {...control} style={{ width: 300 }} />
 
                   <p style={errorStyle}>{errors.join(',')}</p>
                 </div>
@@ -122,18 +118,11 @@ const Demo = () => {
           <div>
             <Field
               name="select"
-              rules={[
-                { required: true, type: 'array', message: 'select 需要必填' },
-              ]}
+              rules={[{ required: true, type: 'array', message: 'select 需要必填' }]}
             >
               {(control, { errors }) => (
                 <div>
-                  <Select
-                    style={{ width: 200 }}
-                    {...control}
-                    allowClear
-                    mode="multiple"
-                  >
+                  <Select style={{ width: 200 }} {...control} allowClear mode="multiple">
                     <Option value="jack">jack</Option>
                     <Option value="lucy">lucy</Option>
                     <Option value="disabled" disabled>

examples/utils/big-data-generator.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { generateData, calcTotal } from './dataUtil';
 
 interface GenProps {
-  onGen: Function;
+  onGen: (data: any[]) => void;
   x: number;
   y: number;
   z: number;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rc-tree-select",
-  "version": "5.23.0",
+  "version": "5.24.1",
   "description": "tree-select ui component for react",
   "keywords": [
     "react",
@@ -34,49 +34,54 @@
     "compile": "father build",
     "lint": "eslint src/ examples/ --ext .tsx,.ts,.jsx,.js",
     "now-build": "npm run build",
-    "prepare": "dumi setup",
+    "prepare": "husky && dumi setup",
     "prepublishOnly": "npm run compile && np --yolo --no-publish --any-branch",
     "prettier": "prettier '{src,tests}/**/*.{ts,tsx}' 'tests/**/*.js' --write",
     "start": "dumi dev",
     "test": "rc-test"
   },
+  "lint-staged": {
+    "*": "prettier --write --ignore-unknown"
+  },
   "dependencies": {
-    "@babel/runtime": "^7.10.1",
+    "@babel/runtime": "^7.25.7",
     "classnames": "2.x",
-    "rc-select": "~14.15.0",
-    "rc-tree": "~5.9.0",
-    "rc-util": "^5.16.1"
+    "rc-select": "~14.15.2",
+    "rc-tree": "~5.10.1",
+    "rc-util": "^5.43.0"
   },
   "devDependencies": {
-    "@rc-component/father-plugin": "^1.0.0",
-    "@rc-component/trigger": "^1.5.0",
-    "@testing-library/react": "^12.0.0",
-    "@types/jest": "^29.5.12",
-    "@types/node": "^20.9.0",
-    "@types/react": "^16.8.19",
-    "@types/react-dom": "^18.2.19",
-    "@types/warning": "^3.0.0",
+    "@rc-component/father-plugin": "^1.1.0",
+    "@rc-component/trigger": "^1.18.3",
+    "@testing-library/react": "^12.1.5",
+    "@types/jest": "^29.5.13",
+    "@types/node": "^22.7.5",
+    "@types/react": "^18.3.11",
+    "@types/react-dom": "^18.3.1",
+    "@types/warning": "^3.0.3",
     "@umijs/fabric": "^4.0.1",
-    "cross-env": "^7.0.2",
-    "dumi": "^2.0.0",
-    "enzyme": "^3.10.0",
-    "enzyme-adapter-react-16": "^1.1.1",
-    "enzyme-to-json": "^3.4.0",
-    "eslint": "^8.56.0",
-    "eslint-plugin-jest": "^27.6.0",
-    "eslint-plugin-unicorn": "^52.0.0",
-    "father": "^4.0.0",
-    "glob": "^7.1.6",
-    "np": "^10.0.5",
-    "prettier": "^3.1.1",
-    "rc-dialog": "^7.5.7",
-    "rc-field-form": "^2.0.0",
-    "rc-test": "^7.0.4",
-    "rc-virtual-list": "^3.0.0",
-    "react": "^16.8.0",
-    "react-dom": "^16.8.0",
-    "typescript": "^5.0.0",
-    "cheerio": "1.0.0-rc.12"
+    "cheerio": "1.0.0-rc.12",
+    "cross-env": "^7.0.3",
+    "dumi": "^2.4.12",
+    "enzyme": "^3.11.0",
+    "enzyme-adapter-react-16": "^1.15.8",
+    "enzyme-to-json": "^3.6.2",
+    "eslint": "^8.57.1",
+    "eslint-plugin-jest": "^27.9.0",
+    "eslint-plugin-unicorn": "^56.0.0",
+    "father": "^4.5.0",
+    "glob": "^11.0.0",
+    "husky": "^9.1.6",
+    "lint-staged": "^15.2.10",
+    "np": "^10.0.7",
+    "prettier": "^3.3.3",
+    "rc-dialog": "^9.6.0",
+    "rc-field-form": "^2.4.0",
+    "rc-test": "^7.1.1",
+    "rc-virtual-list": "^3.14.8",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0",
+    "typescript": "^5.6.3"
   },
   "peerDependencies": {
     "react": "*",

src/LegacyContext.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import type { DataEntity, IconType } from 'rc-tree/lib/interface';
-import type { Key, LegacyDataNode, RawValueType } from './interface';
+import type { LegacyDataNode, SafeKey, Key } from './interface';
 
 interface LegacyContextProps {
   checkable: boolean | React.ReactNode;
@@ -20,7 +20,7 @@ interface LegacyContextProps {
   loadData: (treeNode: LegacyDataNode) => Promise<unknown>;
   onTreeLoad: (loadedKeys: Key[]) => void;
 
-  keyEntities: Record<RawValueType, DataEntity<any>>;
+  keyEntities: Record<SafeKey, DataEntity<any>>;
 }
 
 const LegacySelectContext = React.createContext<LegacyContextProps>(null);

src/OptionList.tsx

@@ -8,7 +8,7 @@ import useMemo from 'rc-util/lib/hooks/useMemo';
 import * as React from 'react';
 import LegacyContext from './LegacyContext';
 import TreeSelectContext from './TreeSelectContext';
-import type { Key, TreeDataNode } from './interface';
+import type { Key, SafeKey } from './interface';
 import { getAllKeys, isCheckDisabled } from './utils/valueUtil';
 
 const HIDDEN_STYLE = {
@@ -78,7 +78,7 @@ const OptionList: React.ForwardRefRenderFunction<ReviseRefOptionListProps> = (_,
 
   // ========================== Active ==========================
   const [activeKey, setActiveKey] = React.useState<Key>(null);
-  const activeEntity = keyEntities[activeKey];
+  const activeEntity = keyEntities[activeKey as SafeKey];
 
   // ========================== Values ==========================
   const mergedCheckedKeys = React.useMemo(() => {
@@ -143,7 +143,7 @@ const OptionList: React.ForwardRefRenderFunction<ReviseRefOptionListProps> = (_,
     event.preventDefault();
   };
 
-  const onInternalSelect = (__: React.Key[], info: TreeEventInfo) => {
+  const onInternalSelect = (__: Key[], info: TreeEventInfo) => {
     const { node } = info;
 
     if (checkable && isCheckDisabled(node)) {
@@ -237,7 +237,7 @@ const OptionList: React.ForwardRefRenderFunction<ReviseRefOptionListProps> = (_,
         ref={treeRef}
         focusable={false}
         prefixCls={`${prefixCls}-tree`}
-        treeData={memoTreeData as TreeDataNode[]}
+        treeData={memoTreeData}
         height={listHeight}
         itemHeight={listItemHeight}
         itemScrollOffset={listItemScrollOffset}