From fe8b9c9f40abc383ce7a4f222e16e29e4095319c Mon Sep 17 00:00:00 2001
From: mnbvfe <lyuf@google.com>
Date: Wed, 22 Dec 2021 22:30:00 -0800
Subject: [PATCH] Update FlexboxLayout.java

---
 .../main/java/com/google/android/flexbox/FlexboxLayout.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayout.java b/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayout.java
index 12c3e8ab..005555da 100644
--- a/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayout.java
+++ b/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayout.java
@@ -455,6 +455,9 @@ private void setMeasuredDimensionForFlex(@FlexDirection int flexDirection, int w
                 throw new IllegalArgumentException("Invalid flex direction: " + flexDirection);
         }
 
+        calculatedMaxWidth = Math.max(calculatedMaxWidth, getSuggestedMinimumWidth());
+        calculatedMaxHeight = Math.max(calculatedMaxHeight, getSuggestedMinimumHeight());
+
         int widthSizeAndState;
         switch (widthMode) {
             case MeasureSpec.EXACTLY: