feat(module:menu): menu with nzMatchRouter work with CanDeactivate

close #4407
NG-ZORRO · Jan 28, 2020 · 7560563 · 7560563
1 parent 51fbf5e
commit 7560563
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/components/menu/menu.directive.ts b/components/menu/menu.directive.ts
@@ -124,7 +124,7 @@ export class NzMenuDirective implements AfterContentInit, OnInit, OnChanges, OnD
       });
     this.nzMenuService.descendantMenuItemClick$.pipe(takeUntil(this.destroy$)).subscribe(menu => {
       this.nzClick.emit(menu);
-      if (this.nzSelectable) {
+      if (this.nzSelectable && !menu.nzMatchRouter) {
         this.listOfNzMenuItemDirective.forEach(item => item.setSelectedState(item === menu));
       }
     });

diff --git a/components/menu/submenu.component.ts b/components/menu/submenu.component.ts
@@ -215,6 +215,7 @@ export class NzSubMenuComponent implements OnInit, OnDestroy, AfterContentInit,
       });
     /** current submenu open status **/
     this.nzSubmenuService.isCurrentSubMenuOpen$.pipe(takeUntil(this.destroy$)).subscribe(open => {
+      this.isActive = open;
       if (open !== this.nzOpen) {
         this.setTriggerWidth();
         this.nzOpen = open;