react-native-tvos 0.77.1-0 → 0.77.2-1

package/Libraries/Core/ReactNativeVersion.js

@@ -16,8 +16,8 @@ const version: $ReadOnly<{
 }> = {
   major: 0,
   minor: 77,
-  patch: 1,
-  prerelease: '0',
+  patch: 2,
+  prerelease: '1',
 };
 
 module.exports = {version};

package/Libraries/Image/Image.android.js

@@ -133,6 +133,7 @@ let BaseImage: AbstractImageAndroid = React.forwardRef(
       width: undefined,
       height: undefined,
     };
+    const defaultSource = resolveAssetSource(props.defaultSource);
     const loadingIndicatorSource = resolveAssetSource(
       props.loadingIndicatorSource,
     );
@@ -178,6 +179,7 @@ let BaseImage: AbstractImageAndroid = React.forwardRef(
       /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
        * when making Flow check .android.js files. */
       headers: (source?.[0]?.headers || source?.headers: ?{[string]: string}),
+      defaultSource: defaultSource ? defaultSource.uri : null,
       loadingIndicatorSrc: loadingIndicatorSource
         ? loadingIndicatorSource.uri
         : null,

package/Libraries/Image/ImageViewNativeComponent.js

@@ -21,6 +21,7 @@ import type {
 } from '../StyleSheet/StyleSheet';
 import type {ResolvedAssetSource} from './AssetSourceResolver';
 import type {ImageProps} from './ImageProps';
+import type {ImageSource} from './ImageSource';
 
 import * as NativeComponentRegistry from '../NativeComponent/NativeComponentRegistry';
 import {ConditionallyIgnoredEventHandlers} from '../NativeComponent/ViewConfigIgnore';
@@ -42,7 +43,7 @@ type Props = $ReadOnly<{
     | ?ResolvedAssetSource
     | ?$ReadOnlyArray<?$ReadOnly<{uri?: ?string, ...}>>,
   headers?: ?{[string]: string},
-  defaultSrc?: ?string,
+  defaultSource?: ?ImageSource | ?string,
   loadingIndicatorSrc?: ?string,
 }>;
 
@@ -82,9 +83,7 @@ export const __INTERNAL_VIEW_CONFIG: PartialViewConfig =
         },
         validAttributes: {
           blurRadius: true,
-          defaultSource: {
-            process: require('./resolveAssetSource'),
-          },
+          defaultSource: true,
           internal_analyticTag: true,
           resizeMethod: true,
           resizeMode: true,

package/React/Base/RCTVersion.m

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

package/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm

@@ -101,11 +101,7 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
   NSMutableDictionary<NSAttributedStringKey, id> *defaultAttributes =
       [_backedTextInputView.defaultTextAttributes mutableCopy];
 
-#if !TARGET_OS_MACCATALYST
-  RCTWeakEventEmitterWrapper *eventEmitterWrapper = [RCTWeakEventEmitterWrapper new];
-  eventEmitterWrapper.eventEmitter = _eventEmitter;
-  defaultAttributes[RCTAttributedStringEventEmitterKey] = eventEmitterWrapper;
-#endif
+  defaultAttributes[RCTAttributedStringEventEmitterKey] = RCTWrapEventEmitter(_eventEmitter);
 
   _backedTextInputView.defaultTextAttributes = defaultAttributes;
 }
@@ -266,10 +262,8 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
   if (newTextInputProps.textAttributes != oldTextInputProps.textAttributes) {
     NSMutableDictionary<NSAttributedStringKey, id> *defaultAttributes =
         RCTNSTextAttributesFromTextAttributes(newTextInputProps.getEffectiveTextAttributes(RCTFontSizeMultiplier()));
-#if !TARGET_OS_MACCATALYST
     defaultAttributes[RCTAttributedStringEventEmitterKey] =
         _backedTextInputView.defaultTextAttributes[RCTAttributedStringEventEmitterKey];
-#endif
     _backedTextInputView.defaultTextAttributes = defaultAttributes;
   }
 

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.77.1-0
+VERSION_NAME=0.77.2-1
 react.internal.publishingGroup=io.github.react-native-tvos
 
 android.useAndroidX=true

package/ReactAndroid/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
    up from the file to lint until it find an AndroidManifest with a minSdkVersion. This is then used
    as the min SDK to lint the file.-->
   <uses-sdk
