From d69e55060fd76d91eccc45905d250a9fce4b2c49 Mon Sep 17 00:00:00 2001
From: Tim Yung <yungsters@fb.com>
Date: Thu, 19 Apr 2018 15:42:49 -0700
Subject: [PATCH] RN: Support `flexWrap: 'wrap-reverse'`

Reviewed By: fkgozali

Differential Revision: D7684403

fbshipit-source-id: 6c247ba86b8ad1bb4dcc8f44f5609c939afe0f06
---
 Libraries/StyleSheet/LayoutPropTypes.js                       | 3 ++-
 Libraries/StyleSheet/StyleSheetTypes.js                       | 2 +-
 React/Base/RCTConvert.m                                       | 3 ++-
 .../java/com/facebook/react/uimanager/LayoutShadowNode.java   | 4 ++++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Libraries/StyleSheet/LayoutPropTypes.js b/Libraries/StyleSheet/LayoutPropTypes.js
index 5921334c5b7cea..02ec8733f6bbd8 100644
--- a/Libraries/StyleSheet/LayoutPropTypes.js
+++ b/Libraries/StyleSheet/LayoutPropTypes.js
@@ -432,7 +432,8 @@ var LayoutPropTypes = {
    */
   flexWrap: ReactPropTypes.oneOf([
     'wrap',
-    'nowrap'
+    'nowrap',
+    'wrap-reverse'
   ]),
 
   /** `justifyContent` aligns children in the main direction.
diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js
index a176ca1e810785..1134c252deeb81 100644
--- a/Libraries/StyleSheet/StyleSheetTypes.js
+++ b/Libraries/StyleSheet/StyleSheetTypes.js
@@ -57,7 +57,7 @@ export type ____LayoutStyle_Internal = $ReadOnly<{|
   borderTopWidth?: number,
   position?: 'absolute' | 'relative',
   flexDirection?: 'row' | 'row-reverse' | 'column' | 'column-reverse',
-  flexWrap?: 'wrap' | 'nowrap',
+  flexWrap?: 'wrap' | 'nowrap' | 'wrap-reverse',
   justifyContent?:
     | 'flex-start'
     | 'flex-end'
diff --git a/React/Base/RCTConvert.m b/React/Base/RCTConvert.m
index 173c9047530491..7528259fda00ad 100644
--- a/React/Base/RCTConvert.m
+++ b/React/Base/RCTConvert.m
@@ -685,7 +685,8 @@ + (NSPropertyList)NSPropertyList:(id)json
 
 RCT_ENUM_CONVERTER(YGWrap, (@{
   @"wrap": @(YGWrapWrap),
-  @"nowrap": @(YGWrapNoWrap)
+  @"nowrap": @(YGWrapNoWrap),
+  @"wrap-reverse": @(YGWrapWrapReverse)
 }), YGWrapNoWrap, intValue)
 
 RCT_ENUM_CONVERTER(RCTPointerEvents, (@{
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
index 86c1a7832ba778..ae85bbdccd7646 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
@@ -315,6 +315,10 @@ public void setFlexWrap(@Nullable String flexWrap) {
         setFlexWrap(YogaWrap.WRAP);
         break;
       }
+      case "wrap-reverse": {
+        setFlexWrap(YogaWrap.WRAP_REVERSE);
+        break;
+      }
       default: {
         throw new JSApplicationIllegalArgumentException(
             "invalid value for flexWrap: " + flexWrap);