refactor: [v6] use rc-component (#52337)

* refactor: use @rc-component

* chore: adjust compile

* test: fix logic

* chore: back of reset

---------

Co-authored-by: 二货机器人 <smith3816@gmail.com>

.dumi/hooks/useThemeAnimation.ts

@@ -1,5 +1,5 @@
 import { useEffect, useRef } from 'react';
-import { removeCSS, updateCSS } from 'rc-util/lib/Dom/dynamicCSS';
+import { removeCSS, updateCSS } from '@rc-component/util/lib/Dom/dynamicCSS';
 
 import theme from '../../components/theme';
 

.dumi/theme/builtins/ImagePreview/index.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
+import toArray from '@rc-component/util/lib/Children/toArray';
 import { Image } from 'antd';
 import classNames from 'classnames';
-import toArray from 'rc-util/lib/Children/toArray';
 
 interface ImagePreviewProps {
   className?: string;

.dumi/theme/builtins/Previewer/CodePreviewer.tsx

@@ -95,7 +95,7 @@ const CodePreviewer: React.FC<AntdPreviewerProps> = (props) => {
 
   const entryName = 'index.tsx';
   const entryCode = asset.dependencies[entryName].value;
-  
+
   const previewDemo = useRef<React.ReactNode>(null);
   const demoContainer = useRef<HTMLElement>(null);
   const {
@@ -288,7 +288,7 @@ createRoot(document.getElementById('container')).render(<Demo />);
     main: 'index.js',
     dependencies: {
       ...dependencies,
-      'rc-util': pkgDependencyList['rc-util'],
+      '@rc-component/util': pkgDependencyList['@rc-component/util'],
       react: '^18.0.0',
       'react-dom': '^18.0.0',
       'react-scripts': '^5.0.0',

.dumi/theme/common/styles/Common.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { css, Global } from '@emotion/react';
+import { updateCSS } from '@rc-component/util/lib/Dom/dynamicCSS';
 import { useTheme } from 'antd-style';
-import { updateCSS } from 'rc-util/lib/Dom/dynamicCSS';
 
 export default () => {
   const { anchorTop } = useTheme();

.dumi/theme/slots/Footer/AdditionalInfo.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
+import { removeCSS, updateCSS } from '@rc-component/util/lib/Dom/dynamicCSS';
 import { createStyles } from 'antd-style';
-import { removeCSS, updateCSS } from 'rc-util/lib/Dom/dynamicCSS';
 
 import useLocale from '../../../hooks/useLocale';
 

.jest.js

@@ -6,6 +6,7 @@ const compileModules = [
   'countup.js',
   '.pnpm',
   '@asamuzakjp/css-color',
+  '@rc-component',
 ];
 
 const ignoreList = [];

components/_util/ActionButton.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import useState from 'rc-util/lib/hooks/useState';
+import useState from '@rc-component/util/lib/hooks/useState';
 
 import Button from '../button';
 import type { ButtonProps, LegacyButtonType } from '../button/button';

components/_util/PurePanel.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import useMergedState from '@rc-component/util/lib/hooks/useMergedState';
 
 import ConfigProvider, { ConfigContext } from '../config-provider';
 import type { AnyObject } from './type';

components/_util/__tests__/wave.test.tsx

@@ -21,7 +21,7 @@ jest.mock('react-dom', () => {
   return realReactDOM;
 });
 
-jest.mock('rc-util/lib/Dom/isVisible', () => {
+jest.mock('@rc-component/util/lib/Dom/isVisible', () => {
   const mockFn = () => (global as any).isVisible;
   return mockFn;
 });

components/_util/hooks/useClosable.tsx

@@ -1,8 +1,8 @@
 import type { ReactNode } from 'react';
 import React from 'react';
 import CloseOutlined from '@ant-design/icons/CloseOutlined';
+import pickAttrs from '@rc-component/util/lib/pickAttrs';
 import type { DialogProps } from 'rc-dialog';
-import pickAttrs from 'rc-util/lib/pickAttrs';
 
 export type ClosableType = DialogProps['closable'];
 

components/_util/scrollTo.ts

@@ -1,4 +1,4 @@
-import raf from 'rc-util/lib/raf';
+import raf from '@rc-component/util/lib/raf';
 
 import { easeInOutCubic } from './easings';
 import getScroll, { isWindow } from './getScroll';

components/_util/styleChecker.ts

@@ -1,5 +1,5 @@
-import canUseDom from 'rc-util/lib/Dom/canUseDom';
-import { isStyleSupport } from 'rc-util/lib/Dom/styleChecker';
+import canUseDom from '@rc-component/util/lib/Dom/canUseDom';
+import { isStyleSupport } from '@rc-component/util/lib/Dom/styleChecker';
 
 export const canUseDocElement = () => canUseDom() && window.document.documentElement;
 

components/_util/throttleByAnimationFrame.ts

@@ -1,4 +1,4 @@
-import raf from 'rc-util/lib/raf';
+import raf from '@rc-component/util/lib/raf';
 
 function throttleByAnimationFrame<T extends any[]>(fn: (...args: T) => void) {
   let requestId: number | null;

components/_util/warning.ts

@@ -1,5 +1,6 @@
 import * as React from 'react';
-import rcWarning, { resetWarned as rcResetWarned } from 'rc-util/lib/warning';
+import rcWarning, { resetWarned as rcResetWarned } from '@rc-component/util/lib/warning';
+import { resetWarned as deprecatedRcResetWarned } from 'rc-util/lib/warning';
 
 export function noop() {}
 
@@ -8,6 +9,7 @@ let deprecatedWarnList: Record<string, string[]> | null = null;
 export function resetWarned() {
   deprecatedWarnList = null;
   rcResetWarned();
+  deprecatedRcResetWarned();
 }
 
 type Warning = (valid: boolean, component: string, message?: string) => void;

components/_util/wave/WaveEffect.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
+import raf from '@rc-component/util/lib/raf';
+import { composeRef } from '@rc-component/util/lib/ref';
 import classNames from 'classnames';
 import CSSMotion from 'rc-motion';
-import raf from 'rc-util/lib/raf';
-import { composeRef } from 'rc-util/lib/ref';
 
 import { getReactRender, type UnmountType } from '../../config-provider/UnstableContext';
 import { TARGET_CLS } from './interface';

components/_util/wave/index.ts

@@ -1,7 +1,7 @@
 import React, { useContext, useRef } from 'react';
+import isVisible from '@rc-component/util/lib/Dom/isVisible';
+import { composeRef, getNodeRef, supportRef } from '@rc-component/util/lib/ref';
 import classNames from 'classnames';
-import isVisible from 'rc-util/lib/Dom/isVisible';
-import { composeRef, getNodeRef, supportRef } from 'rc-util/lib/ref';
 
 import type { ConfigConsumerProps } from '../../config-provider';
 import { ConfigContext } from '../../config-provider';

components/_util/wave/useWave.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import useEvent from 'rc-util/lib/hooks/useEvent';
-import raf from 'rc-util/lib/raf';
+import useEvent from '@rc-component/util/lib/hooks/useEvent';
+import raf from '@rc-component/util/lib/raf';
 
 import { ConfigContext } from '../../config-provider';
 import useToken from '../../theme/useToken';

components/affix/__tests__/demo.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { spyElementPrototype } from 'rc-util/lib/test/domHook';
+import { spyElementPrototype } from '@rc-component/util/lib/test/domHook';
 
 import demoTest, { rootPropsTest } from '../../../tests/shared/demoTest';
 

components/affix/index.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
+import omit from '@rc-component/util/lib/omit';
 import classNames from 'classnames';
 import ResizeObserver from 'rc-resize-observer';
-import omit from 'rc-util/lib/omit';
 
 import throttleByAnimationFrame from '../_util/throttleByAnimationFrame';
 import type { ConfigConsumerProps } from '../config-provider';

components/alert/Alert.tsx

@@ -5,10 +5,10 @@ import CloseCircleFilled from '@ant-design/icons/CloseCircleFilled';
 import CloseOutlined from '@ant-design/icons/CloseOutlined';
 import ExclamationCircleFilled from '@ant-design/icons/ExclamationCircleFilled';
 import InfoCircleFilled from '@ant-design/icons/InfoCircleFilled';
+import pickAttrs from '@rc-component/util/lib/pickAttrs';
+import { composeRef } from '@rc-component/util/lib/ref';
 import classNames from 'classnames';
 import CSSMotion from 'rc-motion';
-import pickAttrs from 'rc-util/lib/pickAttrs';
-import { composeRef } from 'rc-util/lib/ref';
 
 import type { ClosableType } from '../_util/hooks/useClosable';
 import { replaceElement } from '../_util/reactNode';

components/alert/__tests__/index.test.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
+import { resetWarned } from '@rc-component/util/lib/warning';
 import userEvent from '@testing-library/user-event';
-import { resetWarned } from 'rc-util/lib/warning';
 
 import Alert from '..';
 import { accessibilityTest } from '../../../tests/shared/accessibilityTest';

components/anchor/Anchor.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
+import useEvent from '@rc-component/util/lib/hooks/useEvent';
 import classNames from 'classnames';
-import useEvent from 'rc-util/lib/hooks/useEvent';
 import scrollIntoView from 'scroll-into-view-if-needed';
 
 import getScroll from '../_util/getScroll';

components/anchor/__tests__/Anchor.test.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { resetWarned } from 'rc-util/lib/warning';
+import { resetWarned } from '@rc-component/util/lib/warning';
 import scrollIntoView from 'scroll-into-view-if-needed';
 
 import Anchor from '..';

components/auto-complete/index.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
+import toArray from '@rc-component/util/lib/Children/toArray';
+import omit from '@rc-component/util/lib/omit';
 import classNames from 'classnames';
 import type { BaseSelectRef } from 'rc-select';
-import toArray from 'rc-util/lib/Children/toArray';
-import omit from 'rc-util/lib/omit';
 
 import { useZIndex } from '../_util/hooks/useZIndex';
 import genPurePanel from '../_util/PurePanel';

components/avatar/avatar.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
+import { composeRef } from '@rc-component/util/lib/ref';
 import classNames from 'classnames';
 import ResizeObserver from 'rc-resize-observer';
-import { composeRef } from 'rc-util/lib/ref';
 
 import type { Breakpoint } from '../_util/responsiveObserver';
 import { responsiveArray } from '../_util/responsiveObserver';

components/avatar/group.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
+import toArray from '@rc-component/util/lib/Children/toArray';
 import classNames from 'classnames';
-import toArray from 'rc-util/lib/Children/toArray';
 
 import { cloneElement } from '../_util/reactNode';
 import { devUseWarning } from '../_util/warning';

components/breadcrumb/Breadcrumb.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
+import toArray from '@rc-component/util/lib/Children/toArray';
+import pickAttrs from '@rc-component/util/lib/pickAttrs';
 import classNames from 'classnames';
-import toArray from 'rc-util/lib/Children/toArray';
-import pickAttrs from 'rc-util/lib/pickAttrs';
 
 import { cloneElement } from '../_util/reactNode';
 import type { AnyObject } from '../_util/type';

components/breadcrumb/useItemRender.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
+import pickAttrs from '@rc-component/util/lib/pickAttrs';
 import classNames from 'classnames';
-import pickAttrs from 'rc-util/lib/pickAttrs';
 
 import type { BreadcrumbProps, InternalRouteType, ItemType } from './Breadcrumb';
 

components/button/__tests__/index.test.tsx

@@ -1,6 +1,6 @@
 import React, { Suspense, useRef, useState } from 'react';
 import { SearchOutlined } from '@ant-design/icons';
-import { resetWarned } from 'rc-util/lib/warning';
+import { resetWarned } from '@rc-component/util/lib/warning';
 
 import Button, { _ButtonVariantTypes } from '..';
 import type { GetRef } from '../../_util/type';

components/button/__tests__/wave.test.tsx

@@ -16,7 +16,7 @@ jest.mock('react-dom', () => {
   return realReactDOM;
 });
 
-jest.mock('rc-util/lib/Dom/isVisible', () => {
+jest.mock('@rc-component/util/lib/Dom/isVisible', () => {
   const mockFn = () => true;
   return mockFn;
 });

components/button/button.tsx

@@ -1,7 +1,7 @@
 import React, { Children, useContext, useEffect, useMemo, useRef, useState } from 'react';
+import omit from '@rc-component/util/lib/omit';
+import { useComposeRef } from '@rc-component/util/lib/ref';
 import classNames from 'classnames';
-import omit from 'rc-util/lib/omit';
-import { useComposeRef } from 'rc-util/lib/ref';
 
 import { devUseWarning } from '../_util/warning';
 import Wave from '../_util/wave';
@@ -19,8 +19,8 @@ import type {
   ButtonVariantType,
 } from './buttonHelpers';
 import { isTwoCNChar, isUnBorderedButtonVariant, spaceChildren } from './buttonHelpers';
-import IconWrapper from './IconWrapper';
 import DefaultLoadingIcon from './DefaultLoadingIcon';
+import IconWrapper from './IconWrapper';
 import useStyle from './style';
 import Compact from './style/compact';
 

components/calendar/__tests__/index.test.tsx

@@ -3,22 +3,22 @@ import Dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
 
 import React from 'react';
+import { resetWarned } from '@rc-component/util/lib/warning';
 import MockDate from 'mockdate';
 import type { PickerPanelProps } from 'rc-picker';
 import dayjsGenerateConfig from 'rc-picker/lib/generate/dayjs';
 import type { Locale } from 'rc-picker/lib/interface';
-import { resetWarned } from 'rc-util/lib/warning';
 
 import Calendar from '..';
 import mountTest from '../../../tests/shared/mountTest';
 import rtlTest from '../../../tests/shared/rtlTest';
 import { fireEvent, render } from '../../../tests/utils';
+import ConfigProvider from '../../config-provider';
 import Group from '../../radio/group';
 import Button from '../../radio/radioButton';
 import Select from '../../select';
 import Header from '../Header';
 import type { CalendarHeaderProps } from '../Header';
-import ConfigProvider from '../../config-provider';
 
 const ref: {
   calendarProps?: PickerPanelProps;

components/calendar/__tests__/select.test.tsx

@@ -3,7 +3,7 @@ import Dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
 
 import React from 'react';
-import { resetWarned } from 'rc-util/lib/warning';
+import { resetWarned } from '@rc-component/util/lib/warning';
 
 import Calendar from '..';
 import { fireEvent, render, waitFakeTimer } from '../../../tests/utils';

components/calendar/generateCalendar.tsx

@@ -1,10 +1,10 @@
 import * as React from 'react';
+import useMergedState from '@rc-component/util/lib/hooks/useMergedState';
 import classNames from 'classnames';
 import type { BasePickerPanelProps as RcBasePickerPanelProps } from 'rc-picker';
 import { PickerPanel as RCPickerPanel } from 'rc-picker';
 import type { GenerateConfig } from 'rc-picker/lib/generate';
 import type { CellRenderInfo } from 'rc-picker/lib/interface';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
 
 import type { AnyObject } from '../_util/type';
 import { devUseWarning } from '../_util/warning';

components/card/Card.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
+import omit from '@rc-component/util/lib/omit';
 import classNames from 'classnames';
 import type { Tab } from 'rc-tabs/lib/interface';
-import omit from 'rc-util/lib/omit';
 
 import { devUseWarning } from '../_util/warning';
 import { ConfigContext } from '../config-provider';

components/cascader/index.tsx

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import omit from '@rc-component/util/lib/omit';
 import classNames from 'classnames';
 import type {
   BaseOptionType,
@@ -9,7 +10,6 @@ import type {
 } from 'rc-cascader';
 import RcCascader from 'rc-cascader';
 import type { Placement } from 'rc-select/lib/BaseSelect';
-import omit from 'rc-util/lib/omit';
 
 import { useZIndex } from '../_util/hooks/useZIndex';
 import type { SelectCommonPlacement } from '../_util/motion';

components/checkbox/Checkbox.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
+import { composeRef } from '@rc-component/util/lib/ref';
 import classNames from 'classnames';
 import type { CheckboxRef } from 'rc-checkbox';
 import RcCheckbox from 'rc-checkbox';
-import { composeRef } from 'rc-util/lib/ref';
 
 import { devUseWarning } from '../_util/warning';
 import Wave from '../_util/wave';

components/checkbox/Group.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
+import omit from '@rc-component/util/lib/omit';
 import classNames from 'classnames';
-import omit from 'rc-util/lib/omit';
 
 import { ConfigContext } from '../config-provider';
 import useCSSVarCls from '../config-provider/hooks/useCSSVarCls';

components/checkbox/useBubbleLock.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import raf from 'rc-util/lib/raf';
+import raf from '@rc-component/util/lib/raf';
 
 /**
  * When click on the label,

components/collapse/Collapse.tsx

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import RightOutlined from '@ant-design/icons/RightOutlined';
+import toArray from '@rc-component/util/lib/Children/toArray';
+import omit from '@rc-component/util/lib/omit';
 import classNames from 'classnames';
 import type { CollapseProps as RcCollapseProps } from 'rc-collapse';
 import RcCollapse from 'rc-collapse';
 import type { CSSMotionProps } from 'rc-motion';
-import toArray from 'rc-util/lib/Children/toArray';
-import omit from 'rc-util/lib/omit';
 
 import initCollapseMotion from '../_util/motion';
 import { cloneElement } from '../_util/reactNode';

components/color-picker/ColorPicker.tsx

@@ -1,6 +1,6 @@
 import React, { useContext, useMemo } from 'react';
+import useMergedState from '@rc-component/util/lib/hooks/useMergedState';
 import classNames from 'classnames';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
 
 import ContextIsolator from '../_util/ContextIsolator';
 import genPurePanel from '../_util/PurePanel';

components/color-picker/__tests__/gradient.test.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
+import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
 import { render } from '@testing-library/react';
-import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
 
 import { resetWarned } from '../../_util/warning';
 import { createEvent, fireEvent } from '../../../tests/utils';

components/color-picker/__tests__/index.test.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useMemo, useState } from 'react';
+import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
 import { createEvent, fireEvent, render } from '@testing-library/react';
-import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
 
 import { resetWarned } from '../../_util/warning';
 import mountTest from '../../../tests/shared/mountTest';

components/color-picker/components/ColorInput.tsx

@@ -1,6 +1,6 @@
 import type { FC } from 'react';
 import React, { useMemo } from 'react';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import useMergedState from '@rc-component/util/lib/hooks/useMergedState';
 
 import Select from '../../select';
 import type { AggregationColor } from '../color';

components/color-picker/components/ColorPresets.tsx

@@ -1,8 +1,8 @@
 import type { FC } from 'react';
 import React, { useMemo } from 'react';
 import { ColorBlock, Color as RcColor } from '@rc-component/color-picker';
+import useMergedState from '@rc-component/util/lib/hooks/useMergedState';
 import classNames from 'classnames';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
 
 import type { CollapseProps } from '../../collapse';
 import Collapse from '../../collapse';

components/color-picker/components/ColorSlider.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import type { BaseSliderProps } from '@rc-component/color-picker';
+import useEvent from '@rc-component/util/lib/hooks/useEvent';
 import classNames from 'classnames';
 import { UnstableContext } from 'rc-slider';
-import useEvent from 'rc-util/lib/hooks/useEvent';
 
 import type { GetContextProp, GetProp } from '../../_util/type';
 import Slider from '../../slider';

components/color-picker/components/ColorTrigger.tsx

@@ -2,8 +2,8 @@
 import type { CSSProperties, MouseEventHandler } from 'react';
 import React, { forwardRef, useMemo } from 'react';
 import { ColorBlock } from '@rc-component/color-picker';
+import pickAttrs from '@rc-component/util/lib/pickAttrs';
 import classNames from 'classnames';
-import pickAttrs from 'rc-util/lib/pickAttrs';
 
 import { useLocale } from '../../locale';
 import type { AggregationColor } from '../color';

components/color-picker/components/PanelPicker/index.tsx

@@ -2,7 +2,7 @@ import type { FC } from 'react';
 import React, { useContext } from 'react';
 import RcColorPicker from '@rc-component/color-picker';
 import type { Color } from '@rc-component/color-picker';
-import useLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect';
+import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect';
 
 import Segmented from '../../../segmented';
 import { AggregationColor } from '../../color';

components/color-picker/hooks/useModeColor.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import useEvent from 'rc-util/lib/hooks/useEvent';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import useEvent from '@rc-component/util/lib/hooks/useEvent';
+import useMergedState from '@rc-component/util/lib/hooks/useMergedState';
 
 import { useLocale } from '../../locale';
 import type { AggregationColor } from '../color';

components/config-provider/UnstableContext.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import { render, unmount } from 'rc-util/lib/React/render';
+import { render, unmount } from '@rc-component/util/lib/React/render';
 
 import warning from '../_util/warning';
 

components/config-provider/__tests__/components.test.tsx

@@ -58,7 +58,8 @@ import TreeSelect from '../../tree-select';
 import Upload from '../../upload';
 
 dayjs.extend(customParseFormat);
-jest.mock('rc-util/lib/Portal');
+
+jest.mock('@rc-component/util/lib/Portal');
 
 describe('ConfigProvider', () => {
   describe('components', () => {

components/config-provider/__tests__/popup.test.tsx

@@ -10,7 +10,8 @@ import Select from '../../select';
 import TreeSelect from '../../tree-select';
 
 dayjs.extend(customParseFormat);
-jest.mock('rc-util/lib/Portal');
+
+jest.mock('@rc-component/util/lib/Portal');
 
 function triggerProps(): TriggerProps {
   return (global as any).triggerProps;

components/config-provider/__tests__/theme.test.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
+import canUseDom from '@rc-component/util/lib/Dom/canUseDom';
 import kebabCase from 'lodash/kebabCase';
-import canUseDom from 'rc-util/lib/Dom/canUseDom';
 
 import ConfigProvider from '..';
 import { Button, InputNumber, Select } from '../..';
@@ -15,7 +15,7 @@ const { defaultAlgorithm, darkAlgorithm, compactAlgorithm } = theme;
 /* biome-ignore lint/style/noVar: has to be a global variable */ /* eslint-disable-next-line no-var */
 var mockCanUseDom = true;
 
-jest.mock('rc-util/lib/Dom/canUseDom', () => () => mockCanUseDom);
+jest.mock('@rc-component/util/lib/Dom/canUseDom', () => () => mockCanUseDom);
 
 describe('ConfigProvider.Theme', () => {
   beforeEach(() => {

components/config-provider/__tests__/unstable.test.tsx

@@ -3,7 +3,7 @@ import { version } from 'react';
 import { waitFakeTimer19 } from '../../../tests/utils';
 import Modal from '../../modal';
 
-jest.mock('rc-util/lib/Dom/isVisible', () => () => true);
+jest.mock('@rc-component/util/lib/Dom/isVisible', () => () => true);
 
 describe('UnstableContext', () => {
   beforeEach(() => {

components/config-provider/__tests__/wave.test.tsx

@@ -4,7 +4,7 @@ import ConfigProvider from '..';
 import { fireEvent, render, waitFakeTimer } from '../../../tests/utils';
 import Button from '../../button';
 
-jest.mock('rc-util/lib/Dom/isVisible', () => () => true);
+jest.mock('@rc-component/util/lib/Dom/isVisible', () => () => true);
 
 describe('ConfigProvider.Wave', () => {
   beforeEach(() => {

components/config-provider/cssVariables.ts

@@ -1,7 +1,7 @@
 import { generate } from '@ant-design/colors';
 import { FastColor } from '@ant-design/fast-color';
-import canUseDom from 'rc-util/lib/Dom/canUseDom';
-import { updateCSS } from 'rc-util/lib/Dom/dynamicCSS';
+import canUseDom from '@rc-component/util/lib/Dom/canUseDom';
+import { updateCSS } from '@rc-component/util/lib/Dom/dynamicCSS';
 
 import warning from '../_util/warning';
 import type { Theme } from './context';

components/config-provider/hooks/useTheme.ts

@@ -1,5 +1,5 @@
-import useMemo from 'rc-util/lib/hooks/useMemo';
-import isEqual from 'rc-util/lib/isEqual';
+import useMemo from '@rc-component/util/lib/hooks/useMemo';
+import isEqual from '@rc-component/util/lib/isEqual';
 
 import { devUseWarning } from '../../_util/warning';
 import type { OverrideToken } from '../../theme/interface';

components/config-provider/index.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { createTheme } from '@ant-design/cssinjs';
 import IconContext from '@ant-design/icons/lib/components/Context';
-import useMemo from 'rc-util/lib/hooks/useMemo';
-import { merge } from 'rc-util/lib/utils/set';
+import useMemo from '@rc-component/util/lib/hooks/useMemo';
+import { merge } from '@rc-component/util/lib/utils/set';
 
 import warning, { devUseWarning, WarningContext } from '../_util/warning';
 import type { WarningContextProps } from '../_util/warning';
@@ -27,6 +27,7 @@ import type {
   DatePickerConfig,
   DirectionType,
   DrawerConfig,
+  EmptyConfig,
   FlexConfig,
   FloatButtonGroupConfig,
   FormConfig,
@@ -39,6 +40,8 @@ import type {
   ModalConfig,
   NotificationConfig,
   PaginationConfig,
+  PopconfirmConfig,
+  PopoverConfig,
   PopupOverflow,
   RangePickerConfig,
   SelectConfig,
@@ -52,14 +55,11 @@ import type {
   ThemeConfig,
   TimePickerConfig,
   TooltipConfig,
-  PopoverConfig,
-  PopconfirmConfig,
   TourConfig,
   TransferConfig,
   TreeSelectConfig,
   Variant,
   WaveConfig,
-  EmptyConfig,
 } from './context';
 import {
   ConfigConsumer,

components/descriptions/hooks/useItems.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import toArray from 'rc-util/lib/Children/toArray';
+import toArray from '@rc-component/util/lib/Children/toArray';
 
 import type { DescriptionsItemType, InternalDescriptionsItemType } from '..';
 import { matchScreen } from '../../_util/responsiveObserver';

components/dropdown/dropdown.tsx

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import RightOutlined from '@ant-design/icons/RightOutlined';
 import type { AlignType } from '@rc-component/trigger';
+import useEvent from '@rc-component/util/lib/hooks/useEvent';
+import useMergedState from '@rc-component/util/lib/hooks/useMergedState';
+import omit from '@rc-component/util/lib/omit';
 import classNames from 'classnames';
 import RcDropdown from 'rc-dropdown';
-import useEvent from 'rc-util/lib/hooks/useEvent';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
-import omit from 'rc-util/lib/omit';
 
 import { useZIndex } from '../_util/hooks/useZIndex';
 import isPrimitive from '../_util/isPrimitive';

components/flex/index.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
+import omit from '@rc-component/util/lib/omit';
 import classNames from 'classnames';
-import omit from 'rc-util/lib/omit';
 
 import { isPresetSize } from '../_util/gapSize';
 import { ConfigContext } from '../config-provider';

components/float-button/BackTop.tsx

@@ -1,8 +1,8 @@
 import React, { useContext, useEffect, useState } from 'react';
 import VerticalAlignTopOutlined from '@ant-design/icons/VerticalAlignTopOutlined';
+import { composeRef } from '@rc-component/util/lib/ref';
 import classNames from 'classnames';
 import CSSMotion from 'rc-motion';
-import { composeRef } from 'rc-util/lib/ref';
 
 import getScroll from '../_util/getScroll';
 import scrollTo from '../_util/scrollTo';

components/float-button/FloatButton.tsx

@@ -1,6 +1,6 @@
 import React, { useContext, useMemo } from 'react';
+import omit from '@rc-component/util/lib/omit';
 import classNames from 'classnames';
-import omit from 'rc-util/lib/omit';
 
 import { useZIndex } from '../_util/hooks/useZIndex';
 import { devUseWarning } from '../_util/warning';

components/float-button/FloatButtonGroup.tsx

@@ -1,10 +1,10 @@
 import React from 'react';
 import CloseOutlined from '@ant-design/icons/CloseOutlined';
 import FileTextOutlined from '@ant-design/icons/FileTextOutlined';
+import useEvent from '@rc-component/util/lib/hooks/useEvent';
+import useMergedState from '@rc-component/util/lib/hooks/useMergedState';
 import classNames from 'classnames';
 import CSSMotion from 'rc-motion';
-import useEvent from 'rc-util/lib/hooks/useEvent';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
 
 import { useZIndex } from '../_util/hooks/useZIndex';
 import { devUseWarning } from '../_util/warning';

components/form/FormItem/ItemHolder.tsx

@@ -1,9 +1,9 @@
 import * as React from 'react';
+import isVisible from '@rc-component/util/lib/Dom/isVisible';
+import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect';
+import omit from '@rc-component/util/lib/omit';
 import classNames from 'classnames';
 import type { Meta } from 'rc-field-form/lib/interface';
-import isVisible from 'rc-util/lib/Dom/isVisible';
-import useLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect';
-import omit from 'rc-util/lib/omit';
 
 import type { FormItemProps } from '.';
 import { Row } from '../../grid';

components/form/FormItem/index.tsx

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import type { JSX } from 'react';
+import useState from '@rc-component/util/lib/hooks/useState';
+import { supportRef } from '@rc-component/util/lib/ref';
 import classNames from 'classnames';
 import { Field, FieldContext, ListContext } from 'rc-field-form';
 import type { FieldProps } from 'rc-field-form/lib/Field';
 import type { InternalNamePath, Meta } from 'rc-field-form/lib/interface';
-import useState from 'rc-util/lib/hooks/useState';
-import { supportRef } from 'rc-util/lib/ref';
 
 import { cloneElement } from '../../_util/reactNode';
 import { devUseWarning } from '../../_util/warning';

components/form/FormItemInput.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import type { JSX } from 'react';
+import { get, set } from '@rc-component/util';
+import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect';
 import classNames from 'classnames';
-import { get, set } from 'rc-util';
-import useLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect';
 
 import type { ColProps } from '../grid/col';
 import Col from '../grid/col';

components/form/context.tsx

@@ -1,14 +1,14 @@
 import type { PropsWithChildren, ReactNode } from 'react';
 import * as React from 'react';
+import omit from '@rc-component/util/lib/omit';
 import { FormProvider as RcFormProvider } from 'rc-field-form';
 import type { FormProviderProps as RcFormProviderProps } from 'rc-field-form/lib/FormContext';
 import type { Meta } from 'rc-field-form/lib/interface';
-import omit from 'rc-util/lib/omit';
 
+import type { Variant } from '../config-provider';
 import type { ColProps } from '../grid/col';
 import type { FormInstance, RequiredMark } from './Form';
 import type { FeedbackIcons, ValidateStatus } from './FormItem';
-import type { Variant } from '../config-provider';
 import type { FormLabelAlign } from './interface';
 
 /** Form Context. Set top form style and pass to Form Item usage. */

components/form/hooks/useChildren.ts

@@ -1,4 +1,4 @@
-import toArray from 'rc-util/lib/Children/toArray';
+import toArray from '@rc-component/util/lib/Children/toArray';
 
 import type { FormItemProps } from '../FormItem';
 

components/form/hooks/useForm.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
+import { getDOM } from '@rc-component/util/lib/Dom/findDOMNode';
 import type { FormInstance as RcFormInstance } from 'rc-field-form';
 import { useForm as useRcForm } from 'rc-field-form';
-import { getDOM } from 'rc-util/lib/Dom/findDOMNode';
 import scrollIntoView from 'scroll-into-view-if-needed';
 
 import type { InternalNamePath, NamePath, ScrollOptions } from '../interface';

components/form/hooks/useFrameState.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import raf from 'rc-util/lib/raf';
+import raf from '@rc-component/util/lib/raf';
 
 type Updater<ValueType> = (prev?: ValueType) => ValueType;
 

components/form/hooks/useItemRef.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { composeRef, getNodeRef } from 'rc-util/lib/ref';
+import { composeRef, getNodeRef } from '@rc-component/util/lib/ref';
 
 import { FormContext } from '../context';
 import type { InternalNamePath } from '../interface';

components/grid/__tests__/server.test.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import { Col, Row } from '..';
 import { render } from '../../../tests/utils';
 
-jest.mock('rc-util/lib/Dom/canUseDom', () => () => false);
+jest.mock('@rc-component/util/lib/Dom/canUseDom', () => () => false);
 
 describe('Grid.Server', () => {
   it('use compatible gap logic', () => {

components/grid/hooks/useBreakpoint.tsx

@@ -1,5 +1,5 @@
 import { useRef } from 'react';
-import useLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect';
+import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect';
 
 import useForceUpdate from '../../_util/hooks/useForceUpdate';
 import type { ScreenMap } from '../../_util/responsiveObserver';

components/input/Input.tsx

@@ -1,9 +1,9 @@
 import React, { forwardRef, useContext, useEffect, useRef } from 'react';
+import { composeRef } from '@rc-component/util/lib/ref';
 import classNames from 'classnames';
 import type { InputRef, InputProps as RcInputProps } from 'rc-input';
 import RcInput from 'rc-input';
 import { InputFocusOptions, triggerFocus } from 'rc-input/lib/utils/commonUtils';
-import { composeRef } from 'rc-util/lib/ref';
 
 import ContextIsolator from '../_util/ContextIsolator';
 import getAllowClear from '../_util/getAllowClear';

components/input/OTP/OTPInput.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import raf from 'rc-util/lib/raf';
+import raf from '@rc-component/util/lib/raf';
 
 import Input from '../Input';
 import type { InputProps, InputRef } from '../Input';

components/input/OTP/index.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
+import useEvent from '@rc-component/util/lib/hooks/useEvent';
+import pickAttrs from '@rc-component/util/lib/pickAttrs';
 import classNames from 'classnames';
-import useEvent from 'rc-util/lib/hooks/useEvent';
-import pickAttrs from 'rc-util/lib/pickAttrs';
 
 import { getMergedStatus } from '../../_util/statusUtils';
 import type { InputStatus } from '../../_util/statusUtils';

components/input/Password.tsx

@@ -2,9 +2,9 @@ import * as React from 'react';
 import { useRef, useState } from 'react';
 import EyeInvisibleOutlined from '@ant-design/icons/EyeInvisibleOutlined';
 import EyeOutlined from '@ant-design/icons/EyeOutlined';
+import omit from '@rc-component/util/lib/omit';
+import { composeRef } from '@rc-component/util/lib/ref';
 import classNames from 'classnames';
-import omit from 'rc-util/lib/omit';
-import { composeRef } from 'rc-util/lib/ref';
 
 import type { ConfigConsumerProps } from '../config-provider';
 import { ConfigContext } from '../config-provider';

components/input/Search.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import SearchOutlined from '@ant-design/icons/SearchOutlined';
+import { composeRef } from '@rc-component/util/lib/ref';
 import classNames from 'classnames';
-import { composeRef } from 'rc-util/lib/ref';
 
 import { cloneElement } from '../_util/reactNode';
 import Button from '../button';

components/input/__tests__/focus.test.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
+import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
 
 import Input from '..';
 import { fireEvent, render } from '../../../tests/utils';

components/input/__tests__/textarea.test.tsx

@@ -1,6 +1,6 @@
 import type { ChangeEventHandler, TextareaHTMLAttributes } from 'react';
 import React, { useState } from 'react';
-import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
+import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
 
 import Input from '..';
 import focusTest from '../../../tests/shared/focusTest';

components/layout/Sider.tsx

@@ -3,8 +3,8 @@ import { useContext, useEffect, useRef, useState } from 'react';
 import BarsOutlined from '@ant-design/icons/BarsOutlined';
 import LeftOutlined from '@ant-design/icons/LeftOutlined';
 import RightOutlined from '@ant-design/icons/RightOutlined';
+import omit from '@rc-component/util/lib/omit';
 import classNames from 'classnames';
-import omit from 'rc-util/lib/omit';
 
 import isNumeric from '../_util/isNumeric';
 import { ConfigContext } from '../config-provider';

components/layout/hooks/useHasSider.ts

@@ -1,5 +1,5 @@
 import type * as React from 'react';
-import toArray from 'rc-util/lib/Children/toArray';
+import toArray from '@rc-component/util/lib/Children/toArray';
 
 import Sider from '../Sider';
 

components/layout/layout.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
+import omit from '@rc-component/util/lib/omit';
 import classNames from 'classnames';
-import omit from 'rc-util/lib/omit';
 
 import { ConfigContext } from '../config-provider';
 import { LayoutContext } from './context';

components/mentions/index.tsx

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { composeRef } from '@rc-component/util/lib/ref';
 import classNames from 'classnames';
 import RcMentions from 'rc-mentions';
 import type {
@@ -6,7 +7,6 @@ import type {
   MentionsProps as RcMentionsProps,
   MentionsRef as RcMentionsRef,
 } from 'rc-mentions/lib/Mentions';
-import { composeRef } from 'rc-util/lib/ref';
 
 import getAllowClear from '../_util/getAllowClear';
 import genPurePanel from '../_util/PurePanel';

components/menu/MenuItem.tsx

@@ -1,9 +1,9 @@
 import * as React from 'react';
+import toArray from '@rc-component/util/lib/Children/toArray';
+import omit from '@rc-component/util/lib/omit';
 import classNames from 'classnames';
 import type { MenuItemProps as RcMenuItemProps } from 'rc-menu';
 import { Item } from 'rc-menu';
-import toArray from 'rc-util/lib/Children/toArray';
-import omit from 'rc-util/lib/omit';
 
 import { cloneElement } from '../_util/reactNode';
 import type { SiderContextProps } from '../layout/Sider';

components/menu/OverrideContext.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { getNodeRef, supportNodeRef, useComposeRef } from 'rc-util/lib/ref';
+import { getNodeRef, supportNodeRef, useComposeRef } from '@rc-component/util/lib/ref';
 
 import ContextIsolator from '../_util/ContextIsolator';
 import type { MenuProps } from './menu';

components/menu/SubMenu.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
+import omit from '@rc-component/util/lib/omit';
 import classNames from 'classnames';
 import { SubMenu as RcSubMenu, useFullPath } from 'rc-menu';
-import omit from 'rc-util/lib/omit';
 
 import { useZIndex } from '../_util/hooks/useZIndex';
 import { cloneElement } from '../_util/reactNode';

components/menu/menu.tsx

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import { forwardRef } from 'react';
 import EllipsisOutlined from '@ant-design/icons/EllipsisOutlined';
+import useEvent from '@rc-component/util/lib/hooks/useEvent';
+import omit from '@rc-component/util/lib/omit';
 import classNames from 'classnames';
 import type { MenuProps as RcMenuProps, MenuRef as RcMenuRef } from 'rc-menu';
 import RcMenu from 'rc-menu';
-import useEvent from 'rc-util/lib/hooks/useEvent';
-import omit from 'rc-util/lib/omit';
 
 import initCollapseMotion from '../_util/motion';
 import { cloneElement } from '../_util/reactNode';

components/modal/__tests__/Modal.test.tsx

@@ -6,7 +6,7 @@ import mountTest from '../../../tests/shared/mountTest';
 import rtlTest from '../../../tests/shared/rtlTest';
 import { createEvent, fireEvent, render } from '../../../tests/utils';
 
-jest.mock('rc-util/lib/Portal');
+jest.mock('@rc-component/util/lib/Portal');
 
 const ModalTester: React.FC<ModalProps> = (props) => {
   const [open, setOpen] = React.useState(false);

components/modal/__tests__/confirm.test.tsx

@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { SmileOutlined } from '@ant-design/icons';
+import KeyCode from '@rc-component/util/lib/KeyCode';
+import { resetWarned } from '@rc-component/util/lib/warning';
 import CSSMotion from 'rc-motion';
 import { genCSSMotion } from 'rc-motion/lib/CSSMotion';
-import KeyCode from 'rc-util/lib/KeyCode';
-import { resetWarned } from 'rc-util/lib/warning';
 
 import type { ModalFuncProps } from '..';
 import Modal from '..';
@@ -76,7 +76,7 @@ describe('Modal.confirm triggers callbacks correctly', () => {
     (CSSMotion as any)[key] = (MockCSSMotion as any)[key];
   });
 
-  // // Mock for rc-util raf
+  // // Mock for @rc-component/util raf
   // window.requestAnimationFrame = callback => {
   //   const ret = window.setTimeout(callback, 16);
   //   return ret;

components/modal/__tests__/hook.test.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
+import KeyCode from '@rc-component/util/lib/KeyCode';
 import CSSMotion from 'rc-motion';
 import { genCSSMotion } from 'rc-motion/lib/CSSMotion';
-import KeyCode from 'rc-util/lib/KeyCode';
 
 import Modal from '..';
 import { act, fireEvent, render, waitFakeTimer } from '../../../tests/utils';
@@ -11,7 +11,7 @@ import Input from '../../input';
 import zhCN from '../../locale/zh_CN';
 import type { ModalFunc } from '../confirm';
 
-jest.mock('rc-util/lib/Portal');
+jest.mock('@rc-component/util/lib/Portal');
 jest.mock('rc-motion');
 
 // TODO: Remove this. Mock for React 19

components/popconfirm/__tests__/index.test.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { spyElementPrototype } from 'rc-util/lib/test/domHook';
+import { spyElementPrototype } from '@rc-component/util/lib/test/domHook';
 
 import Popconfirm from '..';
 import mountTest from '../../../tests/shared/mountTest';

components/popconfirm/index.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import ExclamationCircleFilled from '@ant-design/icons/ExclamationCircleFilled';
+import useMergedState from '@rc-component/util/lib/hooks/useMergedState';
+import omit from '@rc-component/util/lib/omit';
 import classNames from 'classnames';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
-import omit from 'rc-util/lib/omit';
 
 import type { RenderFunction } from '../_util/getRenderPropValue';
 import type { ButtonProps, LegacyButtonType } from '../button/button';

components/popover/index.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
+import useMergedState from '@rc-component/util/lib/hooks/useMergedState';
+import KeyCode from '@rc-component/util/lib/KeyCode';
 import classNames from 'classnames';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
-import KeyCode from 'rc-util/lib/KeyCode';
 
 import type { RenderFunction } from '../_util/getRenderPropValue';
 import { getRenderPropValue } from '../_util/getRenderPropValue';

components/progress/progress.tsx

@@ -1,11 +1,11 @@
 import * as React from 'react';
+import { FastColor } from '@ant-design/fast-color';
 import CheckCircleFilled from '@ant-design/icons/CheckCircleFilled';
 import CheckOutlined from '@ant-design/icons/CheckOutlined';
 import CloseCircleFilled from '@ant-design/icons/CloseCircleFilled';
 import CloseOutlined from '@ant-design/icons/CloseOutlined';
-import { FastColor } from '@ant-design/fast-color';
+import omit from '@rc-component/util/lib/omit';
 import classNames from 'classnames';
-import omit from 'rc-util/lib/omit';
 
 import { devUseWarning } from '../_util/warning';
 import type { ConfigConsumerProps } from '../config-provider';

components/qr-code/index.tsx

@@ -1,8 +1,8 @@
 import React, { useContext, type AriaAttributes } from 'react';
 import { QRCodeCanvas, QRCodeSVG } from '@rc-component/qrcode';
+import omit from '@rc-component/util/lib/omit';
+import pickAttrs from '@rc-component/util/lib/pickAttrs';
 import classNames from 'classnames';
-import omit from 'rc-util/lib/omit';
-import pickAttrs from 'rc-util/lib/pickAttrs';
 
 import { devUseWarning } from '../_util/warning';
 import type { ConfigConsumerProps } from '../config-provider';

components/radio/group.tsx

@@ -1,7 +1,8 @@
 import * as React from 'react';
+import useId from '@rc-component/util/lib/hooks/useId';
+import useMergedState from '@rc-component/util/lib/hooks/useMergedState';
+import pickAttrs from '@rc-component/util/lib/pickAttrs';
 import classNames from 'classnames';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
-import pickAttrs from 'rc-util/lib/pickAttrs';
 
 import { ConfigContext } from '../config-provider';
 import useCSSVarCls from '../config-provider/hooks/useCSSVarCls';
@@ -15,7 +16,6 @@ import type {
 } from './interface';
 import Radio from './radio';
 import useStyle from './style';
-import useId from 'rc-util/lib/hooks/useId';
 
 const RadioGroup = React.forwardRef<HTMLDivElement, RadioGroupProps>((props, ref) => {
   const { getPrefixCls, direction } = React.useContext(ConfigContext);

components/radio/radio.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
+import { composeRef } from '@rc-component/util/lib/ref';
 import classNames from 'classnames';
 import RcCheckbox from 'rc-checkbox';
-import { composeRef } from 'rc-util/lib/ref';
 
 import { devUseWarning } from '../_util/warning';
 import Wave from '../_util/wave';

components/segmented/index.tsx

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import useId from '@rc-component/util/lib/hooks/useId';
 import classNames from 'classnames';
 import type {
   SegmentedLabeledOption as RcSegmentedLabeledOption,
@@ -12,7 +13,6 @@ import { ConfigContext } from '../config-provider';
 import useSize from '../config-provider/hooks/useSize';
 import type { SizeType } from '../config-provider/SizeContext';
 import useStyle from './style';
-import useId from 'rc-util/lib/hooks/useId';
 
 export type { SegmentedValue } from 'rc-segmented';