fix(ios): turbo module not get called on destroyInstance event

Tencent · Apr 10, 2024 · a967be0 · a967be0
1 parent aebad43
commit a967be0
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 17 deletions.
diff --git a/docs/en-us/guide/jsi.md b/docs/en-us/guide/jsi.md
@@ -103,7 +103,7 @@ HippyRootView *rootView = [[HippyRootView alloc] initWithBridge:nil
                                                    shareOptions:nil 
                                                       debugMode:YES 
                                                        delegate:nil];
-rootView.bridge.enableTurbo = YES;
+[rootView.bridge setTurboModuleEnabled:YES];
 
 ```
 

diff --git a/docs/guide/jsi.md b/docs/guide/jsi.md
@@ -101,7 +101,7 @@ HippyRootView *rootView = [[HippyRootView alloc] initWithBridge:nil
                                                    shareOptions:nil 
                                                       debugMode:YES 
                                                        delegate:nil];
-rootView.bridge.enableTurbo = YES;
+[rootView.bridge setTurboModuleEnabled:YES];
 
 ```
 

diff --git a/examples/hippy-react-demo/src/main.js b/examples/hippy-react-demo/src/main.js
@@ -1,5 +1,9 @@
-import { Hippy } from '@hippy/react';
+import { ConsoleModule, Hippy, NetworkModule } from '@hippy/react';
 import App from './app';
+import {
+  getTurboConfig,
+  printTurboConfig,
+} from './externals/Turbo/demoTurbo';
 
 global.Hippy.on('uncaughtException', (err) => {
   console.error('uncaughtException error', err.stack, err.message);
@@ -10,6 +14,16 @@ global.Hippy.on('unhandledRejection', (reason) => {
   console.error('unhandledRejection reason', reason);
 });
 
+global.Hippy.on('destroyInstance', () => {
+  console.error('on Hippy destroyInstance !!!');
+  // test call turbo module
+  printTurboConfig(getTurboConfig());
+  // test call c++ module
+  ConsoleModule.log('on Hippy destroyInstance !!!');
+  // test call native module
+  NetworkModule.setCookie('https://hippyjs.org', 'name=hippy;network=mobile');
+});
+
 new Hippy({
   appName: 'Demo',
   entryPage: App,

diff --git a/examples/ios-demo/HippyDemo/TestModule.m b/examples/ios-demo/HippyDemo/TestModule.m
@@ -79,12 +79,20 @@ - (dispatch_queue_t)methodQueue
 
     NSURL *url = [NSURL URLWithString:urlString];
     NSDictionary *launchOptions = @{@"EnableTurbo": @(DEMO_ENABLE_TURBO), @"DebugMode": @(YES)};
-    HippyBridge *bridge = [[HippyBridge alloc] initWithDelegate:self bundleURL:url moduleProvider:nil launchOptions:launchOptions executorKey:@"Demo"];
-    HippyRootView *rootView = [[HippyRootView alloc] initWithBridge:bridge moduleName:@"Demo" initialProperties:@{@"isSimulator": @(isSimulator)} shareOptions:nil delegate:nil];
+    HippyBridge *bridge = [[HippyBridge alloc] initWithDelegate:self 
+                                                      bundleURL:url
+                                                 moduleProvider:nil
+                                                  launchOptions:launchOptions
+                                                    executorKey:@"Demo"];
+    HippyRootView *rootView = [[HippyRootView alloc] initWithBridge:bridge 
+                                                         moduleName:@"Demo"
+                                                  initialProperties:@{@"isSimulator": @(isSimulator)}
+                                                       shareOptions:nil
+                                                           delegate:nil];
     rootView.backgroundColor = [UIColor whiteColor];
     rootView.frame = vc.view.bounds;
     [vc.view addSubview:rootView];
-    vc.modalPresentationStyle = UIModalPresentationFullScreen;
+    vc.modalPresentationStyle = UIModalPresentationPageSheet;
     [nav presentViewController:vc animated:YES completion:NULL];
 }
 

diff --git a/ios/sdk/base/HippyBatchedBridge.mm b/ios/sdk/base/HippyBatchedBridge.mm
@@ -717,10 +717,6 @@ - (BOOL)debugMode {
     return _parentBridge.debugMode ?: NO;
 }
 
-- (BOOL)enableTurbo {
-    return _parentBridge.enableTurbo;
-}
-
 - (void)setExecutorClass:(Class)executorClass {
     HippyAssertMainQueue();
     _parentBridge.executorClass = executorClass;

diff --git a/ios/sdk/base/HippyBridge.h b/ios/sdk/base/HippyBridge.h
@@ -259,8 +259,6 @@ HIPPY_EXTERN NSString *HippyBridgeModuleNameForClass(Class bridgeModuleClass);
 
 @property (nonatomic, assign) BOOL debugMode;
 
-@property (nonatomic, assign) BOOL enableTurbo;
-
 @property (nonatomic, strong) NSMutableDictionary *shareOptions;
 
 @property (nonatomic, strong) NSString *moduleName;
@@ -279,11 +277,17 @@ HIPPY_EXTERN NSString *HippyBridgeModuleNameForClass(Class bridgeModuleClass);
 
 #pragma mark - Turbo Module
 
-/**
- * Get the turbo module for a given name.
- */
-- (HippyOCTurboModule *)turboModuleWithName:(NSString *)name;
+/// Whether TurboModule is enabled,
+/// default YES.
+@property (nonatomic, assign, readonly) BOOL enableTurbo;
+
+/// Turn on/off turbo module
+/// - Parameter enabled: YES or NO
+- (void)setTurboModuleEnabled:(BOOL)enabled;
 
+/// Get the turbo module for a given name.
+/// - Parameter name: module name
+- (HippyOCTurboModule *)turboModuleWithName:(NSString *)name;
 
 @end
 

diff --git a/ios/sdk/base/HippyBridge.mm b/ios/sdk/base/HippyBridge.mm
@@ -415,7 +415,12 @@ - (void)setOSNightMode:(BOOL)isOSNightMode withRootViewTag:(NSNumber *)rootViewT
     [self.batchedBridge setOSNightMode:isOSNightMode withRootViewTag:rootViewTag];
 }
 
-#pragma mark -
+#pragma mark - Turbo Module
+
+- (void)setTurboModuleEnabled:(BOOL)enabled {
+    _enableTurbo = enabled;
+    [self.batchedBridge setTurboModuleEnabled:enabled];
+}
 
 - (HippyOCTurboModule *)turboModuleWithName:(NSString *)name {
     return [self.batchedBridge turboModuleWithName:name];