1 files changed, 25 insertions, 24 deletions

diff --git a/src/plugins/platforms/wasm/qwasmclipboard.cpp b/src/plugins/platforms/wasm/qwasmclipboard.cpp
index c33f39d470..1aa3ffa5b3 100644
--- a/src/plugins/platforms/wasm/qwasmclipboard.cpp
+++ b/src/plugins/platforms/wasm/qwasmclipboard.cpp
@@ -27,10 +27,10 @@ static void commonCopyEvent(val event)
     // doing it this way seems to sanitize the text better that calling data() like down below
     if (_mimes->hasText()) {
         event["clipboardData"].call<void>("setData", val("text/plain"),
-                                          _mimes->text().toJsString());
+                                          _mimes->text().toEcmaString());
     }
     if (_mimes->hasHtml()) {
-        event["clipboardData"].call<void>("setData", val("text/html"), _mimes->html().toJsString());
+        event["clipboardData"].call<void>("setData", val("text/html"), _mimes->html().toEcmaString());
     }
 
     for (auto mimetype : _mimes->formats()) {
@@ -38,7 +38,7 @@ static void commonCopyEvent(val event)
             continue;
         QByteArray ba = _mimes->data(mimetype);
         if (!ba.isEmpty())
-            event["clipboardData"].call<void>("setData", mimetype.toJsString(),
+            event["clipboardData"].call<void>("setData", mimetype.toEcmaString(),
                                               val(ba.constData()));
     }
 
@@ -70,25 +70,7 @@ static void qClipboardPasteTo(val event)
 {
     event.call<void>("preventDefault"); // prevent browser from handling drop event
 
-    static std::shared_ptr<qstdweb::CancellationFlag> readDataCancellation = nullptr;
-    readDataCancellation = qstdweb::readDataTransfer(
-            event["clipboardData"],
-            [](QByteArray fileContent) {
-                QImage image;
-                image.loadFromData(fileContent, nullptr);
-                return image;
-            },
-            [event](std::unique_ptr<QMimeData> data) {
-                if (data->formats().isEmpty())
-                    return;
-
-                // Persist clipboard data so that the app can read it when handling the CTRL+V
-                QWasmIntegration::get()->clipboard()->QPlatformClipboard::setMimeData(
-                        data.release(), QClipboard::Clipboard);
-
-                QWindowSystemInterface::handleKeyEvent(0, QEvent::KeyPress, Qt::Key_V,
-                                                       Qt::ControlModifier, "V");
-            });
+    QWasmIntegration::get()->getWasmClipboard()->sendClipboardData(event);
 }
 
 EMSCRIPTEN_BINDINGS(qtClipboardModule) {
@@ -261,12 +243,12 @@ void QWasmClipboard::writeToClipboardApi()
 
         // we have a blob, now create a ClipboardItem
         emscripten::val type = emscripten::val::array();
-        type.set("type", mimetype.toJsString());
+        type.set("type", mimetype.toEcmaString());
 
         emscripten::val contentBlob = emscripten::val::global("Blob").new_(contentArray, type);
 
         emscripten::val clipboardItemObject = emscripten::val::object();
-        clipboardItemObject.set(mimetype.toJsString(), contentBlob);
+        clipboardItemObject.set(mimetype.toEcmaString(), contentBlob);
 
         val clipboardItemData = val::global("ClipboardItem").new_(clipboardItemObject);
 
@@ -300,4 +282,23 @@ void QWasmClipboard::writeToClipboard()
     val document = val::global("document");
     document.call<val>("execCommand", val("copy"));
 }
+
+void QWasmClipboard::sendClipboardData(emscripten::val event)
+{
+    qDebug() << "sendClipboardData";
+
+    dom::DataTransfer *transfer = new dom::DataTransfer(event["clipboardData"]);
+    const auto mimeCallback = std::function([transfer](QMimeData *data) {
+
+        // Persist clipboard data so that the app can read it when handling the CTRL+V
+        QWasmIntegration::get()->clipboard()->QPlatformClipboard::setMimeData(data, QClipboard::Clipboard);
+        QWindowSystemInterface::handleKeyEvent(0, QEvent::KeyPress, Qt::Key_V,
+                                               Qt::ControlModifier, "V");
+        QWindowSystemInterface::handleKeyEvent(0, QEvent::KeyRelease, Qt::Key_V,
+                                               Qt::ControlModifier, "V");
+        delete transfer;
+    });
+
+    transfer->toMimeDataWithFile(mimeCallback);
+}
 QT_END_NAMESPACE