5 files changed, 51 insertions, 15 deletions

diff --git a/src/plugins/platforms/wasm/qwasmdrag.cpp b/src/plugins/platforms/wasm/qwasmdrag.cpp
index 1eed2acde53..6447d1e399f 100644
--- a/src/plugins/platforms/wasm/qwasmdrag.cpp
+++ b/src/plugins/platforms/wasm/qwasmdrag.cpp
@@ -17,6 +17,7 @@
 #include <QFile>
 
 #include <private/qshapedpixmapdndwindow_p.h>
+#include <private/qdnd_p.h>
 
 #include <functional>
 #include <string>
@@ -93,15 +94,13 @@ Qt::DropAction QWasmDrag::drag(QDrag *drag)
         return Qt::IgnoreAction;
 
     Qt::DropAction dragResult = Qt::IgnoreAction;
-    if (qstdweb::haveJspi()) {
+    if (qstdweb::haveAsyncify()) {
         m_dragState = std::make_unique<DragState>(drag, window, [this]() { QSimpleDrag::cancelDrag();  });
-        QSimpleDrag::drag(drag);
-        dragResult = m_dragState->dropAction;
+        dragResult = QSimpleDrag::drag(drag);
         m_dragState.reset();
-    }
-
-    if (dragResult == Qt::IgnoreAction)
+    } else {
         dragResult = QBasicDrag::drag(drag);
+    }
 
     return dragResult;
 }
@@ -116,6 +115,7 @@ void QWasmDrag::onNativeDragStarted(DragEvent *event)
         event->cancelDragStart();
         return;
     }
+    setExecutedDropAction(event->dropAction);
 
     // We have our own window
     if (shapedPixmapWindow())
@@ -144,8 +144,10 @@ void QWasmDrag::onNativeDragOver(DragEvent *event)
             event->mouseButton, event->modifiers);
     event->acceptDragOver();
     if (dragResponse.isAccepted()) {
+        setExecutedDropAction(dragResponse.acceptedAction());
         event->dataTransfer.setDropAction(dragResponse.acceptedAction());
     } else {
+        setExecutedDropAction(Qt::DropAction::IgnoreAction);
         event->dataTransfer.setDropAction(Qt::DropAction::IgnoreAction);
     }
 }
@@ -173,19 +175,22 @@ void QWasmDrag::onNativeDrop(DragEvent *event)
     // files, but the browser expects that accepted state is set before any
     // async calls.
     event->acceptDrop();
+    setExecutedDropAction(event->dropAction);
+    std::shared_ptr<DragState> dragState = m_dragState;
 
