Skip to content

fix(motion): attach motionRef to correct DOM element for CSSMotion lifecycle #591

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
JeremiahGeronimo wants to merge 2 commits into
base: master
Choose a base branch
from
+10 −2
Open

fix(motion): attach motionRef to correct DOM element for CSSMotion lifecycle #591

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9026e79
fix(motion): attach motionRef to correct DOM element for CSSMotion li…
JeremiahGeronimo Mar 29, 2026
dfa8d29
fix(motion): attach motionRef to correct DOM element for CSSMotion li…
JeremiahGeronimo Mar 30, 2026
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
12 changes: 10 additions & 2 deletions src/DrawerPopup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { clsx } from 'clsx';
import type { CSSMotionProps } from '@rc-component/motion';
import CSSMotion from '@rc-component/motion';
import pickAttrs from '@rc-component/util/lib/pickAttrs';
import { fillRef } from '@rc-component/util/lib/ref';
import * as React from 'react';
import type { DrawerContextProps } from './context';
import DrawerContext from './context';
Expand Down Expand Up @@ -303,6 +304,14 @@ const DrawerPopup: React.ForwardRefRenderFunction<
onResizeEnd: resizeConfig.onResizeEnd,
});

const mergeRefs = React.useCallback(
(motionRef: React.Ref<HTMLDivElement>) => (node: HTMLDivElement) => {
wrapperRef.current = node;
fillRef(motionRef, node);
},
[],
);

// =========================== Events ===========================
const eventHandlers = {
onMouseEnter,
Expand Down Expand Up @@ -332,7 +341,6 @@ const DrawerPopup: React.ForwardRefRenderFunction<
const content = (
<DrawerPanel
id={id}
containerRef={motionRef}
prefixCls={prefixCls}
className={clsx(className, drawerClassNames?.section)}
style={{ ...style, ...styles?.section }}
Expand All @@ -344,7 +352,7 @@ const DrawerPopup: React.ForwardRefRenderFunction<
);
return (
<div
ref={wrapperRef}
ref={mergeRefs(motionRef)}
className={clsx(
`${prefixCls}-content-wrapper`,
isDragging && `${prefixCls}-content-wrapper-dragging`,
Expand Down