expo-modules-core 1.6.0 → 1.7.0

package/android/src/main/java/expo/modules/adapters/react/ModuleRegistryAdapter.java

@@ -12,8 +12,6 @@ import java.util.Objects;
 import androidx.annotation.Nullable;
 
 import expo.modules.BuildConfig;
-import expo.modules.adapters.react.views.SimpleViewManagerAdapter;
-import expo.modules.adapters.react.views.ViewGroupManagerAdapter;
 import expo.modules.core.ModuleRegistry;
 import expo.modules.core.interfaces.Consumer;
 import expo.modules.core.interfaces.InternalModule;
@@ -105,17 +103,6 @@ public class ModuleRegistryAdapter implements ReactPackage {
   public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
     List<ViewManager> viewManagerList = new ArrayList<>(mModuleRegistryProvider.getReactViewManagers(reactContext));
 
-    for (expo.modules.core.ViewManager viewManager : mModuleRegistryProvider.getViewManagers(reactContext)) {
-      switch (viewManager.getViewManagerType()) {
-        case GROUP:
-          viewManagerList.add(new ViewGroupManagerAdapter(viewManager));
-          break;
-        case SIMPLE:
-          viewManagerList.add(new SimpleViewManagerAdapter(viewManager));
-          break;
-      }
-    }
-
     NativeModulesProxy modulesProxy = Objects.requireNonNull(getOrCreateNativeModulesProxy(reactContext, null));
     KotlinInteropModuleRegistry kotlinInteropModuleRegistry = modulesProxy.getKotlinInteropModuleRegistry();
     List<ViewManager<?, ?>> kViewManager = kotlinInteropModuleRegistry.exportViewManagers();
@@ -135,7 +122,7 @@ public class ModuleRegistryAdapter implements ReactPackage {
     @Nullable ModuleRegistry moduleRegistry
   ) {
     if (mModulesProxy != null && mModulesProxy.getReactContext() != reactContext) {
-      setModulesProxy(mModulesProxy);
+      setModulesProxy(null);
     }
     if (mModulesProxy == null) {
       ModuleRegistry registry = moduleRegistry != null ? moduleRegistry : mModuleRegistryProvider.get(reactContext);

package/android/src/main/java/expo/modules/adapters/react/NativeModulesProxy.java

@@ -1,6 +1,5 @@
 package expo.modules.adapters.react;
 
-import android.util.Log;
 import android.util.SparseArray;
 
 import com.facebook.react.bridge.Dynamic;
@@ -24,7 +23,6 @@ import javax.annotation.Nullable;
 
 import expo.modules.core.ExportedModule;
 import expo.modules.core.ModuleRegistry;
-import expo.modules.core.ViewManager;
 import expo.modules.core.interfaces.ExpoMethod;
 import expo.modules.kotlin.CoreLoggerKt;
 import expo.modules.kotlin.ExpoModulesHelper;
@@ -102,11 +100,9 @@ public class NativeModulesProxy extends ReactContextBaseJavaModule {
     getKotlinInteropModuleRegistry().installJSIInterop();
 
     Collection<ExportedModule> exportedModules = mModuleRegistry.getAllExportedModules();
-    Collection<ViewManager> viewManagers = mModuleRegistry.getAllViewManagers();
 
     Map<String, Object> modulesConstants = new HashMap<>(exportedModules.size());
     Map<String, Object> exportedMethodsMap = new HashMap<>(exportedModules.size());
-    Map<String, Object> viewManagersMetadata = new HashMap<>(viewManagers.size());
 
     for (ExportedModule exportedModule : exportedModules) {
       String moduleName = exportedModule.getName();
@@ -124,16 +120,10 @@ public class NativeModulesProxy extends ReactContextBaseJavaModule {
       return null;
     }));
 
-    for (ViewManager viewManager : viewManagers) {
-      viewManagersMetadata.put(viewManager.getName(), viewManager.getMetadata());
-    }
-
-    viewManagersMetadata.putAll(mKotlinInteropModuleRegistry.viewManagersMetadata());
-
     Map<String, Object> constants = new HashMap<>(3);
     constants.put(MODULES_CONSTANTS_KEY, modulesConstants);
     constants.put(EXPORTED_METHODS_KEY, exportedMethodsMap);
-    constants.put(VIEW_MANAGERS_METADATA_KEY, viewManagersMetadata);
+    constants.put(VIEW_MANAGERS_METADATA_KEY, mKotlinInteropModuleRegistry.viewManagersMetadata());
 
     CoreLoggerKt.getLogger().info("✅ Constants were exported");
 

package/android/src/main/java/expo/modules/adapters/react/views/ViewManagerAdapterUtils.java

@@ -1,60 +1,6 @@
 package expo.modules.adapters.react.views;
 
-import android.util.Log;
-import android.view.View;
-
-import com.facebook.react.bridge.Dynamic;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableMapKeySetIterator;
-import com.facebook.react.common.MapBuilder;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import expo.modules.adapters.react.ArgumentsHelper;
-import expo.modules.core.ViewManager;
-
 public class ViewManagerAdapterUtils {
-  /* package */ static String getViewManagerAdapterName(ViewManager viewManager) {
-    return "ViewManagerAdapter_" + viewManager.getName();
-  }
-
-  /* package */ static Map<String, Object> getConstants(ViewManager viewManager) {
-    Map<String, Object> constants = new HashMap<>();
-    constants.put("eventNames", viewManager.getExportedEventNames());
-    return constants;
-  }
-
-  /* package */ static Map<String, Object> getExportedCustomDirectEventTypeConstants(ViewManager viewManager) {
-    MapBuilder.Builder<String, Object> builder = MapBuilder.builder();
-    // Somehow Java compiler thinks getExportedEventNames() returns list of Objects.
-    // ¯\_(ツ)_/¯
-    for (Object eventName : viewManager.getExportedEventNames()) {
-      if (eventName instanceof String) {
-        builder.put(normalizeEventName((String) eventName), MapBuilder.of("registrationName", eventName));
-      }
-    }
-    return builder.build();
-  }
-
-  /* package */ static <V extends View> void setProxiedProperties(String viewManagerAdapterName, ViewManager<V> viewManager, V view, ReadableMap proxiedProperties) {
-    ReadableMapKeySetIterator keyIterator = proxiedProperties.keySetIterator();
-    while (keyIterator.hasNextKey()) {
-      String key = keyIterator.nextKey();
-      try {
-        ViewManager.PropSetterInfo propSetterInfo = viewManager.getPropSetterInfos().get(key);
-        if (propSetterInfo == null) {
-          throw new IllegalArgumentException("No setter found for prop " + key + " in " + viewManagerAdapterName);
-        }
-        Dynamic dynamicPropertyValue = proxiedProperties.getDynamic(key);
-        Object castPropertyValue = ArgumentsHelper.getNativeArgumentForExpectedClass(dynamicPropertyValue, propSetterInfo.getExpectedValueClass());
-        viewManager.updateProp(view, key, castPropertyValue);
-      } catch (Exception e) {
-        Log.e(viewManagerAdapterName, "Error when setting prop " + key + ". " + e.getMessage());
-      }
-    }
-  }
-
   public static String normalizeEventName(final String eventName) {
     if (eventName.startsWith("on")) {
       return "top" + eventName.substring(2);

package/android/src/main/java/expo/modules/core/ModuleRegistry.java

@@ -13,7 +13,6 @@ import java.util.Map;
 
 public class ModuleRegistry {
   private final Map<Class, InternalModule> mInternalModulesMap = new HashMap<>();
-  private final Map<String, ViewManager> mViewManagersMap = new HashMap<>();
   private final Map<String, ExportedModule> mExportedModulesMap = new HashMap<>();
   private final Map<Class, ExportedModule> mExportedModulesByClassMap = new HashMap<>();
   private final Map<String, SingletonModule> mSingletonModulesMap = new HashMap<>();
@@ -33,10 +32,6 @@ public class ModuleRegistry {
       registerExportedModule(module);
     }
 
-    for (ViewManager manager : viewManagers) {
-      registerViewManager(manager);
-    }
-
     for (SingletonModule singleton : singletonModules) {
       registerSingletonModule(singleton);
     }
@@ -61,10 +56,6 @@ public class ModuleRegistry {
     return mExportedModulesByClassMap.get(moduleClass);
   }
 
-  public Collection<ViewManager> getAllViewManagers() {
-    return mViewManagersMap.values();
-  }
-
   public Collection<ExportedModule> getAllExportedModules() {
     return mExportedModulesMap.values();
   }
@@ -95,11 +86,6 @@ public class ModuleRegistry {
     mExportedModulesByClassMap.put(module.getClass(), module);
   }
 
-  public void registerViewManager(ViewManager manager) {
-    String managerName = manager.getName();
-    mViewManagersMap.put(managerName, manager);
-  }
-
   public void registerSingletonModule(SingletonModule singleton) {
     String singletonName = singleton.getName();
     mSingletonModulesMap.put(singletonName, singleton);
@@ -137,7 +123,6 @@ public class ModuleRegistry {
     List<RegistryLifecycleListener> lifecycleListeners = new ArrayList<>();
     lifecycleListeners.addAll(mExportedModulesMap.values());
     lifecycleListeners.addAll(mInternalModulesMap.values());
-    lifecycleListeners.addAll(mViewManagersMap.values());
 
     for (WeakReference<RegistryLifecycleListener> ref : mExtraRegistryLifecycleListeners) {
       if (ref.get() != null) {
@@ -154,7 +139,6 @@ public class ModuleRegistry {
     List<RegistryLifecycleListener> lifecycleListeners = new ArrayList<>();
     lifecycleListeners.addAll(mExportedModulesMap.values());
     lifecycleListeners.addAll(mInternalModulesMap.values());
-    lifecycleListeners.addAll(mViewManagersMap.values());
 
     for (WeakReference<RegistryLifecycleListener> ref : mExtraRegistryLifecycleListeners) {
       if (ref.get() != null) {

package/android/src/main/java/expo/modules/core/ViewManager.java

@@ -1,136 +1,9 @@
 package expo.modules.core;
 
-import android.content.Context;
 import android.view.View;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import expo.modules.core.interfaces.RegistryLifecycleListener;
-import expo.modules.core.interfaces.ExpoProp;
-
-public abstract class ViewManager<V extends View> implements RegistryLifecycleListener {
-  /**
-   * A helper class for passing information about prop setter so that
-   * eg. adapter can infer the expected class of the property value.
-   */
-  public class PropSetterInfo {
-    private Class<?> mExpectedPropertyClass;
-    PropSetterInfo(Class<?>[] parameterTypes) {
-      mExpectedPropertyClass = parameterTypes[parameterTypes.length - 1];
-    }
-
-    public Class<?> getExpectedValueClass() {
-      return mExpectedPropertyClass;
-    }
-  }
-
-  public enum ViewManagerType {
-    SIMPLE,
-    GROUP
-  }
-
-  private Map<String, PropSetterInfo> mPropSetterInfos;
-  private Map<String, Method> mPropSetters;
-
-
-  public abstract String getName();
-  public abstract V createViewInstance(Context context);
-  public abstract ViewManagerType getViewManagerType();
-
-  public List<String> getExportedEventNames() {
-    return Collections.emptyList();
-  }
-
-  public void onDropViewInstance(V view) {
-    // by default do nothing
-  }
-
-  /**
-   * Returns a map of view manager's metadata that will be exposed to JavaScript.
-   */
-  public Map<String, Object> getMetadata() {
-    Map<String, Object> metadata = new HashMap<>();
-    metadata.put("propsNames", getPropSetters().keySet().toArray());
-    return metadata;
-  }
-
-  /**
-   * Returns a map of { propName => propInfo } so that platform adapter knows value of what class
-   * does the propsetter expect.
-   */
-  public Map<String, PropSetterInfo> getPropSetterInfos() {
-    if (mPropSetterInfos != null) {
-      return mPropSetterInfos;
-    }
-
-    Map<String, PropSetterInfo> propSetterInfos = new HashMap<>();
-    for (Map.Entry<String, Method> entry : getPropSetters().entrySet()) {
-      propSetterInfos.put(entry.getKey(), new PropSetterInfo(entry.getValue().getParameterTypes()));
-    }
-
-    mPropSetterInfos = propSetterInfos;
-    return mPropSetterInfos;
-  }
-
-  public void updateProp(V view, String propName, Object propValue) throws RuntimeException {
-    Method propSetter = getPropSetters().get(propName);
-    if (propSetter == null) {
-      throw new IllegalArgumentException("There is no propSetter in " + getName() + " for prop of name " + propName + ".");
-    }
-
-    // We've validated parameter types length in getPropSetterInfos()
-    Object transformedPropertyValue = transformArgumentToClass(propValue, getPropSetterInfos().get(propName).getExpectedValueClass());
-
-    try {
-      propSetter.invoke(this, view, transformedPropertyValue);
-    } catch (IllegalAccessException | InvocationTargetException e) {
-      throw new RuntimeException("Exception occurred while updating property " + propName
-              + " on module " + getName() + ": " + e.getMessage(), e);
-    }
-  }
-
-  protected Object transformArgumentToClass(Object argument, Class<?> expectedArgumentClass) {
-    return ArgumentsHelper.validatedArgumentForClass(argument, expectedArgumentClass);
-  }
-
-  /**
-   * Creates or returns a cached map of propName => methodSettingThatProp. Validates returned methods.
-   * @return Map of { propName => methodSettingThatProp }
-   */
-  private Map<String, Method> getPropSetters() {
-    if (mPropSetters != null) {
-      return mPropSetters;
-    }
-
-    mPropSetters = new HashMap<>();
-    Method[] declaredMethodsArray = getClass().getDeclaredMethods();
-
-    for (Method method : declaredMethodsArray) {
-      if (method.getAnnotation(ExpoProp.class) != null) {
-        ExpoProp propAnnotation = method.getAnnotation(ExpoProp.class);
-        String propName = propAnnotation.name();
-        Class<?>[] methodParameterTypes = method.getParameterTypes();
-        if (methodParameterTypes.length != 2) {
-          throw new IllegalArgumentException(
-                  "Expo prop setter should define at least two arguments: view and prop value. Propsetter for " + propName + " of module " + getName() + " does not define these arguments."
-          );
-        }
-
-        if (mPropSetters.containsKey(propName)) {
-          throw new IllegalArgumentException(
-                  "View manager " + getName() + " prop setter name already registered: " + propName + "."
-          );
-        }
-
-        mPropSetters.put(propName, method);
-      }
-    }
 
-    return mPropSetters;
-  }
-}
+@Deprecated
+// TODO(@lukmccall): Remove in the SDK 51. We leave it for now because that class was used in the unimodules package interface.
+public abstract class ViewManager<V extends View> implements RegistryLifecycleListener { }

package/android/src/main/java/expo/modules/kotlin/AppContext.kt

@@ -9,8 +9,9 @@ import android.view.View
 import androidx.annotation.UiThread
 import androidx.appcompat.app.AppCompatActivity
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.turbomodule.core.CallInvokerHolderImpl
 import com.facebook.react.uimanager.UIManagerHelper
+import com.facebook.react.uimanager.UIManagerModule
+import com.facebook.react.uimanager.common.UIManagerType
 import expo.modules.adapters.react.NativeModulesProxy
 import expo.modules.core.errors.ContextDestroyedException
 import expo.modules.core.errors.ModuleNotFoundException
@@ -36,6 +37,7 @@ import expo.modules.kotlin.events.EventName
 import expo.modules.kotlin.events.KEventEmitterWrapper
 import expo.modules.kotlin.events.KModuleEventEmitterWrapper
 import expo.modules.kotlin.events.OnActivityResultPayload
+import expo.modules.kotlin.exception.Exceptions
 import expo.modules.kotlin.jni.JNIDeallocator
 import expo.modules.kotlin.jni.JSIInteropModuleRegistry
 import expo.modules.kotlin.modules.Module
@@ -148,7 +150,7 @@ class AppContext(
               it,
               jniDeallocator,
               jsContextProvider.jsCallInvokerHolder,
-              catalystInstance.nativeCallInvokerHolder as CallInvokerHolderImpl
+              ReactNativeCompatibleHelper.getNativeMethodCallInvokerHolderImplCompatible(catalystInstance)
             )
             logger.info("✅ JSI interop was installed")
           }
@@ -283,7 +285,7 @@ class AppContext(
       return KEventEmitterWrapper(legacyEventEmitter, reactContextHolder)
     }
 
-  internal val errorManager: ErrorManagerModule?
+  val errorManager: ErrorManagerModule?
     get() = registry.getModule()
 
   internal fun onDestroy() = trace("AppContext.onDestroy") {
@@ -350,6 +352,22 @@ class AppContext(
     return UIManagerHelper.getUIManagerForReactTag(reactContext, viewTag)?.resolveView(viewTag) as? T
   }
 
+  internal fun dispatchOnMainUsingUIManager(block: () -> Unit) {
+    val reactContext = reactContextHolder.get() ?: throw Exceptions.ReactContextLost()
+    val uiManager = UIManagerHelper.getUIManagerForReactTag(
+      reactContext,
+      UIManagerType.DEFAULT
+    ) as UIManagerModule
+
+    uiManager.addUIBlock {
+      block()
+    }
+  }
+
+  internal fun assertMainThread() {
+    Utils.assertMainThread()
+  }
+
   /**
    * Runs a code block on the JavaScript thread.
    */

package/android/src/main/java/expo/modules/kotlin/KotlinInteropModuleRegistry.kt

@@ -4,6 +4,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.uimanager.ViewManager
 import expo.modules.adapters.react.NativeModulesProxy
+import expo.modules.kotlin.views.ViewManagerType
 import expo.modules.kotlin.defaultmodules.NativeModulesProxyModuleName
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.exception.UnexpectedException
@@ -77,8 +78,8 @@ class KotlinInteropModuleRegistry(
         .map {
           val wrapperDelegate = ViewManagerWrapperDelegate(it)
           when (it.definition.viewManagerDefinition!!.getViewManagerType()) {
-            expo.modules.core.ViewManager.ViewManagerType.SIMPLE -> SimpleViewManagerWrapper(wrapperDelegate)
-            expo.modules.core.ViewManager.ViewManagerType.GROUP -> GroupViewManagerWrapper(wrapperDelegate)
+            ViewManagerType.SIMPLE -> SimpleViewManagerWrapper(wrapperDelegate)
+            ViewManagerType.GROUP -> GroupViewManagerWrapper(wrapperDelegate)
           }
         }
     }

package/android/src/main/java/expo/modules/kotlin/Promise.kt

@@ -9,6 +9,10 @@ private const val unknownCode = "UnknownCode"
 interface Promise {
   fun resolve(value: Any?)
 
+  fun resolve() {
+    resolve(null)
+  }
+
   fun reject(code: String, message: String?, cause: Throwable?)
 
   fun reject(exception: CodedException) {
@@ -18,7 +22,7 @@ interface Promise {
 
 fun Promise.toBridgePromise(): com.facebook.react.bridge.Promise {
   val expoPromise = this
-  val resolveMethod = if (expoPromise is PromiseImpl) {
+  val resolveMethod: (value: Any?) -> Unit = if (expoPromise is PromiseImpl) {
     expoPromise.resolveBlock::invoke
   } else {
     expoPromise::resolve

package/android/src/main/java/expo/modules/kotlin/activityresult/ActivityResultsManager.kt

@@ -1,5 +1,3 @@
-@file:OptIn(DelicateCoroutinesApi::class)
-
 package expo.modules.kotlin.activityresult
 
 import android.app.Activity
@@ -22,6 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger
  * Manager class that takes care of proper communication with [AppContextActivityResultRegistry]
  * It also monitors the needed lifecycle state using [AppCompatActivityAwareHelper]
  */
+@OptIn(DelicateCoroutinesApi::class)
 class ActivityResultsManager(
   currentActivityProvider: CurrentActivityProvider
 ) : AppContextActivityResultCaller, AppCompatActivityAware {

package/android/src/main/java/expo/modules/kotlin/classcomponent/ClassComponentBuilder.kt

@@ -4,6 +4,7 @@ package expo.modules.kotlin.classcomponent
 
 import expo.modules.kotlin.functions.SyncFunctionComponent
 import expo.modules.kotlin.objects.ObjectDefinitionBuilder
+import expo.modules.kotlin.objects.PropertyComponentBuilderWithThis
 import expo.modules.kotlin.types.toAnyType
 import kotlin.reflect.KClass
 import kotlin.reflect.KType
@@ -12,7 +13,7 @@ import kotlin.reflect.typeOf
 class ClassComponentBuilder<SharedObjectType : Any>(
   val name: String,
   private val ownerClass: KClass<SharedObjectType>,
-  private val ownerType: KType
+  val ownerType: KType
 ) : ObjectDefinitionBuilder() {
   var constructor: SyncFunctionComponent? = null
 
@@ -109,4 +110,20 @@ class ClassComponentBuilder<SharedObjectType : Any>(
       constructor = it
     }
   }
+
+  /**
+   * Creates the read-only property whose getter takes the caller as an argument.
+   */
+  inline fun <T> Property(name: String, crossinline body: (owner: SharedObjectType) -> T): PropertyComponentBuilderWithThis<SharedObjectType> {
+    return PropertyComponentBuilderWithThis<SharedObjectType>(ownerType, name).also {
+      it.get(body)
+      properties[name] = it
+    }
+  }
+
+  override fun Property(name: String): PropertyComponentBuilderWithThis<SharedObjectType> {
+    return PropertyComponentBuilderWithThis<SharedObjectType>(ownerType, name).also {
+      properties[name] = it
+    }
+  }
 }

package/android/src/main/java/expo/modules/kotlin/defaultmodules/ErrorManagerModule.kt

@@ -6,11 +6,12 @@ import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 
 private const val onNewException = "ExpoModulesCoreErrorManager.onNewException"
+private const val onNewWarning = "ExpoModulesCoreErrorManager.onNewWarning"
 
 class ErrorManagerModule : Module() {
   override fun definition() = ModuleDefinition {
     Name("ExpoModulesCoreErrorManager")
-    Events(onNewException)
+    Events(onNewException, onNewWarning)
   }
 
   fun reportExceptionToLogBox(codedException: CodedException) {
@@ -22,4 +23,14 @@ class ErrorManagerModule : Module() {
       }
     )
   }
+
+  fun reportWarningToLogBox(warning: String) {
+    val eventEmitter = appContext.eventEmitter(this) ?: return
+    eventEmitter.emit(
+      onNewWarning,
+      Bundle().apply {
+        putString("message", warning)
+      }
+    )
+  }
 }

package/android/src/main/java/expo/modules/kotlin/functions/AnyFunction.kt

@@ -24,6 +24,7 @@ abstract class AnyFunction(
 ) {
   internal val argsCount get() = desiredArgsTypes.size
 
+  @PublishedApi
   internal var canTakeOwner: Boolean = false
 
   @PublishedApi

package/android/src/main/java/expo/modules/kotlin/functions/AsyncFunction.kt

@@ -1,16 +1,11 @@
 package expo.modules.kotlin.functions
 
-import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.uimanager.UIManagerHelper
-import com.facebook.react.uimanager.UIManagerModule
-import com.facebook.react.uimanager.common.UIManagerType
 import expo.modules.BuildConfig
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.ModuleHolder
 import expo.modules.kotlin.Promise
 import expo.modules.kotlin.exception.CodedException
-import expo.modules.kotlin.exception.Exceptions
 import expo.modules.kotlin.exception.FunctionCallException
 import expo.modules.kotlin.exception.UnexpectedException
 import expo.modules.kotlin.exception.exceptionDecorator
@@ -98,14 +93,7 @@ abstract class AsyncFunction(
           // but the JavaScript code has already received the future tag of the view.
           // To avoid this issue, we have decided to temporarily utilize
           // the UIManagerModule for dispatching functions on the main thread.
-          val uiManager = UIManagerHelper.getUIManagerForReactTag(
-            appContext.reactContext as? ReactContext ?: throw Exceptions.ReactContextLost(),
-            UIManagerType.DEFAULT
-          ) as UIManagerModule
-
-          uiManager.addUIBlock {
-            functionBody()
-          }
+          appContext.dispatchOnMainUsingUIManager(functionBody)
           return@registerAsyncFunction
         }