Expose Gap Percentage to ReactNative

Summary: Expose the Gap Percent from Yoga to RN Layer Changelog: [Internal] - Enable flex gap percentage value for RN. Differential Revision: D56160597
facebook · Apr 17, 2024 · ab09d82 · ab09d82
1 parent cd4a1b8
commit ab09d82
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 0 deletions.
diff --git a/java/com/facebook/yoga/YogaNative.java b/java/com/facebook/yoga/YogaNative.java
@@ -109,6 +109,7 @@ public class YogaNative {
   static native float jni_YGNodeStyleGetGapJNI(long nativePointer, int gutter);
   static native void jni_YGNodeStyleSetGapJNI(long nativePointer, int gutter, float gapLength);
   static native void jni_YGNodeStyleSetGapPercentJNI(long nativePointer, int gutter, float gapLength);
+  static native void jni_YGNodeStyleSetGapAutoJNI(long nativePointer, int gutter);
   static native void jni_YGNodeSetHasMeasureFuncJNI(long nativePointer, boolean hasMeasureFunc);
   static native void jni_YGNodeSetHasBaselineFuncJNI(long nativePointer, boolean hasMeasureFunc);
   static native void jni_YGNodeSetStyleInputsJNI(long nativePointer, float[] styleInputsArray, int size);

diff --git a/java/com/facebook/yoga/YogaNode.java b/java/com/facebook/yoga/YogaNode.java
@@ -194,6 +194,8 @@ public interface Inputs {
 
   public abstract void setGapPercent(YogaGutter gutter, float gapLength);
 
+  public abstract void setGapAuto(YogaGutter gutter);
+
   public abstract float getLayoutX();
 
   public abstract float getLayoutY();

diff --git a/java/com/facebook/yoga/YogaNodeJNIBase.java b/java/com/facebook/yoga/YogaNodeJNIBase.java
@@ -726,4 +726,9 @@ public void setGap(YogaGutter gutter, float gapLength) {
   public void setGapPercent(YogaGutter gutter, float gapLength) {
     YogaNative.jni_YGNodeStyleSetGapPercentJNI(mNativePointer, gutter.intValue(), gapLength);
   }
+
+  @Override
+  public void setGapAuto(YogaGutter gutter) {
+    YogaNative.jni_YGNodeStyleSetGapAutoJNI(mNativePointer, gutter.intValue());
+  }
 }
diff --git a/java/jni/YGJNIVanilla.cpp b/java/jni/YGJNIVanilla.cpp
@@ -727,6 +727,15 @@ static void jni_YGNodeStyleSetGapPercentJNI(
       static_cast<float>(gapLength));
 }
 
+static void jni_YGNodeStyleSetGapAutoJNI(
+    JNIEnv* /*env*/,
+    jobject /*obj*/,
+    jlong nativePointer,
+    jint gutter) {
+  YGNodeStyleSetGapAuto(
+      _jlong2YGNodeRef(nativePointer), static_cast<YGGutter>(gutter));
+}
+
 // Yoga specific properties, not compatible with flexbox specification
 YG_NODE_JNI_STYLE_PROP(jfloat, float, AspectRatio);
 
@@ -959,6 +968,9 @@ static JNINativeMethod methods[] = {
     {"jni_YGNodeStyleSetGapPercentJNI",
      "(JIF)V",
      (void*)jni_YGNodeStyleSetGapPercentJNI},
+    {"jni_YGNodeStyleSetGapAutoJNI",
+     "(JI)V",
+     (void*)jni_YGNodeStyleSetGapAutoJNI},
     {"jni_YGNodeSetHasBaselineFuncJNI",
      "(JZ)V",
      (void*)jni_YGNodeSetHasBaselineFuncJNI},

diff --git a/yoga/YGNodeStyle.cpp b/yoga/YGNodeStyle.cpp
@@ -267,6 +267,11 @@ void YGNodeStyleSetGap(
       node, scopedEnum(gutter), value::points(gapLength));
 }
 
+void YGNodeStyleSetGapAuto(YGNodeRef node, YGGutter gutter) {
+  updateStyle<&Style::gap, &Style::setGap>(
+      node, scopedEnum(gutter), value::ofAuto());
+}
+
 void YGNodeStyleSetGapPercent(YGNodeRef node, YGGutter gutter, float percent) {
   updateStyle<&Style::gap, &Style::setGap>(
       node, scopedEnum(gutter), value::percent(percent));

diff --git a/yoga/YGNodeStyle.h b/yoga/YGNodeStyle.h
@@ -89,6 +89,7 @@ YG_EXPORT float YGNodeStyleGetBorder(YGNodeConstRef node, YGEdge edge);
 
 YG_EXPORT void
 YGNodeStyleSetGap(YGNodeRef node, YGGutter gutter, float gapLength);
+YG_EXPORT void YGNodeStyleSetGapAuto(YGNodeRef node, YGGutter gutter);
 YG_EXPORT void
 YGNodeStyleSetGapPercent(YGNodeRef node, YGGutter gutter, float gapLength);
 YG_EXPORT float YGNodeStyleGetGap(YGNodeConstRef node, YGGutter gutter);