Back out "Update public API for intrinsic sizing setters" (#1752)

Summary: X-link: facebook/react-native#47896 Pull Request resolved: #1752 These APIs were only added so that we could do TDD as we work on intrinsic sizing functionality. As of right now they do nothing. We are aiming on publishing a new version of Yoga soon so for the time being we are going to back these out so as not to confuse anyone with this new functionality. Ideally we get to a point where we have some temporary experimental header to stage these in but this is a bit time sensitive so just backing out for now Changelog: [Internal] Reviewed By: NickGerleman Differential Revision: D66332309 fbshipit-source-id: 793f77dad021fa5e57b52c36ae954307636bcbf0
facebook · Nov 25, 2024 · 0c99549 · 0c99549
1 parent c12e732
commit 0c99549
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 634 deletions.
diff --git a/java/com/facebook/yoga/YogaNative.java b/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/java/com/facebook/yoga/YogaNode.java b/java/com/facebook/yoga/YogaNode.java
@@ -124,12 +124,6 @@ public interface Inputs {
 
   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 interface Inputs {
 
   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 interface Inputs {
 
   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/java/com/facebook/yoga/YogaNodeJNIBase.java b/java/com/facebook/yoga/YogaNodeJNIBase.java
@@ -373,18 +373,6 @@ public void setFlexBasisAuto() {
     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 void setWidthAuto() {
     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 void setHeightAuto() {
     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 void setMinWidthPercent(float percent) {
     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 void setMinHeightPercent(float percent) {
     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 void setMaxWidthPercent(float percent) {
     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 void setMaxHeightPercent(float percent) {
     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/java/com/facebook/yoga/YogaProps.java b/java/com/facebook/yoga/YogaProps.java
@@ -15,67 +15,31 @@ 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 */
 
   void setHeight(float height);
 
   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);