adjust interface

Author: kochavi-daniel

lib/ios/TurboModules/RNNTurboModule.mm

@@ -32,15 +32,13 @@ - (void)dismissAllModals:(NSString *)commandId options:(NSDictionary *)options r
     });
 }
 
-
 - (void)dismissAllOverlays:(NSString *)commandId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
     RCTExecuteOnMainQueue(^{
         [[RNNTurboCommandsHandler sharedInstance] dismissAllOverlays:commandId];
         resolve(nil);
     });
 }
 
-
 - (void)dismissModal:(NSString *)commandId componentId:(NSString *)componentId options:(NSDictionary *)options resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
     RCTExecuteOnMainQueue(^{
         [[RNNTurboCommandsHandler sharedInstance] dismissModal:componentId
@@ -53,7 +51,6 @@ - (void)dismissModal:(NSString *)commandId componentId:(NSString *)componentId o
     });
 }
 
-
 - (void)dismissOverlay:(NSString *)commandId componentId:(NSString *)componentId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
     RCTExecuteOnMainQueue(^{
         [[RNNTurboCommandsHandler sharedInstance] dismissOverlay:componentId
@@ -65,24 +62,12 @@ - (void)dismissOverlay:(NSString *)commandId componentId:(NSString *)componentId
     });
 }
 
-
 - (void)getLaunchArgs:(NSString *)commandId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
     NSArray *args = [[NSProcessInfo processInfo] arguments];
     resolve(args);
 }
 
 
-- (void)mergeOptions:(NSString *)componentId options:(NSDictionary *)options resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
-    RCTExecuteOnMainQueue(^{
-        [[RNNTurboCommandsHandler sharedInstance] mergeOptions:componentId
-                                   options:options
-                                completion:^{
-                                resolve(componentId);
-                                }];
-    });
-}
-
-
 - (void)pop:(NSString *)commandId componentId:(NSString *)componentId options:(NSDictionary *)options resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
     RCTExecuteOnMainQueue(^{
         [[RNNTurboCommandsHandler sharedInstance] pop:componentId
@@ -95,7 +80,6 @@ - (void)pop:(NSString *)commandId componentId:(NSString *)componentId options:(N
     });
 }
 
-
 - (void)popTo:(NSString *)commandId componentId:(NSString *)componentId options:(NSDictionary *)options resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
     RCTExecuteOnMainQueue(^{
         [[RNNTurboCommandsHandler sharedInstance] popTo:componentId
@@ -108,7 +92,6 @@ - (void)popTo:(NSString *)commandId componentId:(NSString *)componentId options:
     });
 }
 
-
 - (void)popToRoot:(NSString *)commandId componentId:(NSString *)componentId options:(NSDictionary *)options resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
     RCTExecuteOnMainQueue(^{
         [[RNNTurboCommandsHandler sharedInstance] popToRoot:componentId
@@ -121,7 +104,6 @@ - (void)popToRoot:(NSString *)commandId componentId:(NSString *)componentId opti
     });
 }
 
-
 - (void)push:(NSString *)commandId componentId:(NSString *)componentId layout:(NSDictionary *)layout resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
     RCTExecuteOnMainQueue(^{
         [[RNNTurboCommandsHandler sharedInstance] push:componentId
@@ -134,16 +116,6 @@ - (void)push:(NSString *)commandId componentId:(NSString *)componentId layout:(N
     });
 }
 
-
-- (void)setDefaultOptions:(NSDictionary *)options resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
-    RCTExecuteOnMainQueue(^{
-        [[RNNTurboCommandsHandler sharedInstance] setDefaultOptions:options completion: ^() {
-            resolve(nil);
-        }];
-    });
-}
-
-
 - (void)setRoot:(NSString *)commandId layout:(NSDictionary *)layout resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
     RCTExecuteOnMainQueue(^{
         [[RNNTurboCommandsHandler sharedInstance] setRoot:layout
@@ -154,7 +126,6 @@ - (void)setRoot:(NSString *)commandId layout:(NSDictionary *)layout resolve:(RCT
     });
 }
 
-
 - (void)setStackRoot:(NSString *)commandId componentId:(NSString *)componentId layout:(NSDictionary *)layout resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
     RCTExecuteOnMainQueue(^{
         [[RNNTurboCommandsHandler sharedInstance] setStackRoot:componentId
@@ -167,7 +138,6 @@ - (void)setStackRoot:(NSString *)commandId componentId:(NSString *)componentId l
     });
 }
 
-
 - (void)showModal:(NSString *)commandId layout:(NSDictionary *)layout resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
     RCTExecuteOnMainQueue(^{
         [[RNNTurboCommandsHandler sharedInstance] showModal:layout
@@ -178,7 +148,6 @@ - (void)showModal:(NSString *)commandId layout:(NSDictionary *)layout resolve:(R
     });
 }
 
-
 - (void)showOverlay:(NSString *)commandId layout:(NSDictionary *)layout resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { 
     RCTExecuteOnMainQueue(^{
         [[RNNTurboCommandsHandler sharedInstance] showOverlay:layout
@@ -189,6 +158,20 @@ - (void)showOverlay:(NSString *)commandId layout:(NSDictionary *)layout resolve:
     });
 }
 
+- (void)mergeOptions:(NSString *)componentId options:(NSDictionary *)options { 
+    RCTExecuteOnMainQueue(^{
+        [[RNNTurboCommandsHandler sharedInstance] mergeOptions:componentId
+                                   options:options
+                                completion:^{}];
+    });
+}
+
+
+- (void)setDefaultOptions:(NSDictionary *)options { 
+    RCTExecuteOnMainQueue(^{
+        [[RNNTurboCommandsHandler sharedInstance] setDefaultOptions:options completion: ^() {}];
+    });
+}
 
 @end
 #endif

lib/src/adapters/NativeRNNTurboModule.ts

@@ -15,7 +15,11 @@ export interface Spec extends TurboModule {
   pop(commandId: string, componentId: string, options: UnsafeObject): Promise<string>;
   popTo(commandId: string, componentId: string, options: UnsafeObject): Promise<string>;
   popToRoot(commandId: string, componentId: string, options: UnsafeObject): Promise<string>;
-  setStackRoot(commandId: string, componentId: string, layout: UnsafeObject): Promise<string>;
+  setStackRoot(
+    commandId: string,
+    componentId: string,
+    layout: Array<UnsafeObject>
+  ): Promise<string>;
   showModal(commandId: string, layout: UnsafeObject): Promise<string>;
   dismissModal(commandId: string, componentId: string, options: UnsafeObject): Promise<string>;
   dismissAllModals(commandId: string, options: UnsafeObject): Promise<void>;