[modules] Fix global.expo object installation on iOS (#19354)

expo · Oct 3, 2022 · 98fa297 · 98fa297
1 parent beecb66
commit 98fa297
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/packages/expo-modules-core/ios/JSI/EXJavaScriptRuntime.mm b/packages/expo-modules-core/ios/JSI/EXJavaScriptRuntime.mm
@@ -43,10 +43,7 @@ - (nonnull instancetype)init
     _runtime = jsc::makeJSCRuntime();
 #endif
     _jsCallInvoker = nil;
-
-    // Add the main object to the runtime (`global.expo`).
-    _mainObject = [self createObject];
-    [[self global] defineProperty:mainObjectPropertyName value:_mainObject options:EXJavaScriptObjectPropertyDescriptorEnumerable];
+    [self initializeMainObject];
   }
   return self;
 }
@@ -60,6 +57,7 @@ - (nonnull instancetype)initWithRuntime:(nonnull jsi::Runtime *)runtime
     // See explanation for constructor (8): https://en.cppreference.com/w/cpp/memory/shared_ptr/shared_ptr
     _runtime = std::shared_ptr<jsi::Runtime>(std::shared_ptr<jsi::Runtime>(), runtime);
     _jsCallInvoker = callInvoker;
+    [self initializeMainObject];
   }
   return self;
 }
@@ -188,6 +186,15 @@ - (nonnull EXJavaScriptValue *)evaluateScript:(nonnull NSString *)scriptSource
 
 #pragma mark - Private
 
+- (void)initializeMainObject
+{
+  if (!_mainObject) {
+    // Add the main object to the runtime (`global.expo`).
+    _mainObject = [self createObject];
+    [[self global] defineProperty:mainObjectPropertyName value:_mainObject options:EXJavaScriptObjectPropertyDescriptorEnumerable];
+  }
+}
+
 - (nonnull EXJavaScriptObject *)createHostFunction:(nonnull NSString *)name
                                          argsCount:(NSInteger)argsCount
                                              block:(nonnull JSHostFunctionBlock)block