删除popToNativeRoot

Author: caven775

example/ios/Flutter/.last_build_id

@@ -1 +1 @@
-3f715bff32baf5101070f62afcbad897
+f74dd5904491587016158cb099c86426

ios/Classes/Node/DActionManager.m

@@ -35,7 +35,6 @@ + (void)handlerActionWithNodeList:(NSArray<DNode *> *)nodeList node:(nonnull DNo
         }
         case DNodeActionTypePopTo:
         case DNodeActionTypePopToRoot:
-        case DNodeActionTypePopToNativeRoot:
         case DNodeActionTypePopSkip:
         {
             [self closePageListWithNode:node willRemovedList:nodeList];
@@ -184,16 +183,14 @@ + (void)closePageListWithNode:(DNode *)node willRemovedList:(nullable NSArray<DN
 
     if (flutterNodes.count) {
         // flutter的节点信息直接发消息到flutter
-        if (node.action == DNodeActionTypePopToRoot ||
-            node.action == DNodeActionTypePopToNativeRoot) {
+        if (node.action == DNodeActionTypePopToRoot) {
             node.animated = nativeNodes.count == 0;
         }
         [self sendMessageToFlutterWithFlutterNodes:flutterNodes node:node];
     }
     if (!node.fromFlutter) { return;}
     UINavigationController *navigation = [self currentNavigationControllerWithNode:node];
-    if (node.action == DNodeActionTypePopToRoot ||
-        node.action == DNodeActionTypePopToNativeRoot) {
+    if (node.action == DNodeActionTypePopToRoot) {
         [navigation setValue:@(YES) forKey:@"dStackFlutterNodeMessage"];
         [navigation popToRootViewControllerAnimated:YES];
         [navigation setValue:@(NO) forKey:@"dStackFlutterNodeMessage"];
@@ -226,8 +223,7 @@ + (void)_checkTabBarWithNode:(DNode *)node popNodeList:(NSArray <DNode *>*)nodeL
     if (!node.fromFlutter) {return;}
     DNode *preNode = nil;
     DNode *target = nodeList.lastObject;
-    if (node.action == DNodeActionTypePopToRoot ||
-        node.action == DNodeActionTypePopToNativeRoot) {
+    if (node.action == DNodeActionTypePopToRoot) {
         target = nodeList.firstObject;
     }
     NSInteger index = [[DNodeManager sharedInstance].currentNodeList indexOfObject:target];

ios/Classes/Node/DNode.m

@@ -49,7 +49,6 @@ - (NSString *)actionTypeString
         case DNodeActionTypePop:{action = @"pop";break;}
         case DNodeActionTypePopTo:{action = @"popTo";break;}
         case DNodeActionTypePopToRoot:{action = @"popToRoot";break;}
-        case DNodeActionTypePopToNativeRoot:{action = @"popToNativeRoot";break;}
         case DNodeActionTypePopSkip:{action = @"popSkip";break;}
         case DNodeActionTypeGesture:{action = @"gesture";break;}
         case DNodeActionTypeDismiss:{action = @"dismiss";break;}
@@ -101,8 +100,6 @@ + (DNodeActionType)actionTypeWithString:(NSString *)string
         actionType = DNodeActionTypePopTo;
     } else if ([_actionType isEqualToString:@"popSkip"]) {
         actionType = DNodeActionTypePopSkip;
-    } else if ([_actionType isEqualToString:@"popToNativeRoot"]) {
-        actionType = DNodeActionTypePopToNativeRoot;
     } else if ([_actionType isEqualToString:@"popToRoot"]) {
         actionType = DNodeActionTypePopToRoot;
     } else if ([_actionType isEqualToString:@"dismiss"]) {

ios/Classes/Node/DNodeManager.m

@@ -107,7 +107,6 @@ - (NSArray *)subArrayWithNode:(DNode *)node
             break;
         }
         case DNodeActionTypePopToRoot:
-        case DNodeActionTypePopToNativeRoot:
         {
             subArray = [self.nodeList subarrayWithRange:NSMakeRange(1, self.nodeList.count - 1)];
             break;
@@ -195,7 +194,6 @@ - (void)removeNodesWithNodeArray:(NSArray *)subArray node:(DNode *)node
             case DNodeActionTypePop:
             case DNodeActionTypePopTo:
             case DNodeActionTypePopToRoot:
-            case DNodeActionTypePopToNativeRoot:
             case DNodeActionTypePopSkip:
             case DNodeActionTypeGesture:
             case DNodeActionTypeDismiss:
@@ -219,7 +217,6 @@ - (void)removeNodesWithNodeArray:(NSArray *)subArray node:(DNode *)node
             case DNodeActionTypePopTo:
             case DNodeActionTypePopSkip:
             case DNodeActionTypePopToRoot:
-            case DNodeActionTypePopToNativeRoot:
             case DNodeActionTypeGesture:
             {
                 [self outStackWithNode:node nodeArray:subArray];

ios/Classes/Stack/DStackProvider.h

@@ -36,14 +36,13 @@ typedef NS_ENUM(NSInteger, DNodeActionType) {
     DNodeActionTypePush,        // push跳转
     DNodeActionTypePresent,     // present跳转
     DNodeActionTypePop,         // pop返回
-    DNodeActionTypePopTo,       // popTo 返回
-    DNodeActionTypePopToRoot,   // PopToRoot
-    DNodeActionTypePopToNativeRoot,   // PopToRoot
-    DNodeActionTypePopSkip,     // PopSkip
+    DNodeActionTypePopTo,       // popTo返回
+    DNodeActionTypePopToRoot,   // popToRoot
+    DNodeActionTypePopSkip,     // dopSkip
     DNodeActionTypeGesture,     // 手势
-    DNodeActionTypeDismiss,     // Dismiss返回
+    DNodeActionTypeDismiss,     // dismiss返回
     DNodeActionTypeReplace,     // replace返回
-    DNodeActionTypeDidPop,      // didpop 确认
+    DNodeActionTypeDidPop,      // didPop确认
 };
 
 // 应用的生命周期

lib/navigator/dnavigator_manager.dart

@@ -230,10 +230,6 @@ class DNavigatorManager {
         animated: animated);
   }
 
-  static void popToNativeRoot() {
-    DNavigatorManager.nodeHandle(null, null, 'popToNativeRoot');
-  }
-
   static void popSkip(String skipName, {Map result, bool animated = true}) {
     DNavigatorManager.nodeHandle(skipName, null, DStackConstant.popSkip,
         result: result, animated: animated);
@@ -353,8 +349,6 @@ class DNavigatorManager {
         break;
       case DStackConstant.popTo:
         continue PopSkip;
-      case 'popToNativeRoot':
-        continue PopSkip;
       case DStackConstant.popToRoot:
         continue PopSkip;
       PopSkip: