fix: let Android to correctly recognize the NativeMobileWeb environme…

…nt when opening WebView on Android (#1503)
standardnotes · Sep 8, 2022 · 461ebc2 · 461ebc2
1 parent 1d93210
commit 461ebc2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/packages/mobile/WebFrame/MessageSender.template.js b/packages/mobile/WebFrame/MessageSender.template.js
@@ -3,6 +3,7 @@ class WebProcessMessageSender {
   constructor() {
     this.pendingMessages = []
     window.addEventListener('message', this.handleMessageFromReactNative.bind(this))
+    document.addEventListener('message', this.handleMessageFromReactNative.bind(this))
   }
 
   handleMessageFromReactNative(event) {

diff --git a/packages/mobile/src/MobileWebAppContainer.tsx b/packages/mobile/src/MobileWebAppContainer.tsx
@@ -57,6 +57,7 @@ export const MobileWebAppContainer = () => {
     constructor() {
       this.pendingMessages = []
       window.addEventListener('message', this.handleMessageFromReactNative.bind(this))
+      document.addEventListener('message', this.handleMessageFromReactNative.bind(this))
     }
 
     handleMessageFromReactNative(event) {
@@ -128,7 +129,7 @@ export const MobileWebAppContainer = () => {
       onMessage={onMessage}
       allowFileAccess={true}
       allowUniversalAccessFromFileURLs={true}
-      injectedJavaScript={injectedJS}
+      injectedJavaScriptBeforeContentLoaded={injectedJS}
     />
   )
   /* eslint-enable @typescript-eslint/no-empty-function */