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 be8363f02ea..8ef153ed353 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 @@ -16,10 +16,12 @@ import com.facebook.react.uimanager.annotations.ReactPropertyHolder; import com.facebook.yoga.YogaAlign; import com.facebook.yoga.YogaBaselineFunction; import com.facebook.yoga.YogaConfig; +import com.facebook.yoga.YogaConfigFactory; import com.facebook.yoga.YogaConstants; import com.facebook.yoga.YogaDirection; import com.facebook.yoga.YogaDisplay; import com.facebook.yoga.YogaEdge; +import com.facebook.yoga.YogaErrata; import com.facebook.yoga.YogaFlexDirection; import com.facebook.yoga.YogaGutter; import com.facebook.yoga.YogaJustify; @@ -63,7 +65,9 @@ public class ReactShadowNodeImpl implements ReactShadowNode private static final YogaConfig sYogaConfig; static { - sYogaConfig = ReactYogaConfigProvider.INSTANCE.getYogaConfig(); + sYogaConfig = YogaConfigFactory.create(); + sYogaConfig.setPointScaleFactor(0f); + sYogaConfig.setErrata(YogaErrata.ALL); } static { 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 deleted file mode 100644 index 9005d1a07dc..00000000000 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactYogaConfigProvider.kt +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -package com.facebook.react.uimanager - -import com.facebook.react.common.annotations.internal.LegacyArchitecture -import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel -import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger -import com.facebook.yoga.YogaConfig -import com.facebook.yoga.YogaConfigFactory -import com.facebook.yoga.YogaErrata - -@LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) -internal object ReactYogaConfigProvider { - init { - LegacyArchitectureLogger.assertLegacyArchitecture("ReactYogaConfigProvider") - } - - val yogaConfig: YogaConfig by - lazy(LazyThreadSafetyMode.NONE) { - YogaConfigFactory.create().apply { - setPointScaleFactor(0f) - setErrata(YogaErrata.ALL) - } - } -}