Skip to content

Commit ec0274c

Browse files
author
刘欢
committed
fix: refactor imports to use named exports from @rc-component/util
1 parent 038c4b3 commit ec0274c

10 files changed

Lines changed: 19 additions & 9 deletions

File tree

src/Menu.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
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';
4+
import { useControlledState } from '@rc-component/util';
5+
/* eslint-disable no-restricted-imports */
56
import useId from '@rc-component/util/lib/hooks/useId';
67
import isEqual from '@rc-component/util/lib/isEqual';
7-
import warning from '@rc-component/util/lib/warning';
8+
9+
import { warning } from '@rc-component/util';
810
import * as React from 'react';
911
import { useImperativeHandle } from 'react';
1012
import { flushSync } from 'react-dom';

src/MenuItem.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import { clsx } from 'clsx';
22
import Overflow from '@rc-component/overflow';
3+
/* eslint-disable no-restricted-imports */
34
import KeyCode from '@rc-component/util/lib/KeyCode';
4-
import omit from '@rc-component/util/lib/omit';
5+
6+
import { omit } from '@rc-component/util';
57
import { useComposeRef } from '@rc-component/util/lib/ref';
6-
import warning from '@rc-component/util/lib/warning';
8+
import { warning } from '@rc-component/util';
79
import * as React from 'react';
810
import { useMenuId } from './context/IdContext';
911
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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import * as React from 'react';
22
import Trigger from '@rc-component/trigger';
33
import { clsx } from 'clsx';
4+
/* eslint-disable no-restricted-imports */
45
import raf from '@rc-component/util/lib/raf';
6+
57
import type { CSSMotionProps } from '@rc-component/motion';
68
import { MenuContext } from '../context/MenuContext';
79
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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import * as React from 'react';
22
import type { CSSMotionProps } from '@rc-component/motion';
3+
/* eslint-disable no-restricted-imports */
34
import useMemo from '@rc-component/util/lib/hooks/useMemo';
45
import isEqual from '@rc-component/util/lib/isEqual';
6+
57
import type {
68
BuiltinPlacements,
79
MenuClickEventHandler,

src/hooks/useAccessibility.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
/* eslint-disable no-restricted-imports */
12
import { getFocusNodeList } from '@rc-component/util/lib/Dom/focus';
23
import KeyCode from '@rc-component/util/lib/KeyCode';
34
import raf from '@rc-component/util/lib/raf';
5+
46
import * as React from 'react';
57
import { getMenuId } from '../context/IdContext';
68
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[]) {

src/utils/warnUtil.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

33
/**
44
* `onClick` event return `info.item` which point to react node directly.

0 commit comments

Comments
 (0)