react-native 0.80.0-rc.2 → 0.80.0-rc.3

package/Libraries/Core/ReactNativeVersion.js

@@ -17,5 +17,5 @@ export const version: $ReadOnly<{
   major: 0,
   minor: 80,
   patch: 0,
-  prerelease: 'rc.2',
+  prerelease: 'rc.3',
 };

package/React/Base/RCTVersion.m

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

package/ReactAndroid/api/ReactAndroid.api

@@ -5123,13 +5123,13 @@ public final class com/facebook/react/uimanager/events/TouchEventType$Companion
 	public final fun getJSEventName (Lcom/facebook/react/uimanager/events/TouchEventType;)Ljava/lang/String;
 }
 
-public final class com/facebook/react/uimanager/layoutanimation/LayoutAnimationController {
+public class com/facebook/react/uimanager/layoutanimation/LayoutAnimationController {
 	public fun <init> ()V
-	public final fun applyLayoutUpdate (Landroid/view/View;IIII)V
-	public final fun deleteView (Landroid/view/View;Lcom/facebook/react/uimanager/layoutanimation/LayoutAnimationListener;)V
+	public fun applyLayoutUpdate (Landroid/view/View;IIII)V
+	public fun deleteView (Landroid/view/View;Lcom/facebook/react/uimanager/layoutanimation/LayoutAnimationListener;)V
 	public final fun initializeFromConfig (Lcom/facebook/react/bridge/ReadableMap;Lcom/facebook/react/bridge/Callback;)V
-	public final fun reset ()V
-	public final fun shouldAnimateLayout (Landroid/view/View;)Z
+	public fun reset ()V
+	public fun shouldAnimateLayout (Landroid/view/View;)Z
 }
 
 public abstract interface class com/facebook/react/uimanager/layoutanimation/LayoutAnimationListener {
@@ -6565,7 +6565,6 @@ public class com/facebook/react/views/textinput/ReactEditText : androidx/appcomp
 	public fun addTextChangedListener (Landroid/text/TextWatcher;)V
 	protected final fun applyTextAttributes ()V
 	public final fun canUpdateWithEventCount (I)Z
-	public fun clearFocus ()V
 	protected final fun finalize ()V
 	public final fun getBorderColor (I)I
 	protected final fun getContainsImages ()Z

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.80.0-rc.2
+VERSION_NAME=0.80.0-rc.3
 react.internal.publishingGroup=com.facebook.react
 
 android.useAndroidX=true

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

@@ -15,6 +15,6 @@ public object ReactNativeVersion {
     "major" to 0,
     "minor" to 80,
     "patch" to 0,
-    "prerelease" to "rc.2"
+    "prerelease" to "rc.3"
   )
 }

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

@@ -29,7 +29,7 @@ import javax.annotation.concurrent.NotThreadSafe
  */
 @NotThreadSafe
 @LegacyArchitecture
-public class LayoutAnimationController {
+public open class LayoutAnimationController {
   private val layoutCreateAnimation: AbstractLayoutAnimation = LayoutCreateAnimation()
   private val layoutUpdateAnimation: AbstractLayoutAnimation = LayoutUpdateAnimation()
   private val layoutDeleteAnimation: AbstractLayoutAnimation = LayoutDeleteAnimation()
@@ -68,7 +68,7 @@ public class LayoutAnimationController {
     }
   }
 
-  public fun reset() {
+  public open fun reset() {
     layoutCreateAnimation.reset()
     layoutUpdateAnimation.reset()
     layoutDeleteAnimation.reset()
@@ -83,7 +83,7 @@ public class LayoutAnimationController {
     }
   }
 
-  public fun shouldAnimateLayout(viewToAnimate: View?): Boolean {
+  public open fun shouldAnimateLayout(viewToAnimate: View?): Boolean {
     // if view parent is null, skip animation: view have been clipped, we don't want animation to
     // resume when view is re-attached to parent, which is the standard android animation behavior.
     // If there's a layout handling animation going on, it should be animated nonetheless since the
@@ -106,7 +106,7 @@ public class LayoutAnimationController {
    * @param width the new width value for the view
    * @param height the new height value for the view
    */
-  public fun applyLayoutUpdate(view: View, x: Int, y: Int, width: Int, height: Int) {
+  public open fun applyLayoutUpdate(view: View, x: Int, y: Int, width: Int, height: Int) {
     assertOnUiThread()
 
     val reactTag = view.id
@@ -167,7 +167,7 @@ public class LayoutAnimationController {
    * @param listener Called once the animation is finished, should be used to completely remove the
    *   view.
    */
-  public fun deleteView(view: View, listener: LayoutAnimationListener) {
+  public open fun deleteView(view: View, listener: LayoutAnimationListener) {
     assertOnUiThread()
 
     val animation =

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

@@ -35,6 +35,7 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.MotionEvent
 import android.view.View
+import android.view.ViewGroup
 import android.view.accessibility.AccessibilityNodeInfo
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputConnection
@@ -359,11 +360,26 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
       super.onTextContextMenuItem(
           if (id == android.R.id.paste) android.R.id.pasteAsPlainText else id)
 
-  override fun clearFocus() {
-    super.clearFocus()
+  internal fun clearFocusAndMaybeRefocus() {
+    if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P || !isInTouchMode) {
+      super.clearFocus()
+    } else {
+      // Avoid refocusing to a new view on old versions of Android by default
+      // by preventing `requestFocus()` on the rootView from moving focus to any child.
+      // https://cs.android.com/android/_/android/platform/frameworks/base/+/bdc66cb5a0ef513f4306edf9156cc978b08e06e4
+      val rootViewGroup = rootView as ViewGroup
+      val oldDescendantFocusability = rootViewGroup.descendantFocusability
+      rootViewGroup.descendantFocusability = ViewGroup.FOCUS_BLOCK_DESCENDANTS
+      super.clearFocus()
+      rootViewGroup.descendantFocusability = oldDescendantFocusability
+    }
     hideSoftKeyboard()
   }
 
+  internal fun clearFocusFromJS() {
+    clearFocusAndMaybeRefocus()
+  }
+
   // For cases like autoFocus, or ref.focus() where we request focus programmatically and not
   // through
   // interacting with the EditText directly (like clicking on it). We cannot use stock
@@ -598,10 +614,6 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
     requestFocusProgrammatically()
   }
 
-  internal fun clearFocusFromJS() {
-    clearFocus()
-  }
-
   public fun incrementAndGetEventCounter(): Int = ++nativeEventCount
 
   public fun maybeSetTextFromJS(reactTextUpdate: ReactTextUpdate) {

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

@@ -926,7 +926,7 @@ public open class ReactTextInputManager public constructor() :
         }
 
         if (shouldBlur) {
-          editText.clearFocus()
+          editText.clearFocusAndMaybeRefocus()
         }
 
         // Prevent default behavior except when we want it to insert a newline.

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -22,7 +22,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 80;
   int32_t Patch = 0;
-  std::string_view Prerelease = "rc.2";
+  std::string_view Prerelease = "rc.3";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/react/runtime/TimerManager.cpp

@@ -242,8 +242,9 @@ void TimerManager::attachGlobals(jsi::Runtime& runtime) {
             }
 
             if (!args[0].isObject() || !args[0].asObject(rt).isFunction(rt)) {
-              // Do not throw any error to match web spec
-              return timerIndex_++;
+              // Do not throw any error to match web spec; instead return 0, an
+              // invalid timer id
+              return 0;
             }
 
             auto callback = args[0].getObject(rt).getFunction(rt);
@@ -300,8 +301,9 @@ void TimerManager::attachGlobals(jsi::Runtime& runtime) {
             }
 
             if (!args[0].isObject() || !args[0].asObject(rt).isFunction(rt)) {
-              throw jsi::JSError(
-                  rt, "The first argument to setInterval must be a function.");
+              // Do not throw any error to match web spec; instead return 0, an
+              // invalid timer id
+              return 0;
             }
             auto callback = args[0].getObject(rt).getFunction(rt);
             auto delay = count > 1

package/ReactCommon/react/runtime/TimerManager.h

@@ -93,7 +93,9 @@ class TimerManager {
 
   // Each timeout that is registered on this queue gets a sequential id.  This
   // is the global count from which those are assigned.
-  TimerHandle timerIndex_{0};
+  // As per WHATWG HTML 8.6.1 (Timers) ids must be greater than zero, i.e. start
+  // at 1
+  TimerHandle timerIndex_{1};
 
   // The React Native microtask queue is used to back public APIs including
   // `queueMicrotask`, `clearImmediate`, and `setImmediate` (which is used by

package/ReactCommon/react/runtime/tests/cxx/ReactInstanceTest.cpp

@@ -267,7 +267,9 @@ TEST_F(ReactInstanceTest, testSetTimeoutWithoutDelay) {
   EXPECT_CALL(
       *mockRegistry_,
       createTimer(_, 0)); // If delay is not provided, it should use 0
-  eval("setTimeout(() => {});");
+  auto val = eval("setTimeout(() => {});");
+  expectNoError();
+  EXPECT_EQ(val.asNumber(), 1); // First timer id should start at 1
 }
 
 TEST_F(ReactInstanceTest, testSetTimeoutWithPassThroughArgs) {
@@ -299,8 +301,9 @@ TEST_F(ReactInstanceTest, testSetTimeoutWithInvalidArgs) {
       getErrorMessage("setTimeout();"),
       "setTimeout must be called with at least one argument (the function to call).");
 
-  eval("setTimeout('invalid');");
+  auto val = eval("setTimeout('invalid')");
   expectNoError();
+  EXPECT_EQ(val.asNumber(), 0);
 
   eval("setTimeout(() => {}, 'invalid');");
   expectNoError();
@@ -417,9 +420,10 @@ TEST_F(ReactInstanceTest, testSetIntervalWithInvalidArgs) {
   EXPECT_EQ(
       getErrorMessage("setInterval();"),
       "setInterval must be called with at least one argument (the function to call).");
-  EXPECT_EQ(
-      getErrorMessage("setInterval('invalid', 100);"),
-      "The first argument to setInterval must be a function.");
+
+  auto val = eval("setInterval('invalid', 100)");
+  expectNoError();
+  EXPECT_EQ(val.asNumber(), 0);
 }
 
 TEST_F(ReactInstanceTest, testClearInterval) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.80.0-rc.2",
+  "version": "0.80.0-rc.3",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -155,13 +155,13 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.7.0",
-    "@react-native/assets-registry": "0.80.0-rc.2",
-    "@react-native/codegen": "0.80.0-rc.2",
-    "@react-native/community-cli-plugin": "0.80.0-rc.2",
-    "@react-native/gradle-plugin": "0.80.0-rc.2",
-    "@react-native/js-polyfills": "0.80.0-rc.2",
-    "@react-native/normalize-colors": "0.80.0-rc.2",
-    "@react-native/virtualized-lists": "0.80.0-rc.2",
+    "@react-native/assets-registry": "0.80.0-rc.3",
+    "@react-native/codegen": "0.80.0-rc.3",
+    "@react-native/community-cli-plugin": "0.80.0-rc.3",
+    "@react-native/gradle-plugin": "0.80.0-rc.3",
+    "@react-native/js-polyfills": "0.80.0-rc.3",
+    "@react-native/normalize-colors": "0.80.0-rc.3",
+    "@react-native/virtualized-lists": "0.80.0-rc.3",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",

package/types/index.d.ts

@@ -68,7 +68,7 @@
 /// <reference path="modules/BatchedBridge.d.ts" />
 /// <reference path="modules/Codegen.d.ts" />
 /// <reference path="modules/Devtools.d.ts" />
-/// <reference types="../src/types/globals.d.ts" />
+/// <reference path="../src/types/globals.d.ts" />
 
 export * from '../Libraries/ActionSheetIOS/ActionSheetIOS';
 export * from '../Libraries/Alert/Alert';

package/types/tsconfig.test.json

@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+      "module": "commonjs",
+      "lib": ["es6"],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictFunctionTypes": true,
+      "strictNullChecks": true,
+      "types": [],
+      "jsx": "react",
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true,
+      "paths": {"react-native": ["."]}
+    },
+    "include": ["../**/*.d.ts", "__typetests__/**/*"]
+}