1 files changed, 30 insertions, 35 deletions

diff --git a/src/plugins/platforms/wasm/qwasminputcontext.cpp b/src/plugins/platforms/wasm/qwasminputcontext.cpp
index 157f96fe49..ae72e7b7f9 100644
--- a/src/plugins/platforms/wasm/qwasminputcontext.cpp
+++ b/src/plugins/platforms/wasm/qwasminputcontext.cpp
@@ -30,7 +30,7 @@ static void inputCallback(emscripten::val event)
         QString str = QString::fromStdString(_incomingCharVal.as<std::string>());
         QWasmInputContext *wasmInput =
                 reinterpret_cast<QWasmInputContext*>(event["target"]["data-qinputcontext"].as<quintptr>());
-        wasmInput->inputStringChanged(str, wasmInput);
+        wasmInput->inputStringChanged(str, EMSCRIPTEN_EVENT_KEYDOWN, wasmInput);
     }
     // this clears the input string, so backspaces do not send a character
     // but stops suggestions
@@ -49,29 +49,24 @@ QWasmInputContext::QWasmInputContext()
     m_inputElement.set("style", "position:absolute;left:-1000px;top:-1000px"); // offscreen
     m_inputElement.set("contenteditable","true");
 
-    if (platform() == Platform::Android || platform() == Platform::Windows) {
+    if (platform() == Platform::MacOS || platform() == Platform::iOS) {
+        auto callback = [=](emscripten::val) {
+            m_inputElement["parentElement"].call<void>("removeChild", m_inputElement);
+            inputPanelIsOpen = false;
+        };
+        m_blurEventHandler.reset(new EventCallback(m_inputElement, "blur", callback));
+
+    } else {
+
         const std::string inputType = platform() == Platform::Windows ? "textInput" : "input";
 
         document.call<void>("addEventListener", inputType,
-                                  emscripten::val::module_property("qtInputContextCallback"),
-                                  emscripten::val(false));
+                            emscripten::val::module_property("qtInputContextCallback"),
+                            emscripten::val(false));
         m_inputElement.set("data-qinputcontext",
                            emscripten::val(quintptr(reinterpret_cast<void *>(this))));
         emscripten::val body = document["body"];
         body.call<void>("appendChild", m_inputElement);
-
-        // Enter is sent through target window, let's just handle this here
-        emscripten_set_keydown_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, (void *)this, 1,
-                                        &androidKeyboardCallback);
-
-    }
-
-    if (platform() == Platform::MacOS || platform() == Platform::iPhone) {
-        auto callback = [=](emscripten::val) {
-            m_inputElement["parentElement"].call<void>("removeChild", m_inputElement);
-            inputPanelIsOpen = false;
-        };
-        m_blurEventHandler.reset(new EventCallback(m_inputElement, "blur", callback));
     }
 
     QObject::connect(qGuiApp, &QGuiApplication::focusWindowChanged, this,
@@ -118,7 +113,7 @@ void QWasmInputContext::showInputPanel()
     // screen element.
 
     if (platform() == Platform::MacOS // keep for compatibility
-     || platform() == Platform::iPhone
+     || platform() == Platform::iOS
      || platform() == Platform::Windows) {
         emscripten::val inputWrapper = inputHandlerElementForFocusedWindow();
         if (inputWrapper.isUndefined())
@@ -138,29 +133,29 @@ void QWasmInputContext::hideInputPanel()
     inputPanelIsOpen = false;
 }
 
-void QWasmInputContext::inputStringChanged(QString &inputString, QWasmInputContext *context)
+void QWasmInputContext::inputStringChanged(QString &inputString, int eventType, QWasmInputContext *context)
 {
     Q_UNUSED(context)
     QKeySequence keys = QKeySequence::fromString(inputString);
+    Qt::Key thisKey = keys[0].key();
+
     // synthesize this keyevent as android is not normal
+    if (inputString.size() > 2 && (thisKey < Qt::Key_F35
+                                   || thisKey > Qt::Key_Back)) {
+        inputString.clear();
+    }
+    if (inputString == QStringLiteral("Escape")) {
+        thisKey = Qt::Key_Escape;
+        inputString.clear();
+    } else if (thisKey == Qt::Key(0)) {
+        thisKey = Qt::Key_Return;
+    }
+
     QWindowSystemInterface::handleKeyEvent(
-                0, QEvent::KeyPress,keys[0].key(), keys[0].keyboardModifiers(), inputString);
+        0, eventType == EMSCRIPTEN_EVENT_KEYDOWN ? QEvent::KeyPress : QEvent::KeyRelease,
+        thisKey, keys[0].keyboardModifiers(),
+        eventType == EMSCRIPTEN_EVENT_KEYDOWN ? inputString : QStringLiteral(""));
 }
 
-int QWasmInputContext::androidKeyboardCallback(int eventType,
-                                               const EmscriptenKeyboardEvent *keyEvent,
-                                               void *userData)
-{
-    // we get Enter, Backspace and function keys via emscripten on target window
-    Q_UNUSED(eventType)
-    QString strKey(keyEvent->key);
-    if (strKey == "Unidentified" || strKey == "Process")
-        return false;
-
-    QWasmInputContext *wasmInput = reinterpret_cast<QWasmInputContext*>(userData);
-    wasmInput->inputStringChanged(strKey, wasmInput);
-
-    return true;
-}
 
 QT_END_NAMESPACE