From b5eb104617b6da12419e66801acb487802586236 Mon Sep 17 00:00:00 2001
From: Greg Herlihy <gherlihy@skillz.com>
Date: Thu, 18 May 2017 11:17:51 -0700
Subject: [PATCH] Fix view collapsing

Summary:
Make more views collapse on Android by designating FLEX_BASIS, FLEX_GROW and FLEX_SHRINK as "layout-only" props.

Relies on existing layout tests.

See Issue #13622
Closes https://github.com/facebook/react-native/pull/13868

Reviewed By: astreet

Differential Revision: D5035864

Pulled By: javache

fbshipit-source-id: d2c9e0b33b07e51b19afc383ef913ac41b70415c
---
 .../src/main/java/com/facebook/react/uimanager/ViewProps.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
index 67265436a..e3a6fb024 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
@@ -120,7 +120,10 @@ public class ViewProps {
             ALIGN_ITEMS,
             COLLAPSABLE,
             FLEX,
+            FLEX_BASIS,
             FLEX_DIRECTION,
+            FLEX_GROW,
+            FLEX_SHRINK,
             FLEX_WRAP,
             JUSTIFY_CONTENT,
             OVERFLOW,