Skip to content

Commit fd6ca0a

Browse files
QDyanbingQDyanbing
authored
Avoid rc package deep imports (#1489)
* fix: avoid rc package deep imports * fix: address table test setup * fix: trim public exports
1 parent c210b35 commit fd6ca0a

29 files changed

Lines changed: 80 additions & 56 deletions

‎docs/examples/animation.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
2-
import CSSMotionList from 'rc-animate/lib/CSSMotionList';
2+
import { CSSMotionList } from '@rc-component/motion';
33
import { clsx } from 'clsx';
4-
import toArray from '@rc-component/util/lib/Children/toArray';
4+
import { toArray } from '@rc-component/util';
55
import type { TableProps } from 'rc-table';
66
import Table from 'rc-table';
77
import '../../assets/index.less';

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,13 @@
5151
"dependencies": {
5252
"@rc-component/context": "^2.0.1",
5353
"@rc-component/resize-observer": "^1.0.0",
54-
"@rc-component/util": "^1.1.0",
54+
"@rc-component/util": "^1.11.1",
5555
"@rc-component/virtual-list": "^1.0.1",
5656
"clsx": "^2.1.1"
5757
},
5858
"devDependencies": {
59-
"@rc-component/father-plugin": "^2.0.1",
59+
"@rc-component/father-plugin": "^2.2.0",
60+
"@rc-component/motion": "^1.3.2",
6061
"@rc-component/np": "^1.0.3",
6162
"@testing-library/dom": "^10.4.1",
6263
"@testing-library/jest-dom": "^6.4.0",
@@ -80,7 +81,6 @@
8081
"less": "^4.1.3",
8182
"lint-staged": "^16.1.5",
8283
"prettier": "^3.1.0",
83-
"rc-animate": "^3.0.0",
8484
"rc-dropdown": "~4.0.1",
8585
"rc-menu": "~9.16.1",
8686
"rc-tooltip": "^6.2.0",

‎src/Body/MeasureCell.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react';
22
import ResizeObserver from '@rc-component/resize-observer';
3-
import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect';
3+
import { useLayoutEffect } from '@rc-component/util';
44

55
export interface MeasureCellProps {
66
columnKey: React.Key;

‎src/Body/MeasureRow.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react';
22
import ResizeObserver from '@rc-component/resize-observer';
33
import MeasureCell from './MeasureCell';
4-
import isVisible from '@rc-component/util/lib/Dom/isVisible';
4+
import { isVisible } from '@rc-component/util';
55
import { useContext } from '@rc-component/context';
66
import TableContext from '../context/TableContext';
77
import type { ColumnType } from '../interface';

‎src/Cell/useCellRender.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
import useMemo from '@rc-component/util/lib/hooks/useMemo';
2-
import isEqual from '@rc-component/util/lib/isEqual';
3-
import getValue from '@rc-component/util/lib/utils/get';
4-
import warning from '@rc-component/util/lib/warning';
1+
import { get as getValue, isEqual, useMemo, warning } from '@rc-component/util';
52
import * as React from 'react';
63
import PerfContext from '../context/PerfContext';
74
import type { CellType, ColumnType, DataIndex, RenderedCell } from '../interface';

‎src/FixedHolder/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useContext } from '@rc-component/context';
22
import { clsx } from 'clsx';
3-
import { fillRef } from '@rc-component/util/lib/ref';
3+
import { fillRef } from '@rc-component/util';
44
import * as React from 'react';
55
import { useMemo } from 'react';
66
import ColGroup from '../ColGroup';

‎src/Table.tsx‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,18 @@
2424
* - All expanded props, move into expandable
2525
*/
2626

27-
import type { CompareProps } from '@rc-component/context/lib/Immutable';
2827
import { clsx } from 'clsx';
2928
import ResizeObserver from '@rc-component/resize-observer';
30-
import { getTargetScrollBarSize } from '@rc-component/util/lib/getScrollBarSize';
31-
import useEvent from '@rc-component/util/lib/hooks/useEvent';
32-
import pickAttrs from '@rc-component/util/lib/pickAttrs';
33-
import getValue from '@rc-component/util/lib/utils/get';
34-
import warning from '@rc-component/util/lib/warning';
29+
import {
30+
getDOM,
31+
get as getValue,
32+
getTargetScrollBarSize,
33+
isEqual,
34+
pickAttrs,
35+
useEvent,
36+
useLayoutEffect,
37+
warning,
38+
} from '@rc-component/util';
3539
import * as React from 'react';
3640
import Body from './Body';
3741
import ColGroup from './ColGroup';
@@ -73,9 +77,11 @@ import StickyScrollBar from './stickyScrollBar';
7377
import Column from './sugar/Column';
7478
import ColumnGroup from './sugar/ColumnGroup';
7579
import { getColumnsKey, validateValue, validNumberValue } from './utils/valueUtil';
76-
import { getDOM } from '@rc-component/util/lib/Dom/findDOMNode';
77-
import isEqual from '@rc-component/util/lib/isEqual';
78-
import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect';
80+
81+
export type CompareProps<T extends React.ComponentType<any>> = (
82+
prevProps: Readonly<React.ComponentProps<T>>,
83+
nextProps: Readonly<React.ComponentProps<T>>,
84+
) => boolean;
7985

8086
export const DEFAULT_PREFIX = 'rc-table';
8187

‎src/VirtualTable/index.tsx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
import type { CompareProps } from '@rc-component/context/lib/Immutable';
21
import { clsx } from 'clsx';
3-
import { useEvent, warning } from '@rc-component/util';
2+
import { get as getValue, useEvent, warning } from '@rc-component/util';
43
import * as React from 'react';
54
import { INTERNAL_HOOKS } from '../constant';
65
import { makeImmutable } from '../context/TableContext';
76
import type { CustomizeScrollBody, GetComponent, Reference } from '../interface';
8-
import Table, { DEFAULT_PREFIX, type TableProps } from '../Table';
7+
import Table, { DEFAULT_PREFIX, type CompareProps, type TableProps } from '../Table';
98
import Grid from './BodyGrid';
109
import { StaticContext } from './context';
11-
import getValue from '@rc-component/util/lib/utils/get';
1210

1311
const renderBody: CustomizeScrollBody<any> = (rawData, props) => {
1412
const { ref, onScroll } = props;

‎src/hooks/useColumns/index.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import toArray from '@rc-component/util/lib/Children/toArray';
2-
import warning from '@rc-component/util/lib/warning';
1+
import { toArray, warning } from '@rc-component/util';
32
import * as React from 'react';
43
import { EXPAND_COLUMN } from '../../constant';
54
import type {

‎src/hooks/useExpand.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import warning from '@rc-component/util/lib/warning';
1+
import { warning } from '@rc-component/util';
22
import * as React from 'react';
33
import { INTERNAL_HOOKS } from '../constant';
44
import type {

0 commit comments

Comments
 (0)