Merge pull request #266 from hotwired/update_layout_params_based_on_parent

Set WebView's height to wrap content if its parent is ScrollingView

Author: mbarta

turbo/src/main/kotlin/dev/hotwire/turbo/views/TurboView.kt

@@ -9,9 +9,7 @@ import android.view.ViewGroup
 import android.webkit.WebView
 import android.widget.FrameLayout
 import android.widget.ImageView
-import androidx.core.view.contains
-import androidx.core.view.drawToBitmap
-import androidx.core.view.isVisible
+import androidx.core.view.*
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import dev.hotwire.turbo.R
 
@@ -47,6 +45,13 @@ class TurboView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
             // doesn't have a new parent, since we have no control
             // over the message queue.
             if (isAttachedToWindow && webView.parent == null) {
+                webView.updateLayoutParams {
+                    height = when (webViewContainer) {
+                        is ScrollingView -> LayoutParams.WRAP_CONTENT
+                        else -> LayoutParams.MATCH_PARENT
+                    }
+                }
+
                 webViewContainer.addView(webView)
                 onAttachedToNewDestination(true)
             }

turbo/src/main/kotlin/dev/hotwire/turbo/views/TurboWebView.kt

@@ -29,7 +29,7 @@ open class TurboWebView @JvmOverloads constructor(context: Context, attrs: Attri
         settings.javaScriptEnabled = true
         settings.domStorageEnabled = true
         settings.setSupportMultipleWindows(true)
-        layoutParams = FrameLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT)
+        layoutParams = FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT)
     }
 
     /**

turbo/src/test/kotlin/dev/hotwire/turbo/views/TurboViewTest.kt

@@ -5,7 +5,9 @@ import android.os.Build
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.webkit.WebView
+import android.widget.FrameLayout.LayoutParams
 import androidx.test.core.app.ApplicationProvider
+import com.nhaarman.mockito_kotlin.whenever
 import dev.hotwire.turbo.R
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
@@ -30,6 +32,10 @@ class TurboViewTest {
         context = ApplicationProvider.getApplicationContext()
         view = LayoutInflater.from(context).inflate(R.layout.turbo_view, null) as ViewGroup
         turboView = view.findViewById(R.id.turbo_view)
+
+        whenever(webView.layoutParams).thenReturn(
+            LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
+        )
     }
 
     @Test fun refreshLayoutIsFirstChild() {