Refactor #11561

primefaces · Jun 8, 2022 · 4184d1d · 4184d1d
1 parent e277932
commit 4184d1d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/app/components/image/image.css b/src/app/components/image/image.css
@@ -40,6 +40,7 @@
     top: 0;
     right: 0;
     display: flex;
+    z-index: 1;
 }
 
 .p-image-action.p-link {

diff --git a/src/app/components/image/image.ts b/src/app/components/image/image.ts
@@ -20,7 +20,7 @@ import { ZIndexUtils } from 'primeng/utils';
                 </ng-template>
             </div>
             <div #mask class="p-image-mask p-component-overlay p-component-overlay-enter" *ngIf="maskVisible" (click)="onMaskClick()">
-                <div #toolbar class="p-image-toolbar" (click)="handleToolbarClick($event)">
+                <div class="p-image-toolbar" (click)="handleToolbarClick($event)">
                     <button class="p-image-action p-link" (click)="rotateRight()" type="button">
                         <i class="pi pi-refresh"></i>
                     </button>
@@ -94,8 +94,6 @@ export class Image implements AfterContentInit {
 
     @ViewChild('mask') mask: ElementRef;
 
-    @ViewChild('toolbar') toolbarViewChild: ElementRef;
-
     @ContentChildren(PrimeTemplate) templates: QueryList<any>;
 
     indicatorTemplate: TemplateRef<any>;
@@ -202,8 +200,7 @@ export class Image implements AfterContentInit {
     onAnimationEnd(event: AnimationEvent) {
         switch(event.toState) {
             case 'void':
-                ZIndexUtils.clear(this.container);
-                this.toolbarViewChild.nativeElement.style.zIndex = '';
+                ZIndexUtils.clear(this.wrapper);
                 this.maskVisible = false;
                 this.container = null;
                 this.wrapper = null;
@@ -217,9 +214,7 @@ export class Image implements AfterContentInit {
     }
 
     moveOnTop() {
-        ZIndexUtils.set('modal', this.container, this.config.zIndex.modal);
-        this.wrapper.style.zIndex = String(parseInt(this.container.style.zIndex, 10) - 1);
-        this.toolbarViewChild.nativeElement.style.zIndex = String(ZIndexUtils.get(this.wrapper) + 2);
+        ZIndexUtils.set('modal', this.wrapper, this.config.zIndex.modal);
     }
 
     appendContainer() {