Merge pull request #145 from hotwired/target-blank

Allow all target="_blank" links to propose visits
hotwired · Feb 8, 2021 · 6c910d7 · 6c910d7
2 parents ee96d4d + 95ee001
commit 6c910d7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/turbo/src/main/kotlin/dev/hotwire/turbo/views/TurboWebChromeClient.kt b/turbo/src/main/kotlin/dev/hotwire/turbo/views/TurboWebChromeClient.kt
@@ -1,10 +1,13 @@
 package dev.hotwire.turbo.views
 
 import android.net.Uri
+import android.os.Message
 import android.webkit.ValueCallback
 import android.webkit.WebChromeClient
 import android.webkit.WebView
 import dev.hotwire.turbo.session.TurboSession
+import dev.hotwire.turbo.util.toJson
+import dev.hotwire.turbo.visit.TurboVisitOptions
 
 open class TurboWebChromeClient(val session: TurboSession) : WebChromeClient() {
     override fun onShowFileChooser(
@@ -17,4 +20,18 @@ open class TurboWebChromeClient(val session: TurboSession) : WebChromeClient() {
             params = fileChooserParams
         )
     }
+
+    override fun onCreateWindow(webView: WebView, isDialog: Boolean, isUserGesture: Boolean, resultMsg: Message?): Boolean {
+        val message = webView.handler.obtainMessage()
+        webView.requestFocusNodeHref(message)
+
+        message.data.getString("url")?.let {
+            session.visitProposedToLocation(
+                location = it,
+                optionsJson = TurboVisitOptions().toJson()
+            )
+        }
+
+        return false
+    }
 }
diff --git a/turbo/src/main/kotlin/dev/hotwire/turbo/views/TurboWebView.kt b/turbo/src/main/kotlin/dev/hotwire/turbo/views/TurboWebView.kt
@@ -27,6 +27,7 @@ open class TurboWebView @JvmOverloads constructor(context: Context, attrs: Attri
     init {
         settings.javaScriptEnabled = true
         settings.domStorageEnabled = true
+        settings.setSupportMultipleWindows(true)
         layoutParams = FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT)
     }