From 13d221208183e174deed3f4f73e8af4331758558 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Tue, 4 Feb 2025 07:17:50 -0800 Subject: [PATCH] [skip ci] Make ReactYogaConfigProvider internal Summary: This makes the `ReactYogaConfigProvider` class internal. I've verified that there are no meaningful usages in OSS: https://github.com/search?type=code&q=NOT+is%3Afork+NOT+org%3Afacebook+NOT+repo%3Areact-native-tvos%2Freact-native-tvos+NOT+repo%3Anuagoz%2Freact-native+NOT+repo%3A2lambda123%2Freact-native+NOT+repo%3Abeanchips%2Ffacebookreactnative+NOT+repo%3AfabOnReact%2Freact-native-notes+NOT+user%3Ahuntie+com.facebook.react.uimanager.ReactYogaConfigProvider Changelog: [Internal] [Changed] - Differential Revision: D69120491 --- .../ReactAndroid/api/ReactAndroid.api | 5 ----- .../react/uimanager/ReactShadowNodeImpl.java | 2 +- .../react/uimanager/ReactYogaConfigProvider.kt | 17 ++++++----------- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index f3404273bd50..102eada49510 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -4718,11 +4718,6 @@ public class com/facebook/react/uimanager/ReactStylesDiffMap { public fun toString ()Ljava/lang/String; } -public final class com/facebook/react/uimanager/ReactYogaConfigProvider { - public static final field INSTANCE Lcom/facebook/react/uimanager/ReactYogaConfigProvider; - public static final fun get ()Lcom/facebook/yoga/YogaConfig; -} - public abstract interface class com/facebook/react/uimanager/ReactZIndexedViewGroup { public abstract fun getZIndexMappedChildIndex (I)I public abstract fun updateDrawingOrder ()V diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java index 193fee669477..7e764a4ec336 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java @@ -59,7 +59,7 @@ public class ReactShadowNodeImpl implements ReactShadowNode private static final YogaConfig sYogaConfig; static { - sYogaConfig = ReactYogaConfigProvider.get(); + sYogaConfig = ReactYogaConfigProvider.INSTANCE.getYogaConfig(); } private int mReactTag; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactYogaConfigProvider.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactYogaConfigProvider.kt index bcfdbc81b2cf..e04c0d9edd6d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactYogaConfigProvider.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactYogaConfigProvider.kt @@ -11,18 +11,13 @@ import com.facebook.yoga.YogaConfig import com.facebook.yoga.YogaConfigFactory import com.facebook.yoga.YogaErrata -public object ReactYogaConfigProvider { +internal object ReactYogaConfigProvider { - private val yogaConfig: YogaConfig by + val yogaConfig: YogaConfig by lazy(LazyThreadSafetyMode.NONE) { - val config = YogaConfigFactory.create() - config.setPointScaleFactor(0f) - config.setErrata(YogaErrata.ALL) - config + YogaConfigFactory.create().apply { + setPointScaleFactor(0f) + setErrata(YogaErrata.ALL) + } } - - @JvmStatic - public fun get(): YogaConfig { - return yogaConfig - } }