react-native 0.73.0-rc.6 → 0.73.0-rc.8

package/Libraries/Core/ReactNativeVersion.js

@@ -13,5 +13,5 @@ exports.version = {
   major: 0,
   minor: 73,
   patch: 0,
-  prerelease: 'rc.6',
+  prerelease: 'rc.8',
 };

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(73),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"rc.6",
+                  RCTVersionPrerelease: @"rc.8",
                   };
   });
   return __rnVersion;

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.73.0-rc.6
+VERSION_NAME=0.73.0-rc.8
 react.internal.publishingGroup=com.facebook.react
 
 android.useAndroidX=true

package/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

@@ -1278,14 +1278,12 @@ public class ReactInstanceManager {
           uiManager.stopSurface(surfaceId);
         } else {
           FLog.w(ReactConstants.TAG, "Failed to stop surface, UIManager has already gone away");
-          reactRoot.getRootViewGroup().removeAllViews();
         }
       } else {
         ReactSoftExceptionLogger.logSoftException(
             TAG,
             new RuntimeException(
                 "detachRootViewFromInstance called with ReactRootView with invalid id"));
-        reactRoot.getRootViewGroup().removeAllViews();
       }
     } else {
       reactContext
@@ -1294,8 +1292,7 @@ public class ReactInstanceManager {
           .unmountApplicationComponentAtRootTag(reactRoot.getRootViewTag());
     }
 
-    // The view is no longer attached, so mark it as such by resetting its ID.
-    reactRoot.getRootViewGroup().setId(View.NO_ID);
+    clearReactRoot(reactRoot);
   }
 
   @ThreadConfined(UI)

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

@@ -18,5 +18,5 @@ public class ReactNativeVersion {
       "major", 0,
       "minor", 73,
       "patch", 0,
-      "prerelease", "rc.6");
+      "prerelease", "rc.8");
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java

@@ -75,16 +75,6 @@ public abstract class ReactTextAnchorViewManager<T extends View, C extends React
     view.setAdjustFontSizeToFit(adjustsFontSizeToFit);
   }
 
-  @ReactProp(name = ViewProps.ALLOW_FONT_SCALING, defaultBoolean = true)
-  public void setAllowFontScaling(ReactTextView view, boolean allowFontScaling) {
-    view.setAllowFontScaling(allowFontScaling);
-  }
-
-  @ReactProp(name = ViewProps.MAX_FONT_SIZE_MULTIPLIER, defaultFloat = Float.NaN)
-  public void setMaxFontSizeMultiplier(ReactTextView view, float maxFontSizeMultiplier) {
-    view.setMaxFontSizeMultiplier(maxFontSizeMultiplier);
-  }
-
   @ReactProp(name = ViewProps.FONT_SIZE)
   public void setFontSize(ReactTextView view, float fontSize) {
     view.setFontSize(fontSize);

package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java

@@ -58,6 +58,8 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
   private int mNumberOfLines;
   private TextUtils.TruncateAt mEllipsizeLocation;
   private boolean mAdjustsFontSizeToFit;
+  private float mFontSize = Float.NaN;
+  private float mLetterSpacing = Float.NaN;
   private int mLinkifyMaskType;
   private boolean mNotifyOnInlineViewLayout;
   private boolean mTextIsSelectable;
@@ -65,12 +67,6 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
   private ReactViewBackgroundManager mReactBackgroundManager;
   private Spannable mSpanned;
 
-  /**
-   * Used to collect some text size affecting attributes to fix some text cut-off issues when users
-   * adjust text size and font weight to the max value in system font settings.
-   */
-  private TextAttributes mTextAttributes;
-
   public ReactTextView(Context context) {
     super(context);
 
@@ -102,7 +98,6 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
     mEllipsizeLocation = TextUtils.TruncateAt.END;
 
     mSpanned = null;
-    mTextAttributes = new TextAttributes();
   }
 
   /* package */ void recycleView() {
@@ -592,6 +587,29 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
     mAdjustsFontSizeToFit = adjustsFontSizeToFit;
   }
 
+  public void setFontSize(float fontSize) {
+    mFontSize =
+        mAdjustsFontSizeToFit
+            ? (float) Math.ceil(PixelUtil.toPixelFromSP(fontSize))
+            : (float) Math.ceil(PixelUtil.toPixelFromDIP(fontSize));
+
+    applyTextAttributes();
+  }
+
+  public void setLetterSpacing(float letterSpacing) {
+    if (Float.isNaN(letterSpacing)) {
+      return;
+    }
+
+    float letterSpacingPixels = PixelUtil.toPixelFromDIP(letterSpacing);
+
+    // `letterSpacingPixels` and `getEffectiveFontSize` are both in pixels,
+    // yielding an accurate em value.
+    mLetterSpacing = letterSpacingPixels / mFontSize;
+
+    applyTextAttributes();
+  }
+
   public void setEllipsizeLocation(TextUtils.TruncateAt ellipsizeLocation) {
     mEllipsizeLocation = ellipsizeLocation;
   }
@@ -607,8 +625,6 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
             ? null
             : mEllipsizeLocation;
     setEllipsize(ellipsizeLocation);
-
-    applyTextAttributes();
   }
 
   @Override
@@ -664,37 +680,16 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
     return super.dispatchHoverEvent(event);
   }
 
-  public void setLetterSpacing(float letterSpacing) {
-    mTextAttributes.setLetterSpacing(letterSpacing);
-  }
-
-  public void setAllowFontScaling(boolean allowFontScaling) {
-    if (mTextAttributes.getAllowFontScaling() != allowFontScaling) {
-      mTextAttributes.setAllowFontScaling(allowFontScaling);
-    }
-  }
-
-  public void setFontSize(float fontSize) {
-    mTextAttributes.setFontSize(fontSize);
-  }
-
-  public void setMaxFontSizeMultiplier(float maxFontSizeMultiplier) {
-    if (maxFontSizeMultiplier != mTextAttributes.getMaxFontSizeMultiplier()) {
-      mTextAttributes.setMaxFontSizeMultiplier(maxFontSizeMultiplier);
-    }
-  }
-
   private void applyTextAttributes() {
-    // In general, the `getEffective*` functions return `Float.NaN` if the
-    // property hasn't been set.
-
-    // `getEffectiveFontSize` always returns a value so don't need to check for anything like
-    // `Float.NaN`.
-    setTextSize(TypedValue.COMPLEX_UNIT_PX, mTextAttributes.getEffectiveFontSize());
+    // Workaround for an issue where text can be cut off with an ellipsis when
+    // using certain font sizes and padding. Sets the provided text size and
+    // letter spacing to ensure consistent rendering and prevent cut-off.
+    if (!Float.isNaN(mFontSize)) {
+      setTextSize(TypedValue.COMPLEX_UNIT_PX, mFontSize);
+    }
 
-    float effectiveLetterSpacing = mTextAttributes.getEffectiveLetterSpacing();
-    if (!Float.isNaN(effectiveLetterSpacing)) {
-      super.setLetterSpacing(effectiveLetterSpacing);
+    if (!Float.isNaN(mLetterSpacing)) {
+      super.setLetterSpacing(mLetterSpacing);
     }
   }
 }

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -18,7 +18,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 73;
   int32_t Patch = 0;
-  std::string_view Prerelease = "rc.6";
+  std::string_view Prerelease = "rc.8";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.73.0-rc.6",
+  "version": "0.73.0-rc.8",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {

package/template/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "react": "18.2.0",
-    "react-native": "0.73.0-rc.6"
+    "react-native": "0.73.0-rc.8"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",