From cdc2eb8feb75dce9b806aff73992897fe20f27e6 Mon Sep 17 00:00:00 2001
From: MrKBear <mrkbear@qq.com>
Date: Mon, 28 Mar 2022 17:55:02 +0800
Subject: [PATCH] Optim popup focus

---
 source/Component/Popup/Popup.tsx | 8 +++++---
 source/Context/Popups.ts         | 8 ++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/source/Component/Popup/Popup.tsx b/source/Component/Popup/Popup.tsx
index c029472..6e8e129 100644
--- a/source/Component/Popup/Popup.tsx
+++ b/source/Component/Popup/Popup.tsx
@@ -78,9 +78,6 @@ class Popup extends Component<IPopupProps & IMixinStatusProps & IMixinSettingPro
                     popup.isOnMouseDown = true;
                     popup.lastMouseLeft = e.clientX;
                     popup.lastMouseTop = e.clientY;
-                    if (this.props.status) {
-                        this.props.status.popup.topping(popup);
-                    }
                 }}
             >
                 {popup.onRenderHeader()}
@@ -257,6 +254,11 @@ class Popup extends Component<IPopupProps & IMixinStatusProps & IMixinSettingPro
                 className: "popup-layer" + (hasAnimate ? " show-scale" : ""),
                 backgroundLevel: BackgroundLevel.Level4,
             }, this.props.setting).join(" ")}
+            onClick={() => {
+                if (this.props.status) {
+                    this.props.status.popup.topping(popup);
+                }
+            }}
         >
             {this.renderDragLine(ResizeDragDirection.top, popup)}
             <div className="popup-layer-container">
diff --git a/source/Context/Popups.ts b/source/Context/Popups.ts
index 561832c..e5e4cd6 100644
--- a/source/Context/Popups.ts
+++ b/source/Context/Popups.ts
@@ -163,8 +163,12 @@ class PopupController extends Emitter<IPopupControllerEvent> {
             newPopup = new (popup ?? Popup)(props);
         }
         newPopup.init(this, `P-${this.idIndex ++}`);
-        this.popups.push(newPopup);
-        this.sortPopup();
+
+        // 延迟渲染防止焦点冲突
+        setTimeout(() => {
+            this.popups.push(newPopup);
+            this.sortPopup();
+        });
         return newPopup;
     }