Skip to content

Commit

Permalink
fix: nested drawer onOpenChange issue (#516)
Browse files Browse the repository at this point in the history
* fix: nested drawer onOpenChange issue

* Removed useEffect
  • Loading branch information
chrism authored Dec 13, 2024
1 parent 17a60c5 commit 6ba4c44
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,9 @@ export function Root({

set(drawerRef.current, {
transition: `transform ${TRANSITIONS.DURATION}s cubic-bezier(${TRANSITIONS.EASE.join(',')})`,
transform: isVertical(direction) ? `scale(${scale}) translate3d(0, ${initialTranslate}px, 0)` : `scale(${scale}) translate3d(${initialTranslate}, 0, 0)`,
transform: isVertical(direction)
? `scale(${scale}) translate3d(0, ${initialTranslate}px, 0)`
: `scale(${scale}) translate3d(${initialTranslate}px, 0, 0)`,
});

if (!o && drawerRef.current) {
Expand Down Expand Up @@ -1093,7 +1095,7 @@ export const Handle = React.forwardRef<HTMLDivElement, HandleProps>(function (

Handle.displayName = 'Drawer.Handle';

export function NestedRoot({ onDrag, onOpenChange, ...rest }: DialogProps) {
export function NestedRoot({ onDrag, onOpenChange, open: nestedIsOpen, ...rest }: DialogProps) {
const { onNestedDrag, onNestedOpenChange, onNestedRelease } = useDrawerContext();

if (!onNestedDrag) {
Expand All @@ -1103,6 +1105,7 @@ export function NestedRoot({ onDrag, onOpenChange, ...rest }: DialogProps) {
return (
<Root
nested
open={nestedIsOpen}
onClose={() => {
onNestedOpenChange(false);
}}
Expand All @@ -1114,6 +1117,7 @@ export function NestedRoot({ onDrag, onOpenChange, ...rest }: DialogProps) {
if (o) {
onNestedOpenChange(o);
}
onOpenChange?.(o);
}}
onRelease={onNestedRelease}
{...rest}
Expand Down

0 comments on commit 6ba4c44

Please sign in to comment.