-      android:minSdkVersion="24"
+      android:minSdkVersion="22"
       android:targetSdkVersion="35"
       />
 

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

@@ -222,7 +222,10 @@ public class ReactActivityDelegate {
   public void requestPermissions(
       String[] permissions, int requestCode, PermissionListener listener) {
     mPermissionListener = listener;
-    getPlainActivity().requestPermissions(permissions, requestCode);
+    // For Android API < 23, permissions are granted at install time.
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+      getPlainActivity().requestPermissions(permissions, requestCode);
+    }
   }
 
   public void onRequestPermissionsResult(

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

@@ -9,6 +9,7 @@ package com.facebook.react;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -213,7 +214,11 @@ public class ReactFragment extends Fragment implements PermissionAwareActivity {
 
   @Override
   public int checkSelfPermission(String permission) {
-    return getActivity().checkSelfPermission(permission);
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+      return getActivity().checkSelfPermission(permission);
+    }
+
+    return getContext().checkPermission(permission, android.os.Process.myPid(), android.os.Process.myUid());
   }
 
   @Override

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DebugOverlayController.java

@@ -13,6 +13,7 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.PixelFormat;
 import android.net.Uri;
+import android.os.Build;
 import android.provider.Settings;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
@@ -30,7 +31,7 @@ import com.facebook.react.common.ReactConstants;
 
   public static void requestPermission(Context context) {
     // Get permission to show debug overlay in dev builds.
-    if (!Settings.canDrawOverlays(context)) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !Settings.canDrawOverlays(context)) {
       Intent intent =
           new Intent(
               Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
@@ -49,7 +50,11 @@ import com.facebook.react.common.ReactConstants;
   private static boolean permissionCheck(Context context) {
     // Get permission to show debug overlay in dev builds.
     // overlay permission not yet granted
-    return Settings.canDrawOverlays(context);
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+      return Settings.canDrawOverlays(context);
+    }
+
+    return true;
   }
 
   private static boolean hasPermission(Context context, String permission) {

package/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java

@@ -445,12 +445,18 @@ public class FabricUIManager
 
   @Override
   public void markActiveTouchForTag(int surfaceId, int reactTag) {
-    mMountingManager.getSurfaceManager(surfaceId).markActiveTouchForTag(reactTag);
+    SurfaceMountingManager surfaceMountingManager = mMountingManager.getSurfaceManager(surfaceId);
+    if (surfaceMountingManager != null) {
+      surfaceMountingManager.markActiveTouchForTag(reactTag);
+    }
   }
 
   @Override
   public void sweepActiveTouchForTag(int surfaceId, int reactTag) {
-    mMountingManager.getSurfaceManager(surfaceId).sweepActiveTouchForTag(reactTag);
+    SurfaceMountingManager surfaceMountingManager = mMountingManager.getSurfaceManager(surfaceId);
+    if (surfaceMountingManager != null) {
+      surfaceMountingManager.sweepActiveTouchForTag(reactTag);
+    }
   }
 
   /**

package/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.kt

@@ -7,6 +7,7 @@
 
 package com.facebook.react.modules.i18nmanager
 
+import android.os.Build
 import com.facebook.fbreact.specs.NativeI18nManagerSpec
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.annotations.ReactModule
@@ -16,7 +17,11 @@ import com.facebook.react.module.annotations.ReactModule
 public class I18nManagerModule(context: ReactApplicationContext?) : NativeI18nManagerSpec(context) {
   override public fun getTypedExportedConstants(): Map<String, Any> {
     val context = getReactApplicationContext()
-    val locale = context.resources.configuration.locales[0]
+    val locale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+      context.resources.configuration.locales[0]
+    } else {
+      context.resources.configuration.locale
+    }
 
     return mapOf(
         "isRTL" to I18nUtil.instance.isRTL(context),

package/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/PermissionsModule.kt

@@ -8,7 +8,10 @@
 package com.facebook.react.modules.permissions
 
 import android.app.Activity
+import android.content.Context
 import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Process
 import android.util.SparseArray
 import com.facebook.common.logging.FLog
 import com.facebook.fbreact.specs.NativePermissionsAndroidSpec
@@ -20,7 +23,7 @@ import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.core.PermissionAwareActivity
 import com.facebook.react.modules.core.PermissionListener
-import java.util.ArrayList
+
 
 /** Module that exposes the Android M Permission system to JS. */
 @ReactModule(name = NativePermissionsAndroidSpec.NAME)
@@ -33,13 +36,21 @@ public class PermissionsModule(reactContext: ReactApplicationContext?) :
   private val DENIED = "denied"
   private val NEVER_ASK_AGAIN = "never_ask_again"
 
+  private fun checkSelfPermission(context: Context, permission: String): Int {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+      return context.checkSelfPermission(permission)
+    }
+
+    return context.checkPermission(permission, Process.myPid(), Process.myUid())
+  }
+
   /**
    * Check if the app has the permission given. successCallback is called with true if the
    * permission had been granted, false otherwise. See [Activity.checkSelfPermission].
    */
   override public fun checkPermission(permission: String, promise: Promise): Unit {
     val context = getReactApplicationContext().getBaseContext()
-    promise.resolve(context.checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED)
+    promise.resolve(checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED)
   }
 
   /**
@@ -69,7 +80,7 @@ public class PermissionsModule(reactContext: ReactApplicationContext?) :
    */
   override public fun requestPermission(permission: String, promise: Promise): Unit {
     val context = getReactApplicationContext().getBaseContext()
-    if (context.checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED) {
+    if (checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED) {
       promise.resolve(GRANTED)
       return
     }
@@ -109,7 +120,7 @@ public class PermissionsModule(reactContext: ReactApplicationContext?) :
     val context = getReactApplicationContext().getBaseContext()
     for (i in 0 until permissions.size()) {
       val perm = permissions.getString(i) ?: continue
-      if (context.checkSelfPermission(perm) == PackageManager.PERMISSION_GRANTED) {
+      if (checkSelfPermission(context, perm) == PackageManager.PERMISSION_GRANTED) {
         grantedPermissions.putString(perm, GRANTED)
         checkedPermissionsCount++
       } else {

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", 77,
-      "patch", 1,
-      "prerelease", "0");
+      "patch", 2,
+      "prerelease", "1");
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/BackgroundStyleApplicator.kt

@@ -13,7 +13,6 @@ import android.graphics.Path
 import android.graphics.Rect
 import android.graphics.RectF
 import android.graphics.drawable.Drawable
-import android.graphics.drawable.LayerDrawable
 import android.os.Build
 import android.view.View
 import android.widget.ImageView
@@ -106,14 +105,10 @@ public object BackgroundStyleApplicator {
 
     composite.borderInsets = composite.borderInsets ?: BorderInsets()
     composite.borderInsets?.setBorderWidth(edge, width)
+
     if (Build.VERSION.SDK_INT >= MIN_INSET_BOX_SHADOW_SDK_VERSION) {
-      val innerShadows = composite.innerShadows
-      if (innerShadows != null) {
-        for (i in 0 until innerShadows.numberOfLayers) {
-          val shadow = innerShadows.getDrawable(i)
-          (shadow as InsetBoxShadowDrawable).borderInsets = composite.borderInsets
-          shadow.invalidateSelf()
-        }
+      for (shadow in composite.innerShadows.filterIsInstance<InsetBoxShadowDrawable>()) {
+        shadow.borderInsets = composite.borderInsets
       }
     }
   }
@@ -174,30 +169,16 @@ public object BackgroundStyleApplicator {
     }
 
     if (Build.VERSION.SDK_INT >= MIN_OUTSET_BOX_SHADOW_SDK_VERSION) {
-      val outerShadows = compositeBackgroundDrawable.outerShadows
-      if (outerShadows != null) {
-        for (i in 0 until outerShadows.numberOfLayers) {
-          val shadow = outerShadows.getDrawable(i)
-          if (shadow is OutsetBoxShadowDrawable) {
-            shadow.borderRadius = shadow.borderRadius ?: BorderRadiusStyle()
-            shadow.borderRadius?.set(corner, radius)
-            shadow.invalidateSelf()
-          }
-        }
+      for (shadow in
+          compositeBackgroundDrawable.outerShadows.filterIsInstance<OutsetBoxShadowDrawable>()) {
+        shadow.borderRadius = compositeBackgroundDrawable.borderRadius
       }
     }
 
     if (Build.VERSION.SDK_INT >= MIN_INSET_BOX_SHADOW_SDK_VERSION) {
-      val innerShadows = compositeBackgroundDrawable.innerShadows
-      if (innerShadows != null) {
-        for (i in 0 until innerShadows.numberOfLayers) {
-          val shadow = innerShadows.getDrawable(i)
-          if (shadow is InsetBoxShadowDrawable) {
-            shadow.borderRadius = shadow.borderRadius ?: BorderRadiusStyle()
-            shadow.borderRadius?.set(corner, radius)
-            shadow.invalidateSelf()
-          }
-        }
+      for (shadow in
+          compositeBackgroundDrawable.innerShadows.filterIsInstance<InsetBoxShadowDrawable>()) {
+        shadow.borderRadius = compositeBackgroundDrawable.borderRadius
       }
     }
 
@@ -291,14 +272,18 @@ public object BackgroundStyleApplicator {
       return
     }
 
-    var innerShadows: LayerDrawable? = null
-    var outerShadows: LayerDrawable? = null
+    var innerShadows = mutableListOf<InsetBoxShadowDrawable>()
+    var outerShadows = mutableListOf<OutsetBoxShadowDrawable>()
 
     val compositeBackgroundDrawable = ensureCompositeBackgroundDrawable(view)
     val borderInsets = compositeBackgroundDrawable.borderInsets
     val borderRadius = compositeBackgroundDrawable.borderRadius
 
-    for (boxShadow in shadows.asReversed()) {
+    /**
+     * z-ordering of user-provided shadow-list is opposite direction of LayerDrawable z-ordering
+     * https://drafts.csswg.org/css-backgrounds/#shadow-layers
+     */
+    for (boxShadow in shadows) {
       val offsetX = boxShadow.offsetX
       val offsetY = boxShadow.offsetY
       val color = boxShadow.color ?: Color.BLACK
@@ -307,10 +292,7 @@ public object BackgroundStyleApplicator {
       val inset = boxShadow.inset ?: false
 
       if (inset && Build.VERSION.SDK_INT >= MIN_INSET_BOX_SHADOW_SDK_VERSION) {
-        if (innerShadows == null) {
-          innerShadows = LayerDrawable(emptyArray())
-        }
-        innerShadows.addLayer(
+        innerShadows.add(
             InsetBoxShadowDrawable(
                 context = view.context,
                 borderRadius = borderRadius,
@@ -321,10 +303,7 @@ public object BackgroundStyleApplicator {
                 blurRadius = blurRadius,
                 spread = spreadDistance))
       } else if (!inset && Build.VERSION.SDK_INT >= MIN_OUTSET_BOX_SHADOW_SDK_VERSION) {
-        if (outerShadows == null) {
-          outerShadows = LayerDrawable(emptyArray())
-        }
-        outerShadows.addLayer(
+        outerShadows.add(
             OutsetBoxShadowDrawable(
                 context = view.context,
                 borderRadius = borderRadius,
@@ -336,8 +315,9 @@ public object BackgroundStyleApplicator {
       }
     }
 
-    view.background = ensureCompositeBackgroundDrawable(view).withNewOuterShadow(outerShadows)
-    view.background = ensureCompositeBackgroundDrawable(view).withNewInnerShadow(innerShadows)
+    view.background =
+        ensureCompositeBackgroundDrawable(view)
+            .withNewShadows(outerShadows = outerShadows, innerShadows = innerShadows)
   }
 
   @JvmStatic

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/BackgroundDrawable.kt

@@ -19,7 +19,6 @@ import android.graphics.PorterDuff
 import android.graphics.Rect
 import android.graphics.RectF
 import android.graphics.Shader
-import android.graphics.drawable.Drawable
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.facebook.react.uimanager.PixelUtil.pxToDp
 import com.facebook.react.uimanager.style.BackgroundImageLayer

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/BorderDrawable.kt

@@ -20,7 +20,6 @@ import android.graphics.PointF
 import android.graphics.Rect
 import android.graphics.RectF
 import android.graphics.Region
-import android.graphics.drawable.Drawable
 import android.os.Build
 import com.facebook.react.uimanager.FloatUtil.floatsEqual
 import com.facebook.react.uimanager.LengthPercentage

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/CSSBackgroundDrawable.java

@@ -25,7 +25,6 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Region;
 import android.graphics.Shader;
-import android.graphics.drawable.Drawable;
 import android.view.View;
 import androidx.annotation.Nullable;
 import androidx.core.graphics.ColorUtils;