From 8b0635bd15ccb39d21fb142f0b0193300da0f13a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateo=20Guzm=C3=A1n?= Date: Fri, 25 Apr 2025 06:56:11 -0700 Subject: [PATCH] Make `MeasureUtil` internal (#50918) 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.view.MeasureUtil). ## Changelog: [INTERNAL] - Make com.facebook.react.views.view.MeasureUtil internal Pull Request resolved: https://github.com/facebook/react-native/pull/50918 Test Plan: ```bash yarn test-android yarn android ``` Reviewed By: javache, cortinico Differential Revision: D73642487 Pulled By: Abbondanzo fbshipit-source-id: a6bfa875883ec1c179022305734eadc00184123b --- packages/react-native/ReactAndroid/api/ReactAndroid.api | 5 ----- .../main/java/com/facebook/react/views/view/MeasureUtil.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 0476b31828f..057554ef748 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -6794,11 +6794,6 @@ public final class com/facebook/react/views/view/ColorUtil { public static final fun normalize (DDDD)I } -public final class com/facebook/react/views/view/MeasureUtil { - public static final field INSTANCE Lcom/facebook/react/views/view/MeasureUtil; - public static final fun getMeasureSpec (FLcom/facebook/yoga/YogaMeasureMode;)I -} - public abstract class com/facebook/react/views/view/ReactClippingViewManager : com/facebook/react/uimanager/ViewGroupManager { public fun ()V public synthetic fun addView (Landroid/view/View;Landroid/view/View;I)V diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/MeasureUtil.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/MeasureUtil.kt index 1aaf806a2d4..e86316dd89d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/MeasureUtil.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/MeasureUtil.kt @@ -10,10 +10,10 @@ package com.facebook.react.views.view import android.view.View import com.facebook.yoga.YogaMeasureMode -public object MeasureUtil { +internal object MeasureUtil { @JvmStatic - public fun getMeasureSpec(size: Float, mode: YogaMeasureMode): Int = + fun getMeasureSpec(size: Float, mode: YogaMeasureMode): Int = when (mode) { YogaMeasureMode.EXACTLY -> View.MeasureSpec.makeMeasureSpec(size.toInt(), View.MeasureSpec.EXACTLY)