react-native 0.66.0-rc.4 → 0.67.0-rc.1

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

@@ -64,6 +64,7 @@ public class TextLayoutManager {
   private static final boolean DEFAULT_INCLUDE_FONT_PADDING = true;
   private static final String INCLUDE_FONT_PADDING_KEY = "includeFontPadding";
   private static final String TEXT_BREAK_STRATEGY_KEY = "textBreakStrategy";
+  private static final String HYPHENATION_FREQUENCY_KEY = "android_hyphenationFrequency";
   private static final String MAXIMUM_NUMBER_OF_LINES_KEY = "maximumNumberOfLines";
   private static final LruCache<ReadableNativeMap, Spannable> sSpannableCache =
       new LruCache<>(spannableCacheSize);
@@ -250,7 +251,8 @@ public class TextLayoutManager {
       float width,
       YogaMeasureMode widthYogaMeasureMode,
       boolean includeFontPadding,
-      int textBreakStrategy) {
+      int textBreakStrategy,
+      int hyphenationFrequency) {
     Layout layout;
     int spanLength = text.length();
     boolean unconstrainedWidth = widthYogaMeasureMode == YogaMeasureMode.UNDEFINED || width < 0;
@@ -281,10 +283,9 @@ public class TextLayoutManager {
                 .setLineSpacing(0.f, 1.f)
                 .setIncludePad(includeFontPadding)
                 .setBreakStrategy(textBreakStrategy)
-                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)
+                .setHyphenationFrequency(hyphenationFrequency)
                 .build();
       }
-
     } else if (boring != null && (unconstrainedWidth || boring.width <= width)) {
       int boringLayoutWidth = boring.width;
       if (boring.width < 0) {
@@ -325,7 +326,7 @@ public class TextLayoutManager {
                 .setLineSpacing(0.f, 1.f)
                 .setIncludePad(includeFontPadding)
                 .setBreakStrategy(textBreakStrategy)
-                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL);
+                .setHyphenationFrequency(hyphenationFrequency);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
           builder.setUseLineSpacingFromFallbacks(true);
@@ -378,6 +379,9 @@ public class TextLayoutManager {
         paragraphAttributes.hasKey(INCLUDE_FONT_PADDING_KEY)
             ? paragraphAttributes.getBoolean(INCLUDE_FONT_PADDING_KEY)
             : DEFAULT_INCLUDE_FONT_PADDING;
+    int hyphenationFrequency =
+        TextAttributeProps.getHyphenationFrequency(
+            paragraphAttributes.getString(HYPHENATION_FREQUENCY_KEY));
 
     if (text == null) {
       throw new IllegalStateException("Spannable element has not been prepared in onBeforeLayout");
@@ -387,7 +391,13 @@ public class TextLayoutManager {
 
     Layout layout =
         createLayout(
-            text, boring, width, widthYogaMeasureMode, includeFontPadding, textBreakStrategy);
+            text,
+            boring,
+            width,
+            widthYogaMeasureMode,
+            includeFontPadding,
+            textBreakStrategy,
+            hyphenationFrequency);
 
     int maximumNumberOfLines =
         paragraphAttributes.hasKey(MAXIMUM_NUMBER_OF_LINES_KEY)
@@ -539,10 +549,19 @@ public class TextLayoutManager {
         paragraphAttributes.hasKey(INCLUDE_FONT_PADDING_KEY)
             ? paragraphAttributes.getBoolean(INCLUDE_FONT_PADDING_KEY)
             : DEFAULT_INCLUDE_FONT_PADDING;
+    int hyphenationFrequency =
+        TextAttributeProps.getTextBreakStrategy(
+            paragraphAttributes.getString(HYPHENATION_FREQUENCY_KEY));
 
     Layout layout =
         createLayout(
-            text, boring, width, YogaMeasureMode.EXACTLY, includeFontPadding, textBreakStrategy);
+            text,
+            boring,
+            width,
+            YogaMeasureMode.EXACTLY,
+            includeFontPadding,
+            textBreakStrategy,
+            hyphenationFrequency);
     return FontMetricsUtil.getFontMetrics(text, layout, sTextPaintInstance, context);
   }
 

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

@@ -61,6 +61,7 @@ public class TextLayoutManagerMapBuffer {
   public static final short PA_KEY_TEXT_BREAK_STRATEGY = 2;
   public static final short PA_KEY_ADJUST_FONT_SIZE_TO_FIT = 3;
   public static final short PA_KEY_INCLUDE_FONT_PADDING = 4;
+  public static final short PA_KEY_HYPHENATION_FREQUENCY = 5;
 
   private static final boolean ENABLE_MEASURE_LOGGING = ReactBuildConfig.DEBUG && false;
 
@@ -264,7 +265,8 @@ public class TextLayoutManagerMapBuffer {
       float width,
       YogaMeasureMode widthYogaMeasureMode,
       boolean includeFontPadding,
-      int textBreakStrategy) {
+      int textBreakStrategy,
+      int hyphenationFrequency) {
     Layout layout;
     int spanLength = text.length();
     boolean unconstrainedWidth = widthYogaMeasureMode == YogaMeasureMode.UNDEFINED || width < 0;
@@ -295,7 +297,7 @@ public class TextLayoutManagerMapBuffer {
                 .setLineSpacing(0.f, 1.f)
                 .setIncludePad(includeFontPadding)
                 .setBreakStrategy(textBreakStrategy)
-                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)
+                .setHyphenationFrequency(hyphenationFrequency)
                 .build();
       }
 
@@ -338,7 +340,7 @@ public class TextLayoutManagerMapBuffer {
                 .setLineSpacing(0.f, 1.f)
                 .setIncludePad(includeFontPadding)
                 .setBreakStrategy(textBreakStrategy)
-                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL);
+                .setHyphenationFrequency(hyphenationFrequency);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
           builder.setUseLineSpacingFromFallbacks(true);
@@ -391,6 +393,9 @@ public class TextLayoutManagerMapBuffer {
         paragraphAttributes.hasKey(PA_KEY_INCLUDE_FONT_PADDING)
             ? paragraphAttributes.getBoolean(PA_KEY_INCLUDE_FONT_PADDING)
             : DEFAULT_INCLUDE_FONT_PADDING;
+    int hyphenationFrequency =
+        TextAttributeProps.getTextBreakStrategy(
+            paragraphAttributes.getString(PA_KEY_HYPHENATION_FREQUENCY));
 
     if (text == null) {
       throw new IllegalStateException("Spannable element has not been prepared in onBeforeLayout");
@@ -404,7 +409,13 @@ public class TextLayoutManagerMapBuffer {
 
     Layout layout =
         createLayout(
-            text, boring, width, widthYogaMeasureMode, includeFontPadding, textBreakStrategy);
+            text,
+            boring,
+            width,
+            widthYogaMeasureMode,
+            includeFontPadding,
+            textBreakStrategy,
+            hyphenationFrequency);
 
     int maximumNumberOfLines =
         paragraphAttributes.hasKey(PA_KEY_MAX_NUMBER_OF_LINES)
@@ -561,10 +572,19 @@ public class TextLayoutManagerMapBuffer {
         paragraphAttributes.hasKey(PA_KEY_INCLUDE_FONT_PADDING)
             ? paragraphAttributes.getBoolean(PA_KEY_INCLUDE_FONT_PADDING)
             : DEFAULT_INCLUDE_FONT_PADDING;
+    int hyphenationFrequency =
+        TextAttributeProps.getTextBreakStrategy(
+            paragraphAttributes.getString(PA_KEY_HYPHENATION_FREQUENCY));
 
     Layout layout =
         createLayout(
-            text, boring, width, YogaMeasureMode.EXACTLY, includeFontPadding, textBreakStrategy);
+            text,
+            boring,
+            width,
+            YogaMeasureMode.EXACTLY,
+            includeFontPadding,
+            textBreakStrategy,
+            hyphenationFrequency);
     return FontMetricsUtil.getFontMetrics(text, layout, sTextPaintInstance, context);
   }
 

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

@@ -131,10 +131,13 @@ class ReactEditTextInputConnectionWrapper extends InputConnectionWrapper {
   @Override
   public boolean sendKeyEvent(KeyEvent event) {
     if (event.getAction() == KeyEvent.ACTION_DOWN) {
+      boolean isNumberKey = event.getUnicodeChar() < 58 && event.getUnicodeChar() > 47;
       if (event.getKeyCode() == KeyEvent.KEYCODE_DEL) {
         dispatchKeyEvent(BACKSPACE_KEY_VALUE);
       } else if (event.getKeyCode() == KeyEvent.KEYCODE_ENTER) {
         dispatchKeyEvent(ENTER_KEY_VALUE);
+      } else if (isNumberKey) {
+        dispatchKeyEvent(String.valueOf(event.getNumber()));
       }
     }
     return super.sendKeyEvent(event);

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

@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.views.view;
+
+import android.annotation.SuppressLint;
+import android.graphics.Canvas;
+import android.os.Build;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import javax.annotation.Nullable;
+
+/**
+ * Copied from <a
+ * href="https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/CanvasUtils.android.kt;drc=3b2dde134afab8d58b9c39ad4820eaf9a6e014a9">
+ * Compose canvas utils </a>
+ */
+public class CanvasUtil {
+  private CanvasUtil() {}
+
+  private @Nullable static Method mReorderBarrierMethod = null;
+  private @Nullable static Method mInorderBarrierMethod = null;
+  private static boolean mOrderMethodsFetched = false;
+
+  /**
+   * Enables Z support for the Canvas. The method is publicly available starting from API 29 and was
+   * hidden before, so we have to resort to reflection tricks to ensure we can use this API.
+   */
+  @SuppressLint({"SoonBlockedPrivateApi", "PrivateApi"})
+  public static void enableZ(Canvas canvas, boolean enable) {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+      return;
+    }
+
+    if (Build.VERSION.SDK_INT >= 29) {
+      if (enable) {
+        canvas.enableZ();
+      } else {
+        canvas.disableZ();
+      }
+    } else {
+      fetchOrderMethods();
+      try {
+        if (enable && mReorderBarrierMethod != null) {
+          mReorderBarrierMethod.invoke(canvas);
+        }
+        if (!enable && mInorderBarrierMethod != null) {
+          mInorderBarrierMethod.invoke(canvas);
+        }
+      } catch (IllegalAccessException | InvocationTargetException ignore) {
+        // Do nothing
+      }
+    }
+  }
+
+  private static void fetchOrderMethods() {
+    if (!mOrderMethodsFetched) {
+      try {
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.P) {
+          // use double reflection to avoid grey list on P
+          Method getDeclaredMethod =
+              Class.class.getDeclaredMethod("getDeclaredMethod", String.class, Class[].class);
+          mReorderBarrierMethod =
+              (Method) getDeclaredMethod.invoke(Canvas.class, "insertReorderBarrier", new Class[0]);
+          mInorderBarrierMethod =
+              (Method) getDeclaredMethod.invoke(Canvas.class, "insertInorderBarrier", new Class[0]);
+        } else {
+          mReorderBarrierMethod = Canvas.class.getDeclaredMethod("insertReorderBarrier");
+          mInorderBarrierMethod = Canvas.class.getDeclaredMethod("insertInorderBarrier");
+        }
+
+        if (mReorderBarrierMethod == null || mInorderBarrierMethod == null) {
+          return;
+        }
+
+        mReorderBarrierMethod.setAccessible(true);
+        mInorderBarrierMethod.setAccessible(true);
+      } catch (IllegalAccessException ignore) {
+        // Do nothing
+      } catch (InvocationTargetException ignore) {
+        // Do nothing
+      } catch (NoSuchMethodException ignore) {
+        // Do nothing
+      }
+      mOrderMethodsFetched = true;
+    }
+  }
+}

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

@@ -1106,8 +1106,8 @@ public class ReactViewBackgroundDrawable extends Drawable {
             int width = Math.round(borderWidth.left);
             updatePathEffect(width);
             mPaint.setStrokeWidth(width);
-            mPathForSingleBorder.moveTo(left, top - borderWidth.top / 2);
-            mPathForSingleBorder.lineTo(left, bottom + borderWidth.bottom / 2);
+            mPathForSingleBorder.moveTo(left + width / 2, top);
+            mPathForSingleBorder.lineTo(left + width / 2, bottom);
             canvas.drawPath(mPathForSingleBorder, mPaint);
           }
           if (borderTop > 0) {
@@ -1115,8 +1115,8 @@ public class ReactViewBackgroundDrawable extends Drawable {
             int width = Math.round(borderWidth.top);
             updatePathEffect(width);
             mPaint.setStrokeWidth(width);
-            mPathForSingleBorder.moveTo(left, top);
-            mPathForSingleBorder.lineTo(right, top);
+            mPathForSingleBorder.moveTo(left, top + width / 2);
+            mPathForSingleBorder.lineTo(right, top + width / 2);
             canvas.drawPath(mPathForSingleBorder, mPaint);
           }
           if (borderRight > 0) {
@@ -1124,8 +1124,8 @@ public class ReactViewBackgroundDrawable extends Drawable {
             int width = Math.round(borderWidth.right);
             updatePathEffect(width);
             mPaint.setStrokeWidth(width);
-            mPathForSingleBorder.moveTo(right, top - borderWidth.top / 2);
-            mPathForSingleBorder.lineTo(right, bottom + borderWidth.bottom / 2);
+            mPathForSingleBorder.moveTo(right - width / 2, top);
+            mPathForSingleBorder.lineTo(right - width / 2, bottom);
             canvas.drawPath(mPathForSingleBorder, mPaint);
           }
           if (borderBottom > 0) {
@@ -1133,8 +1133,8 @@ public class ReactViewBackgroundDrawable extends Drawable {
             int width = Math.round(borderWidth.bottom);
             updatePathEffect(width);
             mPaint.setStrokeWidth(width);
-            mPathForSingleBorder.moveTo(left, bottom);
-            mPathForSingleBorder.lineTo(right, bottom);
+            mPathForSingleBorder.moveTo(left, bottom - width / 2);
+            mPathForSingleBorder.lineTo(right, bottom - width / 2);
             canvas.drawPath(mPathForSingleBorder, mPaint);
           }
         }

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

@@ -33,6 +33,7 @@ import com.facebook.react.bridge.ReactNoCrashSoftException;
 import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.annotations.VisibleForTesting;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
 import com.facebook.react.touch.OnInterceptTouchEventListener;
 import com.facebook.react.touch.ReactHitSlopView;
@@ -759,6 +760,23 @@ public class ReactViewGroup extends ViewGroup
     }
   }
 
+  @Override
+  protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
+    boolean drawWithZ =
+        child.getElevation() > 0 && ReactFeatureFlags.insertZReorderBarriersOnViewGroupChildren;
+
+    if (drawWithZ) {
+      CanvasUtil.enableZ(canvas, true);
+    }
+
+    boolean result = super.drawChild(canvas, child, drawingTime);
+
+    if (drawWithZ) {
+      CanvasUtil.enableZ(canvas, false);
+    }
+    return result;
+  }
+
   private void dispatchOverflowDraw(Canvas canvas) {
     if (mOverflow != null) {
       switch (mOverflow) {
@@ -768,6 +786,7 @@ public class ReactViewGroup extends ViewGroup
           }
           break;
         case ViewProps.HIDDEN:
+        case ViewProps.SCROLL:
           float left = 0f;
           float top = 0f;
           float right = getWidth();

package/ReactAndroid/src/main/jni/react/jni/Android.mk

@@ -27,7 +27,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -Wno-unused-lambda-capture
 LOCAL_LDLIBS += -landroid
 
 # The dynamic libraries (.so files) that this module depends on.
-LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libglog_init libyoga
+LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libglog_init libyoga libreact_render_runtimescheduler
 
 # The static libraries (.a files) that this module depends on.
 LOCAL_STATIC_LIBRARIES := libreactnative libcallinvokerholder libruntimeexecutor
@@ -77,7 +77,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -Wno-unused-lambda-capture
 LOCAL_LDLIBS += -landroid
 
 # The dynamic libraries (.so files) that this module depends on.
-LOCAL_SHARED_LIBRARIES := libreactnativeutilsjni libfolly_json libfb libfbjni libglog_init libyoga logger
+LOCAL_SHARED_LIBRARIES := libreactnativeutilsjni libfolly_json libfb libfbjni libglog_init libyoga logger libreact_render_runtimescheduler
 
 # The static libraries (.a files) that this module depends on.
 LOCAL_STATIC_LIBRARIES := libreactnative libruntimeexecutor libcallinvokerholder
@@ -129,6 +129,7 @@ $(call import-module,callinvoker)
 $(call import-module,reactperflogger)
 $(call import-module,hermes)
 $(call import-module,runtimeexecutor)
+$(call import-module,react/renderer/runtimescheduler)
 $(call import-module,react/nativemodule/core)
 
 include $(REACT_SRC_DIR)/reactperflogger/jni/Android.mk

package/ReactAndroid/src/main/jni/react/jni/BUCK

@@ -20,6 +20,7 @@ EXPORTED_HEADERS = [
     "ReadableNativeArray.h",
     "ReadableNativeMap.h",
     "JRuntimeExecutor.h",
+    "JRuntimeScheduler.h",
     "WritableNativeArray.h",
     "WritableNativeMap.h",
 ]
@@ -34,14 +35,11 @@ rn_xplat_cxx_library(
     header_namespace = "react/jni",
     exported_headers = EXPORTED_HEADERS,
     compiler_flags = [
-        "-Wall",
-        "-Werror",
-        "-fexceptions",
-        "-std=c++1y",
-        "-frtti",
         "-Wno-pessimizing-move",
         "-Wno-inconsistent-missing-override",
     ],
+    compiler_flags_enable_exceptions = True,
+    compiler_flags_enable_rtti = True,  # dynamic_cast used within ReadableNative*
     fbandroid_allow_jni_merging = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     platforms = ANDROID,
@@ -67,6 +65,7 @@ rn_xplat_cxx_library(
         react_native_xplat_target("cxxreact:module"),
         react_native_xplat_target("jsinspector:jsinspector"),
         react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
+        react_native_xplat_target("react/renderer/runtimescheduler:runtimescheduler"),
         react_native_xplat_target("logger:logger"),
         react_native_xplat_dep("jsi:jsi"),
         FBJNI_TARGET,

package/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp

@@ -27,11 +27,15 @@
 #include <fbjni/ByteBuffer.h>
 #include <folly/dynamic.h>
 #include <glog/logging.h>
+#include <react/renderer/runtimescheduler/RuntimeScheduler.h>
+#include <react/renderer/runtimescheduler/RuntimeSchedulerBinding.h>
+#include <react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h>
 
 #include <logger/react_native_log.h>
 
 #include "CxxModuleWrapper.h"
 #include "JNativeRunnable.h"
+#include "JReactCxxErrorHandler.h"
 #include "JReactSoftExceptionLogger.h"
 #include "JavaScriptExecutorHolder.h"
 #include "JniJSModulesUnbundle.h"
@@ -89,12 +93,21 @@ class JInstanceCallback : public InstanceCallback {
 } // namespace
 
 jni::local_ref<CatalystInstanceImpl::jhybriddata>
-CatalystInstanceImpl::initHybrid(jni::alias_ref<jclass>) {
-  return makeCxxInstance();
+CatalystInstanceImpl::initHybrid(
+    jni::alias_ref<jclass>,
+    bool enableRuntimeScheduler,
+    bool enableRuntimeSchedulerInTurboModule) {
+  return makeCxxInstance(
+      enableRuntimeScheduler, enableRuntimeSchedulerInTurboModule);
 }
 
-CatalystInstanceImpl::CatalystInstanceImpl()
-    : instance_(std::make_unique<Instance>()) {}
+CatalystInstanceImpl::CatalystInstanceImpl(
+    bool enableRuntimeScheduler,
+    bool enableRuntimeSchedulerInTurboModule)
+    : instance_(std::make_unique<Instance>()),
+      enableRuntimeScheduler_(enableRuntimeScheduler),
+      enableRuntimeSchedulerInTurboModule_(
+          enableRuntimeScheduler && enableRuntimeSchedulerInTurboModule) {}
 
 void CatalystInstanceImpl::warnOnLegacyNativeModuleSystemUse() {
   CxxNativeModule::setShouldWarnOnUse(true);
@@ -135,6 +148,8 @@ void CatalystInstanceImpl::registerNatives() {
           CatalystInstanceImpl::handleMemoryPressure),
       makeNativeMethod(
           "getRuntimeExecutor", CatalystInstanceImpl::getRuntimeExecutor),
+      makeNativeMethod(
+          "getRuntimeScheduler", CatalystInstanceImpl::getRuntimeScheduler),
       makeNativeMethod(
           "warnOnLegacyNativeModuleSystemUse",
           CatalystInstanceImpl::warnOnLegacyNativeModuleSystemUse),
@@ -155,6 +170,7 @@ void log(ReactNativeLogLevel level, const char *message) {
       break;
     case ReactNativeLogLevelError:
       LOG(ERROR) << message;
+      JReactCxxErrorHandler::handleError(message);
       break;
     case ReactNativeLogLevelFatal:
       LOG(FATAL) << message;
@@ -338,10 +354,18 @@ void CatalystInstanceImpl::handleMemoryPressure(int pressureLevel) {
 jni::alias_ref<CallInvokerHolder::javaobject>
 CatalystInstanceImpl::getJSCallInvokerHolder() {
   if (!jsCallInvokerHolder_) {
-    jsCallInvokerHolder_ = jni::make_global(
-        CallInvokerHolder::newObjectCxxArgs(instance_->getJSCallInvoker()));
+    if (enableRuntimeSchedulerInTurboModule_) {
+      auto runtimeScheduler = getRuntimeScheduler();
+      auto runtimeSchedulerCallInvoker =
+          std::make_shared<RuntimeSchedulerCallInvoker>(
+              runtimeScheduler->cthis()->get());
+      jsCallInvokerHolder_ = jni::make_global(
+          CallInvokerHolder::newObjectCxxArgs(runtimeSchedulerCallInvoker));
+    } else {
+      jsCallInvokerHolder_ = jni::make_global(
+          CallInvokerHolder::newObjectCxxArgs(instance_->getJSCallInvoker()));
+    }
   }
-
   return jsCallInvokerHolder_;
 }
 
@@ -386,5 +410,23 @@ CatalystInstanceImpl::getRuntimeExecutor() {
   return runtimeExecutor_;
 }
 
+jni::alias_ref<JRuntimeScheduler::javaobject>
+CatalystInstanceImpl::getRuntimeScheduler() {
+  if (enableRuntimeScheduler_ && !runtimeScheduler_) {
+    auto runtimeExecutor = instance_->getRuntimeExecutor();
+    auto runtimeScheduler = std::make_shared<RuntimeScheduler>(runtimeExecutor);
+
+    runtimeScheduler_ =
+        jni::make_global(JRuntimeScheduler::newObjectCxxArgs(runtimeScheduler));
+
+    runtimeExecutor([runtimeScheduler](jsi::Runtime &runtime) {
+      RuntimeSchedulerBinding::createAndInstallIfNeeded(
+          runtime, runtimeScheduler);
+    });
+  }
+
+  return runtimeScheduler_;
+}
+
 } // namespace react
 } // namespace facebook

package/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h

@@ -15,6 +15,7 @@
 #include "CxxModuleWrapper.h"
 #include "JMessageQueueThread.h"
 #include "JRuntimeExecutor.h"
+#include "JRuntimeScheduler.h"
 #include "JSLoader.h"
 #include "JavaModuleWrapper.h"
 #include "ModuleRegistryBuilder.h"
@@ -36,7 +37,10 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
   static constexpr auto kJavaDescriptor =
       "Lcom/facebook/react/bridge/CatalystInstanceImpl;";
 
-  static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jclass>);
+  static jni::local_ref<jhybriddata> initHybrid(
+      jni::alias_ref<jclass>,
+      bool enableRuntimeScheduler,
+      bool enableRuntimeSchedulerInTurboModule);
 
   static void registerNatives();
 
@@ -47,7 +51,9 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
  private:
   friend HybridBase;
 
-  CatalystInstanceImpl();
+  CatalystInstanceImpl(
+      bool enableRuntimeScheduler,
+      bool enableRuntimeSchedulerInTurboModule);
 
   void initializeBridge(
       jni::alias_ref<ReactCallback::javaobject> callback,
@@ -98,10 +104,13 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
   jni::alias_ref<CallInvokerHolder::javaobject> getJSCallInvokerHolder();
   jni::alias_ref<CallInvokerHolder::javaobject> getNativeCallInvokerHolder();
   jni::alias_ref<JRuntimeExecutor::javaobject> getRuntimeExecutor();
+  jni::alias_ref<JRuntimeScheduler::javaobject> getRuntimeScheduler();
   void setGlobalVariable(std::string propName, std::string &&jsonValue);
   jlong getJavaScriptContext();
   void handleMemoryPressure(int pressureLevel);
 
+  void createAndInstallRuntimeSchedulerIfNecessary();
+
   // This should be the only long-lived strong reference, but every C++ class
   // will have a weak reference.
   std::shared_ptr<Instance> instance_;
@@ -110,6 +119,10 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
   jni::global_ref<CallInvokerHolder::javaobject> jsCallInvokerHolder_;
   jni::global_ref<CallInvokerHolder::javaobject> nativeCallInvokerHolder_;
   jni::global_ref<JRuntimeExecutor::javaobject> runtimeExecutor_;
+  jni::global_ref<JRuntimeScheduler::javaobject> runtimeScheduler_;
+
+  bool const enableRuntimeScheduler_;
+  bool const enableRuntimeSchedulerInTurboModule_;
 };
 
 } // namespace react

package/ReactAndroid/src/main/jni/react/jni/JReactCxxErrorHandler.cpp

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "JReactCxxErrorHandler.h"
+
+using namespace facebook::react;
+
+void JReactCxxErrorHandler::handleError(std::string message) {
+  static const auto handleError =
+      javaClassStatic()->getStaticMethod<void(std::string message)>(
+          "handleError");
+
+  return handleError(javaClassStatic(), message);
+}

package/ReactAndroid/src/main/jni/react/jni/JReactCxxErrorHandler.h

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <string>
+
+namespace facebook {
+namespace react {
+
+class JReactCxxErrorHandler : public jni::JavaClass<JReactCxxErrorHandler> {
+ public:
+  static constexpr const char *kJavaDescriptor =
+      "Lcom/facebook/react/bridge/ReactCxxErrorHandler;";
+
+  static void handleError(std::string message);
+};
+
+} // namespace react
+} // namespace facebook

package/{ReactCommon/react/renderer/core/Constants.cpp → ReactAndroid/src/main/jni/react/jni/JRuntimeScheduler.cpp}

@@ -5,19 +5,17 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "Constants.h"
+#include "JRuntimeScheduler.h"
 
 namespace facebook {
 namespace react {
 
-static bool isPropsForwardingEnabled = false;
+JRuntimeScheduler::JRuntimeScheduler(
+    std::weak_ptr<RuntimeScheduler> runtimeScheduler)
+    : runtimeScheduler_(runtimeScheduler) {}
 
-void Constants::setPropsForwardingEnabled(bool propsForwardingEnabled) {
-  isPropsForwardingEnabled = propsForwardingEnabled;
-}
-
-bool Constants::getPropsForwardingEnabled() {
-  return isPropsForwardingEnabled;
+std::weak_ptr<RuntimeScheduler> JRuntimeScheduler::get() {
+  return runtimeScheduler_;
 }
 
 } // namespace react

package/ReactAndroid/src/main/jni/react/jni/JRuntimeScheduler.h

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <react/renderer/runtimescheduler/RuntimeScheduler.h>
+
+namespace facebook {
+namespace react {
+
+class JRuntimeScheduler : public jni::HybridClass<JRuntimeScheduler> {
+ public:
+  static auto constexpr kJavaDescriptor =
+      "Lcom/facebook/react/bridge/RuntimeScheduler;";
+
+  std::weak_ptr<RuntimeScheduler> get();
+
+ private:
+  friend HybridBase;
+  JRuntimeScheduler(std::weak_ptr<RuntimeScheduler> runtimeScheduler);
+  std::weak_ptr<RuntimeScheduler> runtimeScheduler_;
+};
+
+} // namespace react
+} // namespace facebook