Skip to content

Commit b99172d

Browse files
Emil SjolanderFacebook Github Bot
Emil Sjolander
authored and
Facebook Github Bot
committed
rename CSSWrapType to shorter CSSWrap matching java and csharp
Summary: Java and csharp already use CSSWrap and not CSSWrapType. Let's consolidate and stick with the shorter of the two. Reviewed By: gkassabli Differential Revision: D4174257 fbshipit-source-id: ba0bfab996ba158b07863d8c72cf2a41262c9592
1 parent 7a3df99 commit b99172d

12 files changed

Lines changed: 28 additions & 28 deletions

‎CSSLayout/CSSLayout.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ typedef struct CSSStyle {
6969
CSSAlign alignItems;
7070
CSSAlign alignSelf;
7171
CSSPositionType positionType;
72-
CSSWrapType flexWrap;
72+
CSSWrap flexWrap;
7373
CSSOverflow overflow;
7474
float flex;
7575
float flexGrow;
@@ -423,7 +423,7 @@ CSS_NODE_STYLE_PROPERTY_IMPL(CSSAlign, AlignContent, alignContent, alignContent)
423423
CSS_NODE_STYLE_PROPERTY_IMPL(CSSAlign, AlignItems, alignItems, alignItems);
424424
CSS_NODE_STYLE_PROPERTY_IMPL(CSSAlign, AlignSelf, alignSelf, alignSelf);
425425
CSS_NODE_STYLE_PROPERTY_IMPL(CSSPositionType, PositionType, positionType, positionType);
426-
CSS_NODE_STYLE_PROPERTY_IMPL(CSSWrapType, FlexWrap, flexWrap, flexWrap);
426+
CSS_NODE_STYLE_PROPERTY_IMPL(CSSWrap, FlexWrap, flexWrap, flexWrap);
427427
CSS_NODE_STYLE_PROPERTY_IMPL(CSSOverflow, Overflow, overflow, overflow);
428428

429429
CSS_NODE_STYLE_PROPERTY_SETTER_IMPL(float, FlexGrow, flexGrow, flexGrow);
@@ -1395,7 +1395,7 @@ static void layoutNodeImpl(const CSSNodeRef node,
13951395
const CSSFlexDirection crossAxis = getCrossFlexDirection(mainAxis, direction);
13961396
const bool isMainAxisRow = isRowDirection(mainAxis);
13971397
const CSSJustify justifyContent = node->style.justifyContent;
1398-
const bool isNodeFlexWrap = node->style.flexWrap == CSSWrapTypeWrap;
1398+
const bool isNodeFlexWrap = node->style.flexWrap == CSSWrapWrap;
13991399

14001400
CSSNodeRef firstAbsoluteChild = NULL;
14011401
CSSNodeRef currentAbsoluteChild = NULL;

‎CSSLayout/CSSLayout.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ typedef enum CSSPositionType {
7474
CSSPositionTypeAbsolute,
7575
} CSSPositionType;
7676

77-
typedef enum CSSWrapType {
78-
CSSWrapTypeNoWrap,
79-
CSSWrapTypeWrap,
80-
} CSSWrapType;
77+
typedef enum CSSWrap {
78+
CSSWrapNoWrap,
79+
CSSWrapWrap,
80+
} CSSWrap;
8181

8282
typedef enum CSSMeasureMode {
8383
CSSMeasureModeUndefined,
@@ -207,7 +207,7 @@ CSS_NODE_STYLE_PROPERTY(CSSAlign, AlignContent, alignContent);
207207
CSS_NODE_STYLE_PROPERTY(CSSAlign, AlignItems, alignItems);
208208
CSS_NODE_STYLE_PROPERTY(CSSAlign, AlignSelf, alignSelf);
209209
CSS_NODE_STYLE_PROPERTY(CSSPositionType, PositionType, positionType);
210-
CSS_NODE_STYLE_PROPERTY(CSSWrapType, FlexWrap, flexWrap);
210+
CSS_NODE_STYLE_PROPERTY(CSSWrap, FlexWrap, flexWrap);
211211
CSS_NODE_STYLE_PROPERTY(CSSOverflow, Overflow, overflow);
212212

213213
WIN_EXPORT void CSSNodeStyleSetFlex(const CSSNodeRef node, const float flex);

‎CSSLayoutKit/UIView+CSSLayout.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
- (void)css_setAlignItems:(CSSAlign)alignItems;
2525
- (void)css_setAlignSelf:(CSSAlign)alignSelf;
2626
- (void)css_setPositionType:(CSSPositionType)positionType;
27-
- (void)css_setFlexWrap:(CSSWrapType)flexWrap;
27+
- (void)css_setFlexWrap:(CSSWrap)flexWrap;
2828

2929
- (void)css_setFlexGrow:(CGFloat)flexGrow;
3030
- (void)css_setFlexShrink:(CGFloat)flexShrink;

‎CSSLayoutKit/UIView+CSSLayout.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ - (void)css_setPositionType:(CSSPositionType)positionType
8585
CSSNodeStyleSetPositionType([self cssNode], positionType);
8686
}
8787

88-
- (void)css_setFlexWrap:(CSSWrapType)flexWrap
88+
- (void)css_setFlexWrap:(CSSWrap)flexWrap
8989
{
9090
CSSNodeStyleSetFlexWrap([self cssNode], flexWrap);
9191
}

‎gentest/gentest-cpp.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ CPPEmitter.prototype = Object.create(Emitter.prototype, {
8484
CSSPositionTypeAbsolute:{value:'CSSPositionTypeAbsolute'},
8585
CSSPositionTypeRelative:{value:'CSSPositionTypeRelative'},
8686

87-
CSSWrapTypeNoWrap:{value:'CSSWrapTypeNoWrap'},
88-
CSSWrapTypeWrap:{value:'CSSWrapTypeWrap'},
87+
CSSWrapNoWrap:{value:'CSSWrapNoWrap'},
88+
CSSWrapWrap:{value:'CSSWrapWrap'},
8989

9090
CSSUndefined:{value:'CSSUndefined'},
9191

‎gentest/gentest-cs.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ CSEmitter.prototype = Object.create(Emitter.prototype, {
100100

101101
CSSUndefined:{value:'CSSConstants.Undefined'},
102102

103-
CSSWrapTypeNoWrap:{value:'CSSWrap.NoWrap'},
104-
CSSWrapTypeWrap:{value:'CSSWrap.Wrap'},
103+
CSSWrapNoWrap:{value:'CSSWrap.NoWrap'},
104+
CSSWrapWrap:{value:'CSSWrap.Wrap'},
105105

106106
CSSNodeCalculateLayout:{value:function(node, dir) {
107107
this.push(node + '.StyleDirection = ' + dir + ';');

‎gentest/gentest-java.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ JavaEmitter.prototype = Object.create(Emitter.prototype, {
9393

9494
CSSUndefined:{value:'CSSConstants.UNDEFINED'},
9595

96-
CSSWrapTypeNoWrap:{value:'CSSWrap.NO_WRAP'},
97-
CSSWrapTypeWrap:{value:'CSSWrap.WRAP'},
96+
CSSWrapNoWrap:{value:'CSSWrap.NO_WRAP'},
97+
CSSWrapWrap:{value:'CSSWrap.WRAP'},
9898

9999
CSSNodeCalculateLayout:{value:function(node, dir) {
100100
this.push(node + '.setDirection(' + dir + ');');

‎gentest/gentest.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,8 @@ function overflowValue(e, value) {
354354

355355
function wrapValue(e, value) {
356356
switch (value) {
357-
case 'wrap': return e.CSSWrapTypeWrap;
358-
case 'nowrap': return e.CSSWrapTypeNoWrap;
357+
case 'wrap': return e.CSSWrapWrap;
358+
case 'nowrap': return e.CSSWrapNoWrap;
359359
}
360360
}
361361

‎java/jni/CSSJNI.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ CSS_NODE_JNI_STYLE_PROP(jint, CSSAlign, AlignItems);
203203
CSS_NODE_JNI_STYLE_PROP(jint, CSSAlign, AlignSelf);
204204
CSS_NODE_JNI_STYLE_PROP(jint, CSSAlign, AlignContent);
205205
CSS_NODE_JNI_STYLE_PROP(jint, CSSPositionType, PositionType);
206-
CSS_NODE_JNI_STYLE_PROP(jint, CSSWrapType, FlexWrap);
206+
CSS_NODE_JNI_STYLE_PROP(jint, CSSWrap, FlexWrap);
207207
CSS_NODE_JNI_STYLE_PROP(jint, CSSOverflow, Overflow);
208208

209209
void jni_CSSNodeStyleSetFlex(alias_ref<jobject>, jlong nativePointer, jfloat value) {

‎tests/CSSLayoutAlignContentTest.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
TEST(CSSLayoutTest, align_content_flex_start) {
5151
const CSSNodeRef root = CSSNodeNew();
52-
CSSNodeStyleSetFlexWrap(root, CSSWrapTypeWrap);
52+
CSSNodeStyleSetFlexWrap(root, CSSWrapWrap);
5353
CSSNodeStyleSetWidth(root, 100);
5454
CSSNodeStyleSetHeight(root, 100);
5555

@@ -147,7 +147,7 @@ TEST(CSSLayoutTest, align_content_flex_start) {
147147
TEST(CSSLayoutTest, align_content_flex_end) {
148148
const CSSNodeRef root = CSSNodeNew();
149149
CSSNodeStyleSetAlignContent(root, CSSAlignFlexEnd);
150-
CSSNodeStyleSetFlexWrap(root, CSSWrapTypeWrap);
150+
CSSNodeStyleSetFlexWrap(root, CSSWrapWrap);
151151
CSSNodeStyleSetWidth(root, 100);
152152
CSSNodeStyleSetHeight(root, 100);
153153

@@ -245,7 +245,7 @@ TEST(CSSLayoutTest, align_content_flex_end) {
245245
TEST(CSSLayoutTest, align_content_center) {
246246
const CSSNodeRef root = CSSNodeNew();
247247
CSSNodeStyleSetAlignContent(root, CSSAlignCenter);
248-
CSSNodeStyleSetFlexWrap(root, CSSWrapTypeWrap);
248+
CSSNodeStyleSetFlexWrap(root, CSSWrapWrap);
249249
CSSNodeStyleSetWidth(root, 100);
250250
CSSNodeStyleSetHeight(root, 100);
251251

@@ -343,7 +343,7 @@ TEST(CSSLayoutTest, align_content_center) {
343343
TEST(CSSLayoutTest, align_content_stretch) {
344344
const CSSNodeRef root = CSSNodeNew();
345345
CSSNodeStyleSetAlignContent(root, CSSAlignStretch);
346-
CSSNodeStyleSetFlexWrap(root, CSSWrapTypeWrap);
346+
CSSNodeStyleSetFlexWrap(root, CSSWrapWrap);
347347
CSSNodeStyleSetWidth(root, 100);
348348
CSSNodeStyleSetHeight(root, 100);
349349

0 commit comments

Comments
 (0)