Merge branch 'main' into feat/scene-delegate

Author: cipolleschi

packages/react-native/React/Base/RCTUtils.h

@@ -148,6 +148,11 @@ RCT_EXTERN NSData *__nullable RCTDecompressGzipData(NSData *__nullable data, NSU
 // (or nil, if the URL does not specify a path within the main bundle)
 RCT_EXTERN NSString *__nullable RCTBundlePathForURL(NSURL *__nullable URL);
 
+// Returns the asset catalog image name for a packager asset URL, or nil if the
+// URL is not a main-bundle packager asset. The name matches the identifier the
+// CLI uses when generating the catalog (see assetPathUtils.getResourceIdentifier).
+RCT_EXTERN NSString *__nullable RCTAssetCatalogNameForURL(NSURL *__nullable URL);
+
 // Returns the Path of Library directory
 RCT_EXTERN NSString *__nullable RCTLibraryPath(void);
 

packages/react-native/React/Base/RCTUtils.mm

@@ -13,6 +13,7 @@
 #import <objc/runtime.h>
 #import <zlib.h>
 #import <atomic>
+#import <vector>
 
 #import <UIKit/UIKit.h>
 
@@ -963,7 +964,8 @@ BOOL RCTIsGzippedData(NSData *__nullable data)
 static BOOL RCTIsImageAssetsPath(NSString *path)
 {
   NSString *extension = [path pathExtension];
-  return [extension isEqualToString:@"png"] || [extension isEqualToString:@"jpg"];
+  return
+      [extension isEqualToString:@"png"] || [extension isEqualToString:@"jpg"] || [extension isEqualToString:@"jpeg"];
 }
 
 BOOL RCTIsBundleAssetURL(NSURL *__nullable imageURL)
@@ -1016,6 +1018,115 @@ BOOL RCTIsLocalAssetURL(NSURL *__nullable imageURL)
   return bundleCache[key];
 }
 
