diff --git a/packages/react-native/React/Views/RCTShadowView.m b/packages/react-native/React/Views/RCTShadowView.m index 53c51d2bbde..66385dba06f 100644 --- a/packages/react-native/React/Views/RCTShadowView.m +++ b/packages/react-native/React/Views/RCTShadowView.m @@ -97,31 +97,6 @@ typedef NS_ENUM(unsigned int, meta_prop_t) { break; \ } -#define RCT_SET_YGVALUE_AUTO_INTRINSIC(ygvalue, setter, ...) \ - switch (ygvalue.unit) { \ - case YGUnitAuto: \ - setter##Auto(__VA_ARGS__); \ - break; \ - case YGUnitMaxContent: \ - setter##MaxContent(__VA_ARGS__); \ - break; \ - case YGUnitFitContent: \ - setter##FitContent(__VA_ARGS__); \ - break; \ - case YGUnitStretch: \ - setter##Stretch(__VA_ARGS__); \ - break; \ - case YGUnitUndefined: \ - setter(__VA_ARGS__, YGUndefined); \ - break; \ - case YGUnitPoint: \ - setter(__VA_ARGS__, ygvalue.value); \ - break; \ - case YGUnitPercent: \ - setter##Percent(__VA_ARGS__, ygvalue.value); \ - break; \ - } - static void RCTProcessMetaPropsPadding(const YGValue metaProps[META_PROP_COUNT], YGNodeRef node) { if (![[RCTI18nUtil sharedInstance] doLeftAndRightSwapInRTL]) { @@ -515,14 +490,14 @@ RCT_BORDER_PROPERTY(Start, START) RCT_BORDER_PROPERTY(End, END) // Dimensions -#define RCT_DIMENSION_PROPERTY(setProp, getProp, cssProp) \ - -(void)set##setProp : (YGValue)value \ - { \ - RCT_SET_YGVALUE_AUTO_INTRINSIC(value, YGNodeStyleSet##cssProp, _yogaNode); \ - } \ - -(YGValue)getProp \ - { \ - return YGNodeStyleGet##cssProp(_yogaNode); \ +#define RCT_DIMENSION_PROPERTY(setProp, getProp, cssProp) \ + -(void)set##setProp : (YGValue)value \ + { \ + RCT_SET_YGVALUE_AUTO(value, YGNodeStyleSet##cssProp, _yogaNode); \ + } \ + -(YGValue)getProp \ + { \ + return YGNodeStyleGet##cssProp(_yogaNode); \ } #define RCT_MIN_MAX_DIMENSION_PROPERTY(setProp, getProp, cssProp) \ @@ -666,7 +641,7 @@ RCTShadowViewMeasure(YGNodeConstRef node, float width, YGMeasureMode widthMode, - (void)setFlexBasis:(YGValue)value { - RCT_SET_YGVALUE_AUTO_INTRINSIC(value, YGNodeStyleSetFlexBasis, _yogaNode); + RCT_SET_YGVALUE_AUTO(value, YGNodeStyleSetFlexBasis, _yogaNode); } - (YGValue)flexBasis diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNative.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNative.java index 582bd1eb19e..89ef5ef16f5 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNative.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNative.java @@ -74,9 +74,6 @@ public class YogaNative { static native void jni_YGNodeStyleSetFlexBasisJNI(long nativePointer, float flexBasis); static native void jni_YGNodeStyleSetFlexBasisPercentJNI(long nativePointer, float percent); static native void jni_YGNodeStyleSetFlexBasisAutoJNI(long nativePointer); - static native void jni_YGNodeStyleSetFlexBasisMaxContentJNI(long nativePointer); - static native void jni_YGNodeStyleSetFlexBasisFitContentJNI(long nativePointer); - static native void jni_YGNodeStyleSetFlexBasisStretchJNI(long nativePointer); static native long jni_YGNodeStyleGetMarginJNI(long nativePointer, int edge); static native void jni_YGNodeStyleSetMarginJNI(long nativePointer, int edge, float margin); static native void jni_YGNodeStyleSetMarginPercentJNI(long nativePointer, int edge, float percent); @@ -94,40 +91,22 @@ public class YogaNative { static native void jni_YGNodeStyleSetWidthJNI(long nativePointer, float width); static native void jni_YGNodeStyleSetWidthPercentJNI(long nativePointer, float percent); static native void jni_YGNodeStyleSetWidthAutoJNI(long nativePointer); - static native void jni_YGNodeStyleSetWidthMaxContentJNI(long nativePointer); - static native void jni_YGNodeStyleSetWidthFitContentJNI(long nativePointer); - static native void jni_YGNodeStyleSetWidthStretchJNI(long nativePointer); static native long jni_YGNodeStyleGetHeightJNI(long nativePointer); static native void jni_YGNodeStyleSetHeightJNI(long nativePointer, float height); static native void jni_YGNodeStyleSetHeightPercentJNI(long nativePointer, float percent); static native void jni_YGNodeStyleSetHeightAutoJNI(long nativePointer); - static native void jni_YGNodeStyleSetHeightMaxContentJNI(long nativePointer); - static native void jni_YGNodeStyleSetHeightFitContentJNI(long nativePointer); - static native void jni_YGNodeStyleSetHeightStretchJNI(long nativePointer); static native long jni_YGNodeStyleGetMinWidthJNI(long nativePointer); static native void jni_YGNodeStyleSetMinWidthJNI(long nativePointer, float minWidth); static native void jni_YGNodeStyleSetMinWidthPercentJNI(long nativePointer, float percent); - static native void jni_YGNodeStyleSetMinWidthMaxContentJNI(long nativePointer); - static native void jni_YGNodeStyleSetMinWidthFitContentJNI(long nativePointer); - static native void jni_YGNodeStyleSetMinWidthStretchJNI(long nativePointer); static native long jni_YGNodeStyleGetMinHeightJNI(long nativePointer); static native void jni_YGNodeStyleSetMinHeightJNI(long nativePointer, float minHeight); static native void jni_YGNodeStyleSetMinHeightPercentJNI(long nativePointer, float percent); - static native void jni_YGNodeStyleSetMinHeightMaxContentJNI(long nativePointer); - static native void jni_YGNodeStyleSetMinHeightFitContentJNI(long nativePointer); - static native void jni_YGNodeStyleSetMinHeightStretchJNI(long nativePointer); static native long jni_YGNodeStyleGetMaxWidthJNI(long nativePointer); static native void jni_YGNodeStyleSetMaxWidthJNI(long nativePointer, float maxWidth); static native void jni_YGNodeStyleSetMaxWidthPercentJNI(long nativePointer, float percent); - static native void jni_YGNodeStyleSetMaxWidthMaxContentJNI(long nativePointer); - static native void jni_YGNodeStyleSetMaxWidthFitContentJNI(long nativePointer); - static native void jni_YGNodeStyleSetMaxWidthStretchJNI(long nativePointer); static native long jni_YGNodeStyleGetMaxHeightJNI(long nativePointer); static native void jni_YGNodeStyleSetMaxHeightJNI(long nativePointer, float maxheight); static native void jni_YGNodeStyleSetMaxHeightPercentJNI(long nativePointer, float percent); - static native void jni_YGNodeStyleSetMaxHeightMaxContentJNI(long nativePointer); - static native void jni_YGNodeStyleSetMaxHeightFitContentJNI(long nativePointer); - static native void jni_YGNodeStyleSetMaxHeightStretchJNI(long nativePointer); static native float jni_YGNodeStyleGetAspectRatioJNI(long nativePointer); static native void jni_YGNodeStyleSetAspectRatioJNI(long nativePointer, float aspectRatio); static native float jni_YGNodeStyleGetGapJNI(long nativePointer, int gutter); diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java index b683b553ca4..ba076846759 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java @@ -124,12 +124,6 @@ public abstract class YogaNode implements YogaProps { public abstract void setFlexBasisAuto(); - public abstract void setFlexBasisMaxContent(); - - public abstract void setFlexBasisFitContent(); - - public abstract void setFlexBasisStretch(); - public abstract YogaValue getMargin(YogaEdge edge); public abstract void setMargin(YogaEdge edge, float margin); @@ -164,12 +158,6 @@ public abstract class YogaNode implements YogaProps { public abstract void setWidthAuto(); - public abstract void setWidthMaxContent(); - - public abstract void setWidthFitContent(); - - public abstract void setWidthStretch(); - public abstract YogaValue getHeight(); public abstract void setHeight(float height); @@ -178,60 +166,30 @@ public abstract class YogaNode implements YogaProps { public abstract void setHeightAuto(); - public abstract void setHeightMaxContent(); - - public abstract void setHeightFitContent(); - - public abstract void setHeightStretch(); - public abstract YogaValue getMinWidth(); public abstract void setMinWidth(float minWidth); public abstract void setMinWidthPercent(float percent); - public abstract void setMinWidthMaxContent(); - - public abstract void setMinWidthFitContent(); - - public abstract void setMinWidthStretch(); - public abstract YogaValue getMinHeight(); public abstract void setMinHeight(float minHeight); public abstract void setMinHeightPercent(float percent); - public abstract void setMinHeightMaxContent(); - - public abstract void setMinHeightFitContent(); - - public abstract void setMinHeightStretch(); - public abstract YogaValue getMaxWidth(); public abstract void setMaxWidth(float maxWidth); public abstract void setMaxWidthPercent(float percent); - public abstract void setMaxWidthMaxContent(); - - public abstract void setMaxWidthFitContent(); - - public abstract void setMaxWidthStretch(); - public abstract YogaValue getMaxHeight(); public abstract void setMaxHeight(float maxheight); public abstract void setMaxHeightPercent(float percent); - public abstract void setMaxHeightMaxContent(); - - public abstract void setMaxHeightFitContent(); - - public abstract void setMaxHeightStretch(); - public abstract float getAspectRatio(); public abstract void setAspectRatio(float aspectRatio); diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java index e25872545e4..a53fe74af00 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java @@ -373,18 +373,6 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable { YogaNative.jni_YGNodeStyleSetFlexBasisAutoJNI(mNativePointer); } - public void setFlexBasisMaxContent() { - YogaNative.jni_YGNodeStyleSetFlexBasisMaxContentJNI(mNativePointer); - } - - public void setFlexBasisFitContent() { - YogaNative.jni_YGNodeStyleSetFlexBasisFitContentJNI(mNativePointer); - } - - public void setFlexBasisStretch() { - YogaNative.jni_YGNodeStyleSetFlexBasisStretchJNI(mNativePointer); - } - public YogaValue getMargin(YogaEdge edge) { return valueFromLong(YogaNative.jni_YGNodeStyleGetMarginJNI(mNativePointer, edge.intValue())); } @@ -453,18 +441,6 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable { YogaNative.jni_YGNodeStyleSetWidthAutoJNI(mNativePointer); } - public void setWidthMaxContent() { - YogaNative.jni_YGNodeStyleSetWidthMaxContentJNI(mNativePointer); - } - - public void setWidthFitContent() { - YogaNative.jni_YGNodeStyleSetWidthFitContentJNI(mNativePointer); - } - - public void setWidthStretch() { - YogaNative.jni_YGNodeStyleSetWidthStretchJNI(mNativePointer); - } - public YogaValue getHeight() { return valueFromLong(YogaNative.jni_YGNodeStyleGetHeightJNI(mNativePointer)); } @@ -481,18 +457,6 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable { YogaNative.jni_YGNodeStyleSetHeightAutoJNI(mNativePointer); } - public void setHeightMaxContent() { - YogaNative.jni_YGNodeStyleSetHeightMaxContentJNI(mNativePointer); - } - - public void setHeightFitContent() { - YogaNative.jni_YGNodeStyleSetHeightFitContentJNI(mNativePointer); - } - - public void setHeightStretch() { - YogaNative.jni_YGNodeStyleSetHeightStretchJNI(mNativePointer); - } - public YogaValue getMinWidth() { return valueFromLong(YogaNative.jni_YGNodeStyleGetMinWidthJNI(mNativePointer)); } @@ -505,18 +469,6 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable { YogaNative.jni_YGNodeStyleSetMinWidthPercentJNI(mNativePointer, percent); } - public void setMinWidthMaxContent() { - YogaNative.jni_YGNodeStyleSetMinWidthMaxContentJNI(mNativePointer); - } - - public void setMinWidthFitContent() { - YogaNative.jni_YGNodeStyleSetMinWidthFitContentJNI(mNativePointer); - } - - public void setMinWidthStretch() { - YogaNative.jni_YGNodeStyleSetMinWidthStretchJNI(mNativePointer); - } - public YogaValue getMinHeight() { return valueFromLong(YogaNative.jni_YGNodeStyleGetMinHeightJNI(mNativePointer)); } @@ -529,18 +481,6 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable { YogaNative.jni_YGNodeStyleSetMinHeightPercentJNI(mNativePointer, percent); } - public void setMinHeightMaxContent() { - YogaNative.jni_YGNodeStyleSetMinHeightMaxContentJNI(mNativePointer); - } - - public void setMinHeightFitContent() { - YogaNative.jni_YGNodeStyleSetMinHeightFitContentJNI(mNativePointer); - } - - public void setMinHeightStretch() { - YogaNative.jni_YGNodeStyleSetMinHeightStretchJNI(mNativePointer); - } - public YogaValue getMaxWidth() { return valueFromLong(YogaNative.jni_YGNodeStyleGetMaxWidthJNI(mNativePointer)); } @@ -553,18 +493,6 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable { YogaNative.jni_YGNodeStyleSetMaxWidthPercentJNI(mNativePointer, percent); } - public void setMaxWidthMaxContent() { - YogaNative.jni_YGNodeStyleSetMaxWidthMaxContentJNI(mNativePointer); - } - - public void setMaxWidthFitContent() { - YogaNative.jni_YGNodeStyleSetMaxWidthFitContentJNI(mNativePointer); - } - - public void setMaxWidthStretch() { - YogaNative.jni_YGNodeStyleSetMaxWidthStretchJNI(mNativePointer); - } - public YogaValue getMaxHeight() { return valueFromLong(YogaNative.jni_YGNodeStyleGetMaxHeightJNI(mNativePointer)); } @@ -577,18 +505,6 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable { YogaNative.jni_YGNodeStyleSetMaxHeightPercentJNI(mNativePointer, percent); } - public void setMaxHeightMaxContent() { - YogaNative.jni_YGNodeStyleSetMaxHeightMaxContentJNI(mNativePointer); - } - - public void setMaxHeightFitContent() { - YogaNative.jni_YGNodeStyleSetMaxHeightFitContentJNI(mNativePointer); - } - - public void setMaxHeightStretch() { - YogaNative.jni_YGNodeStyleSetMaxHeightStretchJNI(mNativePointer); - } - public float getAspectRatio() { return YogaNative.jni_YGNodeStyleGetAspectRatioJNI(mNativePointer); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaProps.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaProps.java index 0cad45fa9cc..c596c6a7c1c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaProps.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaProps.java @@ -15,33 +15,15 @@ public interface YogaProps { void setWidthPercent(float percent); - void setWidthAuto(); - - void setWidthMaxContent(); - - void setWidthFitContent(); - - void setWidthStretch(); - void setMinWidth(float minWidth); void setMinWidthPercent(float percent); - void setMinWidthMaxContent(); - - void setMinWidthFitContent(); - - void setMinWidthStretch(); - void setMaxWidth(float maxWidth); void setMaxWidthPercent(float percent); - void setMaxWidthMaxContent(); - - void setMaxWidthFitContent(); - - void setMaxWidthStretch(); + void setWidthAuto(); /* Height properties */ @@ -49,33 +31,15 @@ public interface YogaProps { void setHeightPercent(float percent); - void setHeightAuto(); - - void setHeightMaxContent(); - - void setHeightFitContent(); - - void setHeightStretch(); - void setMinHeight(float minHeight); void setMinHeightPercent(float percent); - void setMinHeightMaxContent(); - - void setMinHeightFitContent(); - - void setMinHeightStretch(); - void setMaxHeight(float maxHeight); void setMaxHeightPercent(float percent); - void setMaxHeightMaxContent(); - - void setMaxHeightFitContent(); - - void setMaxHeightStretch(); + void setHeightAuto(); /* Margin properties */ @@ -117,12 +81,6 @@ public interface YogaProps { void setFlexBasis(float flexBasis); - void setFlexBasisMaxContent(); - - void setFlexBasisFitContent(); - - void setFlexBasisStretch(); - void setFlexDirection(YogaFlexDirection direction); void setFlexGrow(float flexGrow); diff --git a/packages/react-native/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNIVanilla.cpp b/packages/react-native/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNIVanilla.cpp index 95273836c22..6b8ed14bd69 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNIVanilla.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNIVanilla.cpp @@ -429,28 +429,6 @@ static void jni_YGNodeCopyStyleJNI( YGNodeStyleSet##name##Auto(_jlong2YGNodeRef(nativePointer)); \ } -#define YG_NODE_JNI_STYLE_UNIT_PROP_AUTO_INTRINSIC(name) \ - YG_NODE_JNI_STYLE_UNIT_PROP_AUTO(name) \ - YG_NODE_JNI_STYLE_UNIT_INTRINSIC(name) - -#define YG_NODE_JNI_STYLE_UNIT_PROP_INTRINSIC(name) \ - YG_NODE_JNI_STYLE_UNIT_PROP(name) \ - YG_NODE_JNI_STYLE_UNIT_INTRINSIC(name) - -#define YG_NODE_JNI_STYLE_UNIT_INTRINSIC(name) \ - static void jni_YGNodeStyleSet##name##MaxContentJNI( \ - JNIEnv* /*env*/, jobject /*obj*/, jlong nativePointer) { \ - YGNodeStyleSet##name##MaxContent(_jlong2YGNodeRef(nativePointer)); \ - } \ - static void jni_YGNodeStyleSet##name##FitContentJNI( \ - JNIEnv* /*env*/, jobject /*obj*/, jlong nativePointer) { \ - YGNodeStyleSet##name##FitContent(_jlong2YGNodeRef(nativePointer)); \ - } \ - static void jni_YGNodeStyleSet##name##StretchJNI( \ - JNIEnv* /*env*/, jobject /*obj*/, jlong nativePointer) { \ - YGNodeStyleSet##name##Stretch(_jlong2YGNodeRef(nativePointer)); \ - } - #define YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(name) \ static jlong jni_YGNodeStyleGet##name##JNI( \ JNIEnv* /*env*/, jobject /*obj*/, jlong nativePointer, jint edge) { \ @@ -505,13 +483,13 @@ YG_NODE_JNI_STYLE_PROP(jfloat, float, Flex); YG_NODE_JNI_STYLE_PROP(jfloat, float, FlexGrow); YG_NODE_JNI_STYLE_PROP(jfloat, float, FlexShrink); -YG_NODE_JNI_STYLE_UNIT_PROP_AUTO_INTRINSIC(FlexBasis); -YG_NODE_JNI_STYLE_UNIT_PROP_AUTO_INTRINSIC(Width); -YG_NODE_JNI_STYLE_UNIT_PROP_INTRINSIC(MinWidth); -YG_NODE_JNI_STYLE_UNIT_PROP_INTRINSIC(MaxWidth); -YG_NODE_JNI_STYLE_UNIT_PROP_AUTO_INTRINSIC(Height); -YG_NODE_JNI_STYLE_UNIT_PROP_INTRINSIC(MinHeight); -YG_NODE_JNI_STYLE_UNIT_PROP_INTRINSIC(MaxHeight); +YG_NODE_JNI_STYLE_UNIT_PROP_AUTO(FlexBasis); +YG_NODE_JNI_STYLE_UNIT_PROP_AUTO(Width); +YG_NODE_JNI_STYLE_UNIT_PROP(MinWidth); +YG_NODE_JNI_STYLE_UNIT_PROP(MaxWidth); +YG_NODE_JNI_STYLE_UNIT_PROP_AUTO(Height); +YG_NODE_JNI_STYLE_UNIT_PROP(MinHeight); +YG_NODE_JNI_STYLE_UNIT_PROP(MaxHeight); YG_NODE_JNI_STYLE_EDGE_UNIT_PROP_AUTO(Position); @@ -892,15 +870,6 @@ static JNINativeMethod methods[] = { {"jni_YGNodeStyleSetFlexBasisAutoJNI", "(J)V", (void*)jni_YGNodeStyleSetFlexBasisAutoJNI}, - {"jni_YGNodeStyleSetFlexBasisMaxContentJNI", - "(J)V", - (void*)jni_YGNodeStyleSetFlexBasisMaxContentJNI}, - {"jni_YGNodeStyleSetFlexBasisFitContentJNI", - "(J)V", - (void*)jni_YGNodeStyleSetFlexBasisFitContentJNI}, - {"jni_YGNodeStyleSetFlexBasisStretchJNI", - "(J)V", - (void*)jni_YGNodeStyleSetFlexBasisStretchJNI}, {"jni_YGNodeStyleGetMarginJNI", "(JI)J", (void*)jni_YGNodeStyleGetMarginJNI}, @@ -948,15 +917,6 @@ static JNINativeMethod methods[] = { {"jni_YGNodeStyleSetWidthAutoJNI", "(J)V", (void*)jni_YGNodeStyleSetWidthAutoJNI}, - {"jni_YGNodeStyleSetWidthMaxContentJNI", - "(J)V", - (void*)jni_YGNodeStyleSetWidthMaxContentJNI}, - {"jni_YGNodeStyleSetWidthFitContentJNI", - "(J)V", - (void*)jni_YGNodeStyleSetWidthFitContentJNI}, - {"jni_YGNodeStyleSetWidthStretchJNI", - "(J)V", - (void*)jni_YGNodeStyleSetWidthStretchJNI}, {"jni_YGNodeStyleGetHeightJNI", "(J)J", (void*)jni_YGNodeStyleGetHeightJNI}, {"jni_YGNodeStyleSetHeightJNI", "(JF)V", @@ -967,15 +927,6 @@ static JNINativeMethod methods[] = { {"jni_YGNodeStyleSetHeightAutoJNI", "(J)V", (void*)jni_YGNodeStyleSetHeightAutoJNI}, - {"jni_YGNodeStyleSetHeightMaxContentJNI", - "(J)V", - (void*)jni_YGNodeStyleSetHeightMaxContentJNI}, - {"jni_YGNodeStyleSetHeightFitContentJNI", - "(J)V", - (void*)jni_YGNodeStyleSetHeightFitContentJNI}, - {"jni_YGNodeStyleSetHeightStretchJNI", - "(J)V", - (void*)jni_YGNodeStyleSetHeightStretchJNI}, {"jni_YGNodeStyleGetMinWidthJNI", "(J)J", (void*)jni_YGNodeStyleGetMinWidthJNI}, @@ -985,15 +936,6 @@ static JNINativeMethod methods[] = { {"jni_YGNodeStyleSetMinWidthPercentJNI", "(JF)V", (void*)jni_YGNodeStyleSetMinWidthPercentJNI}, - {"jni_YGNodeStyleSetMinWidthMaxContentJNI", - "(J)V", - (void*)jni_YGNodeStyleSetMinWidthMaxContentJNI}, - {"jni_YGNodeStyleSetMinWidthFitContentJNI", - "(J)V", - (void*)jni_YGNodeStyleSetMinWidthFitContentJNI}, - {"jni_YGNodeStyleSetMinWidthStretchJNI", - "(J)V", - (void*)jni_YGNodeStyleSetMinWidthStretchJNI}, {"jni_YGNodeStyleGetMinHeightJNI", "(J)J", (void*)jni_YGNodeStyleGetMinHeightJNI}, @@ -1003,15 +945,6 @@ static JNINativeMethod methods[] = { {"jni_YGNodeStyleSetMinHeightPercentJNI", "(JF)V", (void*)jni_YGNodeStyleSetMinHeightPercentJNI}, - {"jni_YGNodeStyleSetMinHeightMaxContentJNI", - "(J)V", - (void*)jni_YGNodeStyleSetMinHeightMaxContentJNI}, - {"jni_YGNodeStyleSetMinHeightFitContentJNI", - "(J)V", - (void*)jni_YGNodeStyleSetMinHeightFitContentJNI}, - {"jni_YGNodeStyleSetMinHeightStretchJNI", - "(J)V", - (void*)jni_YGNodeStyleSetMinHeightStretchJNI}, {"jni_YGNodeStyleGetMaxWidthJNI", "(J)J", (void*)jni_YGNodeStyleGetMaxWidthJNI}, @@ -1021,15 +954,6 @@ static JNINativeMethod methods[] = { {"jni_YGNodeStyleSetMaxWidthPercentJNI", "(JF)V", (void*)jni_YGNodeStyleSetMaxWidthPercentJNI}, - {"jni_YGNodeStyleSetMaxWidthMaxContentJNI", - "(J)V", - (void*)jni_YGNodeStyleSetMaxWidthMaxContentJNI}, - {"jni_YGNodeStyleSetMaxWidthFitContentJNI", - "(J)V", - (void*)jni_YGNodeStyleSetMaxWidthFitContentJNI}, - {"jni_YGNodeStyleSetMaxWidthStretchJNI", - "(J)V", - (void*)jni_YGNodeStyleSetMaxWidthStretchJNI}, {"jni_YGNodeStyleGetMaxHeightJNI", "(J)J", (void*)jni_YGNodeStyleGetMaxHeightJNI}, @@ -1039,15 +963,6 @@ static JNINativeMethod methods[] = { {"jni_YGNodeStyleSetMaxHeightPercentJNI", "(JF)V", (void*)jni_YGNodeStyleSetMaxHeightPercentJNI}, - {"jni_YGNodeStyleSetMaxHeightMaxContentJNI", - "(J)V", - (void*)jni_YGNodeStyleSetMaxHeightMaxContentJNI}, - {"jni_YGNodeStyleSetMaxHeightFitContentJNI", - "(J)V", - (void*)jni_YGNodeStyleSetMaxHeightFitContentJNI}, - {"jni_YGNodeStyleSetMaxHeightStretchJNI", - "(J)V", - (void*)jni_YGNodeStyleSetMaxHeightStretchJNI}, {"jni_YGNodeStyleGetAspectRatioJNI", "(J)F", (void*)jni_YGNodeStyleGetAspectRatioJNI}, diff --git a/packages/react-native/ReactCommon/yoga/yoga/YGNodeStyle.cpp b/packages/react-native/ReactCommon/yoga/yoga/YGNodeStyle.cpp index 3f1be42e463..1309117af42 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/YGNodeStyle.cpp +++ b/packages/react-native/ReactCommon/yoga/yoga/YGNodeStyle.cpp @@ -192,21 +192,6 @@ void YGNodeStyleSetFlexBasisAuto(const YGNodeRef node) { node, StyleSizeLength::ofAuto()); } -void YGNodeStyleSetFlexBasisMaxContent(const YGNodeRef node) { - updateStyle<&Style::flexBasis, &Style::setFlexBasis>( - node, StyleSizeLength::ofMaxContent()); -} - -void YGNodeStyleSetFlexBasisFitContent(const YGNodeRef node) { - updateStyle<&Style::flexBasis, &Style::setFlexBasis>( - node, StyleSizeLength::ofFitContent()); -} - -void YGNodeStyleSetFlexBasisStretch(const YGNodeRef node) { - updateStyle<&Style::flexBasis, &Style::setFlexBasis>( - node, StyleSizeLength::ofStretch()); -} - YGValue YGNodeStyleGetFlexBasis(const YGNodeConstRef node) { return (YGValue)resolveRef(node)->style().flexBasis(); } @@ -336,21 +321,6 @@ void YGNodeStyleSetWidthAuto(YGNodeRef node) { node, Dimension::Width, StyleSizeLength::ofAuto()); } -void YGNodeStyleSetWidthMaxContent(YGNodeRef node) { - updateStyle<&Style::dimension, &Style::setDimension>( - node, Dimension::Width, StyleSizeLength::ofMaxContent()); -} - -void YGNodeStyleSetWidthFitContent(YGNodeRef node) { - updateStyle<&Style::dimension, &Style::setDimension>( - node, Dimension::Width, StyleSizeLength::ofFitContent()); -} - -void YGNodeStyleSetWidthStretch(YGNodeRef node) { - updateStyle<&Style::dimension, &Style::setDimension>( - node, Dimension::Width, StyleSizeLength::ofStretch()); -} - YGValue YGNodeStyleGetWidth(YGNodeConstRef node) { return (YGValue)resolveRef(node)->style().dimension(Dimension::Width); } @@ -370,21 +340,6 @@ void YGNodeStyleSetHeightAuto(YGNodeRef node) { node, Dimension::Height, StyleSizeLength::ofAuto()); } -void YGNodeStyleSetHeightMaxContent(YGNodeRef node) { - updateStyle<&Style::dimension, &Style::setDimension>( - node, Dimension::Height, StyleSizeLength::ofMaxContent()); -} - -void YGNodeStyleSetHeightFitContent(YGNodeRef node) { - updateStyle<&Style::dimension, &Style::setDimension>( - node, Dimension::Height, StyleSizeLength::ofFitContent()); -} - -void YGNodeStyleSetHeightStretch(YGNodeRef node) { - updateStyle<&Style::dimension, &Style::setDimension>( - node, Dimension::Height, StyleSizeLength::ofStretch()); -} - YGValue YGNodeStyleGetHeight(YGNodeConstRef node) { return (YGValue)resolveRef(node)->style().dimension(Dimension::Height); } @@ -399,21 +354,6 @@ void YGNodeStyleSetMinWidthPercent(const YGNodeRef node, const float minWidth) { node, Dimension::Width, StyleSizeLength::percent(minWidth)); } -void YGNodeStyleSetMinWidthMaxContent(const YGNodeRef node) { - updateStyle<&Style::minDimension, &Style::setMinDimension>( - node, Dimension::Width, StyleSizeLength::ofMaxContent()); -} - -void YGNodeStyleSetMinWidthFitContent(const YGNodeRef node) { - updateStyle<&Style::minDimension, &Style::setMinDimension>( - node, Dimension::Width, StyleSizeLength::ofFitContent()); -} - -void YGNodeStyleSetMinWidthStretch(const YGNodeRef node) { - updateStyle<&Style::minDimension, &Style::setMinDimension>( - node, Dimension::Width, StyleSizeLength::ofStretch()); -} - YGValue YGNodeStyleGetMinWidth(const YGNodeConstRef node) { return (YGValue)resolveRef(node)->style().minDimension(Dimension::Width); } @@ -430,21 +370,6 @@ void YGNodeStyleSetMinHeightPercent( node, Dimension::Height, StyleSizeLength::percent(minHeight)); } -void YGNodeStyleSetMinHeightMaxContent(const YGNodeRef node) { - updateStyle<&Style::minDimension, &Style::setMinDimension>( - node, Dimension::Height, StyleSizeLength::ofMaxContent()); -} - -void YGNodeStyleSetMinHeightFitContent(const YGNodeRef node) { - updateStyle<&Style::minDimension, &Style::setMinDimension>( - node, Dimension::Height, StyleSizeLength::ofFitContent()); -} - -void YGNodeStyleSetMinHeightStretch(const YGNodeRef node) { - updateStyle<&Style::minDimension, &Style::setMinDimension>( - node, Dimension::Height, StyleSizeLength::ofStretch()); -} - YGValue YGNodeStyleGetMinHeight(const YGNodeConstRef node) { return (YGValue)resolveRef(node)->style().minDimension(Dimension::Height); } @@ -459,21 +384,6 @@ void YGNodeStyleSetMaxWidthPercent(const YGNodeRef node, const float maxWidth) { node, Dimension::Width, StyleSizeLength::percent(maxWidth)); } -void YGNodeStyleSetMaxWidthMaxContent(const YGNodeRef node) { - updateStyle<&Style::maxDimension, &Style::setMaxDimension>( - node, Dimension::Width, StyleSizeLength::ofMaxContent()); -} - -void YGNodeStyleSetMaxWidthFitContent(const YGNodeRef node) { - updateStyle<&Style::maxDimension, &Style::setMaxDimension>( - node, Dimension::Width, StyleSizeLength::ofFitContent()); -} - -void YGNodeStyleSetMaxWidthStretch(const YGNodeRef node) { - updateStyle<&Style::maxDimension, &Style::setMaxDimension>( - node, Dimension::Width, StyleSizeLength::ofStretch()); -} - YGValue YGNodeStyleGetMaxWidth(const YGNodeConstRef node) { return (YGValue)resolveRef(node)->style().maxDimension(Dimension::Width); } @@ -490,21 +400,6 @@ void YGNodeStyleSetMaxHeightPercent( node, Dimension::Height, StyleSizeLength::percent(maxHeight)); } -void YGNodeStyleSetMaxHeightMaxContent(const YGNodeRef node) { - updateStyle<&Style::maxDimension, &Style::setMaxDimension>( - node, Dimension::Height, StyleSizeLength::ofMaxContent()); -} - -void YGNodeStyleSetMaxHeightFitContent(const YGNodeRef node) { - updateStyle<&Style::maxDimension, &Style::setMaxDimension>( - node, Dimension::Height, StyleSizeLength::ofFitContent()); -} - -void YGNodeStyleSetMaxHeightStretch(const YGNodeRef node) { - updateStyle<&Style::maxDimension, &Style::setMaxDimension>( - node, Dimension::Height, StyleSizeLength::ofStretch()); -} - YGValue YGNodeStyleGetMaxHeight(const YGNodeConstRef node) { return (YGValue)resolveRef(node)->style().maxDimension(Dimension::Height); } diff --git a/packages/react-native/ReactCommon/yoga/yoga/YGNodeStyle.h b/packages/react-native/ReactCommon/yoga/yoga/YGNodeStyle.h index a971138bb9d..2746a4a00ab 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/YGNodeStyle.h +++ b/packages/react-native/ReactCommon/yoga/yoga/YGNodeStyle.h @@ -64,9 +64,6 @@ YG_EXPORT float YGNodeStyleGetFlexShrink(YGNodeConstRef node); YG_EXPORT void YGNodeStyleSetFlexBasis(YGNodeRef node, float flexBasis); YG_EXPORT void YGNodeStyleSetFlexBasisPercent(YGNodeRef node, float flexBasis); YG_EXPORT void YGNodeStyleSetFlexBasisAuto(YGNodeRef node); -YG_EXPORT void YGNodeStyleSetFlexBasisMaxContent(YGNodeRef node); -YG_EXPORT void YGNodeStyleSetFlexBasisFitContent(YGNodeRef node); -YG_EXPORT void YGNodeStyleSetFlexBasisStretch(YGNodeRef node); YG_EXPORT YGValue YGNodeStyleGetFlexBasis(YGNodeConstRef node); YG_EXPORT void @@ -104,45 +101,27 @@ YG_EXPORT YGBoxSizing YGNodeStyleGetBoxSizing(YGNodeConstRef node); YG_EXPORT void YGNodeStyleSetWidth(YGNodeRef node, float width); YG_EXPORT void YGNodeStyleSetWidthPercent(YGNodeRef node, float width); YG_EXPORT void YGNodeStyleSetWidthAuto(YGNodeRef node); -YG_EXPORT void YGNodeStyleSetWidthMaxContent(YGNodeRef node); -YG_EXPORT void YGNodeStyleSetWidthFitContent(YGNodeRef node); -YG_EXPORT void YGNodeStyleSetWidthStretch(YGNodeRef node); YG_EXPORT YGValue YGNodeStyleGetWidth(YGNodeConstRef node); YG_EXPORT void YGNodeStyleSetHeight(YGNodeRef node, float height); YG_EXPORT void YGNodeStyleSetHeightPercent(YGNodeRef node, float height); YG_EXPORT void YGNodeStyleSetHeightAuto(YGNodeRef node); -YG_EXPORT void YGNodeStyleSetHeightMaxContent(YGNodeRef node); -YG_EXPORT void YGNodeStyleSetHeightFitContent(YGNodeRef node); -YG_EXPORT void YGNodeStyleSetHeightStretch(YGNodeRef node); YG_EXPORT YGValue YGNodeStyleGetHeight(YGNodeConstRef node); YG_EXPORT void YGNodeStyleSetMinWidth(YGNodeRef node, float minWidth); YG_EXPORT void YGNodeStyleSetMinWidthPercent(YGNodeRef node, float minWidth); -YG_EXPORT void YGNodeStyleSetMinWidthMaxContent(YGNodeRef node); -YG_EXPORT void YGNodeStyleSetMinWidthFitContent(YGNodeRef node); -YG_EXPORT void YGNodeStyleSetMinWidthStretch(YGNodeRef node); YG_EXPORT YGValue YGNodeStyleGetMinWidth(YGNodeConstRef node); YG_EXPORT void YGNodeStyleSetMinHeight(YGNodeRef node, float minHeight); YG_EXPORT void YGNodeStyleSetMinHeightPercent(YGNodeRef node, float minHeight); -YG_EXPORT void YGNodeStyleSetMinHeightMaxContent(YGNodeRef node); -YG_EXPORT void YGNodeStyleSetMinHeightFitContent(YGNodeRef node); -YG_EXPORT void YGNodeStyleSetMinHeightStretch(YGNodeRef node); YG_EXPORT YGValue YGNodeStyleGetMinHeight(YGNodeConstRef node); YG_EXPORT void YGNodeStyleSetMaxWidth(YGNodeRef node, float maxWidth); YG_EXPORT void YGNodeStyleSetMaxWidthPercent(YGNodeRef node, float maxWidth); -YG_EXPORT void YGNodeStyleSetMaxWidthMaxContent(YGNodeRef node); -YG_EXPORT void YGNodeStyleSetMaxWidthFitContent(YGNodeRef node); -YG_EXPORT void YGNodeStyleSetMaxWidthStretch(YGNodeRef node); YG_EXPORT YGValue YGNodeStyleGetMaxWidth(YGNodeConstRef node); YG_EXPORT void YGNodeStyleSetMaxHeight(YGNodeRef node, float maxHeight); YG_EXPORT void YGNodeStyleSetMaxHeightPercent(YGNodeRef node, float maxHeight); -YG_EXPORT void YGNodeStyleSetMaxHeightMaxContent(YGNodeRef node); -YG_EXPORT void YGNodeStyleSetMaxHeightFitContent(YGNodeRef node); -YG_EXPORT void YGNodeStyleSetMaxHeightStretch(YGNodeRef node); YG_EXPORT YGValue YGNodeStyleGetMaxHeight(YGNodeConstRef node); YG_EXPORT void YGNodeStyleSetAspectRatio(YGNodeRef node, float aspectRatio);