expo-modules-core 1.2.6 → 1.3.0

package/ios/Fabric/ExpoFabricViewObjC.mm

@@ -140,9 +140,18 @@ static std::unordered_map<std::string, ExpoViewComponentDescriptor::Flavor> _com
 - (void)updateProps:(const facebook::react::Props::Shared &)props oldProps:(const facebook::react::Props::Shared &)oldProps
 {
   const auto &newViewProps = *std::static_pointer_cast<ExpoViewProps const>(props);
-  NSDictionary<NSString *, id> *proxiedProperties = convertFollyDynamicToId(newViewProps.proxiedProperties);
+  NSMutableDictionary<NSString *, id> *propsMap = [[NSMutableDictionary alloc] init];
 
-  [self updateProps:proxiedProperties];
+  for (const auto &item : newViewProps.propsMap) {
+    NSString *propName = [NSString stringWithUTF8String:item.first.c_str()];
+
+    // Ignore props inherited from the base view and Yoga.
+    if ([self supportsPropWithName:propName]) {
+      propsMap[propName] = convertFollyDynamicToId(item.second);
+    }
+  }
+
+  [self updateProps:propsMap];
   [super updateProps:props oldProps:oldProps];
   [self viewDidUpdateProps];
 }
@@ -174,6 +183,12 @@ static std::unordered_map<std::string, ExpoViewComponentDescriptor::Flavor> _com
   // Implemented in `ExpoFabricView.swift`
 }
 
+- (BOOL)supportsPropWithName:(nonnull NSString *)name
+{
+  // Implemented in `ExpoFabricView.swift`
+  return NO;
+}
+
 #pragma mark - Methods to override in the subclass
 
 - (nullable EXAppContext *)__injectedAppContext

package/ios/JSI/EXJSIInstaller.mm

