mirror of
https://github.com/andwati/dokploy.git
synced 2026-11-19 02:15:17 +00:00
fix(ui): resolve dialog closing issues with Command components
- Replace custom overlay click handler with proper onInteractOutside - Add detection for Command components to prevent unwanted closures - Restore overlay visibility without click handler conflicts - Separate DialogFooter from scrollable content for proper spacing - Add border and padding to DialogFooter container for visual separation Fixes dialogs closing unexpectedly when used inside Command menus.
This commit is contained in:
@@ -62,20 +62,28 @@ const DialogContent = React.forwardRef<
|
|||||||
};
|
};
|
||||||
}, [open]);
|
}, [open]);
|
||||||
|
|
||||||
const handleOverlayClick = React.useCallback((e: React.MouseEvent) => {
|
// Handle outside interactions properly with Command components
|
||||||
if (e.target === e.currentTarget && onOpenChange) {
|
const handleInteractOutside = React.useCallback((e: Event) => {
|
||||||
|
if (onOpenChange) {
|
||||||
onOpenChange(false);
|
onOpenChange(false);
|
||||||
}
|
}
|
||||||
}, [onOpenChange]);
|
}, [onOpenChange]);
|
||||||
|
|
||||||
const hasPaddingOverride = className?.includes("p-0");
|
const hasPaddingOverride = className?.includes("p-0");
|
||||||
|
|
||||||
|
// Separate DialogFooter from other children for proper layout
|
||||||
|
const childrenArray = React.Children.toArray(children);
|
||||||
|
const dialogFooter = childrenArray.find((child) =>
|
||||||
|
React.isValidElement(child) && child.type === DialogFooter
|
||||||
|
);
|
||||||
|
const otherChildren = childrenArray.filter((child) =>
|
||||||
|
!(React.isValidElement(child) && child.type === DialogFooter)
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<DialogPortal>
|
<DialogPortal>
|
||||||
<div
|
{/* Custom overlay for modal=false - no click handler to avoid Command conflicts */}
|
||||||
className="fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0"
|
<div className="fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0" />
|
||||||
onClick={handleOverlayClick}
|
|
||||||
/>
|
|
||||||
<DialogPrimitive.Content
|
<DialogPrimitive.Content
|
||||||
ref={ref}
|
ref={ref}
|
||||||
className={cn(
|
className={cn(
|
||||||
@@ -83,12 +91,17 @@ const DialogContent = React.forwardRef<
|
|||||||
"flex flex-col max-h-[90vh]",
|
"flex flex-col max-h-[90vh]",
|
||||||
className,
|
className,
|
||||||
)}
|
)}
|
||||||
onPointerDownOutside={(e) => {
|
onInteractOutside={(e) => {
|
||||||
const originalEvent = e.detail.originalEvent;
|
const target = e.target as HTMLElement;
|
||||||
const target = originalEvent.target as HTMLElement;
|
// Don't close when clicking inside popovers, dropdowns, or command components
|
||||||
if (target.closest('[data-radix-popper-content-wrapper]')) {
|
if (target.closest('[data-radix-popper-content-wrapper]') ||
|
||||||
|
target.closest('[cmdk-root]') ||
|
||||||
|
target.closest('[data-radix-command-root]')) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
// Use our custom handler for modal=false behavior
|
||||||
|
handleInteractOutside(e);
|
||||||
}}
|
}}
|
||||||
{...props}
|
{...props}
|
||||||
>
|
>
|
||||||
@@ -99,9 +112,16 @@ const DialogContent = React.forwardRef<
|
|||||||
!hasPaddingOverride && "p-6"
|
!hasPaddingOverride && "p-6"
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
{children}
|
{otherChildren}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* DialogFooter outside scrollable area with proper spacing */}
|
||||||
|
{dialogFooter && (
|
||||||
|
<div className="p-6 pt-0 border-t border-border/50">
|
||||||
|
{dialogFooter}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
<DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
|
<DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
|
||||||
<X className="h-4 w-4" />
|
<X className="h-4 w-4" />
|
||||||
<span className="sr-only">Close</span>
|
<span className="sr-only">Close</span>
|
||||||
@@ -132,7 +152,7 @@ const DialogFooter = ({
|
|||||||
}: React.HTMLAttributes<HTMLDivElement>) => (
|
}: React.HTMLAttributes<HTMLDivElement>) => (
|
||||||
<div
|
<div
|
||||||
className={cn(
|
className={cn(
|
||||||
"flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
|
"flex flex-col-reverse mt-4 sm:flex-row sm:justify-end sm:space-x-2",
|
||||||
className,
|
className,
|
||||||
)}
|
)}
|
||||||
{...props}
|
{...props}
|
||||||
|
|||||||
Reference in New Issue
Block a user