RN: Support flexWrap: 'wrap-reverse'

Reviewed By: fkgozali Differential Revision: D7684403 fbshipit-source-id: 6c247ba86b8ad1bb4dcc8f44f5609c939afe0f06
facebook · Apr 19, 2018 · d69e550 · d69e550
1 parent 654435d
commit d69e550
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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);