Raise and lower keyboard for HTML fields in Browser window

interface/resources/qml/Browser.qml

@@ -1,5 +1,6 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.2
+import QtWebChannel 1.0
 import QtWebEngine 1.2
 
 import "controls-uit"
@@ -19,6 +20,9 @@ ScrollingWindow {
     property variant permissionsBar: {'securityOrigin':'none','feature':'none'}
     property alias url: webview.url
     property alias webView: webview
+
+    property alias eventBridge: eventBridgeWrapper.eventBridge
+
     x: 100
     y: 100
 
@@ -197,32 +201,60 @@ ScrollingWindow {
             }
         }
 
-        WebEngineView {
+        WebView {
             id: webview
             url: "https://highfidelity.com"
+
+            property alias eventBridgeWrapper: eventBridgeWrapper
+
+            QtObject {
+                id: eventBridgeWrapper
+                WebChannel.id: "eventBridgeWrapper"
+                property var eventBridge;
+            }
+
+            webChannel.registeredObjects: [eventBridgeWrapper]
+
+            // Create a global EventBridge object for raiseAndLowerKeyboard.
+            WebEngineScript {
+                id: createGlobalEventBridge
+                sourceCode: eventBridgeJavaScriptToInject
+                injectionPoint: WebEngineScript.DocumentCreation
+                worldId: WebEngineScript.MainWorld
+            }
+
+            // Detect when may want to raise and lower keyboard.
+            WebEngineScript {
+                id: raiseAndLowerKeyboard
+                injectionPoint: WebEngineScript.Deferred
+                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
+                worldId: WebEngineScript.MainWorld
+            }
+
+            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard ]
+
             anchors.top: buttons.bottom
             anchors.topMargin: 8
             anchors.bottom: parent.bottom
             anchors.left: parent.left
             anchors.right: parent.right
+
             onFeaturePermissionRequested: {
                 permissionsBar.securityOrigin = securityOrigin;
                 permissionsBar.feature = feature;
                 root.showPermissionsBar();
             }
+
             onLoadingChanged: {
                 if (loadRequest.status === WebEngineView.LoadSucceededStatus) {
                     addressBar.text = loadRequest.url
                 }
             }
+
             onIconChanged: {
                 console.log("New icon: " + icon)
             }
-            onNewViewRequested: {
+
-                var component = Qt.createComponent("Browser.qml");
-                var newWindow = component.createObject(desktop);
-                request.openIn(newWindow.webView)
-            }
             onWindowCloseRequested: {
                 root.destroy();
             }
@@ -230,8 +262,6 @@ ScrollingWindow {
             Component.onCompleted: {
                 desktop.initWebviewProfileHandlers(webview.profile)
             }
-
-            profile: desktop.browserProfile
         }
 
     } // item

interface/resources/qml/controls-uit/BaseWebView.qml

@@ -9,7 +9,7 @@
 //
 
 import QtQuick 2.5
-import QtWebEngine 1.1
+import QtWebEngine 1.2
 
 WebEngineView {
     id: root

libraries/gl/src/gl/OffscreenQmlSurface.cpp

@@ -565,6 +565,19 @@ QObject* OffscreenQmlSurface::finishQmlLoad(std::function<void(QQmlContext*, QOb
         return nullptr;
     }
 
+    // FIXME: Refactor with similar code in RenderableWebEntityItem
+    QString javaScriptToInject;
+    QFile webChannelFile(":qtwebchannel/qwebchannel.js");
+    QFile createGlobalEventBridgeFile(PathUtils::resourcesPath() + "/html/createGlobalEventBridge.js");
+    if (webChannelFile.open(QFile::ReadOnly | QFile::Text) &&
+        createGlobalEventBridgeFile.open(QFile::ReadOnly | QFile::Text)) {
+        QString webChannelStr = QTextStream(&webChannelFile).readAll();
+        QString createGlobalEventBridgeStr = QTextStream(&createGlobalEventBridgeFile).readAll();
+        javaScriptToInject = webChannelStr + createGlobalEventBridgeStr;
+    } else {
+        qWarning() << "Unable to find qwebchannel.js or createGlobalEventBridge.js";
+    }
+
     QQmlContext* newContext = new QQmlContext(_qmlEngine, qApp);
     QObject* newObject = _qmlComponent->beginCreate(newContext);
     if (_qmlComponent->isError()) {
@@ -577,6 +590,9 @@ QObject* OffscreenQmlSurface::finishQmlLoad(std::function<void(QQmlContext*, QOb
         return nullptr;
     }
 
+    newObject->setProperty("eventBridge", QVariant::fromValue(this));
+    newContext->setContextProperty("eventBridgeJavaScriptToInject", QVariant(javaScriptToInject));
+
     f(newContext, newObject);
     _qmlComponent->completeCreate();
 
@@ -835,6 +851,9 @@ void OffscreenQmlSurface::onFocusObjectChanged(QObject* object) {
         disconnect(_currentFocusItem, &QObject::destroyed, this, 0);
         setKeyboardRaised(_currentFocusItem, false);
     }
+
+    // Handle QML text fields' focus and unfocus - testing READ_ONLY_PROPERTY prevents action for HTML files.
+    // HTML text fields are handled via emitWebEvent().
     const char* READ_ONLY_PROPERTY = "readOnly";
     setKeyboardRaised(item, item->hasActiveFocus() && item->property(READ_ONLY_PROPERTY) == false);
     _currentFocusItem = item;
@@ -897,12 +916,6 @@ void OffscreenQmlSurface::synthesizeKeyPress(QString key) {
 }
 
 void OffscreenQmlSurface::setKeyboardRaised(QObject* object, bool raised) {
-
-    // raise the keyboard only while in HMD mode and it's being requested.
-    // XXX
-    // bool value = AbstractViewStateInterface::instance()->isHMDMode() && raised;
-    // getRootItem()->setProperty("keyboardRaised", QVariant(value));
-
     if (!object) {
         return;
     }
@@ -931,16 +944,13 @@ void OffscreenQmlSurface::emitWebEvent(const QVariant& message) {
     } else {
         // special case to handle raising and lowering the virtual keyboard
         if (message.type() == QVariant::String && message.toString() == "_RAISE_KEYBOARD") {
-            setKeyboardRaised(getRootItem(), true);
+            setKeyboardRaised(_currentFocusItem, true);
         } else if (message.type() == QVariant::String && message.toString() == "_LOWER_KEYBOARD") {
-            setKeyboardRaised(getRootItem(), false);
+            setKeyboardRaised(_currentFocusItem, false);
         } else {
             emit webEventReceived(message);
         }
     }
 }
 
-
-
-
 #include "OffscreenQmlSurface.moc"