fix(module:tabs): tab-link cannot be disabled

close NG-ZORRO#5549, close NG-ZORRO#5543
hsuanxyz · Sep 10, 2020 · 8a5ce8f · 8a5ce8f
1 parent 4cc14ba
commit 8a5ce8f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/components/button/button.component.ts b/components/button/button.component.ts
@@ -59,8 +59,7 @@ const NZ_CONFIG_MODULE_NAME: NzConfigKey = 'button';
     '[class.ant-btn-block]': `nzBlock`,
     '[class.ant-input-search-button]': `nzSearch`,
     '[attr.tabindex]': 'disabled ? -1 : (tabIndex === null ? null : tabIndex)',
-    '[attr.disabled]': 'disabled || null',
-    '(click)': 'haltDisabledEvents($event)'
+    '[attr.disabled]': 'disabled || null'
   }
 })
 export class NzButtonComponent implements OnDestroy, OnChanges, AfterViewInit, AfterContentInit {
@@ -86,13 +85,6 @@ export class NzButtonComponent implements OnDestroy, OnChanges, AfterViewInit, A
   private destroy$ = new Subject<void>();
   private loading$ = new Subject<boolean>();
 
-  haltDisabledEvents(event: Event): void {
-    if (this.disabled) {
-      event.preventDefault();
-      event.stopImmediatePropagation();
-    }
-  }
-
   insertSpan(nodes: NodeList, renderer: Renderer2): void {
     nodes.forEach(node => {
       if (node.nodeName === '#text') {

diff --git a/components/tabs/style/patch.less b/components/tabs/style/patch.less
@@ -60,8 +60,20 @@ nz-tabs-nav {
             color: @disabled-color;
             background: transparent;
             cursor: not-allowed;
+
+            a {
+              pointer-events: none;
+              color: @disabled-color;
+            }
           }
         }
       }
     }
 }
+
+.@{tab-prefix-cls} {
+  &-tab-disabled a {
+    pointer-events: none;
+    color: @disabled-color;
+  }
+}