react-native-tvos 0.86.0-2 → 0.86.3-0

package/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm

@@ -433,9 +433,7 @@ static BOOL RCTLayerTransformCollapsesAxis(CALayer *layer)
   float magnification = _tvParallaxProperties.magnification;
 
   if (magnification != 1.0) {
-    [UIView animateWithDuration:0.2 animations:^{
       self.transform = CGAffineTransformScale(self.transform, magnification, magnification);
-    }];
   }
 
   _motionEffectsAdded = YES;
@@ -447,13 +445,11 @@ static BOOL RCTLayerTransformCollapsesAxis(CALayer *layer)
     return;
   }
 
-  [UIView animateWithDuration:0.2 animations:^{
-    float magnification = self->_tvParallaxProperties.magnification;
-    BOOL enabled = self->_tvParallaxProperties.enabled;
-    if (enabled && magnification != 0.0 && magnification != 1.0) {
-      self.transform = CGAffineTransformScale(self.transform, 1.0/magnification, 1.0/magnification);
-    }
-  }];
+  float magnification = self->_tvParallaxProperties.magnification;
+  BOOL enabled = self->_tvParallaxProperties.enabled;
+  if (enabled && magnification != 0.0 && magnification != 1.0) {
+    self.transform = CGAffineTransformScale(self.transform, 1.0/magnification, 1.0/magnification);
+  }
 
   for (UIMotionEffect *effect in [self.motionEffects copy]){
     [self removeMotionEffect:effect];
@@ -496,6 +492,34 @@ static BOOL RCTLayerTransformCollapsesAxis(CALayer *layer)
   return _props->isTVSelectable;
 }
 
+// Directional focus destinations are looked up in the containing root view when
+// `updateProps` runs. A destination set while this view is not attached yet --
+// e.g. a nextFocus* value delivered together with the view's creation -- resolves
+// to nil there, and `updateProps` never retries because the prop value does not
+// change. Re-resolve pending destinations lazily: `enableDirectionalFocusGuides`
+// only does work while the view is focused, at which point the hierarchy is
+// guaranteed to be attached.
+- (void)resolvePendingNextFocusTargets
+{
+  UIView *rootView = [self containingRootView];
+
+  if (rootView == nil) {
+    return;
+  }
+  if (_nextFocusUp == nil && _props->nextFocusUp.has_value()) {
+    _nextFocusUp = [rootView viewWithTag:_props->nextFocusUp.value()];
+  }
+  if (_nextFocusDown == nil && _props->nextFocusDown.has_value()) {
+    _nextFocusDown = [rootView viewWithTag:_props->nextFocusDown.value()];
+  }
+  if (_nextFocusLeft == nil && _props->nextFocusLeft.has_value()) {
+    _nextFocusLeft = [rootView viewWithTag:_props->nextFocusLeft.value()];
+  }
+  if (_nextFocusRight == nil && _props->nextFocusRight.has_value()) {
+    _nextFocusRight = [rootView viewWithTag:_props->nextFocusRight.value()];
+  }
+}
+
 // In tvOS, to support directional focus APIs, we add a UIFocusGuide for each
 // side of the view where a nextFocus has been set. Set layout constraints to
 // make the guide 1 px thick, and set the destination to the nextFocus object.
@@ -507,6 +531,8 @@ static BOOL RCTLayerTransformCollapsesAxis(CALayer *layer)
   if (!self.isFocused) {
     return;
   }
