Skip to content

Commit eeeead2

Browse files
committed
fix: avoid rc package deep imports
1 parent 038c4b3 commit eeeead2

17 files changed

Lines changed: 18 additions & 31 deletions

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@
4747
"@rc-component/motion": "^1.1.4",
4848
"@rc-component/overflow": "^1.0.0",
4949
"@rc-component/trigger": "^3.0.0",
50-
"@rc-component/util": "^1.3.0",
50+
"@rc-component/util": "^1.11.1",
5151
"clsx": "^2.1.1"
5252
},
5353
"devDependencies": {
54-
"@rc-component/father-plugin": "^2.0.2",
54+
"@rc-component/father-plugin": "^2.2.0",
5555
"@rc-component/np": "^1.0.3",
5656
"@testing-library/jest-dom": "^6.1.5",
5757
"@testing-library/react": "^16.0.0",

src/Menu.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
import { clsx } from 'clsx';
22
import type { CSSMotionProps } from '@rc-component/motion';
33
import Overflow from '@rc-component/overflow';
4-
import useControlledState from '@rc-component/util/lib/hooks/useControlledState';
5-
import useId from '@rc-component/util/lib/hooks/useId';
6-
import isEqual from '@rc-component/util/lib/isEqual';
7-
import warning from '@rc-component/util/lib/warning';
4+
import { isEqual, useControlledState, useId, warning } from '@rc-component/util';
85
import * as React from 'react';
96
import { useImperativeHandle } from 'react';
107
import { flushSync } from 'react-dom';

src/MenuItem.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import { clsx } from 'clsx';
22
import Overflow from '@rc-component/overflow';
3-
import KeyCode from '@rc-component/util/lib/KeyCode';
4-
import omit from '@rc-component/util/lib/omit';
5-
import { useComposeRef } from '@rc-component/util/lib/ref';
6-
import warning from '@rc-component/util/lib/warning';
3+
import { KeyCode, omit, useComposeRef, warning } from '@rc-component/util';
74
import * as React from 'react';
85
import { useMenuId } from './context/IdContext';
96
import { MenuContext } from './context/MenuContext';

src/MenuItemGroup.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { clsx } from 'clsx';
2-
import omit from '@rc-component/util/lib/omit';
2+
import { omit } from '@rc-component/util';
33
import * as React from 'react';
44
import { MenuContext } from './context/MenuContext';
55
import { useFullPath, useMeasure } from './context/PathContext';

src/SubMenu/PopupTrigger.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 Trigger from '@rc-component/trigger';
33
import { clsx } from 'clsx';
4-
import raf from '@rc-component/util/lib/raf';
4+
import { raf } from '@rc-component/util';
55
import type { CSSMotionProps } from '@rc-component/motion';
66
import { MenuContext } from '../context/MenuContext';
77
import { placements, placementsRtl } from '../placements';

src/SubMenu/index.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 { clsx } from 'clsx';
33
import Overflow from '@rc-component/overflow';
4-
import warning from '@rc-component/util/lib/warning';
4+
import { warning } from '@rc-component/util';
55
import SubMenuList from './SubMenuList';
66
import { parseChildren } from '../utils/commonUtil';
77
import type { MenuInfo, SubMenuType } from '../interface';

src/context/MenuContext.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import * as React from 'react';
22
import type { CSSMotionProps } from '@rc-component/motion';
3-
import useMemo from '@rc-component/util/lib/hooks/useMemo';
4-
import isEqual from '@rc-component/util/lib/isEqual';
3+
import { isEqual, useMemo } from '@rc-component/util';
54
import type {
65
BuiltinPlacements,
76
MenuClickEventHandler,

src/hooks/useAccessibility.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import { getFocusNodeList } from '@rc-component/util/lib/Dom/focus';
2-
import KeyCode from '@rc-component/util/lib/KeyCode';
3-
import raf from '@rc-component/util/lib/raf';
1+
import { getFocusNodeList, KeyCode, raf } from '@rc-component/util';
42
import * as React from 'react';
53
import { getMenuId } from '../context/IdContext';
64
import type { MenuMode } from '../interface';

src/hooks/useKeyRecords.ts

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 { useRef, useCallback } from 'react';
3-
import warning from '@rc-component/util/lib/warning';
3+
import { warning } from '@rc-component/util';
44
import { nextSlice } from '../utils/timeUtil';
55

66
const PATH_SPLIT = '__RC_UTIL_PATH_SPLIT__';

src/utils/commonUtil.ts

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

44
export function parseChildren(children: React.ReactNode | undefined, keyPath: string[]) {

0 commit comments

Comments
 (0)