Skip to content

fix(Drawer): unable to close with esc on first open #4115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RylanBot wants to merge 1 commit into
base: develop
Choose a base branch
from
+5 −10
Open

fix(Drawer): unable to close with esc on first open #4115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/components/dialog/Dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ const Dialog = forwardRef<DialogInstance, DialogProps>((originalProps, ref) => {

const { focusTopDialog } = useDialogEsc(visible, wrapRef);
useLockStyle({ preventScrollThrough, visible, mode, showInAttachedElement });
useDialogEsc(visible, wrapRef);
useDialogPosition(visible, dialogCardRef);
const { isInputInteracting } = useDialogDrag({
dialogCardRef,
Expand Down
14 changes: 5 additions & 9 deletions packages/components/drawer/Drawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { forwardRef, isValidElement, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
import React, { forwardRef, isValidElement, useImperativeHandle, useMemo, useRef, useState } from 'react';
import { CSSTransition } from 'react-transition-group';
import { CloseIcon as TdCloseIcon } from 'tdesign-icons-react';
import classnames from 'classnames';
Expand Down Expand Up @@ -103,13 +103,6 @@ const Drawer = forwardRef<DrawerInstance, DrawerProps>((originalProps, ref) => {
},
}));

useEffect(() => {
if (visible) {
// 聚焦到 Drawer 最外层元素即 containerRef.current，KeyDown 事件才有效。
containerRef.current?.focus?.();
}
}, [visible]);

useDeepEffect(() => {
// 非插件式调用 更新props
if (isPlugin) return;
Expand Down Expand Up @@ -220,7 +213,10 @@ const Drawer = forwardRef<DrawerInstance, DrawerProps>((originalProps, ref) => {
unmountOnExit={destroyOnClose}
timeout={{ appear: 10, enter: 10, exit: 300 }}
onEnter={() => onBeforeOpen?.()}
onEntered={() => setAnimationStart(true)}
onEntered={() => {
setAnimationStart(true);
containerRef.current?.focus?.();
}}
onExit={() => onBeforeClose?.()}
onExited={() => setAnimationStart(false)}
>
Expand Down
Loading