status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

rename CSSWrapType to shorter CSSWrap matching java and csharp 

Reviewed By: gkassabli

Differential Revision: D4174257

fbshipit-source-id: ba0bfab996ba158b07863d8c72cf2a41262c9592
This commit is contained in:
Emil Sjolander 2016-11-14 03:27:31 -08:00 committed by Facebook Github Bot
parent e2e3a27571
commit a2cafb062e
10 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
React/Base/RCTConvert.h
View File

@ -121,7 +121,7 @@ typedef BOOL css_backface_visibility_t;
+ (CSSJustify)CSSJustify:(id)json; + (CSSJustify)CSSJustify:(id)json;
+ (CSSAlign)CSSAlign:(id)json; + (CSSAlign)CSSAlign:(id)json;
+ (CSSPositionType)CSSPositionType:(id)json; + (CSSPositionType)CSSPositionType:(id)json;
+ (CSSWrapType)CSSWrapType:(id)json; + (CSSWrap)CSSWrap:(id)json;
+ (RCTPointerEvents)RCTPointerEvents:(id)json; + (RCTPointerEvents)RCTPointerEvents:(id)json;
+ (RCTAnimationType)RCTAnimationType:(id)json; + (RCTAnimationType)RCTAnimationType:(id)json;

8
React/Base/RCTConvert.m
View File

