From 786c6e8043f59025238b1e698a60344155f6adcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateo=20Guzm=C3=A1n?= Date: Mon, 7 Apr 2025 02:59:30 -0700 Subject: [PATCH] Make `FontMetricsUtil` internal (#50506) Summary: This class can be internalized as part of the initiative to reduce the public API surface. I've checked there are [no relevant OSS usages](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+NOT+user%3Acortinico+NOT+repo%3AMaxdev18%2Fpowersync_app+NOT+repo%3Acarter-0%2Finstagram-decompiled+NOT+repo%3Am0mosenpai%2Finstadamn+NOT+repo%3AA-Star100%2FA-Star100-AUG2-2024+NOT+repo%3Alclnrd%2Fdetox-scrollview-reproductible+NOT+repo%3ADionisisChytiris%2FWorldWiseTrivia_Main+NOT+repo%3Apast3l%2Fhi2+NOT+repo%3AoneDotpy%2FCaribouQuest+NOT+repo%3Abejayoharen%2Fdailytodo+NOT+repo%3Amolangning%2Freversing-discord+NOT+repo%3AScottPrzy%2Freact-native+NOT+repo%3Agabrieldonadel%2Freact-native-visionos+NOT+repo%3AGabriel2308%2FTestes-Soft+NOT+repo%3Adawnzs03%2FflakyBuild+NOT+repo%3Acga2351%2Fcode+NOT+repo%3Astreeg%2Ftcc+NOT+repo%3Asoftware-mansion-labs%2Freact-native-swiftui+NOT+repo%3Apkcsecurity%2Fdecompiled-lightbulb+com.facebook.react.views.text.FontMetricsUtil). ## Changelog: [INTERNAL] - Make com.facebook.react.views.text.FontMetricsUtil internal Pull Request resolved: https://github.com/facebook/react-native/pull/50506 Test Plan: ```bash yarn test-android yarn android ``` Reviewed By: javache Differential Revision: D72549765 Pulled By: cortinico fbshipit-source-id: b7e29dfb716ce7c93620b14adec1425345b13ac1 --- packages/react-native/ReactAndroid/api/ReactAndroid.api | 5 ----- .../java/com/facebook/react/views/text/FontMetricsUtil.kt | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index 105c6723f85..60f55a8185a 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -6513,11 +6513,6 @@ public final class com/facebook/react/views/text/DefaultStyleValuesUtil { public static final fun getDefaultTextColorHint (Landroid/content/Context;)Landroid/content/res/ColorStateList; } -public final class com/facebook/react/views/text/FontMetricsUtil { - public static final field INSTANCE Lcom/facebook/react/views/text/FontMetricsUtil; - public static final fun getFontMetrics (Ljava/lang/CharSequence;Landroid/text/Layout;Landroid/text/TextPaint;Landroid/content/Context;)Lcom/facebook/react/bridge/WritableArray; -} - public abstract class com/facebook/react/views/text/ReactBaseTextShadowNode : com/facebook/react/uimanager/LayoutShadowNode { public static final field DEFAULT_TEXT_SHADOW_COLOR I public static final field PROP_SHADOW_COLOR Ljava/lang/String; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/FontMetricsUtil.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/FontMetricsUtil.kt index f9446d08a93..9ce5e241766 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/FontMetricsUtil.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/FontMetricsUtil.kt @@ -14,14 +14,14 @@ import android.text.TextPaint import com.facebook.react.bridge.Arguments import com.facebook.react.bridge.WritableArray -public object FontMetricsUtil { +internal object FontMetricsUtil { private const val CAP_HEIGHT_MEASUREMENT_TEXT = "T" private const val X_HEIGHT_MEASUREMENT_TEXT = "x" private const val AMPLIFICATION_FACTOR = 100f @JvmStatic - public fun getFontMetrics( + fun getFontMetrics( text: CharSequence, layout: Layout, paint: TextPaint,