From 6e177628636611b5a1b1b508dbad5abba2356e95 Mon Sep 17 00:00:00 2001
From: "mario.gk" <mario.gk@alibaba-inc.com>
Date: Thu, 23 Jul 2020 10:57:13 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20canDropIn=20=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E6=8D=A2=E5=88=B0=20handleAccept?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../designer/src/builtin-simulator/host.ts    | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/designer/src/builtin-simulator/host.ts b/packages/designer/src/builtin-simulator/host.ts
index 8b1091489..a3aa2a0ae 100644
--- a/packages/designer/src/builtin-simulator/host.ts
+++ b/packages/designer/src/builtin-simulator/host.ts
@@ -842,12 +842,8 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
     this.sensing = true;
     this.scroller.scrolling(e);
     const dropContainer = this.getDropContainer(e);
-    if (
-      !dropContainer ||
-      // too dirty
-      (typeof dropContainer.container?.componentMeta?.prototype?.options?.canDropIn === 'function' &&
-        !dropContainer.container?.componentMeta?.prototype?.options?.canDropIn(e.dragObject.nodes[0]))
-    ) {
+
+    if (!dropContainer) {
       return null;
     }
 
@@ -1116,10 +1112,6 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
    */
   handleAccept({ container, instance }: DropContainer, e: LocateEvent) {
     const { dragObject } = e;
-    if (isRootNode(container)) {
-      return this.document.checkDropTarget(container, dragObject as any);
-    }
-
     const meta = (container as Node).componentMeta;
 
     // FIXME: get containerInstance for accept logic use
@@ -1128,6 +1120,15 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
       return false;
     }
 
+    if (typeof meta.prototype?.options?.canDropIn === 'function' &&
+    !meta.prototype?.options?.canDropIn(dragObject.nodes[0])) {
+      return false;
+    }
+
+    if (isRootNode(container)) {
+      return this.document.checkDropTarget(container, dragObject as any);
+    }
+
     // first use accept
     if (acceptable) {
       /*