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

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

diff --git a/packages/designer/src/builtin-simulator/host.ts b/packages/designer/src/builtin-simulator/host.ts
index 452de1b15..dfa70464e 100644
--- a/packages/designer/src/builtin-simulator/host.ts
+++ b/packages/designer/src/builtin-simulator/host.ts
@@ -843,8 +843,12 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
     this.sensing = true;
     this.scroller.scrolling(e);
     const dropContainer = this.getDropContainer(e);
-
-    if (!dropContainer) {
+    if (
+      !dropContainer ||
+      // too dirty
+      (typeof dropContainer.container?.componentMeta?.prototype?.options?.canDropIn === 'function' &&
+        !dropContainer.container?.componentMeta?.prototype?.options?.canDropIn(e.dragObject.nodes[0]))
+    ) {
       return null;
     }
 
@@ -1113,6 +1117,10 @@ 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
@@ -1121,15 +1129,6 @@ 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) {
       /*