fix(module: swipe-action): fix autoclose not work bug (#282)

NG-ZORRO · Feb 19, 2019 · acb180e · acb180e · Guoyuanqiang · Feb 22, 2019
1 parent c533d16
commit acb180e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/components/swipe-action/demo/basic.ts b/components/swipe-action/demo/basic.ts
@@ -10,7 +10,6 @@ import { Component } from '@angular/core';
     <br/>
     <List>
       <SwipeAction style="background-color: gray"
-                   [autoClose]="true"
                    [right]="right"
                    [left]="left"
                    (onOpen)="open()"

diff --git a/components/swipe-action/doc/index.en-US.md b/components/swipe-action/doc/index.en-US.md
@@ -22,7 +22,7 @@ Properties | Descrition | Type | Default
 -----------|------------|------|--------           |
 | left       | left buttons for `swipeout`      | Array | `null` |
 | right       | right buttons for `swipeout`    | Array | `null` |
-| autoClose       | auto hide after button is pressed   | Boolean | `function() {}` |
+| autoClose       | auto hide after button is pressed   | Boolean | `false` |
 | onOpen       |    callback function that is triggered when the buttons will be opened   | (): void | `function() {}` |
 | disabled       |   whether is disabled    | Boolean | `false` |
 | onClose   |  callback function that is triggered when the buttons will be closed | (): void | `function() {}` |

diff --git a/components/swipe-action/doc/index.zh-CN.md b/components/swipe-action/doc/index.zh-CN.md
@@ -22,7 +22,7 @@ subtitle: 滑动操作
 ----|-----|------|------           |
 | left       | 左侧按钮组      | Array | `null` |
 | right       | 右侧按钮组      | Array | `null` |
-| autoClose       | 点击按钮后自动隐藏按钮   | Boolean | `function() {}` |
+| autoClose       | 点击按钮后自动隐藏按钮   | Boolean | `false` |
 | onOpen       |    打开时回调函数   | (): void | `function() {}` |
 | disabled       |   禁用 `swipeout`    | Boolean | `false` |
 | onClose  |  关闭时回调函数    | (): void | `function() {}` |

diff --git a/components/swipe-action/swipe-action.component.spec.ts b/components/swipe-action/swipe-action.component.spec.ts
@@ -136,6 +136,14 @@ describe('swipeAction', () => {
     fixture.detectChanges();
     expect(component.onClose).toHaveBeenCalledTimes(0);
   });
+
+  it('btnLength correct when btnRef is null', () => {
+    component.swipeAction.leftBtnRef = null;
+    component.swipeAction.rightBtnRef = null;
+    component.swipeAction.ngAfterViewInit();
+    expect(component.swipeAction._btnsLeftWidth).toEqual(0);
+    expect(component.swipeAction._btnsRightWidth).toEqual(0);
+  });
 });
 
 @Component({

diff --git a/components/swipe-action/swipe-action.component.ts b/components/swipe-action/swipe-action.component.ts
@@ -10,7 +10,6 @@ import {
   ViewEncapsulation
 } from '@angular/core';
 
-
 @Component({
   selector: 'SwipeAction, nzm-swipe-action',
   templateUrl: './swipe-action.component.html',
@@ -60,11 +59,14 @@ export class SwipeAction implements OnInit, AfterViewInit, OnDestroy {
     };
   }
 
-  onCloseSwipe = () => {
+  onCloseSwipe = (ev) => {
     if (!(this._openedLeft || this._openedRight)) {
       return;
     }
-    this.close();
+    const pNode = ev.target.closest(`.${this.prefixCls}-actions`)
+    if (!pNode) {
+      this.close();
+    }
   };
 
   close() {
@@ -88,7 +90,7 @@ export class SwipeAction implements OnInit, AfterViewInit, OnDestroy {
     return Math.abs(value) - Math.abs(limit) > 0 ? limit : value;
   }
 
-  onTouchStart = e => {
+  onTouchStart(e) {
     this._startX = e.changedTouches[0].clientX;
     this._swiping = true;
   };