+static BOOL RCTUseAssetCatalog(void)
+{
+  static BOOL useAssetCatalog = NO;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    useAssetCatalog = [[[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTUseAssetCatalog"] boolValue];
+  });
+  return useAssetCatalog;
+}
+
+// The bundle react-native-xcode.sh compiles packager image assets into
+// (RNAssets.bundle, an actool-compiled asset catalog inside the app).
+static NSBundle *__nullable RCTAssetCatalogBundle(void)
+{
+  static NSBundle *bundle;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    NSURL *bundleURL = [[NSBundle mainBundle] URLForResource:@"RNAssets" withExtension:@"bundle"];
+    if (bundleURL != nil) {
+      bundle = [NSBundle bundleWithURL:bundleURL];
+    }
+  });
+  return bundle;
+}
+
+NSString *__nullable RCTAssetCatalogNameForURL(NSURL *__nullable URL)
+{
+  // The "assets/" prefix the packager uses for all image assets. The CLI strips
+  // it from the identifiers it names the imagesets with.
+  constexpr NSUInteger assetsPrefixLength = sizeof("assets/") - 1;
+
+  NSString *path = RCTBundlePathForURL(URL);
+  // Packager assets always live under "assets/". Anything else (sub-bundles,
+  // CodePush/OTA assets outside the main bundle) is not in the catalog.
+  if (path == nil || ![path hasPrefix:@"assets/"]) {
+    return nil;
+  }
+
+  // Other packager assets (gif, webp, ...) are copied as plain files and must
+  // use the regular loader.
+  if (!RCTIsImageAssetsPath(path)) {
+    return nil;
+  }
+
+  // File system paths come back decomposed (NFD); restore the precomposed form
+  // the packager saw on disk so non-ASCII characters filter out the same way
+  // they do in the CLI's identifier.
+  path = path.precomposedStringWithCanonicalMapping;
+
+  const NSUInteger length = path.length;
+  unichar stackBuffer[256];
+  std::vector<unichar> heapBuffer;
+  unichar *chars = stackBuffer;
+  if (length > 256) {
+    heapBuffer.resize(length);
+    chars = heapBuffer.data();
+  }
+  [path getCharacters:chars range:NSMakeRange(0, length)];
+
+  // Strip the file extension (guaranteed present by RCTIsImageAssetsPath) and
+  // an optional "@<scale>x" suffix (integer or fractional, e.g. "@2x",
+  // "@1.5x"). The catalog stores a single imageset per image and resolves the
+  // scale by name at runtime, see
+  // https://developer.apple.com/documentation/xcode/managing-assets-with-asset-catalogs
+  NSUInteger end = length - 1;
+  while (end > assetsPrefixLength && chars[end] != '.') {
+    end--;
+  }
+  if (end > assetsPrefixLength && chars[end - 1] == 'x') {
+    // Walk back over "@<digits>(.<digits>)?" ending at the "x".
+    NSUInteger cursor = end - 1;
+    while (cursor > assetsPrefixLength && chars[cursor - 1] >= '0' && chars[cursor - 1] <= '9') {
+      cursor--;
+    }
+    if (cursor < end - 1) {
+      if (chars[cursor - 1] == '@') {
+        end = cursor - 1;
+      } else if (chars[cursor - 1] == '.') {
+        NSUInteger integerPart = cursor - 1;
+        while (integerPart > assetsPrefixLength && chars[integerPart - 1] >= '0' && chars[integerPart - 1] <= '9') {
+          integerPart--;
+        }
+        if (integerPart < cursor - 1 && chars[integerPart - 1] == '@') {
+          end = integerPart - 1;
+        }
+      }
+    }
+  }
+
+  // Build the identifier in place in a single pass: skip the "assets/" prefix,
+  // lowercase, encode the folder structure with "_" and drop anything that is
+  // not a valid identifier character, producing the same identifier as
+  // getResourceIdentifier in the CLI, which names the imagesets.
+  NSUInteger resultLength = 0;
+  for (NSUInteger i = assetsPrefixLength; i < end; i++) {
+    unichar c = chars[i];
+    if (c == '/') {
+      chars[resultLength++] = '_';
+    } else if ((c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '_') {
+      chars[resultLength++] = c;
+    } else if (c >= 'A' && c <= 'Z') {
+      chars[resultLength++] = c + ('a' - 'A');
+    }
+  }
+
+  NSString *name = [NSString stringWithCharacters:chars length:resultLength];
+  return name;
+}
+
 UIImage *__nullable RCTImageFromLocalBundleAssetURL(NSURL *imageURL)
 {
   if (![imageURL.scheme isEqualToString:@"file"]) {
@@ -1032,6 +1143,35 @@ BOOL RCTIsLocalAssetURL(NSURL *__nullable imageURL)
 
 UIImage *__nullable RCTImageFromLocalAssetURL(NSURL *imageURL)
 {
+  if (RCTUseAssetCatalog()) {
+    NSString *catalogName = RCTAssetCatalogNameForURL(imageURL);
+    if (catalogName != nil) {
+      // The app opted into the asset catalog and this is a packager asset, so it
+      // was compiled into RNAssets.bundle at build time. Trust the catalog and
+      // return directly, keeping the common path a single lookup with no
+      // filesystem fallback. Non-catalog assets (nil name) fall through below.
+      NSBundle *assetCatalogBundle = RCTAssetCatalogBundle();
+      if (assetCatalogBundle == nil) {
+        // Passing a nil bundle to imageNamed:inBundle: would silently search the
+        // main bundle instead, potentially resolving an unrelated app image.
+        RCTLogError(
+            @"RCTUseAssetCatalog is enabled but RNAssets.bundle was not found in the app. Image assets must be "
+             "bundled by react-native-xcode.sh, which compiles them into the app at build time. (loading %@)",
+            imageURL);
+        return nil;
+      }
+      UIImage *image = [UIImage imageNamed:catalogName inBundle:assetCatalogBundle compatibleWithTraitCollection:nil];
+      if (image == nil) {
+        RCTLogError(
+            @"Image \"%@\" (%@) was not found in the asset catalog. RCTUseAssetCatalog is enabled, "
+             "so image assets must be compiled into the app's RNAssets.bundle at build time.",
+            catalogName,
+            imageURL);
+      }
+      return image;
+    }
+  }
+
   NSString *imageName = RCTBundlePathForURL(imageURL);
 
   NSBundle *bundle = nil;

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/Overflow.kt

@@ -25,17 +25,18 @@ internal enum class Overflow {
     /**
      * Parses a string into an Overflow value.
      *
-     * @param overflow The string value (case-insensitive)
-     * @return The corresponding Overflow, or null if not recognized
+     * @param overflow The string value (case-insensitive), or null
+     * @param default The value to return when [overflow] is null or unrecognized
+     * @return The corresponding Overflow, or [default]
      */
     @JvmStatic
-    fun fromString(overflow: String): Overflow? {
-      return when (overflow.lowercase()) {
-        "visible" -> VISIBLE
-        "hidden" -> HIDDEN
-        "scroll" -> SCROLL
-        else -> null
-      }
-    }
+    @JvmOverloads
+    fun fromString(overflow: String?, default: Overflow = VISIBLE): Overflow =
+        when (overflow?.lowercase()) {
+          "visible" -> VISIBLE
+          "hidden" -> HIDDEN
+          "scroll" -> SCROLL
+          else -> default
+        }
   }
 }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.kt

@@ -419,10 +419,11 @@ constructor(context: Context, private val fpsListener: FpsListener? = null) :
         if (overflow == null) {
           Overflow.SCROLL
         } else {
-          Overflow.fromString(overflow)
-              ?: if (ReactNativeFeatureFlags.enablePropsUpdateReconciliationAndroid())
-                  Overflow.VISIBLE
-              else Overflow.SCROLL
+          Overflow.fromString(
+              overflow,
+              if (ReactNativeFeatureFlags.enablePropsUpdateReconciliationAndroid()) Overflow.VISIBLE
+              else Overflow.SCROLL,
+          )
         }
     invalidate()
   }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactNestedScrollView.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<cf60b52e15df339a179f392723007fab>>
+ * @generated SignedSource<<1ad8f84ac759d8d225ce0fd57dccea7b>>
  */
 
 /**
@@ -387,10 +387,11 @@ constructor(context: Context, private val fpsListener: FpsListener? = null) :
         if (overflow == null) {
           Overflow.SCROLL
         } else {
-          Overflow.fromString(overflow)
-              ?: if (ReactNativeFeatureFlags.enablePropsUpdateReconciliationAndroid())
-                  Overflow.VISIBLE
-              else Overflow.SCROLL
+          Overflow.fromString(
+              overflow,
+              if (ReactNativeFeatureFlags.enablePropsUpdateReconciliationAndroid()) Overflow.VISIBLE
+              else Overflow.SCROLL,
+          )
         }
     invalidate()
   }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactNestedScrollViewManager.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<d321b1f5f7a34b5717cb7ef5300dda96>>
+ * @generated SignedSource<<543b6175d2ce5e4ec68f1625f0c04095>>
  */
 
 /**
@@ -450,17 +450,15 @@ constructor(private val fpsListener: FpsListener? = null) :
   public companion object {
     public const val REACT_CLASS: String = "RCTScrollView"
 
-    public fun createExportedCustomDirectEventTypeConstants(): Map<String, Any> =
-        mapOf(
-            getJSEventName(ScrollEventType.SCROLL) to mapOf("registrationName" to "onScroll"),
-            getJSEventName(ScrollEventType.BEGIN_DRAG) to
-                mapOf("registrationName" to "onScrollBeginDrag"),
-            getJSEventName(ScrollEventType.END_DRAG) to
-                mapOf("registrationName" to "onScrollEndDrag"),
-            getJSEventName(ScrollEventType.MOMENTUM_BEGIN) to
-                mapOf("registrationName" to "onMomentumScrollBegin"),
-            getJSEventName(ScrollEventType.MOMENTUM_END) to
-                mapOf("registrationName" to "onMomentumScrollEnd"),
-        )
+    public fun createExportedCustomDirectEventTypeConstants(): Map<String, Any> = mapOf(
+        getJSEventName(ScrollEventType.SCROLL) to mapOf("registrationName" to "onScroll"),
+        getJSEventName(ScrollEventType.BEGIN_DRAG) to
+            mapOf("registrationName" to "onScrollBeginDrag"),
+        getJSEventName(ScrollEventType.END_DRAG) to mapOf("registrationName" to "onScrollEndDrag"),
+        getJSEventName(ScrollEventType.MOMENTUM_BEGIN) to
+            mapOf("registrationName" to "onMomentumScrollBegin"),
+        getJSEventName(ScrollEventType.MOMENTUM_END) to
+            mapOf("registrationName" to "onMomentumScrollEnd"),
+    )
   }
 }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.kt

@@ -379,10 +379,11 @@ constructor(context: Context, private val fpsListener: FpsListener? = null) :
         if (overflow == null) {
           Overflow.SCROLL
         } else {
-          Overflow.fromString(overflow)
-              ?: if (ReactNativeFeatureFlags.enablePropsUpdateReconciliationAndroid())
-                  Overflow.VISIBLE
-              else Overflow.SCROLL
+          Overflow.fromString(
+              overflow,
+              if (ReactNativeFeatureFlags.enablePropsUpdateReconciliationAndroid()) Overflow.VISIBLE
+              else Overflow.SCROLL,
+          )
         }
     invalidate()
   }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/PreparedLayoutTextViewManager.kt

@@ -108,7 +108,7 @@ internal class PreparedLayoutTextViewManager :
 
   @ReactProp(name = "overflow")
   fun setOverflow(view: PreparedLayoutTextView, overflow: String?): Unit {
-    view.overflow = overflow?.let { Overflow.fromString(it) } ?: Overflow.VISIBLE
+    view.overflow = Overflow.fromString(overflow)
   }
 
   @ReactProp(name = "accessible")

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java

@@ -673,13 +673,7 @@ private void applyTextAttributes() {
   }
 
   public void setOverflow(@Nullable String overflow) {
-    if (overflow == null) {
-      mOverflow = Overflow.VISIBLE;
-    } else {
-      @Nullable Overflow parsedOverflow = Overflow.fromString(overflow);
-      mOverflow = parsedOverflow == null ? Overflow.VISIBLE : parsedOverflow;
-    }
-
+    mOverflow = Overflow.fromString(overflow);
     invalidate();
   }
 }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt

@@ -1185,13 +1185,7 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
   }
 
   public fun setOverflow(overflow: String?) {
-    if (overflow == null) {
-      this.overflow = Overflow.VISIBLE
-    } else {
-      val parsedOverflow = Overflow.fromString(overflow)
-      this.overflow = parsedOverflow ?: Overflow.VISIBLE
-    }
-
+    this.overflow = Overflow.fromString(overflow)
     invalidate()
   }