From 7cd063bb5d9d50ab3e28d6a8be43d67d1a83103e Mon Sep 17 00:00:00 2001
From: WangCham <651122857@qq.com>
Date: Mon, 6 Apr 2026 08:22:31 +0800
Subject: [PATCH] fix: double close button

---
 .../PluginInstallProgressDialog.tsx           | 20 ++++++++++---------
 web/src/components/ui/dialog.tsx              | 15 +++++++++-----
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/web/src/app/home/plugins/components/plugin-install-task/PluginInstallProgressDialog.tsx b/web/src/app/home/plugins/components/plugin-install-task/PluginInstallProgressDialog.tsx
index f1753265..ce1c55a9 100644
--- a/web/src/app/home/plugins/components/plugin-install-task/PluginInstallProgressDialog.tsx
+++ b/web/src/app/home/plugins/components/plugin-install-task/PluginInstallProgressDialog.tsx
@@ -405,7 +405,7 @@ export default function PluginInstallProgressDialog() {
 
   return (
     <Dialog open={open} onOpenChange={(o) => !o && handleClose()}>
-      <DialogContent className="w-[460px] max-h-[80vh] p-6 bg-white dark:bg-[#1a1a1e] overflow-y-auto">
+      <DialogContent className="w-[460px] max-h-[80vh] p-6 bg-white dark:bg-[#1a1a1e] overflow-y-auto" hideCloseButton>
         <DialogHeader>
           <DialogTitle className="flex items-center gap-3">
             <Download className="size-5" />
@@ -422,14 +422,16 @@ export default function PluginInstallProgressDialog() {
         {selectedTask && <TaskProgressContent task={selectedTask} />}
 
         <div className="flex justify-end gap-2 mt-2">
-          {selectedTask &&
-            (selectedTask.stage === InstallStage.DONE ||
-              selectedTask.stage === InstallStage.ERROR) && (
-              <Button variant="outline" size="sm" onClick={handleDismiss}>
-                {t('plugins.installProgress.dismiss')}
-              </Button>
-            )}
-          <Button variant="default" size="sm" onClick={handleClose}>
+          <Button
+            variant="default"
+            size="sm"
+            onClick={
+              selectedTask?.stage === InstallStage.DONE ||
+              selectedTask?.stage === InstallStage.ERROR
+                ? handleDismiss
+                : handleClose
+            }
+          >
             {selectedTask?.stage === InstallStage.DONE ||
             selectedTask?.stage === InstallStage.ERROR
               ? t('common.close')
diff --git a/web/src/components/ui/dialog.tsx b/web/src/components/ui/dialog.tsx
index 74391e27..8ca3c315 100644
--- a/web/src/components/ui/dialog.tsx
+++ b/web/src/components/ui/dialog.tsx
@@ -109,8 +109,11 @@ function DialogOverlay({
 function DialogContent({
   className,
   children,
+  hideCloseButton = false,
   ...props
-}: React.ComponentProps<typeof DialogPrimitive.Content>) {
+}: React.ComponentProps<typeof DialogPrimitive.Content> & {
+  hideCloseButton?: boolean;
+}) {
   return (
     <DialogPortal data-slot="dialog-portal">
       <DialogOverlay />
@@ -123,10 +126,12 @@ function DialogContent({
         {...props}
       >
         {children}
-        <DialogPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4">
-          <XIcon />
-          <span className="sr-only">Close</span>
-        </DialogPrimitive.Close>
+        {!hideCloseButton && (
+          <DialogPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4">
+            <XIcon />
+            <span className="sr-only">Close</span>
+          </DialogPrimitive.Close>
+        )}
       </DialogPrimitive.Content>
     </DialogPortal>
   );