fix(module:typography): fix the actions button order (NG-ZORRO#3677)

hsuanxyz · Jun 29, 2019 · cc08741 · cc08741
1 parent 4473539
commit cc08741
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/components/typography/demo/interactive.ts b/components/typography/demo/interactive.ts
@@ -3,11 +3,12 @@ import { Component } from '@angular/core';
 @Component({
   selector: 'nz-demo-typography-interactive',
   template: `
-    <p nz-paragraph nzEditable [(nzContent)]="str"></p>
-    <p nz-paragraph nzCopyable nzContent="This is a copyable text."></p>
+    <p nz-paragraph nzEditable [(nzContent)]="editStr"></p>
+    <p nz-paragraph nzCopyable nzEditable [(nzContent)]="copyStr"></p>
     <p nz-paragraph nzCopyable nzCopyText="Hello, Ant Design!">Replace copy text.</p>
   `
 })
 export class NzDemoTypographyInteractiveComponent {
-  str = 'This is an editable text.';
+  editStr = 'This is an editable text.';
+  copyStr = 'This is a copyable text.';
 }
diff --git a/components/typography/nz-typography.component.html b/components/typography/nz-typography.component.html
@@ -14,11 +14,12 @@
   </ng-container>
 </ng-container>
 
-<nz-text-copy *ngIf="nzCopyable" [text]="copyText" (textCopy)="onTextCopy($event)"></nz-text-copy>
 <nz-text-edit
   *ngIf="nzEditable"
   [text]="nzContent"
   (endEditing)="onEndEditing($event)"
   (startEditing)="onStartEditing()">
 </nz-text-edit>
 
+<nz-text-copy *ngIf="nzCopyable && !editing" [text]="copyText" (textCopy)="onTextCopy($event)"></nz-text-copy>
+