Remove margin from CKFlexboxComponent style property
Summary: This diff removes the margin property from the CKFlexboxComponetn style, as it was never working properly. Reviewed By: Andrey-Mishanin Differential Revision: D19251856 fbshipit-source-id: eb8e448a68d2e0ff3cd6726c40af0267fced96ea
This commit is contained in:
committed by
Facebook Github Bot
parent
751c778069
commit
8a136542a3
@@ -79,7 +79,6 @@ static NSDictionary<NSNumber *, NSString *> *CKFlexboxWrapEnumMap;
|
|||||||
@"alignItems": SKMutableObject(CKFlexboxAlignItemsEnumMap[@(style.alignItems)]),
|
@"alignItems": SKMutableObject(CKFlexboxAlignItemsEnumMap[@(style.alignItems)]),
|
||||||
@"alignContent": SKMutableObject(CKFlexboxAlignContentEnumMap[@(style.alignContent)]),
|
@"alignContent": SKMutableObject(CKFlexboxAlignContentEnumMap[@(style.alignContent)]),
|
||||||
@"wrap": SKMutableObject(CKFlexboxWrapEnumMap[@(style.wrap)]),
|
@"wrap": SKMutableObject(CKFlexboxWrapEnumMap[@(style.wrap)]),
|
||||||
@"margin": SKMutableObject(flexboxRect(style.margin)),
|
|
||||||
@"padding": SKMutableObject(flexboxRect(style.padding)),
|
@"padding": SKMutableObject(flexboxRect(style.padding)),
|
||||||
}]];
|
}]];
|
||||||
}
|
}
|
||||||
@@ -143,22 +142,6 @@ static NSDictionary<NSNumber *, NSString *> *CKFlexboxWrapEnumMap;
|
|||||||
}
|
}
|
||||||
return [NSValue value:&style withObjCType:@encode(CKFlexboxComponentStyle)];
|
return [NSValue value:&style withObjCType:@encode(CKFlexboxComponentStyle)];
|
||||||
},
|
},
|
||||||
@"CKFlexboxComponent.margin.bottom": ^(NSString *value) {
|
|
||||||
style.margin.bottom = relativeStructDimension(value);
|
|
||||||
return [NSValue value:&style withObjCType:@encode(CKFlexboxComponentStyle)];
|
|
||||||
},
|
|
||||||
@"CKFlexboxComponent.margin.top": ^(NSString *value) {
|
|
||||||
style.margin.top = relativeStructDimension(value);
|
|
||||||
return [NSValue value:&style withObjCType:@encode(CKFlexboxComponentStyle)];
|
|
||||||
},
|
|
||||||
@"CKFlexboxComponent.margin.end": ^(NSString *value) {
|
|
||||||
style.margin.end = relativeStructDimension(value);
|
|
||||||
return [NSValue value:&style withObjCType:@encode(CKFlexboxComponentStyle)];
|
|
||||||
},
|
|
||||||
@"CKFlexboxComponent.margin.start": ^(NSString *value) {
|
|
||||||
style.margin.start = relativeStructDimension(value);
|
|
||||||
return [NSValue value:&style withObjCType:@encode(CKFlexboxComponentStyle)];
|
|
||||||
},
|
|
||||||
@"CKFlexboxComponent.padding.bottom": ^(NSString *value) {
|
@"CKFlexboxComponent.padding.bottom": ^(NSString *value) {
|
||||||
style.padding.bottom = relativeStructDimension(value);
|
style.padding.bottom = relativeStructDimension(value);
|
||||||
return [NSValue value:&style withObjCType:@encode(CKFlexboxComponentStyle)];
|
return [NSValue value:&style withObjCType:@encode(CKFlexboxComponentStyle)];
|
||||||
|
|||||||
Reference in New Issue
Block a user