From da3bd4784de0816e39226c631a993828edeb56a3 Mon Sep 17 00:00:00 2001
From: Keith Abdulla <kabdulla@squareup.com>
Date: Thu, 18 Jan 2024 10:38:06 +1100
Subject: [PATCH] fix what bounds gets reported in layered dialog sessions

---
 .../workflow1/ui/container/LayeredDialogSessions.kt | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/LayeredDialogSessions.kt b/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/LayeredDialogSessions.kt
index 8f0175062..26eb4c6af 100644
--- a/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/LayeredDialogSessions.kt
+++ b/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/LayeredDialogSessions.kt
@@ -9,6 +9,8 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.View.OnAttachStateChangeListener
 import android.view.ViewTreeObserver.OnGlobalLayoutListener
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat.Type
 import androidx.core.view.doOnAttach
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
@@ -380,7 +382,16 @@ public class LayeredDialogSessions private constructor(
         val attachStateChangeListener = object : OnAttachStateChangeListener {
           val boundsListener = OnGlobalLayoutListener {
             view.getScreenRect(boundsRect)
-            if (boundsRect != boundsStateFlow.value) boundsStateFlow.value = Rect(boundsRect)
+            val type = Type.systemBars()
+            val insets = ViewCompat.getRootWindowInsets(view)?.getInsets(type)?.top
+            // If we managed to get insets, we only accept the bounds if it is below the insets.
+            // There are times that the reported bounds are above the insets or is negative ie) when
+            // the view is animating, and we don't want to accept those bounds.
+            if (boundsRect != boundsStateFlow.value &&
+              (insets == null || boundsRect.top >= insets)
+            ) {
+              boundsStateFlow.value = Rect(boundsRect)
+            }
           }
 
           override fun onViewAttachedToWindow(v: View) {