@ -648,10 +648,10 @@ RCT_ENUM_CONVERTER(CSSPositionType, (@{
@"relative": @(CSSPositionTypeRelative) @"relative": @(CSSPositionTypeRelative)
}), CSSPositionTypeRelative, intValue) }), CSSPositionTypeRelative, intValue)
RCT_ENUM_CONVERTER(CSSWrapType, (@{ RCT_ENUM_CONVERTER(CSSWrap, (@{
@"wrap": @(CSSWrapTypeWrap), @"wrap": @(CSSWrapWrap),
@"nowrap": @(CSSWrapTypeNoWrap) @"nowrap": @(CSSWrapNoWrap)
}), CSSWrapTypeNoWrap, intValue) }), CSSWrapNoWrap, intValue)
RCT_ENUM_CONVERTER(RCTPointerEvents, (@{ RCT_ENUM_CONVERTER(RCTPointerEvents, (@{
@"none": @(RCTPointerEventsNone), @"none": @(RCTPointerEventsNone),

6
React/CSSLayout/CSSLayout.c
View File

@ -69,7 +69,7 @@ typedef struct CSSStyle {
CSSAlign alignItems; CSSAlign alignItems;
CSSAlign alignSelf; CSSAlign alignSelf;
CSSPositionType positionType; CSSPositionType positionType;
CSSWrapType flexWrap; CSSWrap flexWrap;
CSSOverflow overflow; CSSOverflow overflow;
float flex; float flex;
float flexGrow; float flexGrow;
@ -423,7 +423,7 @@ CSS_NODE_STYLE_PROPERTY_IMPL(CSSAlign, AlignContent, alignContent, alignContent)
CSS_NODE_STYLE_PROPERTY_IMPL(CSSAlign, AlignItems, alignItems, alignItems); CSS_NODE_STYLE_PROPERTY_IMPL(CSSAlign, AlignItems, alignItems, alignItems);
CSS_NODE_STYLE_PROPERTY_IMPL(CSSAlign, AlignSelf, alignSelf, alignSelf); CSS_NODE_STYLE_PROPERTY_IMPL(CSSAlign, AlignSelf, alignSelf, alignSelf);
CSS_NODE_STYLE_PROPERTY_IMPL(CSSPositionType, PositionType, positionType, positionType); CSS_NODE_STYLE_PROPERTY_IMPL(CSSPositionType, PositionType, positionType, positionType);
CSS_NODE_STYLE_PROPERTY_IMPL(CSSWrapType, FlexWrap, flexWrap, flexWrap); CSS_NODE_STYLE_PROPERTY_IMPL(CSSWrap, FlexWrap, flexWrap, flexWrap);
CSS_NODE_STYLE_PROPERTY_IMPL(CSSOverflow, Overflow, overflow, overflow); CSS_NODE_STYLE_PROPERTY_IMPL(CSSOverflow, Overflow, overflow, overflow);
CSS_NODE_STYLE_PROPERTY_SETTER_IMPL(float, FlexGrow, flexGrow, flexGrow); CSS_NODE_STYLE_PROPERTY_SETTER_IMPL(float, FlexGrow, flexGrow, flexGrow);
@ -1395,7 +1395,7 @@ static void layoutNodeImpl(const CSSNodeRef node,
const CSSFlexDirection crossAxis = getCrossFlexDirection(mainAxis, direction); const CSSFlexDirection crossAxis = getCrossFlexDirection(mainAxis, direction);
const bool isMainAxisRow = isRowDirection(mainAxis); const bool isMainAxisRow = isRowDirection(mainAxis);
const CSSJustify justifyContent = node->style.justifyContent; const CSSJustify justifyContent = node->style.justifyContent;
const bool isNodeFlexWrap = node->style.flexWrap == CSSWrapTypeWrap; const bool isNodeFlexWrap = node->style.flexWrap == CSSWrapWrap;
CSSNodeRef firstAbsoluteChild = NULL; CSSNodeRef firstAbsoluteChild = NULL;
CSSNodeRef currentAbsoluteChild = NULL; CSSNodeRef currentAbsoluteChild = NULL;

10
React/CSSLayout/CSSLayout.h
View File

@ -74,10 +74,10 @@ typedef enum CSSPositionType {
CSSPositionTypeAbsolute, CSSPositionTypeAbsolute,
} CSSPositionType; } CSSPositionType;
typedef enum CSSWrapType { typedef enum CSSWrap {
CSSWrapTypeNoWrap, CSSWrapNoWrap,
CSSWrapTypeWrap, CSSWrapWrap,
} CSSWrapType; } CSSWrap;
typedef enum CSSMeasureMode { typedef enum CSSMeasureMode {
CSSMeasureModeUndefined, CSSMeasureModeUndefined,
@ -207,7 +207,7 @@ CSS_NODE_STYLE_PROPERTY(CSSAlign, AlignContent, alignContent);
CSS_NODE_STYLE_PROPERTY(CSSAlign, AlignItems, alignItems); CSS_NODE_STYLE_PROPERTY(CSSAlign, AlignItems, alignItems);
CSS_NODE_STYLE_PROPERTY(CSSAlign, AlignSelf, alignSelf); CSS_NODE_STYLE_PROPERTY(CSSAlign, AlignSelf, alignSelf);
CSS_NODE_STYLE_PROPERTY(CSSPositionType, PositionType, positionType); CSS_NODE_STYLE_PROPERTY(CSSPositionType, PositionType, positionType);
CSS_NODE_STYLE_PROPERTY(CSSWrapType, FlexWrap, flexWrap); CSS_NODE_STYLE_PROPERTY(CSSWrap, FlexWrap, flexWrap);
CSS_NODE_STYLE_PROPERTY(CSSOverflow, Overflow, overflow); CSS_NODE_STYLE_PROPERTY(CSSOverflow, Overflow, overflow);
WIN_EXPORT void CSSNodeStyleSetFlex(const CSSNodeRef node, const float flex); WIN_EXPORT void CSSNodeStyleSetFlex(const CSSNodeRef node, const float flex);

2
React/Views/RCTShadowView.h
View File

@ -137,7 +137,7 @@ typedef void (^RCTApplierBlock)(NSDictionary<NSNumber *, UIView *> *viewRegistry
@property (nonatomic, assign) CSSAlign alignSelf; @property (nonatomic, assign) CSSAlign alignSelf;
@property (nonatomic, assign) CSSAlign alignItems; @property (nonatomic, assign) CSSAlign alignItems;
@property (nonatomic, assign) CSSPositionType position; @property (nonatomic, assign) CSSPositionType position;
@property (nonatomic, assign) CSSWrapType flexWrap; @property (nonatomic, assign) CSSWrap flexWrap;
@property (nonatomic, assign) float flexGrow; @property (nonatomic, assign) float flexGrow;
@property (nonatomic, assign) float flexShrink; @property (nonatomic, assign) float flexShrink;

2
React/Views/RCTShadowView.m
View File

@ -648,7 +648,7 @@ RCT_STYLE_PROPERTY(JustifyContent, justifyContent, JustifyContent, CSSJustify)
RCT_STYLE_PROPERTY(AlignSelf, alignSelf, AlignSelf, CSSAlign) RCT_STYLE_PROPERTY(AlignSelf, alignSelf, AlignSelf, CSSAlign)
RCT_STYLE_PROPERTY(AlignItems, alignItems, AlignItems, CSSAlign) RCT_STYLE_PROPERTY(AlignItems, alignItems, AlignItems, CSSAlign)
RCT_STYLE_PROPERTY(Position, position, PositionType, CSSPositionType) RCT_STYLE_PROPERTY(Position, position, PositionType, CSSPositionType)
RCT_STYLE_PROPERTY(FlexWrap, flexWrap, FlexWrap, CSSWrapType) RCT_STYLE_PROPERTY(FlexWrap, flexWrap, FlexWrap, CSSWrap)
RCT_STYLE_PROPERTY(Overflow, overflow, Overflow, CSSOverflow) RCT_STYLE_PROPERTY(Overflow, overflow, Overflow, CSSOverflow)
- (void)setBackgroundColor:(UIColor *)color - (void)setBackgroundColor:(UIColor *)color

2
React/Views/RCTViewManager.m
View File

@ -289,7 +289,7 @@ RCT_EXPORT_SHADOW_PROPERTY(flexGrow, float)
RCT_EXPORT_SHADOW_PROPERTY(flexShrink, float) RCT_EXPORT_SHADOW_PROPERTY(flexShrink, float)
RCT_EXPORT_SHADOW_PROPERTY(flexBasis, float) RCT_EXPORT_SHADOW_PROPERTY(flexBasis, float)
RCT_EXPORT_SHADOW_PROPERTY(flexDirection, CSSFlexDirection) RCT_EXPORT_SHADOW_PROPERTY(flexDirection, CSSFlexDirection)
RCT_EXPORT_SHADOW_PROPERTY(flexWrap, CSSWrapType) RCT_EXPORT_SHADOW_PROPERTY(flexWrap, CSSWrap)
RCT_EXPORT_SHADOW_PROPERTY(justifyContent, CSSJustify) RCT_EXPORT_SHADOW_PROPERTY(justifyContent, CSSJustify)
RCT_EXPORT_SHADOW_PROPERTY(alignItems, CSSAlign) RCT_EXPORT_SHADOW_PROPERTY(alignItems, CSSAlign)
RCT_EXPORT_SHADOW_PROPERTY(alignSelf, CSSAlign) RCT_EXPORT_SHADOW_PROPERTY(alignSelf, CSSAlign)

2
ReactAndroid/src/main/jni/first-party/csslayoutjni/jni/CSSJNI.cpp
View File

@ -203,7 +203,7 @@ CSS_NODE_JNI_STYLE_PROP(jint, CSSAlign, AlignItems);
CSS_NODE_JNI_STYLE_PROP(jint, CSSAlign, AlignSelf); CSS_NODE_JNI_STYLE_PROP(jint, CSSAlign, AlignSelf);
CSS_NODE_JNI_STYLE_PROP(jint, CSSAlign, AlignContent); CSS_NODE_JNI_STYLE_PROP(jint, CSSAlign, AlignContent);
CSS_NODE_JNI_STYLE_PROP(jint, CSSPositionType, PositionType); CSS_NODE_JNI_STYLE_PROP(jint, CSSPositionType, PositionType);
CSS_NODE_JNI_STYLE_PROP(jint, CSSWrapType, FlexWrap); CSS_NODE_JNI_STYLE_PROP(jint, CSSWrap, FlexWrap);
CSS_NODE_JNI_STYLE_PROP(jint, CSSOverflow, Overflow); CSS_NODE_JNI_STYLE_PROP(jint, CSSOverflow, Overflow);
void jni_CSSNodeStyleSetFlex(alias_ref<jobject>, jlong nativePointer, jfloat value) { void jni_CSSNodeStyleSetFlex(alias_ref<jobject>, jlong nativePointer, jfloat value) {

6
ReactCommon/CSSLayout/CSSLayout.c
View File

@ -69,7 +69,7 @@ typedef struct CSSStyle {
CSSAlign alignItems; CSSAlign alignItems;
CSSAlign alignSelf; CSSAlign alignSelf;
CSSPositionType positionType; CSSPositionType positionType;
CSSWrapType flexWrap; CSSWrap flexWrap;
CSSOverflow overflow; CSSOverflow overflow;
float flex; float flex;
float flexGrow; float flexGrow;
@ -423,7 +423,7 @@ CSS_NODE_STYLE_PROPERTY_IMPL(CSSAlign, AlignContent, alignContent, alignContent)
CSS_NODE_STYLE_PROPERTY_IMPL(CSSAlign, AlignItems, alignItems, alignItems); CSS_NODE_STYLE_PROPERTY_IMPL(CSSAlign, AlignItems, alignItems, alignItems);
CSS_NODE_STYLE_PROPERTY_IMPL(CSSAlign, AlignSelf, alignSelf, alignSelf); CSS_NODE_STYLE_PROPERTY_IMPL(CSSAlign, AlignSelf, alignSelf, alignSelf);
CSS_NODE_STYLE_PROPERTY_IMPL(CSSPositionType, PositionType, positionType, positionType); CSS_NODE_STYLE_PROPERTY_IMPL(CSSPositionType, PositionType, positionType, positionType);
CSS_NODE_STYLE_PROPERTY_IMPL(CSSWrapType, FlexWrap, flexWrap, flexWrap); CSS_NODE_STYLE_PROPERTY_IMPL(CSSWrap, FlexWrap, flexWrap, flexWrap);
CSS_NODE_STYLE_PROPERTY_IMPL(CSSOverflow, Overflow, overflow, overflow); CSS_NODE_STYLE_PROPERTY_IMPL(CSSOverflow, Overflow, overflow, overflow);
CSS_NODE_STYLE_PROPERTY_SETTER_IMPL(float, FlexGrow, flexGrow, flexGrow); CSS_NODE_STYLE_PROPERTY_SETTER_IMPL(float, FlexGrow, flexGrow, flexGrow);
@ -1395,7 +1395,7 @@ static void layoutNodeImpl(const CSSNodeRef node,
const CSSFlexDirection crossAxis = getCrossFlexDirection(mainAxis, direction); const CSSFlexDirection crossAxis = getCrossFlexDirection(mainAxis, direction);
const bool isMainAxisRow = isRowDirection(mainAxis); const bool isMainAxisRow = isRowDirection(mainAxis);
const CSSJustify justifyContent = node->style.justifyContent; const CSSJustify justifyContent = node->style.justifyContent;
const bool isNodeFlexWrap = node->style.flexWrap == CSSWrapTypeWrap; const bool isNodeFlexWrap = node->style.flexWrap == CSSWrapWrap;
CSSNodeRef firstAbsoluteChild = NULL; CSSNodeRef firstAbsoluteChild = NULL;
CSSNodeRef currentAbsoluteChild = NULL; CSSNodeRef currentAbsoluteChild = NULL;

10
ReactCommon/CSSLayout/CSSLayout.h
View File

@ -74,10 +74,10 @@ typedef enum CSSPositionType {
CSSPositionTypeAbsolute, CSSPositionTypeAbsolute,
} CSSPositionType; } CSSPositionType;
typedef enum CSSWrapType { typedef enum CSSWrap {
CSSWrapTypeNoWrap, CSSWrapNoWrap,
CSSWrapTypeWrap, CSSWrapWrap,
} CSSWrapType; } CSSWrap;
typedef enum CSSMeasureMode { typedef enum CSSMeasureMode {
CSSMeasureModeUndefined, CSSMeasureModeUndefined,
@ -207,7 +207,7 @@ CSS_NODE_STYLE_PROPERTY(CSSAlign, AlignContent, alignContent);
CSS_NODE_STYLE_PROPERTY(CSSAlign, AlignItems, alignItems); CSS_NODE_STYLE_PROPERTY(CSSAlign, AlignItems, alignItems);
CSS_NODE_STYLE_PROPERTY(CSSAlign, AlignSelf, alignSelf); CSS_NODE_STYLE_PROPERTY(CSSAlign, AlignSelf, alignSelf);
CSS_NODE_STYLE_PROPERTY(CSSPositionType, PositionType, positionType); CSS_NODE_STYLE_PROPERTY(CSSPositionType, PositionType, positionType);
CSS_NODE_STYLE_PROPERTY(CSSWrapType, FlexWrap, flexWrap); CSS_NODE_STYLE_PROPERTY(CSSWrap, FlexWrap, flexWrap);
CSS_NODE_STYLE_PROPERTY(CSSOverflow, Overflow, overflow); CSS_NODE_STYLE_PROPERTY(CSSOverflow, Overflow, overflow);
WIN_EXPORT void CSSNodeStyleSetFlex(const CSSNodeRef node, const float flex); WIN_EXPORT void CSSNodeStyleSetFlex(const CSSNodeRef node, const float flex);