@ts-core/angular 13.0.57 → 13.0.60

package/fesm2020/ts-core-angular.mjs

@@ -4120,9 +4120,12 @@ class WindowImpl extends WindowBase {
         ViewUtil.addClass(this.container, 'vi-window');
         ViewUtil.toggleClass(this.container, 'vi-modal', this.config.isModal);
         this.container.addEventListener('click', this.mouseClickHandlerProxy, true);
+        this.container.addEventListener('mousedown', this.mouseDownHandlerProxy);
+        /*
         if (!this.config.isModal) {
             this.container.addEventListener('mousedown', this.mouseDownHandlerProxy);
         }
+        */
         this.elementsCreate();
     }
     commitIsBlinkProperties() { }
@@ -4140,8 +4143,8 @@ class WindowImpl extends WindowBase {
     }
     isNeedClickStopPropagation(event) {
         // return !this.isWasOnTop;
-        if (this.isWasOnTop) {
-            return false;
+        if (!this.isWasOnTop && !this.isOnTop) {
+            return true;
         }
         let element = _.find(this.elements, item => item.location.nativeElement === event.target);
         if (_.isNil(element)) {
@@ -4590,6 +4593,7 @@ WindowBaseComponent.RESIZE_COMPONENT = WindowResizeElementComponent;
 WindowBaseComponent.MINIMIZE_COMPONENT = WindowMinimizeElementComponent;
 
 class WindowService extends Destroyable {
+    // public topZIndex: number = 1001;
     // --------------------------------------------------------------------------
     //
     // 	Constructor
@@ -4609,7 +4613,7 @@ class WindowService extends Destroyable {
         this.paddingBottom = 25;
         this.defaultVerticalAlign = WindowAlign.CENTER;
         this.defaultHorizontalAlign = WindowAlign.CENTER;
-        this.topZIndex = 999;
+        this.topZIndex = WindowService.Z_INDEX_MAX;
         this._windows = new Map();
         this.dialog = dialog;
         this.language = language;
@@ -4620,23 +4624,40 @@ class WindowService extends Destroyable {
     }
     // --------------------------------------------------------------------------
     //
+    // 	Static Methods
+    //
+    // --------------------------------------------------------------------------
+    static getZIndex(window) {
+        return !_.isNil(window) && !_.isNil(window.container) ? parseInt(ViewUtil.getStyle(window.container.parentElement, 'zIndex'), 10) : -1;
+    }
+    static setZIndex(window, index) {
+        if (_.isNil(window)) {
+            return;
+        }
+        if (!_.isNil(window.backdrop)) {
+            ViewUtil.setStyle(window.backdrop, 'zIndex', index);
+        }
+        if (!_.isNil(window.wrapper)) {
+            ViewUtil.setStyle(window.wrapper, 'zIndex', index);
+        }
+    }
+    // --------------------------------------------------------------------------
+    //
     // 	Private Methods
     //
     // --------------------------------------------------------------------------
     sortFunction(first, second) {
-        let firstIndex = first.container ? parseInt(ViewUtil.getStyle(first.container.parentElement, 'zIndex'), 10) : -1;
-        let secondIndex = second.container ? parseInt(ViewUtil.getStyle(second.container.parentElement, 'zIndex'), 10) : -1;
-        return firstIndex > secondIndex ? -1 : 1;
+        return WindowService.getZIndex(first) > WindowService.getZIndex(second) ? -1 : 1;
     }
     updateTop() {
         let zIndex = 0;
         let topWindow = null;
-        let windows = [this.sheet.window, ...this.windowsArray];
+        let windows = [...this.windowsArray, this.sheet.window];
         for (let window of windows) {
             if (_.isNil(window) || _.isNil(window.container)) {
                 continue;
             }
-            let index = parseInt(ViewUtil.getStyle(window.container.parentElement, 'zIndex'), 10);
+            let index = WindowService.getZIndex(window);
             if (zIndex >= index) {
                 continue;
             }
@@ -4651,16 +4672,16 @@ class WindowService extends Destroyable {
     }
     setWindowOnTop(topWindow) {
         let currentIndex = this.topZIndex - 2;
-        for (let window of this.windowsArray) {
+        let windows = [...this.windowsArray, this.sheet.window];
+        for (let window of windows) {
             if (_.isNil(window.container)) {
                 continue;
             }
             window.isOnTop = window === topWindow;
             let zIndex = window.isOnTop ? this.topZIndex : currentIndex--;
-            ViewUtil.setStyle(window.backdrop, 'zIndex', zIndex);
-            ViewUtil.setStyle(window.wrapper, 'zIndex', zIndex);
+            WindowService.setZIndex(window, zIndex);
         }
-        this.windowsArray.sort(this.sortFunction);
+        windows.sort(this.sortFunction);
         this.observer.next(new ObservableData(WindowServiceEvent.SETTED_ON_TOP, topWindow));
     }
     checkPosition(item) {
@@ -4864,6 +4885,12 @@ class WindowService extends Destroyable {
         return this._windows;
     }
 }
+// --------------------------------------------------------------------------
+//
+// 	Constants
+//
+// --------------------------------------------------------------------------
+WindowService.Z_INDEX_MAX = 1000;
 WindowService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: WindowService, deps: [{ token: i1.MatDialog }, { token: i1$1.LanguageService }, { token: CookieService }, { token: BottomSheetService }], target: i0.ɵɵFactoryTarget.Injectable });
 WindowService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: WindowService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: WindowService, decorators: [{
@@ -4999,9 +5026,12 @@ class BottomSheetImpl extends DestroyableContainer {
         ViewUtil.addClass(this.container, 'vi-bottom-sheet');
         ViewUtil.toggleClass(this.container, 'vi-modal', this.config.isModal);
         this.container.addEventListener('click', this.mouseClickHandlerProxy, true);
+        this.container.addEventListener('mousedown', this.mouseDownHandlerProxy);
+        /*
         if (!this.config.isModal) {
             this.container.addEventListener('mousedown', this.mouseDownHandlerProxy);
         }
+        */
     }
     commitIsBlinkProperties() { }
     commitIsDisabledProperties() { }