From ea6458b63ea268f273af0d30de1eb6aad9e07e27 Mon Sep 17 00:00:00 2001 From: Emil Sjolander Date: Mon, 24 Oct 2016 03:34:55 -0700 Subject: [PATCH] Remove flex shorthand getter because it doesnt make a lot of sense Reviewed By: gkassabli Differential Revision: D4064674 fbshipit-source-id: 69935b85042020b4e8c61a393c1be8f4d42a6674 --- React/CSSLayout/CSSLayout.c | 10 ---------- React/CSSLayout/CSSLayout.h | 3 ++- React/Views/RCTShadowView.m | 8 ++++++-- .../main/java/com/facebook/csslayout/CSSNode.java | 7 ------- .../java/com/facebook/csslayout/CSSNodeAPI.java | 1 - .../com/facebook/csslayout/CSSNodeDEPRECATED.java | 14 -------------- 6 files changed, 8 insertions(+), 35 deletions(-) diff --git a/React/CSSLayout/CSSLayout.c b/React/CSSLayout/CSSLayout.c index 71c5e2d67..69ed034a0 100644 --- a/React/CSSLayout/CSSLayout.c +++ b/React/CSSLayout/CSSLayout.c @@ -302,16 +302,6 @@ void CSSNodeStyleSetFlex(const CSSNodeRef node, const float flex) { } } -float CSSNodeStyleGetFlex(const CSSNodeRef node) { - if (CSSNodeStyleGetFlexGrow(node) > 0) { - return CSSNodeStyleGetFlexGrow(node); - } else if (CSSNodeStyleGetFlexShrink(node) > 0) { - return -CSSNodeStyleGetFlexShrink(node); - } - - return 0; -} - #define CSS_NODE_PROPERTY_IMPL(type, name, paramName, instanceName) \ void CSSNodeSet##name(const CSSNodeRef node, type paramName) { \ node->instanceName = paramName; \ diff --git a/React/CSSLayout/CSSLayout.h b/React/CSSLayout/CSSLayout.h index c314dbda5..50826d5b0 100644 --- a/React/CSSLayout/CSSLayout.h +++ b/React/CSSLayout/CSSLayout.h @@ -192,7 +192,8 @@ CSS_NODE_STYLE_PROPERTY(CSSAlign, AlignSelf, alignSelf); CSS_NODE_STYLE_PROPERTY(CSSPositionType, PositionType, positionType); CSS_NODE_STYLE_PROPERTY(CSSWrapType, FlexWrap, flexWrap); CSS_NODE_STYLE_PROPERTY(CSSOverflow, Overflow, overflow); -CSS_NODE_STYLE_PROPERTY(float, Flex, flex); + +WIN_EXPORT void CSSNodeStyleSetFlex(const CSSNodeRef node, const float flex); CSS_NODE_STYLE_PROPERTY(float, FlexGrow, flexGrow); CSS_NODE_STYLE_PROPERTY(float, FlexShrink, flexShrink); CSS_NODE_STYLE_PROPERTY(float, FlexBasis, flexBasis); diff --git a/React/Views/RCTShadowView.m b/React/Views/RCTShadowView.m index d3befdcb4..15cbad767 100644 --- a/React/Views/RCTShadowView.m +++ b/React/Views/RCTShadowView.m @@ -595,7 +595,7 @@ static inline void RCTAssignSuggestedDimension(CSSNodeRef cssNode, CSSDimension - (void)setIntrinsicContentSize:(CGSize)size { - if (CSSNodeStyleGetFlex(_cssNode) == 0) { + if (CSSNodeStyleGetFlexGrow(_cssNode) == 0 && CSSNodeStyleGetFlexShrink(_cssNode) == 0) { RCTAssignSuggestedDimension(_cssNode, CSSDimensionHeight, size.height); RCTAssignSuggestedDimension(_cssNode, CSSDimensionWidth, size.width); } @@ -615,6 +615,11 @@ static inline void RCTAssignSuggestedDimension(CSSNodeRef cssNode, CSSDimension // Flex +- (void)setFlex:(CGFloat)value +{ + CSSNodeStyleSetFlex(_cssNode, value); +} + #define RCT_STYLE_PROPERTY(setProp, getProp, cssProp, type) \ - (void)set##setProp:(type)value \ { \ @@ -625,7 +630,6 @@ static inline void RCTAssignSuggestedDimension(CSSNodeRef cssNode, CSSDimension return CSSNodeStyleGet##cssProp(_cssNode); \ } -RCT_STYLE_PROPERTY(Flex, flex, Flex, CGFloat) RCT_STYLE_PROPERTY(FlexGrow, flexGrow, FlexGrow, CGFloat) RCT_STYLE_PROPERTY(FlexShrink, flexShrink, FlexShrink, CGFloat) RCT_STYLE_PROPERTY(FlexBasis, flexBasis, FlexBasis, CGFloat) diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNode.java b/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNode.java index 935be0955..ab3f617bc 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNode.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNode.java @@ -295,13 +295,6 @@ public class CSSNode implements CSSNodeAPI { jni_CSSNodeStyleSetOverflow(mNativePointer, overflow.ordinal()); } - private native float jni_CSSNodeStyleGetFlex(long nativePointer); - @Override - public float getFlex() { - assertNativeInstance(); - return jni_CSSNodeStyleGetFlex(mNativePointer); - } - private native void jni_CSSNodeStyleSetFlex(long nativePointer, float flex); @Override public void setFlex(float flex) { diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNodeAPI.java b/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNodeAPI.java index c443a7b2f..cbe60ff62 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNodeAPI.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNodeAPI.java @@ -52,7 +52,6 @@ public interface CSSNodeAPI { CSSPositionType getPositionType(); void setPositionType(CSSPositionType positionType); void setWrap(CSSWrap flexWrap); - float getFlex(); void setFlex(float flex); float getFlexGrow(); void setFlexGrow(float flexGrow); diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNodeDEPRECATED.java b/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNodeDEPRECATED.java index c52cbd578..ac5903fe4 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNodeDEPRECATED.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/CSSNodeDEPRECATED.java @@ -358,20 +358,6 @@ public class CSSNodeDEPRECATED implements CSSNodeAPI { } } - /** - * Get this node's flex, as defined by style. - */ - @Override - public float getFlex() { - if (style.flexGrow > 0) { - return style.flexGrow; - } else if (style.flexShrink > 0) { - return -style.flexShrink; - } - - return 0; - } - @Override public void setFlex(float flex) { if (CSSConstants.isUndefined(flex) || flex == 0) {