@@ -3,7 +3,7 @@ import { useContext, useEffect, useRef, useState } from 'react';
33import BarsOutlined from '@ant-design/icons/BarsOutlined' ;
44import LeftOutlined from '@ant-design/icons/LeftOutlined' ;
55import RightOutlined from '@ant-design/icons/RightOutlined' ;
6- import { omit , useControlledState } from '@rc-component/util' ;
6+ import { omit , useControlledState , useId } from '@rc-component/util' ;
77import { clsx } from 'clsx' ;
88
99import { useMergeSemantic } from '../_util/hooks/useMergeSemantic' ;
@@ -73,14 +73,6 @@ export interface SiderState {
7373 below : boolean ;
7474}
7575
76- const generateId = ( ( ) => {
77- let i = 0 ;
78- return ( prefix = '' ) => {
79- i += 1 ;
80- return `${ prefix } ${ i } ` ;
81- } ;
82- } ) ( ) ;
83-
8476const Sider = React . forwardRef < HTMLDivElement , SiderProps > ( ( props , ref ) => {
8577 const {
8678 prefixCls : customizePrefixCls ,
@@ -103,6 +95,7 @@ const Sider = React.forwardRef<HTMLDivElement, SiderProps>((props, ref) => {
10395 ...otherProps
10496 } = props ;
10597 const { siderHook } = useContext ( LayoutContext ) ;
98+ const uniqueId = useId ( ) ;
10699
107100 const [ collapsed , setCollapsed ] = useControlledState ( defaultCollapsed , props . collapsed ) ;
108101 const [ below , setBelow ] = useState ( false ) ;
@@ -169,10 +162,11 @@ const Sider = React.forwardRef<HTMLDivElement, SiderProps>((props, ref) => {
169162 } , [ breakpoint ] ) ; // in order to accept dynamic 'breakpoint' property, we need to add 'breakpoint' into dependency array.
170163
171164 useEffect ( ( ) => {
172- const uniqueId = generateId ( 'ant-sider-' ) ;
173165 siderHook . addSider ( uniqueId ) ;
174- return ( ) => siderHook . removeSider ( uniqueId ) ;
175- } , [ ] ) ;
166+ return ( ) => {
167+ siderHook . removeSider ( uniqueId ) ;
168+ } ;
169+ } , [ uniqueId , siderHook ] ) ;
176170
177171 const toggle = ( ) => {
178172 handleSetCollapsed ( ! collapsed , 'clickTrigger' ) ;
0 commit comments