-    const auto dropCallback = [&m_dragState = m_dragState, wasmWindow, targetWindowPos,
+    const auto dropCallback = [dragState, wasmWindow, targetWindowPos,
         actions, mouseButton, modifiers](QMimeData *mimeData) {
-
-        auto dropResponse = std::make_shared<QPlatformDropQtResponse>(true, Qt::DropAction::CopyAction);
-        *dropResponse = QWindowSystemInterface::handleDrop(wasmWindow->window(), mimeData,
+        if (mimeData) {
+            auto dropResponse = std::make_shared<QPlatformDropQtResponse>(true, Qt::DropAction::CopyAction);
+            *dropResponse = QWindowSystemInterface::handleDrop(wasmWindow->window(), mimeData,
                                                            targetWindowPos, actions,
                                                            mouseButton, modifiers);
 
-        if (dropResponse->isAccepted())
-            m_dragState->dropAction = dropResponse->acceptedAction();
+            if (dragState && dropResponse->isAccepted())
+                dragState->dropAction = dropResponse->acceptedAction();
 
-        delete mimeData;
+            delete mimeData;
+        }
     };
 
      event->dataTransfer.toMimeDataWithFile(dropCallback);
@@ -195,13 +200,35 @@ void QWasmDrag::onNativeDragFinished(DragEvent *event)
 {
     event->webEvent.call<void>("preventDefault");
     m_dragState->dropAction = event->dropAction;
+    setExecutedDropAction(event->dropAction);
     m_dragState->quitEventLoopClosure();
 }
 
+void QWasmDrag::onNativeDragEnter(DragEvent *event)
+{
+    event->webEvent.call<void>("preventDefault");
+
+    // Already dragging
+    if (QDragManager::self() && QDragManager::self()->object())
+        return;
+
+    // Event coming from external browser, start a drag
+    if (m_dragState)
+        m_dragState->dropAction = event->dropAction;
+
+    setExecutedDropAction(event->dropAction);
+
+    QDrag *drag = new QDrag(this);
+    drag->setMimeData(new QMimeData());
+    drag->exec(Qt::CopyAction | Qt::MoveAction, Qt::CopyAction);
+}
+
 void QWasmDrag::onNativeDragLeave(DragEvent *event)
 {
     event->webEvent.call<void>("preventDefault");
-    m_dragState->dropAction = event->dropAction;
+    if (m_dragState)
+        m_dragState->dropAction = event->dropAction;
+    setExecutedDropAction(event->dropAction);
     event->dataTransfer.setDropAction(Qt::DropAction::IgnoreAction);
 }
 
diff --git a/src/plugins/platforms/wasm/qwasmdrag.h b/src/plugins/platforms/wasm/qwasmdrag.h
index e821470c913..5bb8ec66a3c 100644
--- a/src/plugins/platforms/wasm/qwasmdrag.h
+++ b/src/plugins/platforms/wasm/qwasmdrag.h
@@ -32,6 +32,7 @@ public:
     void onNativeDrop(DragEvent *event);
     void onNativeDragStarted(DragEvent *event);
     void onNativeDragFinished(DragEvent *event);
+    void onNativeDragEnter(DragEvent *event);
     void onNativeDragLeave(DragEvent *event);
 
     // QPlatformDrag:
@@ -40,7 +41,7 @@ public:
 private:
     struct DragState;
 
-    std::unique_ptr<DragState> m_dragState;
+    std::shared_ptr<DragState> m_dragState;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/wasm/qwasmevent.h b/src/plugins/platforms/wasm/qwasmevent.h
index ef1b6129e3c..07faee3fe4b 100644
--- a/src/plugins/platforms/wasm/qwasmevent.h
+++ b/src/plugins/platforms/wasm/qwasmevent.h
@@ -23,6 +23,7 @@ enum class EventType {
     DragEnd,
     DragOver,
     DragStart,
+    DragEnter,
     DragLeave,
     Drop,
     KeyDown,
diff --git a/src/plugins/platforms/wasm/qwasmwindow.cpp b/src/plugins/platforms/wasm/qwasmwindow.cpp
index 264471794bd..6e8bd46ca58 100644
--- a/src/plugins/platforms/wasm/qwasmwindow.cpp
+++ b/src/plugins/platforms/wasm/qwasmwindow.cpp
@@ -203,6 +203,12 @@ void QWasmWindow::registerEventHandlers()
             QWasmDrag::instance()->onNativeDragFinished(&dragEvent);
         }
     );
+    m_dragEnterCallback = QWasmEventHandler(m_window, "dragenter",
+        [this](emscripten::val event) {
+            DragEvent dragEvent(EventType::DragEnter, event, window());
+            QWasmDrag::instance()->onNativeDragEnter(&dragEvent);
+        }
+    );
     m_dragLeaveCallback = QWasmEventHandler(m_window, "dragleave",
         [this](emscripten::val event) {
             DragEvent dragEvent(EventType::DragLeave, event, window());
diff --git a/src/plugins/platforms/wasm/qwasmwindow.h b/src/plugins/platforms/wasm/qwasmwindow.h
index 87f4d6644c7..ca5c9132ca0 100644
--- a/src/plugins/platforms/wasm/qwasmwindow.h
+++ b/src/plugins/platforms/wasm/qwasmwindow.h
@@ -195,6 +195,7 @@ private:
     QWasmEventHandler m_dragStartCallback;
     QWasmEventHandler m_dragEndCallback;
     QWasmEventHandler m_dropCallback;
+    QWasmEventHandler m_dragEnterCallback;
     QWasmEventHandler m_dragLeaveCallback;
 
     QWasmEventHandler m_wheelEventCallback;