react-native-tvos 0.73.0-0rc3 → 0.73.1-1

package/Libraries/AppDelegate/RCTLegacyInteropComponents.mm

@@ -1,3 +1,4 @@
+
 /*
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
@@ -11,7 +12,10 @@
 
 + (NSArray<NSString *> *)legacyInteropComponents
 {
-  return @[ @"RNTMyLegacyNativeView", @"RNTMyNativeView" ];
+  return @[
+			@"RNTMyLegacyNativeView",
+			@"RNTMyNativeView"
+  ];
 }
 
 @end

package/Libraries/Core/ReactNativeVersion.js

@@ -12,6 +12,6 @@
 exports.version = {
   major: 0,
   minor: 73,
-  patch: 0,
-  prerelease: '0rc3',
+  patch: 1,
+  prerelease: '1',
 };

package/README.md

@@ -40,10 +40,10 @@ You should also install `yarn` globally, as it should be used instead of `npm` f
 
 ## Build changes
 
-- _Native layer for Apple TV_: React Native Xcode projects all now have Apple TV build targets, with names ending in the string '-tvOS'.
+- _Native layer for Apple TV_: React Native Xcode projects all now have Apple TV build targets, with names ending in the string '-tvOS'.  Changes in the React Native podspecs in 0.73 now require that your application `Podfile` only have one target. This repo supports either an iOS target or a tvOS target, but both targets should not be active at the same time. The new app template now has the iOS target commented out.
 - _Maven artifacts for Android TV_: In 0.71, the React Native Android prebuilt archives are published to Maven instead of being included in the NPM. We are following the same model, except that the Maven artifacts will be in group `io.github.react-native-tvos` instead of `com.facebook.react`. The `@react-native/gradle-plugin` module has been upgraded so that the Android dependencies will be detected correctly during build.
 
-## New project creation and using the Expo CLI
+## _(New)_ Project creation using the Expo CLI
 
 > _Pitfall:_ Make sure you do not globally install `react-native` or `react-native-tvos`. If you have done this the wrong way, you may get error messages like `ld: library not found for -lPods-TestApp-tvOS`.
 
@@ -70,7 +70,25 @@ npx expo run:ios --scheme MyApp --device "iPhone 15"
 npx expo run:android --device tv_api_31
 ```
 
-See [this document](https://docs.expo.dev/bare/using-expo-cli/) for more details on Expo CLI functionality. (Note that many of these features require that Expo SDK modules be built into your app, which is not yet supported on Apple TV.)
+See [this document](https://docs.expo.dev/bare/using-expo-cli/) for more details on Expo CLI functionality. (Note that many of these features require that Expo SDK modules be built into your app. Expo SDK support requires a different project configuration as described below.)
+
+## _(New)_ Using the Expo SDK with TV apps
+
+Starting with the Expo SDK 50 preview, and react-native-tvos 0.73.x, it will be possible to create Expo apps, and build them for TV via a new config plugin.
+
+This functionality will be new in Expo SDK 50, and will be considered an experimental feature for now.
+
+The fastest way to generate a new project is described in the [TV Example](https://github.com/expo/examples/tree/master/with-tv) in the Expo examples repo.
+
+Besides most of the core Expo modules, these also work on TV:
+
+- expo-av
+- expo-image
+- expo-localization
+- expo-updates
+
+TV does NOT support dev client (dev menu, dev launcher) at this time.
+TV does NOT support Expo Router at this time.
 
 ## Code changes
 

package/React/Base/RCTVersion.m

@@ -23,8 +23,8 @@ NSDictionary* RCTGetReactNativeVersion(void)
     __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(73),
-                  RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"0rc3",
+                  RCTVersionPatch: @(1),
+                  RCTVersionPrerelease: @"1",
                   };
   });
   return __rnVersion;

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.73.0-0rc3
+VERSION_NAME=0.73.1-1
 
 # react.internal.publishingGroup=com.facebook.react
 # For TV use this group

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

@@ -17,6 +17,6 @@ public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
       "minor", 73,
-      "patch", 0,
-      "prerelease", "0rc3");
+      "patch", 1,
+      "prerelease", "1");
 }

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

@@ -17,8 +17,8 @@ namespace facebook::react {
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 73;
-  int32_t Patch = 0;
-  std::string_view Prerelease = "0rc3";
+  int32_t Patch = 1;
+  std::string_view Prerelease = "1";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/components/view/propsConversions.h

@@ -10,7 +10,6 @@
 #include <react/renderer/components/view/conversions.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
-#include <butter/map.h>
 
 #include <optional>
 
@@ -561,7 +560,7 @@ inline void fromRawValue(
     const PropsParserContext &,
     const RawValue &value,
     TVParallaxProperties &result) {
-  auto map = (butter::map<std::string, RawValue>)value;
+  auto map = (std::unordered_map<std::string, RawValue>)value;
 
   auto enabled = map.find("enabled");
   if (enabled != map.end()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.73.0-0rc3",
+  "version": "0.73.1-1",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -94,16 +94,16 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.6.3",
-    "@react-native-community/cli": "12.1.1",
-    "@react-native-community/cli-platform-android": "12.1.1",
-    "@react-native-community/cli-platform-ios": "12.1.1",
+    "@react-native-community/cli": "12.3.0",
+    "@react-native-community/cli-platform-android": "12.3.0",
+    "@react-native-community/cli-platform-ios": "12.3.0",
     "@react-native/assets-registry": "^0.73.1",
-    "@react-native/community-cli-plugin": "^0.73.10",
+    "@react-native/community-cli-plugin": "0.73.11",
     "@react-native/codegen": "^0.73.2",
     "@react-native/gradle-plugin": "^0.73.4",
     "@react-native/js-polyfills": "^0.73.1",
     "@react-native/normalize-colors": "^0.73.2",
-    "@react-native/virtualized-lists": "^0.73.3",
+    "@react-native/virtualized-lists": "^0.73.4",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -150,6 +150,6 @@
     ]
   },
   "devDependencies": {
-    "react-native-core": "npm:react-native@0.73.0-rc.6"
+    "react-native-core": "npm:react-native@0.73.1"
   }
 }

package/scripts/cocoapods/utils.rb

@@ -564,7 +564,8 @@ class ReactNativePodsUtils
                     "NSAppTransportSecurity" => ats_configs
                 }
             else
-                plist["NSAppTransportSecurity"] = ats_configs
+                plist["NSAppTransportSecurity"] ||= {}
+                plist["NSAppTransportSecurity"] = plist["NSAppTransportSecurity"].merge(ats_configs)
             end
             Xcodeproj::Plist.write_to_path(plist, fullPlistPath)
         end

package/template/ios/Podfile

@@ -18,27 +18,30 @@ if linkage != nil
   use_frameworks! :linkage => linkage.to_sym
 end
 
-target 'HelloWorld' do
-  config = use_native_modules!
-  platform :ios, min_ios_version_supported
+####### For now, only one target at a time can be used in a React Native podfile ########
+####### https://github.com/react-native-tvos/react-native-tvos/issues/619        ########
 
-  use_react_native!(
-    :path => config[:reactNativePath],
-    # Enables Flipper.
-    #
-    # Note that if you have use_frameworks! enabled, Flipper will not work and
-    # you should disable the next line.
-    :flipper_configuration => flipper_config,
-    # An absolute path to your application root.
-    :app_path => "#{Pod::Config.instance.installation_root}/.."
-  )
-
-  target 'HelloWorldTests' do
-    inherit! :complete
-    # Pods for testing
-  end
-
-end
+# target 'HelloWorld' do
+#   config = use_native_modules!
+#   platform :ios, min_ios_version_supported
+# 
+#   use_react_native!(
+#     :path => config[:reactNativePath],
+#     # Enables Flipper.
+#     #
+#     # Note that if you have use_frameworks! enabled, Flipper will not work and
+#     # you should disable the next line.
+#     :flipper_configuration => flipper_config,
+#     # An absolute path to your application root.
+#     :app_path => "#{Pod::Config.instance.installation_root}/.."
+#   )
+# 
+#   target 'HelloWorldTests' do
+#     inherit! :complete
+#     # Pods for testing
+#   end
+# 
+# end
 
 target 'HelloWorld-tvOS' do
   config = use_native_modules!

package/template/package.json

@@ -11,9 +11,9 @@
     "test": "jest"
   },
   "dependencies": {
-    "expo": "^49.0.7",
+    "expo": "^50.0.0-preview.4",
     "react": "18.2.0",
-    "react-native": "npm:react-native-tvos@0.73.0-0rc3"
+    "react-native": "npm:react-native-tvos@0.73.1-1"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",