Skip to content

Commit 2e327fd

Browse files
author
刘欢
committed
refactor: useUUID replace useId
1 parent 5e66f74 commit 2e327fd

8 files changed

Lines changed: 88 additions & 106 deletions

File tree

src/Menu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import classNames from 'classnames';
22
import type { CSSMotionProps } from '@rc-component/motion';
33
import Overflow from 'rc-overflow';
44
import useControlledState from '@rc-component/util/lib/hooks/useControlledState';
5+
import useId from '@rc-component/util/lib/hooks/useId';
56
import isEqual from '@rc-component/util/lib/isEqual';
67
import warning from '@rc-component/util/lib/warning';
78
import * as React from 'react';
@@ -14,7 +15,6 @@ import PrivateContext from './context/PrivateContext';
1415
import { getFocusableElements, refreshElements, useAccessibility } from './hooks/useAccessibility';
1516
import useKeyRecords, { OVERFLOW_KEY } from './hooks/useKeyRecords';
1617
import useMemoCallback from './hooks/useMemoCallback';
17-
import useUUID from './hooks/useUUID';
1818
import type {
1919
BuiltinPlacements,
2020
Components,
@@ -260,7 +260,7 @@ const Menu = React.forwardRef<MenuRef, MenuProps>((props, ref) => {
260260

261261
const containerRef = React.useRef<HTMLUListElement>();
262262

263-
const uuid = useUUID(id);
263+
const uuid = useId(id ? `rc-menu-uuid-${id}` : 'rc-menu-uuid');
264264

265265
const isRtl = direction === 'rtl';
266266

src/hooks/useUUID.ts

Lines changed: 0 additions & 18 deletions
This file was deleted.

tests/__snapshots__/Keyboard.spec.tsx.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ HTMLCollection [
1313
role="none"
1414
>
1515
<div
16-
aria-controls="rc-menu-uuid-test-light-popup"
16+
aria-controls="rc-menu-uuid-light-popup"
1717
aria-expanded="true"
1818
aria-haspopup="true"
1919
class="rc-menu-submenu-title"
20-
data-menu-id="rc-menu-uuid-test-light"
20+
data-menu-id="rc-menu-uuid-light"
2121
role="menuitem"
2222
style="padding-left: 24px;"
2323
tabindex="-1"
@@ -31,12 +31,12 @@ HTMLCollection [
3131
<ul
3232
class="rc-menu rc-menu-sub rc-menu-inline"
3333
data-menu-list="true"
34-
id="rc-menu-uuid-test-light-popup"
34+
id="rc-menu-uuid-light-popup"
3535
role="menu"
3636
>
3737
<li
3838
class="rc-menu-item"
39-
data-menu-id="rc-menu-uuid-test-bamboo"
39+
data-menu-id="rc-menu-uuid-bamboo"
4040
role="menuitem"
4141
style="padding-left: 48px;"
4242
tabindex="-1"

0 commit comments

Comments
 (0)