feat:move navigator to another class for iOS

iOS/Pod/Classes/Doric.h

@@ -24,3 +24,4 @@
 #import "DoricJSLoaderManager.h"
 #import "DoricNavigatorProtocol.h"
 #import "DoricViewController.h"
+#import "DoricDefaultNavigator.h"

iOS/Pod/Classes/DoricContext.h

@@ -29,7 +29,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class DoricRootNode;
 
 @interface DoricContext : NSObject
-@property(nonatomic, weak) id <DoricNavigatorProtocol> navigator;
+@property(nonatomic, strong) id <DoricNavigatorProtocol> navigator;
 @property(nonatomic, strong) NSString *contextId;
 @property(nonatomic, strong) DoricDriver *driver;
 @property(nonatomic, strong) NSMutableDictionary *pluginInstanceMap;

iOS/Pod/Classes/DoricPanel.m

@@ -24,9 +24,7 @@ @implementation DoricPanel
 
 - (void)config:(NSString *)script alias:(NSString *)alias {
     self.doricContext = [[[DoricContext alloc] initWithScript:script source:alias] also:^(DoricContext *it) {
-        if ([self.parentViewController conformsToProtocol:@protocol(DoricNavigatorProtocol)]) {
+        it.navigator = [[DoricDefaultNavigator alloc] initWithNavigationController:self.navigationController];
-            it.navigator = (id <DoricNavigatorProtocol>) self.parentViewController;
-        }
         [it.rootNode setupRootView:[[DoricStackView new] also:^(DoricStackView *it) {
             it.width = self.view.width;
             it.height = self.view.height;

iOS/Pod/Classes/DoricViewController.h

@@ -20,6 +20,6 @@
 #import <Foundation/Foundation.h>
 #import "DoricNavigatorProtocol.h"
 
-@interface DoricViewController : UIViewController <DoricNavigatorProtocol>
+@interface DoricViewController : UIViewController
 - (instancetype)initWithScheme:(NSString *)scheme alias:(NSString *)alias;
 @end

iOS/Pod/Classes/DoricViewController.m

@@ -46,14 +46,4 @@ - (instancetype)initWithScheme:(NSString *)scheme alias:(NSString *)alias {
     }
     return self;
 }
-
-- (void)push:(NSString *)scheme alias:(NSString *)alias animated:(BOOL)animated {
-    DoricViewController *viewController = [[DoricViewController alloc] initWithScheme:scheme alias:alias];
-    [self.navigationController pushViewController:viewController animated:animated];
-}
-
-- (void)pop:(BOOL)animated {
-    [self.navigationController popViewControllerAnimated:animated];
-}
-
 @end

iOS/Pod/Classes/Navigator/DoricDefaultNavigator.h

@@ -0,0 +1,10 @@
+//
+// Created by pengfei.zhou on 2019/11/25.
+//
+
+#import <Foundation/Foundation.h>
+#import "DoricNavigatorProtocol.h"
+
+@interface DoricDefaultNavigator : NSObject <DoricNavigatorProtocol>
+- (instancetype)initWithNavigationController:(UINavigationController *)navigationController;
+@end

iOS/Pod/Classes/Navigator/DoricDefaultNavigator.m

@@ -0,0 +1,29 @@
+//
+// Created by pengfei.zhou on 2019/11/25.
+//
+
+#import "DoricDefaultNavigator.h"
+#import "DoricViewController.h"
+
+@interface DoricDefaultNavigator ()
+@property(nonatomic, weak) UINavigationController *navigationController;
+@end
+
+@implementation DoricDefaultNavigator
+- (instancetype)initWithNavigationController:(UINavigationController *)navigationController {
+    if (self = [super init]) {
+        _navigationController = navigationController;
+    }
+    return self;
+}
+
+- (void)push:(NSString *)scheme alias:(NSString *)alias animated:(BOOL)animated {
+    DoricViewController *viewController = [[DoricViewController alloc] initWithScheme:scheme alias:alias];
+    [self.navigationController pushViewController:viewController animated:animated];
+}
+
+- (void)pop:(BOOL)animated {
+    [self.navigationController popViewControllerAnimated:animated];
+}
+
+@end

js-framework/src/util/nativeModules.ts

@@ -170,13 +170,13 @@ export function storage(context: BridgeContext) {
 
 export function navigator(context: BridgeContext) {
     return {
-        push: (scheme: string, alias: string) => {
+        push: (scheme: string, alias: string, animated = true) => {
             return context.navigator.push({
-                scheme, alias
+                scheme, alias, animated
             })
         },
-        pop: () => {
+        pop: (animated = true) => {
-            return context.navigator.pop()
+            return context.navigator.pop({ animated })
         },
     }
 }