chore: bump tree version (#633)

* chore: bump tree version * chore: update import path
react-component · Mar 5, 2025 · 60e2de4 · 60e2de4
1 parent 9ffd1f0
commit 60e2de4
Show file tree

Hide file tree

Showing 17 changed files with 26 additions and 53 deletions.
diff --git a/examples/basic.tsx b/examples/basic.tsx
@@ -1,5 +1,5 @@
-import Dialog from 'rc-dialog';
-import 'rc-dialog/assets/index.css';
+import Dialog from '@rc-component/dialog';
+import '@rc-component/dialog/assets/index.css';
 import React from 'react';
 import '../assets/index.less';
 import TreeSelect, { SHOW_PARENT, TreeNode } from '../src';
@@ -155,20 +155,13 @@ class Demo extends React.Component {
           show dialog
         </button>
         {visible ? (
-          <Dialog
-            visible={visible}
-            animation="zoom"
-            maskAnimation="fade"
-            onClose={this.onClose}
-            // style={{ width: 600, height: 400, overflow: 'auto' }}
-          >
+          <Dialog visible={visible} animation="zoom" maskAnimation="fade" onClose={this.onClose}>
             <div style={{ height: 600, paddingTop: 100 }}>
               <TreeSelect
                 getPopupContainer={triggerNode => triggerNode.parentNode}
                 style={{ width: 300 }}
                 transitionName="rc-tree-select-dropdown-slide-up"
                 choiceTransitionName="rc-tree-select-selection__choice-zoom"
-                // dropdownStyle={{ maxHeight: 200, overflow: 'auto', zIndex: 1500 }}
                 placeholder={<i>请下拉选择</i>}
                 showSearch
                 allowClear
@@ -189,7 +182,6 @@ class Demo extends React.Component {
           style={{ width: 300 }}
           transitionName="rc-tree-select-dropdown-slide-up"
           choiceTransitionName="rc-tree-select-selection__choice-zoom"
-          // dropdownStyle={{ maxHeight: 200, overflow: 'auto' }}
           placeholder={<i>请下拉选择</i>}
           showSearch
           allowClear
@@ -222,7 +214,6 @@ class Demo extends React.Component {
           style={{ width: 300 }}
           transitionName="rc-tree-select-dropdown-slide-up"
           choiceTransitionName="rc-tree-select-selection__choice-zoom"
-          // dropdownStyle={{ maxHeight: 200, overflow: 'auto' }}
           placeholder={<i>请下拉选择</i>}
           showSearch
           allowClear
@@ -239,7 +230,6 @@ class Demo extends React.Component {
           style={{ width: 300 }}
           transitionName="rc-tree-select-dropdown-slide-up"
           choiceTransitionName="rc-tree-select-selection__choice-zoom"
-          // dropdownStyle={{ maxHeight: 200, overflow: 'auto' }}
           placeholder={<i>请下拉选择</i>}
           multiple
           value={multipleValue}
@@ -258,7 +248,6 @@ class Demo extends React.Component {
           transitionName="rc-tree-select-dropdown-slide-up"
           choiceTransitionName="rc-tree-select-selection__choice-zoom"
           style={{ width: 300 }}
-          // dropdownStyle={{ height: 200, overflow: 'auto' }}
           popupAlign={{
             overflow: { adjustY: 0, adjustX: 0 },
             offset: [0, 2],
@@ -287,7 +276,6 @@ class Demo extends React.Component {
           style={{ width: 500 }}
           transitionName="rc-tree-select-dropdown-slide-up"
           choiceTransitionName="rc-tree-select-selection__choice-zoom"
-          // dropdownStyle={{ maxHeight: 200, overflow: 'auto' }}
           placeholder={<i>请下拉选择</i>}
           showSearch
           allowClear
@@ -303,7 +291,6 @@ class Demo extends React.Component {
         <h2>use treeDataSimpleMode</h2>
         <TreeSelect
           style={{ width: 300 }}
-          // dropdownStyle={{ maxHeight: 200, overflow: 'auto' }}
           placeholder={<i>请下拉选择</i>}
           // treeLine
           maxTagTextLength={10}
@@ -351,7 +338,6 @@ class Demo extends React.Component {
         <h2>use TreeNode Component (not recommend)</h2>
         <TreeSelect
           style={{ width: 200 }}
-          // dropdownStyle={{ maxHeight: 200, overflow: 'auto' }}
           defaultValue="leaf1"
           treeDefaultExpandAll
           treeNodeFilterProp="title"

diff --git a/examples/big-data.tsx b/examples/big-data.tsx
@@ -54,7 +54,6 @@ class Demo extends React.Component {
             <h3>normal check</h3>
             <TreeSelect
               style={{ width: 300 }}
-              // dropdownStyle={{ maxHeight: 200, overflow: 'auto' }}
               treeData={gData}
               treeLine
               value={value}
@@ -68,7 +67,6 @@ class Demo extends React.Component {
             <h3>checkStrictly</h3>
             <TreeSelect
               style={{ width: 300 }}
-              // dropdownStyle={{ maxHeight: 200, overflow: 'auto' }}
               treeData={gData1}
               treeLine
               value={value1}

diff --git a/examples/controlled.tsx b/examples/controlled.tsx
@@ -1,6 +1,6 @@
 import '../assets/index.less';
 import React from 'react';
-import 'rc-dialog/assets/index.css';
+import '@rc-component/dialog/assets/index.css';
 import TreeSelect, { TreeNode } from '../src';
 
 class Demo extends React.Component {
@@ -28,19 +28,13 @@ class Demo extends React.Component {
         <h2>Conrolled treeExpandedKeys</h2>
         <TreeSelect
           style={{ width: 200 }}
-          // dropdownStyle={{ maxHeight: 200, overflow: 'auto' }}
           treeExpandedKeys={treeExpandedKeys}
           onTreeExpand={this.onTreeExpand}
         >
           <TreeNode value="" title="parent 1" key="000">
             <TreeNode value="parent 1-0" title="parent 1-0" key="0-1-0">
               <TreeNode value="leaf1" title="my leaf" key="random" />
-              <TreeNode
-                value="leaf2"
-                title="your leaf"
-                key="random1"
-                disabled
-              />
+              <TreeNode value="leaf2" title="your leaf" key="random1" disabled />
             </TreeNode>
             <TreeNode value="parent 1-1" title="parent 1-1" key="0-1-1">
               <TreeNode

diff --git a/examples/custom-icons.tsx b/examples/custom-icons.tsx
@@ -1,6 +1,6 @@
 import '../assets/index.less';
 import React from 'react';
-import 'rc-dialog/assets/index.css';
+import '@rc-component/dialog/assets/index.css';
 import TreeSelect from '../src';
 import { gData } from './utils/dataUtil';
 

diff --git a/examples/fieldNames.tsx b/examples/fieldNames.tsx
@@ -1,6 +1,6 @@
 import '../assets/index.less';
 import React from 'react';
-import 'rc-dialog/assets/index.css';
+import '@rc-component/dialog/assets/index.css';
 import TreeSelect from '../src';
 
 export default () => {

diff --git a/examples/filter.tsx b/examples/filter.tsx
@@ -63,11 +63,6 @@ class Demo extends React.Component {
           style={{ width: 300 }}
           transitionName="rc-tree-select-dropdown-slide-up"
           choiceTransitionName="rc-tree-select-selection__choice-zoom"
-          // dropdownStyle={{ height: 200, overflow: 'auto' }}
-          // dropdownPopupAlign={{
-          //   overflow: { adjustY: 0, adjustX: 0 },
-          //   offset: [0, 2],
-          // }}
           placeholder={<i>请下拉选择</i>}
           treeLine
           maxTagTextLength={10}

diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
   "dependencies": {
     "classnames": "2.x",
     "@rc-component/select": "~1.0.0",
-    "rc-tree": "~5.13.1",
+    "@rc-component/tree": "~1.0.0",
     "@rc-component/util": "^1.2.1"
   },
   "devDependencies": {
@@ -74,7 +74,7 @@
     "husky": "^9.1.6",
     "lint-staged": "^15.2.10",
     "prettier": "^3.3.3",
-    "rc-dialog": "^9.6.0",
+    "@rc-component/dialog": "^1.2.0",
     "rc-field-form": "^2.4.0",
     "rc-test": "^7.1.1",
     "rc-virtual-list": "^3.14.8",

diff --git a/src/LegacyContext.tsx b/src/LegacyContext.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import type { DataEntity, IconType } from 'rc-tree/lib/interface';
+import type { DataEntity, IconType } from '@rc-component/tree/lib/interface';
 import type { LegacyDataNode, SafeKey, Key } from './interface';
 
 interface LegacyContextProps {

diff --git a/src/OptionList.tsx b/src/OptionList.tsx
@@ -1,9 +1,9 @@
 import { useBaseProps } from '@rc-component/select';
 import type { RefOptionListProps } from '@rc-component/select/lib/OptionList';
-import type { TreeProps } from 'rc-tree';
-import Tree from 'rc-tree';
-import { UnstableContext } from 'rc-tree';
-import type { EventDataNode, ScrollTo } from 'rc-tree/lib/interface';
+import type { TreeProps } from '@rc-component/tree';
+import Tree from '@rc-component/tree';
+import { UnstableContext } from '@rc-component/tree';
+import type { EventDataNode, ScrollTo } from '@rc-component/tree/lib/interface';
 import KeyCode from '@rc-component/util/lib/KeyCode';
 import useMemo from '@rc-component/util/lib/hooks/useMemo';
 import * as React from 'react';

diff --git a/src/TreeSelect.tsx b/src/TreeSelect.tsx
@@ -1,9 +1,9 @@
 import type { BaseSelectPropsWithoutPrivate, BaseSelectRef } from '@rc-component/select';
 import { BaseSelect } from '@rc-component/select';
 import useId from '@rc-component/select/lib/hooks/useId';
-import type { IconType } from 'rc-tree/lib/interface';
-import type { ExpandAction } from 'rc-tree/lib/Tree';
-import { conductCheck } from 'rc-tree/lib/utils/conductUtil';
+import type { IconType } from '@rc-component/tree/lib/interface';
+import type { ExpandAction } from '@rc-component/tree/lib/Tree';
+import { conductCheck } from '@rc-component/tree/lib/utils/conductUtil';
 import useMergedState from '@rc-component/util/lib/hooks/useMergedState';
 import * as React from 'react';
 import useCache from './hooks/useCache';

diff --git a/src/TreeSelectContext.ts b/src/TreeSelectContext.ts
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import type { ExpandAction } from 'rc-tree/lib/Tree';
+import type { ExpandAction } from '@rc-component/tree/lib/Tree';
 import type { DataNode, FieldNames, Key } from './interface';
 import type useDataEntities from './hooks/useDataEntities';
 

diff --git a/src/hooks/useCheckedKeys.ts b/src/hooks/useCheckedKeys.ts
@@ -1,6 +1,6 @@
 import * as React from 'react';
-import type { DataEntity } from 'rc-tree/lib/interface';
-import { conductCheck } from 'rc-tree/lib/utils/conductUtil';
+import type { DataEntity } from '@rc-component/tree/lib/interface';
+import { conductCheck } from '@rc-component/tree/lib/utils/conductUtil';
 import type { LabeledValueType, SafeKey, Key } from '../interface';
 
 const useCheckedKeys = (

diff --git a/src/hooks/useDataEntities.ts b/src/hooks/useDataEntities.ts
@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { convertDataToEntities } from 'rc-tree/lib/utils/treeUtil';
-import type { DataEntity } from 'rc-tree/lib/interface';
+import { convertDataToEntities } from '@rc-component/tree/lib/utils/treeUtil';
+import type { DataEntity } from '@rc-component/tree/lib/interface';
 import type { SafeKey, FieldNames } from '../interface';
 import warning from '@rc-component/util/lib/warning';
 import { isNil } from '../utils/valueUtil';

diff --git a/src/interface.ts b/src/interface.ts
@@ -1,5 +1,5 @@
 import type * as React from 'react';
-import type { SafeKey, Key, DataNode as TreeDataNode } from 'rc-tree/lib/interface';
+import type { SafeKey, Key, DataNode as TreeDataNode } from '@rc-component/tree/lib/interface';
 
 export type { SafeKey, Key };
 

diff --git a/src/utils/strategyUtil.ts b/src/utils/strategyUtil.ts
@@ -1,4 +1,4 @@
-import type { DataEntity } from 'rc-tree/lib/interface';
+import type { DataEntity } from '@rc-component/tree/lib/interface';
 import type { SafeKey, FieldNames } from '../interface';
 import { isCheckDisabled } from './valueUtil';
 

diff --git a/tests/Select.props.spec.js b/tests/Select.props.spec.js
@@ -1,6 +1,6 @@
 /* eslint-disable no-undef, react/no-multi-comp, no-console */
 import { mount } from 'enzyme';
-import Tree, { TreeNode } from 'rc-tree';
+import Tree, { TreeNode } from '@rc-component/tree';
 import React from 'react';
 import { render, fireEvent } from '@testing-library/react';
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -10,7 +10,7 @@
     "paths": {
       "@/*": ["src/*"],
       "@@/*": [".dumi/tmp/*"],
-      "rc-tree-select": ["src/index.tsx"]
+      "@rc-component/tree-select": ["src/index.tsx"]
     }
   }
 }