@@ -35,7 +35,7 @@ static NSString *modulesHostObjectLegacyPropertyName = @"ExpoModules";
 
 + (BOOL)installExpoModulesHostObject:(nonnull EXAppContext *)appContext
 {
-  EXJavaScriptRuntime *runtime = [appContext runtime];
+  EXJavaScriptRuntime *runtime = [appContext _runtime];
 
   // The runtime may be unavailable, e.g. remote debugger is enabled or it hasn't been set yet.
   if (!runtime) {

package/ios/JSI/EXJSIUtils.h

@@ -26,6 +26,11 @@ using ClassConstructor = std::function<void(jsi::Runtime &runtime, const jsi::Va
 
 std::shared_ptr<jsi::Function> createClass(jsi::Runtime &runtime, const char *name, ClassConstructor constructor);
 
+/**
+ Creates a new object, using the provided object as the prototype.
+ */
+std::shared_ptr<jsi::Object> createObjectWithPrototype(jsi::Runtime &runtime, std::shared_ptr<jsi::Object> prototype);
+
 #pragma mark - Weak objects
 
 /**

package/ios/JSI/EXJSIUtils.mm

@@ -115,6 +115,23 @@ std::shared_ptr<jsi::Function> createClass(jsi::Runtime &runtime, const char *na
   return std::make_shared<jsi::Function>(klass.asFunction(runtime));
 }
 
+std::shared_ptr<jsi::Object> createObjectWithPrototype(jsi::Runtime &runtime, std::shared_ptr<jsi::Object> prototype) {
+  // Get the "Object" class.
+  jsi::Object objectClass = runtime
+    .global()
+    .getPropertyAsObject(runtime, "Object");
+
+  // Call "Object.create(prototype)" to create an object with the given prototype without calling the constructor.
+  jsi::Object object = objectClass
+    .getPropertyAsFunction(runtime, "create")
+    .callWithThis(runtime, objectClass, {
+      jsi::Value(runtime, *prototype)
+    })
+    .asObject(runtime);
+
+  return std::make_shared<jsi::Object>(std::move(object));
+}
+
 #pragma mark - Weak objects
 
 bool isWeakRefSupported(jsi::Runtime &runtime) {

package/ios/JSI/EXJavaScriptRuntime.h

@@ -103,6 +103,11 @@ typedef void (^ClassConstructorBlock)(EXJavaScriptObject * _Nonnull thisValue, N
 - (nonnull EXJavaScriptObject *)createClass:(nonnull NSString *)name
                                 constructor:(nonnull ClassConstructorBlock)constructor;
 
+/**
+ Creates a new object, using the provided object as the prototype.
+ */
+- (nullable EXJavaScriptObject *)createObjectWithPrototype:(nonnull EXJavaScriptObject *)prototype;
+
 #pragma mark - Script evaluation
 
 /**

package/ios/JSI/EXJavaScriptRuntime.mm

@@ -160,6 +160,12 @@ static NSString *mainObjectPropertyName = @"expo";
   return [[EXJavaScriptObject alloc] initWith:klass runtime:self];
 }
 
+- (nullable EXJavaScriptObject *)createObjectWithPrototype:(nonnull EXJavaScriptObject *)prototype
+{
+  std::shared_ptr<jsi::Object> object = expo::createObjectWithPrototype(*_runtime, [prototype getShared]);
+  return object ? [[EXJavaScriptObject alloc] initWith:object runtime:self] : nil;
+}
+
 #pragma mark - Script evaluation
 
 - (nonnull EXJavaScriptValue *)evaluateScript:(nonnull NSString *)scriptSource

package/ios/JSI/EXJavaScriptValue.h

@@ -9,6 +9,7 @@ namespace jsi = facebook::jsi;
 #endif // __cplusplus
 
 @class EXJavaScriptRuntime;
+@class EXRawJavaScriptFunction;
 @class EXJavaScriptTypedArray;
 
 /**
@@ -49,6 +50,7 @@ NS_SWIFT_NAME(JavaScriptValue)
 - (nonnull NSArray<EXJavaScriptValue *> *)getArray;
 - (nonnull NSDictionary<NSString *, id> *)getDictionary;
 - (nonnull EXJavaScriptObject *)getObject;
+- (nonnull EXRawJavaScriptFunction *)getFunction;
 - (nullable EXJavaScriptTypedArray *)getTypedArray;
 
 #pragma mark - Helpers

package/ios/JSI/EXJavaScriptValue.mm

@@ -3,6 +3,7 @@
 #import <ExpoModulesCore/EXJSIConversions.h>
 #import <ExpoModulesCore/EXJavaScriptValue.h>
 #import <ExpoModulesCore/EXJavaScriptRuntime.h>
+#import <ExpoModulesCore/EXRawJavaScriptFunction.h>
 #import <ExpoModulesCore/EXJavaScriptTypedArray.h>
 #import <ExpoModulesCore/TypedArray.h>
 
@@ -142,6 +143,13 @@
   return [[EXJavaScriptObject alloc] initWith:objectPtr runtime:_runtime];
 }
 
+- (nonnull EXRawJavaScriptFunction *)getFunction
+{
+  jsi::Runtime *runtime = [_runtime get];
+  std::shared_ptr<jsi::Function> functionPtr = std::make_shared<jsi::Function>(_value->asObject(*runtime).asFunction(*runtime));
+  return [[EXRawJavaScriptFunction alloc] initWith:functionPtr runtime:_runtime];
+}
+
 - (nullable EXJavaScriptTypedArray *)getTypedArray
 {
   if (![self isTypedArray]) {

package/ios/JSI/EXJavaScriptWeakObject.mm

@@ -12,10 +12,17 @@
    */
   __weak EXJavaScriptRuntime *_runtime;
 
+#if __has_include(<reacthermes/HermesExecutorFactory.h>)
   /**
-   Shared pointer to the `WeakRef` JS object.
+   A weak reference to a JS object. Available only on Hermes engine.
    */
-  std::shared_ptr<jsi::Object> _jsObject;
+  std::shared_ptr<jsi::WeakObject> _weakObject;
+#else
+  /**
+   Shared pointer to the `WeakRef` JS object. Available only on JSC engine.
+   */
+  std::shared_ptr<jsi::Object> _weakObject;
+#endif
 }
 
 - (nonnull instancetype)initWith:(std::shared_ptr<jsi::Object>)jsObject
@@ -24,15 +31,18 @@
   if (self = [super init]) {
     _runtime = runtime;
 
+#if __has_include(<reacthermes/HermesExecutorFactory.h>)
+    _weakObject = std::make_shared<jsi::WeakObject>(*[runtime get], *jsObject);
+#else
     // Check whether the runtime supports `WeakRef` objects. If it does not,
     // we consciously hold a strong reference to the object and cause memory leaks.
-    // This is the case on hermes and JSC prior to iOS 14.5.
-    // TODO: (@tsapeta) Use `jsi::WeakObject` on hermes
+    // This is the case on JSC prior to iOS 14.5.
     if (expo::isWeakRefSupported(*[runtime get])) {
-      _jsObject = expo::createWeakRef(*[runtime get], jsObject);
+      _weakObject = expo::createWeakRef(*[runtime get], jsObject);
     } else {
-      _jsObject = jsObject;
+      _weakObject = jsObject;
     }
+#endif
   }
   return self;
 }
@@ -40,9 +50,20 @@
 - (nullable EXJavaScriptObject *)lock
 {
   jsi::Runtime *runtime = [_runtime get];
+
+#if __has_include(<reacthermes/HermesExecutorFactory.h>)
+  jsi::Value value = _weakObject->lock(*runtime);
+
+  // `lock` returns an undefined value if the underlying object no longer exists.
+  if (value.isUndefined()) {
+    return nil;
+  }
+  std::shared_ptr<jsi::Object> objectPtr = std::make_shared<jsi::Object>(value.asObject(*runtime));
+#else
   std::shared_ptr<jsi::Object> objectPtr = expo::isWeakRefSupported(*runtime)
-    ? expo::derefWeakRef(*runtime, _jsObject)
-    : _jsObject;
+    ? expo::derefWeakRef(*runtime, _weakObject)
+    : _weakObject;
+#endif
 
   if (!objectPtr) {
     return nil;

package/ios/JSI/EXRawJavaScriptFunction.h

@@ -0,0 +1,24 @@
+// Copyright 2023-present 650 Industries. All rights reserved.
+
+#import <Foundation/Foundation.h>
+#import <ExpoModulesCore/EXJavaScriptRuntime.h>
+
+#ifdef __cplusplus
+#import <jsi/jsi.h>
+
+namespace jsi = facebook::jsi;
+#endif // __cplusplus
+
+NS_SWIFT_NAME(RawJavaScriptFunction)
+@interface EXRawJavaScriptFunction : NSObject
+
+#ifdef __cplusplus
+- (nonnull instancetype)initWith:(std::shared_ptr<jsi::Function>)function
+                         runtime:(nonnull EXJavaScriptRuntime *)runtime;
+#endif // __cplusplus
+
+- (nonnull EXJavaScriptValue *)callWithArguments:(nonnull NSArray<id> *)arguments
+                                      thisObject:(nullable EXJavaScriptObject *)thisObject
+                                   asConstructor:(BOOL)asConstructor;
+
+@end

package/ios/JSI/EXRawJavaScriptFunction.mm

@@ -0,0 +1,52 @@
+// Copyright 2023-present 650 Industries. All rights reserved.
+
+#import <ExpoModulesCore/EXJSIConversions.h>
+#import <ExpoModulesCore/EXRawJavaScriptFunction.h>
+
+@implementation EXRawJavaScriptFunction {
+  /**
+   Pointer to the `EXJavaScriptRuntime` wrapper.
+
+   \note It must be weak because only then the original runtime can be safely deallocated
+   when the JS engine wants to without unsetting it on each created object.
+   */
+  __weak EXJavaScriptRuntime *_runtime;
+
+  /**
+   Shared pointer to the underlying JSI function.
+   */
+  std::shared_ptr<jsi::Function> _function;
+}
+
+- (nonnull instancetype)initWith:(std::shared_ptr<jsi::Function>)function
+                         runtime:(nonnull EXJavaScriptRuntime *)runtime
+{
+  if (self = [super init]) {
+    _runtime = runtime;
+    _function = function;
+  }
+  return self;
+}
+
+- (nonnull EXJavaScriptValue *)callWithArguments:(nonnull NSArray<id> *)arguments
+                                      thisObject:(nullable EXJavaScriptObject *)thisObject
+                                   asConstructor:(BOOL)asConstructor
+{
+  jsi::Runtime *runtime = [_runtime get];
+  std::vector<jsi::Value> vector = expo::convertNSArrayToStdVector(*runtime, arguments);
+  const jsi::Value *data = vector.data();
+  jsi::Value result;
+
+  if (asConstructor) {
+    result = _function->callAsConstructor(*runtime, data, arguments.count);
+  } else if (thisObject) {
+    result = _function->callWithThis(*runtime, *[thisObject get], data, arguments.count);
+  } else {
+    result = _function->call(*runtime, data, arguments.count);
+  }
+
+  std::shared_ptr<jsi::Value> resultPtr = std::make_shared<jsi::Value>(*runtime, result);
+  return [[EXJavaScriptValue alloc] initWithRuntime:_runtime value:resultPtr];
+}
+
+@end

package/ios/JSI/ExpoModulesHostObject.mm

@@ -11,7 +11,7 @@ ExpoModulesHostObject::ExpoModulesHostObject(EXAppContext *appContext) : appCont
 
 ExpoModulesHostObject::~ExpoModulesHostObject() {
   modulesCache.clear();
-  [appContext setRuntime:nil];
+  appContext._runtime = nil;
 }
 
 jsi::Value ExpoModulesHostObject::get(jsi::Runtime &runtime, const jsi::PropNameID &name) {

package/ios/JSI/JavaScriptValue.swift

@@ -15,7 +15,17 @@ public enum JavaScriptValueKind: String {
   case object
 }
 
-public extension JavaScriptValue {
+/**
+ A protocol that JavaScript values, objects and functions can conform to.
+ */
+protocol AnyJavaScriptValue {
+  /**
+   Tries to convert a raw JavaScript value to the conforming type.
+   */
+  static func convert(from value: JavaScriptValue, appContext: AppContext) throws -> Self
+}
+
+extension JavaScriptValue: AnyJavaScriptValue {
   var kind: JavaScriptValueKind {
     switch true {
     case isUndefined():
@@ -86,12 +96,29 @@ public extension JavaScriptValue {
     throw JavaScriptValueConversionException((kind: kind, target: "Object"))
   }
 
+  func asFunction() throws -> RawJavaScriptFunction {
+    if isFunction() {
+      return getFunction()
+    }
+    throw JavaScriptValueConversionException((kind: kind, target: "Function"))
+  }
+
   func asTypedArray() throws -> JavaScriptTypedArray {
     if let typedArray = getTypedArray() {
       return typedArray
     }
     throw JavaScriptValueConversionException((kind: kind, target: "TypedArray"))
   }
+
+  // MARK: - AnyJavaScriptValue
+
+  internal static func convert(from value: JavaScriptValue, appContext: AppContext) throws -> Self {
+    // It's already a `JavaScriptValue` so it should always pass through.
+    if let value = value as? Self {
+      return value
+    }
+    throw JavaScriptValueConversionException((kind: value.kind, target: String(describing: Self.self)))
+  }
 }
 
 internal final class JavaScriptValueConversionException: GenericException<(kind: JavaScriptValueKind, target: String)> {

package/ios/ModuleRegistry/EXModuleRegistry.h

@@ -4,7 +4,6 @@
 
 #import <ExpoModulesCore/EXInternalModule.h>
 #import <ExpoModulesCore/EXExportedModule.h>
-#import <ExpoModulesCore/EXViewManager.h>
 #import <ExpoModulesCore/EXModuleRegistryDelegate.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -13,12 +12,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)initWithInternalModules:(NSSet<id<EXInternalModule>> *)internalModules
                         exportedModules:(NSSet<EXExportedModule *> *)exportedModules
-                           viewManagers:(NSSet<EXViewManager *> *)viewManagers
                        singletonModules:(NSSet *)singletonModules;
 
 - (void)registerInternalModule:(id<EXInternalModule>)internalModule;
 - (void)registerExportedModule:(EXExportedModule *)exportedModule;
-- (void)registerViewManager:(EXViewManager *)viewManager;
 
 - (void)setDelegate:(id<EXModuleRegistryDelegate>)delegate;
 
@@ -32,7 +29,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (NSArray<id<EXInternalModule>> *)getAllInternalModules;
 - (NSArray<EXExportedModule *> *)getAllExportedModules;
-- (NSArray<EXViewManager *> *)getAllViewManagers;
 - (NSArray *)getAllSingletonModules;
 
 @end

package/ios/ModuleRegistry/EXModuleRegistry.m

@@ -14,7 +14,6 @@
 @property NSMapTable<Protocol *, NSMutableArray<id<EXInternalModule>> *> *internalModulesPreResolution;
 @property NSMapTable<Class, EXExportedModule *> *exportedModulesByClass;
 @property NSMutableDictionary<const NSString *, EXExportedModule *> *exportedModules;
-@property NSMutableDictionary<const NSString *, EXViewManager *> *viewManagerModules;
 @property NSMutableDictionary<const NSString *, id> *singletonModules;
 
 @property NSPointerArray *registryConsumers;
@@ -31,7 +30,6 @@
     _internalModulesPreResolution = [NSMapTable weakToStrongObjectsMapTable];
     _exportedModulesByClass = [NSMapTable weakToWeakObjectsMapTable];
     _exportedModules = [NSMutableDictionary dictionary];
-    _viewManagerModules = [NSMutableDictionary dictionary];
     _singletonModules = [NSMutableDictionary dictionary];
     _registryConsumers = [NSPointerArray weakObjectsPointerArray];
   }
@@ -40,7 +38,6 @@
 
 - (instancetype)initWithInternalModules:(NSSet<id<EXInternalModule>> *)internalModules
                         exportedModules:(NSSet<EXExportedModule *> *)exportedModules
-                           viewManagers:(NSSet<EXViewManager *> *)viewManagers
                        singletonModules:(NSSet *)singletonModules
 {
   if (self = [self init]) {
@@ -52,10 +49,6 @@
       [self registerExportedModule:exportedModule];
     }
 
-    for (EXViewManager *viewManager in viewManagers) {
-      [self registerViewManager:viewManager];
-    }
-
     for (id singletonModule in singletonModules) {
       [self registerSingletonModule:singletonModule];
     }
@@ -140,17 +133,6 @@
   [self maybeAddRegistryConsumer:exportedModule];
 }
 
-- (void)registerViewManager:(EXViewManager *)viewManager
-{
-  const NSString *exportedModuleName = [[viewManager class] exportedModuleName];
-  if (_viewManagerModules[exportedModuleName]) {
-    EXLogInfo(@"View manager %@ overrides %@ as the module exported as %@.", viewManager, _viewManagerModules[exportedModuleName], exportedModuleName);
-  }
-
-  _viewManagerModules[exportedModuleName] = viewManager;
-  [self maybeAddRegistryConsumer:viewManager];
-}
-
 - (void)registerSingletonModule:(id)singletonModule
 {
   if ([[singletonModule class] respondsToSelector:@selector(name)]) {
@@ -216,11 +198,6 @@
   return [_exportedModules allValues];
 }
 
-- (NSArray<EXViewManager *> *)getAllViewManagers
-{
-  return [_viewManagerModules allValues];
-}
-
 - (NSArray *)getAllSingletonModules
 {
   return [_singletonModules allValues];

package/ios/ModuleRegistryAdapter/EXModuleRegistryAdapter.m

@@ -1,17 +1,14 @@
 // Copyright 2018-present 650 Industries. All rights reserved.
 
 #import <ExpoModulesCore/EXNativeModulesProxy.h>
-#import <ExpoModulesCore/EXViewManagerAdapter.h>
 #import <ExpoModulesCore/EXModuleRegistryAdapter.h>
 #import <ExpoModulesCore/EXModuleRegistryProvider.h>
-#import <ExpoModulesCore/EXViewManagerAdapterClassesRegistry.h>
 #import <ExpoModulesCore/EXModuleRegistryHolderReactModule.h>
 #import <ExpoModulesCore/EXReactNativeEventEmitter.h>
 
 @interface EXModuleRegistryAdapter ()
 
 @property (nonatomic, strong) EXModuleRegistryProvider *moduleRegistryProvider;
-@property (nonatomic, strong) EXViewManagerAdapterClassesRegistry *viewManagersClassesRegistry;
 
 @end
 
@@ -21,7 +18,6 @@
 {
   if (self = [super init]) {
     _moduleRegistryProvider = moduleRegistryProvider;
-    _viewManagersClassesRegistry = [[EXViewManagerAdapterClassesRegistry alloc] init];
   }
   return self;
 }
@@ -43,18 +39,6 @@
   EXReactNativeEventEmitter *eventEmitter = [EXReactNativeEventEmitter new];
   [moduleRegistry registerInternalModule:eventEmitter];
 
-  for (EXViewManager *viewManager in [moduleRegistry getAllViewManagers]) {
-    Class viewManagerAdapterClass = [EXViewManagerAdapterClassesRegistry createViewManagerAdapterClassForViewManager:viewManager];
-    [extraModules addObject:[[viewManagerAdapterClass alloc] init]];
-  }
-
-  // Silence React Native warning `Base module "%s" does not exist`
-  // occurring when view manager class is subclassing another class
-  // that is not RCTViewManager (in our case all the view manager adapters
-  // subclass EXViewManagerAdapter, so RN expects to find EXViewManagerAdapter
-  // exported.
-  [extraModules addObject:[[EXViewManagerAdapter alloc] init]];
-
   // It is possible that among internal modules there are some RCTBridgeModules --
   // let's add them to extraModules here.
   for (id<EXInternalModule> module in [moduleRegistry getAllInternalModules]) {

package/ios/ModuleRegistryProvider/EXModuleRegistryProvider.m

@@ -110,7 +110,6 @@ void (^EXinitializeGlobalSingletonModulesSet)(void) = ^{
 {
   NSMutableSet<id<EXInternalModule>> *internalModules = [NSMutableSet set];
   NSMutableSet<EXExportedModule *> *exportedModules = [NSMutableSet set];
-  NSMutableSet<EXViewManager *> *viewManagerModules = [NSMutableSet set];
 
   for (Class klass in [self.class getModulesClasses]) {
     if (![klass conformsToProtocol:@protocol(EXInternalModule)]) {
@@ -127,15 +126,10 @@ void (^EXinitializeGlobalSingletonModulesSet)(void) = ^{
     if ([instance isKindOfClass:[EXExportedModule class]]) {
       [exportedModules addObject:(EXExportedModule *)instance];
     }
-
-    if ([instance isKindOfClass:[EXViewManager class]]) {
-      [viewManagerModules addObject:(EXViewManager *)instance];
-    }
   }
 
   EXModuleRegistry *moduleRegistry = [[EXModuleRegistry alloc] initWithInternalModules:internalModules
                                                                        exportedModules:exportedModules
-                                                                          viewManagers:viewManagerModules
                                                                       singletonModules:_singletonModules];
   [moduleRegistry setDelegate:_moduleRegistryDelegate];
   return moduleRegistry;

package/ios/NativeModulesProxy/EXNativeModulesProxy.mm

@@ -16,9 +16,6 @@
 
 #import <ExpoModulesCore/EXNativeModulesProxy.h>
 #import <ExpoModulesCore/EXEventEmitter.h>
-#import <ExpoModulesCore/EXViewManager.h>
-#import <ExpoModulesCore/EXViewManagerAdapter.h>
-#import <ExpoModulesCore/EXViewManagerAdapterClassesRegistry.h>
 #import <ExpoModulesCore/EXModuleRegistryProvider.h>
 #import <ExpoModulesCore/EXReactNativeEventEmitter.h>
 #import <ExpoModulesCore/EXJSIInstaller.h>
@@ -178,19 +175,9 @@ RCT_EXPORT_MODULE(NativeUnimoduleProxy)
     [self assignExportedMethodsKeys:exportedMethodsNamesAccumulator[exportedModuleName] forModuleName:exportedModuleName];
   }
   
-  // Also, add `viewManagersMetadata` for sanity check and testing purposes -- with names we know what managers to mock on UIManager
-  NSArray<EXViewManager *> *viewManagers = [_exModuleRegistry getAllViewManagers];
-  NSMutableDictionary<NSString *, NSDictionary *> *viewManagersMetadata = [[NSMutableDictionary alloc] initWithCapacity:[viewManagers count]];
-
-  for (EXViewManager *viewManager in viewManagers) {
-    viewManagersMetadata[viewManager.viewName] = @{
-      @"propsNames": [[viewManager getPropsNames] allKeys]
-    };
-  }
-  
   EXModulesProxyConfig *config = [[EXModulesProxyConfig alloc] initWithConstants:exportedModulesConstants
                                                                      methodNames:exportedMethodsNamesAccumulator
-                                                                    viewManagers:viewManagersMetadata];
+                                                                    viewManagers:[NSMutableDictionary new]];
   // decorate legacy config with sweet expo-modules config
   [config addEntriesFromConfig:[_appContext expoModulesConfig]];
   
@@ -289,23 +276,6 @@ RCT_EXPORT_METHOD(callMethod:(NSString *)moduleName methodNameOrKey:(id)methodNa
 
   // Add modules from legacy module registry only when the NativeModulesProxy owns the registry.
   if (ownsModuleRegistry) {
-    // Add dynamic wrappers for the classic view managers.
-    for (EXViewManager *viewManager in [_exModuleRegistry getAllViewManagers]) {
-      if (![visitedSweetModules containsObject:viewManager.viewName]) {
-        Class viewManagerWrapperClass = [EXViewManagerAdapterClassesRegistry createViewManagerAdapterClassForViewManager:viewManager];
-        [additionalModuleClasses addObject:viewManagerWrapperClass];
-        [self registerLegacyComponentData:viewManagerWrapperClass inBridge:bridge];
-      }
-    }
-
-    // View manager wrappers don't have their own prop configs, so we must register
-    // their base view managers that provides common props such as `proxiedProperties`.
-    // Otherwise, React Native may treat these props as invalid in subclassing views.
-    [additionalModuleClasses addObject:[EXViewManagerAdapter class]];
-    // Also, we have to register component data for the View Adapter.
-    // Otherwise, it won't be recognized by the UIManager.
-    [self registerLegacyComponentData:[EXViewManagerAdapter class] inBridge:bridge];
-
     // Some modules might need access to the bridge.
     for (id module in [_exModuleRegistry getAllInternalModules]) {
       if ([module conformsToProtocol:@protocol(RCTBridgeModule)]) {

package/ios/Swift/AppContext.swift

@@ -8,7 +8,7 @@ public final class AppContext: NSObject {
   internal static func create() -> AppContext {
     let appContext = AppContext()
 
-    appContext.runtime = JavaScriptRuntime()
+    appContext._runtime = JavaScriptRuntime()
     return appContext
   }
 
@@ -41,17 +41,17 @@ public final class AppContext: NSObject {
   public internal(set) weak var reactBridge: RCTBridge?
 
   /**
-   JSI runtime of the running app.
+   Underlying JSI runtime of the running app.
    */
   @objc
-  public var runtime: JavaScriptRuntime? {
+  public var _runtime: JavaScriptRuntime? {
     didSet {
-      if runtime == nil {
+      if _runtime == nil {
         // When the runtime is unpinned from the context (e.g. deallocated),
         // we should make sure to release all JS objects from the memory.
         // Otherwise the JSCRuntime asserts may fail on deallocation.
         releaseRuntimeObjects()
-      } else if runtime != oldValue {
+      } else if _runtime != oldValue {
         // Try to install ExpoModules host object automatically when the runtime changes.
         // TODO: Should we uninstall in the old runtime? (@tsapeta)
         try? installExpoModulesHostObject()
@@ -59,6 +59,18 @@ public final class AppContext: NSObject {
     }
   }
 
+  /**
+   JSI runtime of the running app.
+   */
+  public var runtime: JavaScriptRuntime {
+    get throws {
+      if let runtime = _runtime {
+        return runtime
+      }
+      throw Exceptions.RuntimeLost()
+    }
+  }
+
   /**
    Designated initializer without modules provider.
    */
@@ -100,6 +112,29 @@ public final class AppContext: NSObject {
     reactBridge?.dispatchBlock(runBlock, queue: RCTJSThread)
   }
 
+  // MARK: - Classes
+
+  /**
+   A registry containing references to JavaScript classes.
+   - ToDo: Make one registry per module, not the entire app context.
+   Perhaps it should be kept by the `ModuleHolder`.
+   */
+  internal let classRegistry = ClassRegistry()
+
+  /**
+   Creates a new JavaScript object with the class prototype associated with the given native class.
+   - ToDo: Move this to `ModuleHolder` along the `classRegistry` property.
+   */
+  internal func newObject(nativeClassId: ObjectIdentifier) throws -> JavaScriptObject? {
+    guard let jsClass = classRegistry.getJavaScriptClass(nativeClassId: nativeClassId) else {
+      return nil
+    }
+    let prototype = try jsClass.getProperty("prototype").asObject()
+    let object = try runtime.createObject(withPrototype: prototype)
+
+    return object
+  }
+
   // MARK: - Legacy modules
 
   /**
@@ -308,7 +343,7 @@ public final class AppContext: NSObject {
   // MARK: - Runtime
 
   internal func installExpoModulesHostObject() throws {
-    guard runtime != nil else {
+    guard _runtime != nil else {
       throw RuntimeLostException()
     }
     EXJavaScriptRuntimeManager.installExpoModulesHostObject(self)
@@ -318,6 +353,11 @@ public final class AppContext: NSObject {
    Unsets runtime objects that we hold for each module.
    */
   private func releaseRuntimeObjects() {
+    // FIXME: Release objects only from the current context.
+    // Making the registry non-global (similarly to the class registry) would fix it.
+    SharedObjectRegistry.clear()
+    classRegistry.clear()
+
     for module in moduleRegistry {
       module.javaScriptObject = nil
     }