fix: update @rc-component/util to version 1.11.1 and consolidate imports across multiple files

Author: 刘欢

package.json

@@ -47,7 +47,7 @@
     "@rc-component/motion": "^1.1.4",
     "@rc-component/overflow": "^1.0.0",
     "@rc-component/trigger": "^3.0.0",
-    "@rc-component/util": "^1.3.0",
+    "@rc-component/util": "^1.11.1",
     "clsx": "^2.1.1"
   },
   "devDependencies": {

src/Menu.tsx

@@ -1,11 +1,7 @@
 import { clsx } from 'clsx';
 import type { CSSMotionProps } from '@rc-component/motion';
 import Overflow from '@rc-component/overflow';
-import { useControlledState, warning } from '@rc-component/util';
-// eslint-disable-next-line no-restricted-imports
-import useId from '@rc-component/util/lib/hooks/useId';
-// eslint-disable-next-line no-restricted-imports
-import isEqual from '@rc-component/util/lib/isEqual';
+import { useControlledState, warning, useId, isEqual } from '@rc-component/util';
 import * as React from 'react';
 import { useImperativeHandle } from 'react';
 import { flushSync } from 'react-dom';

src/MenuItem.tsx

@@ -1,10 +1,6 @@
 import { clsx } from 'clsx';
 import Overflow from '@rc-component/overflow';
-// eslint-disable-next-line no-restricted-imports
-import KeyCode from '@rc-component/util/lib/KeyCode';
-// eslint-disable-next-line no-restricted-imports
-import { useComposeRef } from '@rc-component/util/lib/ref';
-import { omit, warning } from '@rc-component/util';
+import { omit, warning, KeyCode, useComposeRef } from '@rc-component/util';
 import * as React from 'react';
 import { useMenuId } from './context/IdContext';
 import { MenuContext } from './context/MenuContext';

src/SubMenu/PopupTrigger.tsx

@@ -1,9 +1,7 @@
 import * as React from 'react';
 import Trigger from '@rc-component/trigger';
 import { clsx } from 'clsx';
-// eslint-disable-next-line no-restricted-imports
-import raf from '@rc-component/util/lib/raf';
-
+import { raf } from '@rc-component/util';
 import type { CSSMotionProps } from '@rc-component/motion';
 import { MenuContext } from '../context/MenuContext';
 import { placements, placementsRtl } from '../placements';

src/context/MenuContext.tsx

@@ -1,10 +1,6 @@
 import * as React from 'react';
 import type { CSSMotionProps } from '@rc-component/motion';
-// eslint-disable-next-line no-restricted-imports
-import useMemo from '@rc-component/util/lib/hooks/useMemo';
-// eslint-disable-next-line no-restricted-imports
-import isEqual from '@rc-component/util/lib/isEqual';
-
+import { useMemo, isEqual } from '@rc-component/util';
 import type {
   BuiltinPlacements,
   MenuClickEventHandler,

src/hooks/useAccessibility.ts

@@ -1,10 +1,4 @@
-// eslint-disable-next-line no-restricted-imports
-import { getFocusNodeList } from '@rc-component/util/lib/Dom/focus';
-// eslint-disable-next-line no-restricted-imports
-import KeyCode from '@rc-component/util/lib/KeyCode';
-// eslint-disable-next-line no-restricted-imports
-import raf from '@rc-component/util/lib/raf';
-
+import { KeyCode, getFocusNodeList, raf } from '@rc-component/util';
 import * as React from 'react';
 import { getMenuId } from '../context/IdContext';
 import type { MenuMode } from '../interface';

tests/Focus.spec.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable no-undef */
 import { act, fireEvent, render } from '@testing-library/react';
-import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
+import { spyElementPrototypes } from '@rc-component/util';
 import React from 'react';
 import Menu, { MenuItem, MenuItemGroup, MenuRef, SubMenu } from '../src';
 

tests/Keyboard.spec.tsx

@@ -1,7 +1,6 @@
 /* eslint-disable no-undef, react/no-multi-comp, react/jsx-curly-brace-presence, max-classes-per-file */
 import { fireEvent, render } from '@testing-library/react';
-import KeyCode from '@rc-component/util/lib/KeyCode';
-import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
+import { KeyCode, spyElementPrototypes } from '@rc-component/util';
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import Menu, { MenuItem, SubMenu } from '../src';

tests/Menu.spec.tsx

@@ -1,14 +1,12 @@
 /* eslint-disable no-undef, react/no-multi-comp, react/jsx-curly-brace-presence, max-classes-per-file */
 import type { MenuMode } from '@/interface';
 import { fireEvent, render } from '@testing-library/react';
-import KeyCode from '@rc-component/util/lib/KeyCode';
-import { resetWarned } from '@rc-component/util/lib/warning';
+import { KeyCode, resetWarned, spyElementPrototypes } from '@rc-component/util';
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import type { MenuRef } from '../src';
 import Menu, { Divider, MenuItem, MenuItemGroup, SubMenu } from '../src';
 import { isActive, last } from './util';
-import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
 
 jest.mock('@rc-component/trigger', () => {
   const react = require('react');

tests/MenuItem.spec.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable no-undef */
 import { fireEvent, render } from '@testing-library/react';
-import KeyCode from '@rc-component/util/lib/KeyCode';
+import { KeyCode } from '@rc-component/util';
 import React from 'react';
 import Menu, { MenuItem, MenuItemGroup, SubMenu } from '../src';