+
+  [self resolvePendingNextFocusTargets];
   if (self->_nextFocusUp != nil) {
     if (self.focusGuideUp == nil) {
       self.focusGuideUp = [UIFocusGuide new];
@@ -606,12 +632,12 @@ static BOOL RCTLayerTransformCollapsesAxis(CALayer *layer)
 
 - (void)didUpdateFocusInContext:(UIFocusUpdateContext *)context withAnimationCoordinator:(UIFocusAnimationCoordinator *)coordinator
 {
-    if (context.previouslyFocusedView == context.nextFocusedView) {
+    if (context.previouslyFocusedItem == context.nextFocusedItem) {
       return;
     }
   
     if (_autoFocus && self.focusGuide != nil && context.previouslyFocusedItem != nil) {
-      // Whenever focus leaves the container, `nextFocusedView` is the destination, the item outside the container.
+      // Whenever focus leaves the container, `nextFocusedItem` is the destination, the item outside the container.
       // So, `previouslyFocusedItem` is always the last focused child of `TVFocusGuide`.
       // We should update `preferredFocusEnvironments` in this case to make sure `FocusGuide` remembers
       // the last focused element and redirects the focus to it whenever focus comes back.
@@ -619,20 +645,20 @@ static BOOL RCTLayerTransformCollapsesAxis(CALayer *layer)
       [self handleFocusGuide];
     }
 
-    if (context.nextFocusedView == self) {
+    if (context.nextFocusedItem == self) {
       [self becomeFirstResponder];
       [self enableDirectionalFocusGuides];
-      [coordinator addCoordinatedAnimations:^(void){
-          if (self->_eventEmitter) self->_eventEmitter->onFocus();
+      if (self->_eventEmitter) self->_eventEmitter->onFocus();
+      [coordinator addCoordinatedFocusingAnimations:^(id<UIFocusAnimationContext>  _Nonnull animationContext) {
           [self addParallaxMotionEffects];
       } completion:^(void){}];
       // Without this check, onBlur would also trigger when `TVFocusGuideView` transfers focus to its children.
       // [self isTVFocusGuide] is false when autofocus and destinations are not used, so we cannot use that.
       // Generally speaking, it would happen for any non-collapsable `View`.
-    } else if (context.previouslyFocusedView == self) {
-      [coordinator addCoordinatedAnimations:^(void){
+    } else if (context.previouslyFocusedItem == self) {
+      if (self->_eventEmitter) self->_eventEmitter->onBlur();
+      [coordinator addCoordinatedUnfocusingAnimations:^(id<UIFocusAnimationContext>  _Nonnull animationContext) {
           [self removeParallaxMotionEffects];
-          if (self->_eventEmitter) self->_eventEmitter->onBlur();
       } completion:^(void){[self disableDirectionalFocusGuides];}];
       [self resignFirstResponder];
     }

package/React/React-RCTFBReactNativeSpec.podspec

@@ -11,7 +11,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/React/React-RCTFabric.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/React/Runtime/React-RCTRuntime.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/React/Views/ScrollView/RCTScrollView.m

@@ -366,7 +366,7 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
   if (@available(iOS 14.0, *)) {
     // On iOS when Prefer Cross-Fade Transitions is enabled, the keyboard position
     // & height is reported differently (0 instead of Y position value matching height of frame)
-    // Fixes similar issue we saw with https://github.com/facebook/react-native/pull/34503
+    // Fixes similar issue we saw with https://github.com/react/react-native/pull/34503
     if (UIAccessibilityPrefersCrossFadeTransitions() && endFrame.size.height == 0) {
       newContentOffset.y = 0;
       newEdgeInsets.bottom = 0;

package/React-Core.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/React.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactAndroid/build.gradle.kts

@@ -767,7 +767,7 @@ apply(from = "./publish.gradle")
 // We need to override the artifact ID as this project is called `ReactAndroid` but
 // the maven coordinates are on `react-android`.
 // Please note that the original coordinates, `react-native`, have been voided
-// as they caused https://github.com/facebook/react-native/issues/35210
+// as they caused https://github.com/react/react-native/issues/35210
 publishing {
   publications { getByName("release", MavenPublication::class) { artifactId = "react-android" } }
 }

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.86.0-2
+VERSION_NAME=0.86.3-0
 react.internal.publishingGroup=io.github.react-native-tvos
 react.internal.hermesPublishingGroup=com.facebook.hermes
 

package/ReactAndroid/publish.gradle

@@ -37,7 +37,7 @@ publishing {
             pom {
                 name = "react-native"
                 description = "A framework for building native apps with React"
-                url = "https://github.com/facebook/react-native"
+                url = "https://github.com/react/react-native"
 
                 developers {
                     developer {
@@ -49,15 +49,15 @@ publishing {
                 licenses {
                     license {
                         name = "MIT License"
-                        url = "https://github.com/facebook/react-native/blob/HEAD/LICENSE"
+                        url = "https://github.com/react/react-native/blob/HEAD/LICENSE"
                         distribution = "repo"
                     }
                 }
 
                 scm {
-                    url = "https://github.com/facebook/react-native.git"
-                    connection = "scm:git:https://github.com/facebook/react-native.git"
-                    developerConnection = "scm:git:git@github.com:facebook/react-native.git"
+                    url = "https://github.com/react/react-native.git"
+                    connection = "scm:git:https://github.com/react/react-native.git"
+                    developerConnection = "scm:git:git@github.com:react/react-native.git"
                 }
             }
         }

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

@@ -171,6 +171,7 @@ public class ReactInstanceManager {
   // Identifies whether the instance manager destroy function is in process,
   // while true any spawned create thread should wait for proper clean up before initializing
   private volatile Boolean mHasStartedDestroying = false;
+  private final Object mHasStartedDestroyingLock = new Object();
   private final MemoryPressureRouter mMemoryPressureRouter;
   private final @Nullable JSExceptionHandler mJSExceptionHandler;
   private final @Nullable UIManagerProvider mUIManagerProvider;
@@ -782,8 +783,8 @@ public class ReactInstanceManager {
     ResourceDrawableIdHelper.getInstance().clear();
 
     mHasStartedDestroying = false;
-    synchronized (mHasStartedDestroying) {
-      mHasStartedDestroying.notifyAll();
+    synchronized (mHasStartedDestroyingLock) {
+      mHasStartedDestroyingLock.notifyAll();
     }
     synchronized (mPackages) {
       mViewManagerNames = null;
@@ -1139,10 +1140,10 @@ public class ReactInstanceManager {
             null,
             () -> {
               ReactMarker.logMarker(REACT_CONTEXT_THREAD_END);
-              synchronized (ReactInstanceManager.this.mHasStartedDestroying) {
+              synchronized (ReactInstanceManager.this.mHasStartedDestroyingLock) {
                 while (ReactInstanceManager.this.mHasStartedDestroying) {
                   try {
-                    ReactInstanceManager.this.mHasStartedDestroying.wait();
+                    ReactInstanceManager.this.mHasStartedDestroyingLock.wait();
                   } catch (InterruptedException e) {
                     // Interrupted while waiting for destruction to complete, just retry
                     continue;

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/CxxInspectorPackagerConnection.kt

@@ -85,7 +85,7 @@ internal class CxxInspectorPackagerConnection(
    * A simple WebSocket wrapper that prevents having more than 16MiB of messages queued
    * simultaneously. This is done to stop OkHttp from closing the WebSocket connection.
    *
-   * https://github.com/facebook/react-native/issues/39651.
+   * https://github.com/react/react-native/issues/39651.
    * https://github.com/square/okhttp/blob/4e7dbec1ea6c9cf8d80422ac9d44b9b185c749a3/okhttp/src/commonJvmAndroid/kotlin/okhttp3/internal/ws/RealWebSocket.kt#L684.
    */
   private class InspectorPackagerWebSocketImpl(

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.kt

@@ -626,14 +626,15 @@ internal constructor(
 
   public fun storeSynchronousMountPropsOverride(reactTag: Int, props: ReadableMap): Unit {
     if (ReactNativeFeatureFlags.overrideBySynchronousMountPropsAtMountingAndroid()) {
-      val propsMap = getMapFromPropsReadableMap(props)
-      var synchronousMountProps = tagToSynchronousMountProps[reactTag]
-      if (synchronousMountProps != null) {
-        synchronousMountProps.putAll(propsMap)
+      val propsMap = getAnimatedPropsMap(props)
+      val synchronousMountProps = tagToSynchronousMountProps[reactTag] ?: mutableMapOf()
+      clearAnimatedNullPropsMapKeys(props, synchronousMountProps)
+      synchronousMountProps.putAll(propsMap)
+      if (synchronousMountProps.isEmpty()) {
+        tagToSynchronousMountProps.remove(reactTag)
       } else {
-        synchronousMountProps = propsMap
+        tagToSynchronousMountProps[reactTag] = synchronousMountProps
       }
-      tagToSynchronousMountProps[reactTag] = synchronousMountProps
     }
   }
 
@@ -899,7 +900,16 @@ internal constructor(
       return
     }
 
-    val viewState = getViewState(reactTag)
+    val viewState = getNullableViewState(reactTag)
+    if (viewState == null) {
+      ReactSoftExceptionLogger.logSoftException(
+          ReactSoftExceptionLogger.Categories.SURFACE_MOUNTING_MANAGER_MISSING_VIEWSTATE,
+          ReactNoCrashSoftException(
+              "Unable to find viewState for tag $reactTag for updateOverflowInset"
+          ),
+      )
+      return
+    }
     // Do not layout Root Views
     if (viewState.isRoot) {
       return
@@ -1069,8 +1079,8 @@ internal constructor(
       // If the view that went offscreen is still being touched, we can't delete it yet.
       // We have to delay the deletion till the touch is completed.
       // This is causing bugs like those otherwise:
-      // - https://github.com/facebook/react-native/issues/44610
-      // - https://github.com/facebook/react-native/issues/45126
+      // - https://github.com/react/react-native/issues/44610
+      // - https://github.com/react/react-native/issues/45126
       viewsToDeleteAfterTouchFinishes.add(reactTag)
     } else {
       // To delete we simply remove the tag from the registry.
@@ -1328,7 +1338,11 @@ internal constructor(
       for ((propKey, propValue) in patchMap) {
         if (outputReadableMap.hasKey(propKey)) {
           if (propKey == PROP_TRANSFORM) {
-            assert(outputReadableMap.getType(propKey) == ReadableType.Array && propValue is List<*>)
+            val outputType = outputReadableMap.getType(propKey)
+            assert(
+                (outputType == ReadableType.Array || outputType == ReadableType.Null) &&
+                    propValue is List<*>
+            )
             val array = WritableNativeArray()
             for (item in propValue as List<*>) {
               if (item is Map<*, *>) {
@@ -1346,14 +1360,18 @@ internal constructor(
             }
             outputReadableMap.putArray(propKey, array)
           } else if (propKey == PROP_OPACITY) {
-            assert(outputReadableMap.getType(propKey) == ReadableType.Number && propValue is Number)
+            val outputType = outputReadableMap.getType(propKey)
+            assert(
+                (outputType == ReadableType.Number || outputType == ReadableType.Null) &&
+                    propValue is Number
+            )
             outputReadableMap.putDouble(propKey, (propValue as Number).toDouble())
           }
         }
       }
     }
 
-    private fun getMapFromPropsReadableMap(readableMap: ReadableMap): MutableMap<String, Any> {
+    private fun getAnimatedPropsMap(readableMap: ReadableMap): MutableMap<String, Any> {
       val outputMap = mutableMapOf<String, Any>()
 
       if (
@@ -1383,6 +1401,25 @@ internal constructor(
       return outputMap
     }
 
+    private fun clearAnimatedNullPropsMapKeys(
+        readableMap: ReadableMap,
+        outputMap: MutableMap<String, Any>,
+    ) {
+      // Native Animated uses synchronous null updates to restore animated-managed props.
+      // Keep this scoped to props stored by this override path today.
+      if (
+          readableMap.hasKey(PROP_TRANSFORM) &&
+              readableMap.getType(PROP_TRANSFORM) == ReadableType.Null
+      ) {
+        outputMap.remove(PROP_TRANSFORM)
+      }
+      if (
+          readableMap.hasKey(PROP_OPACITY) && readableMap.getType(PROP_OPACITY) == ReadableType.Null
+      ) {
+        outputMap.remove(PROP_OPACITY)
+      }
+    }
+
     // prevents unchecked conversion warn of the <ViewGroup> type
     private fun getViewGroupManager(viewState: ViewState): IViewGroupManager<View> {
       val viewManager =

package/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.kt

@@ -326,8 +326,8 @@ public open class JavaTimerManager(
 
       // If the JS thread is busy for multiple frames we cancel any other pending runnable.
       // We also capture the idleCallbackRunnable to tentatively fix:
-      // https://github.com/facebook/react-native/issues/44842
-      // https://github.com/facebook/react-native/issues/54983
+      // https://github.com/react/react-native/issues/44842
+      // https://github.com/react/react-native/issues/54983
       currentIdleCallbackRunnable?.cancel()
       val idleCallbackRunnable = IdleCallbackRunnable(frameTimeNanos)
       currentIdleCallbackRunnable = idleCallbackRunnable

package/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.kt

@@ -87,11 +87,15 @@ public open class IntentModule(reactContext: ReactApplicationContext) :
           override fun onHostResume() {
             reactApplicationContext.removeLifecycleEventListener(this)
             synchronized(this@IntentModule) {
-              for (pendingPromise in pendingOpenURLPromises) {
+              // getInitialURL can re-enter and re-add to pendingOpenURLPromises when the activity
+              // is still null at resume, so drain a snapshot (after clearing the list and listener)
+              // to avoid mutating the list being iterated (ConcurrentModificationException).
+              val pendingPromises = ArrayList(pendingOpenURLPromises)
+              pendingOpenURLPromises.clear()
+              initialURLListener = null
+              for (pendingPromise in pendingPromises) {
                 getInitialURL(pendingPromise)
               }
-              initialURLListener = null
-              pendingOpenURLPromises.clear()
             }
           }
 
@@ -223,7 +227,7 @@ public open class IntentModule(reactContext: ReactApplicationContext) :
             }
             ReadableType.Number -> {
               // We cannot know from JS if is an Integer or Double
-              // See: https://github.com/facebook/react-native/issues/4141
+              // See: https://github.com/react/react-native/issues/4141
               // We might need to find a workaround if this is really an issue
               val number = map.getDouble(EXTRA_MAP_KEY_FOR_VALUE)
               intent.putExtra(name, number)

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.kt

@@ -166,7 +166,7 @@ public class NetworkingModule(
 
   @Deprecated(
       """To be removed in a future release. See
-        https://github.com/facebook/react-native/pull/37798#pullrequestreview-1518338914"""
+        https://github.com/react/react-native/pull/37798#pullrequestreview-1518338914"""
   )
   public interface CustomClientBuilder : com.facebook.react.modules.network.CustomClientBuilder
 
@@ -480,7 +480,7 @@ public class NetworkingModule(
         } else {
           // Use getBytes() to convert the body into a byte[], preventing okhttp from
           // appending the character set to the Content-Type header when otherwise unspecified
-          // https://github.com/facebook/react-native/issues/8237
+          // https://github.com/react/react-native/issues/8237
           val charset =
               if (contentMediaType == null) {
                 StandardCharsets.UTF_8

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

@@ -14,7 +14,7 @@ public object ReactNativeVersion {
   public val VERSION: Map<String, Any?> = mapOf(
     "major" to 0,
     "minor" to 86,
-    "patch" to 0,
-    "prerelease" to "2"
+    "patch" to 3,
+    "prerelease" to "0"
   )
 }

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.kt

@@ -569,7 +569,7 @@ internal class ReactInstance(
             // We need to null check here because some Java implementation of the
             // `ViewManagerOnDemandReactPackage` interface could still return null even
             // if the method is marked as returning a non-nullable collection in Kotlin.
-            // See https://github.com/facebook/react-native/issues/52014
+            // See https://github.com/react/react-native/issues/52014
             @Suppress("SENSELESS_COMPARISON")
             if (names == null) {
               RNLog.w(

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java

@@ -626,7 +626,7 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
       // The native Android implementation removed the screen density from the
       // calculation, so squaring and a normalization value of
       // sqrt(5) produces an exact replica with iOS.
-      // For more information, see https://github.com/facebook/react-native/pull/18302
+      // For more information, see https://github.com/react/react-native/pull/18302
       float normalizedCameraDistance =
           sanitizeFloatPropertyValue(
               scale * scale * cameraDistance * CAMERA_DISTANCE_NORMALIZATION_MULTIPLIER);

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactNestedScrollViewManager.kt

@@ -438,7 +438,7 @@ constructor(private val fpsListener: FpsListener? = null) :
     // be on the wrong side. Thus we are moving it to the other side, when the list
     // is inverted.
     // See also:
-    //  - https://github.com/facebook/react-native/issues/35350
+    //  - https://github.com/react/react-native/issues/35350
     //  - https://issuetracker.google.com/issues/287304310
     if (applyFix) {
       view.verticalScrollbarPosition = View.SCROLLBAR_POSITION_LEFT

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.kt

@@ -442,7 +442,7 @@ constructor(private val fpsListener: FpsListener? = null) :
     // be on the wrong side. Thus we are moving it to the other side, when the list
     // is inverted.
     // See also:
-    //  - https://github.com/facebook/react-native/issues/35350
+    //  - https://github.com/react/react-native/issues/35350
     //  - https://issuetracker.google.com/issues/287304310
     if (applyFix) {
       view.verticalScrollbarPosition = View.SCROLLBAR_POSITION_LEFT

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

@@ -252,7 +252,7 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
     try (SystraceSection s = new SystraceSection("ReactTextView.setText(ReactTextUpdate)")) {
       // Android's TextView crashes when it tries to relayout if LayoutParams are
       // null; explicitly set the LayoutParams to prevent this crash. See:
-      // https://github.com/facebook/react-native/pull/7011
+      // https://github.com/react/react-native/pull/7011
       if (getLayoutParams() == null) {
         setLayoutParams(EMPTY_LAYOUT_PARAMS);
       }

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt

@@ -772,7 +772,7 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
   /**
    * Remove spans from the SpannableStringBuilder which can be represented by TextAppearance
    * attributes on the underlying EditText. This works around instability on Samsung devices with
-   * the presence of spans https://github.com/facebook/react-native/issues/35936 (S318090)
+   * the presence of spans https://github.com/react/react-native/issues/35936 (S318090)
    */
   private fun stripStyleEquivalentSpans(sb: SpannableStringBuilder) {
     stripSpansOfKind(sb, ReactAbsoluteSizeSpan::class.java) { span: ReactAbsoluteSizeSpan ->
@@ -990,7 +990,7 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
     val selectionEnd = selectionEnd
 
     // Used to ensure that text is selectable inside of removeClippedSubviews
-    // See https://github.com/facebook/react-native/issues/6805 for original
+    // See https://github.com/react/react-native/issues/6805 for original
     // fix that was ported to here.
     super.setTextIsSelectable(true)
 

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.kt

@@ -381,7 +381,7 @@ public open class ReactTextInputManager public constructor() :
       return
     }
 
-    // Based on https://github.com/facebook/react-native/pull/31007
+    // Based on https://github.com/react/react-native/pull/31007
     if (Build.VERSION.SDK_INT == Build.VERSION_CODES.P) {
       return
     }
@@ -739,7 +739,7 @@ public open class ReactTextInputManager public constructor() :
       // crash happens when focusing on a email EditText, during which a prompt will be triggered
       // but
       // the system fail to locate it properly. Here is an example post discussing about this
-      // issue: https://github.com/facebook/react-native/issues/27204
+      // issue: https://github.com/react/react-native/issues/27204
       if (shouldHideCursorForEmailTextInput()) {
         view.isCursorVisible = false
       }

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextSelectionWatcher.kt

@@ -30,7 +30,7 @@ internal class ReactTextSelectionWatcher(private val editText: ReactEditText) :
     // forward it on if we have new values
 
     // Apparently Android might call this with an end value that is less than the start value
-    // Lets normalize them. See https://github.com/facebook/react-native/issues/18579
+    // Lets normalize them. See https://github.com/react/react-native/issues/18579
     val realStart = min(start.toDouble(), end.toDouble()).toInt()
     val realEnd = max(start.toDouble(), end.toDouble()).toInt()
 

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.kt

@@ -458,7 +458,7 @@ public open class ReactViewGroup public constructor(context: Context?) :
 
   internal fun requestFocusFromJS() {
     if (isAttachedToWindow) {
-      super.requestFocus(FOCUS_DOWN, null)
+      requestFocus(FOCUS_DOWN, null)
     } else {
       focusOnAttach = true
     }
@@ -1188,7 +1188,7 @@ public open class ReactViewGroup public constructor(context: Context?) :
           return super.performAccessibilityAction(host, action, args)
         }
         if (action == AccessibilityNodeInfo.ACTION_FOCUS) {
-          if (args?.let { host.interceptAccessibilityEvents(action, it) } == true) {
+          if (host.interceptAccessibilityEvents(action, args) == true) {
             return true
           }
           // Handle case when focus guide cannot find any focusable child
@@ -1206,7 +1206,7 @@ public open class ReactViewGroup public constructor(context: Context?) :
           return super.performAccessibilityAction(host, action, args)
         }
         if (action == AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS) {
-          if (args?.let { host.interceptAccessibilityEvents(action, it) } == true) {
+          if (host.interceptAccessibilityEvents(action, args) == true) {
             return true
           }
           // Handle case when focus guide cannot find any focusable child
@@ -1265,7 +1265,7 @@ public open class ReactViewGroup public constructor(context: Context?) :
     return this.isFocusGuideTalkbackAccessibilityDelegateSet
   }
 
-  private fun interceptAccessibilityEvents(action: Int, args: Bundle): Boolean {
+  private fun interceptAccessibilityEvents(action: Int, args: Bundle?): Boolean {
     if (!this.isTVFocusGuide) {
       return false
     }

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.kt

@@ -518,7 +518,7 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
       HOTSPOT_UPDATE_KEY -> handleHotspotUpdate(root, args)
       "setPressed" -> handleSetPressed(root, args)
       "setDestinations" -> handleSetDestinations(root, args)
-      "requestTVFocus" -> root.requestFocus()
+      "requestTVFocus" -> root.requestFocusFromJS()
       "focus" -> handleFocus(root)
       "blur" -> handleBlur(root)
       else -> {}

package/ReactApple/Libraries/RCTFoundation/RCTDeprecation/RCTDeprecation.podspec

@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
     s.author                 = "Meta Platforms, Inc. and its affiliates"
     s.license                = package["license"]
     s.homepage               = "https://reactnative.dev/"
-    s.source                 = { :git => 'https://github.com/facebook/react-native.git', :tag => 'v#{version}' }
+    s.source                 = { :git => 'https://github.com/react/react-native.git', :tag => 'v#{version}' }
     s.summary                = "Macros for marking APIs as deprecated"
     s.source_files           = podspec_sources(["Exported/*.h", "RCTDeprecation.m"], "Exported/*.h")
     s.pod_target_xcconfig    = {

package/ReactApple/RCTSwiftUI/RCTSwiftUI.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we're presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactApple/RCTSwiftUIWrapper/RCTSwiftUIWrapper.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we're presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")