@ts-core/angular 13.0.47 → 13.0.48

package/fesm2020/ts-core-angular.mjs

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { Component, ViewContainerRef, Injectable, Directive, Input, Pipe, NgModule, InjectionToken, EventEmitter, Output, HostListener, ComponentFactoryResolver, Optional, Inject, RendererStyleFlags2, NgModuleFactory } from '@angular/core';
+import { Component, ViewContainerRef, Injectable, Directive, Input, Pipe, NgModule, InjectionToken, EventEmitter, Output, HostListener, Optional, Inject, RendererStyleFlags2, NgModuleFactory } from '@angular/core';
 import { DestroyableContainer, LoadableEvent, Destroyable, IDestroyable, Loadable, LoadableStatus } from '@ts-core/common';
 import { PromiseHandler } from '@ts-core/common/promise';
 import * as _ from 'lodash';
@@ -3588,7 +3588,13 @@ class WindowImpl extends WindowBase {
     //  Elements Methods
     //
     // --------------------------------------------------------------------------
-    elementsCreate() { }
+    elementsCreate() {
+        this.elements = new Array();
+    }
+    elementsDestroy() {
+        this.elements.forEach(item => this.elementDestroy(item));
+        this.elements = null;
+    }
     elementAdd(item) {
         this.elements.push(item);
         item.instance.window = this;
@@ -3596,6 +3602,10 @@ class WindowImpl extends WindowBase {
     }
     elementRemove(item) {
         ArrayUtil.remove(this.elements, item);
+        this.elementDestroy(item);
+        return item;
+    }
+    elementDestroy(item) {
         item.instance.window = null;
         item.destroy();
         return item;
@@ -3604,10 +3614,16 @@ class WindowImpl extends WindowBase {
         super.setProperties();
         ViewUtil.addClass(this.container, 'vi-window');
         ViewUtil.toggleClass(this.container, 'vi-modal', this.config.isModal);
+        this.container.addEventListener('click', this.mouseClickHandlerProxy, true);
+        if (!this.config.isModal) {
+            this.container.addEventListener('mousedown', this.mouseDownHandlerProxy);
+        }
+        /*
         if (!this.config.isModal) {
             this.container.addEventListener('click', this.mouseClickHandlerProxy, true);
             this.container.addEventListener('mousedown', this.mouseDownHandlerProxy);
         }
+        */
         this.elementsCreate();
     }
     commitIsBlinkProperties() { }
@@ -3624,7 +3640,16 @@ class WindowImpl extends WindowBase {
         return this.properties.reference;
     }
     isNeedClickStopPropagation(event) {
-        return !this.isWasOnTop;
+        // return !this.isWasOnTop;
+        if (this.isWasOnTop) {
+            return false;
+        }
+        let element = _.find(this.elements, item => item.location.nativeElement === event.target);
+        if (_.isNil(element)) {
+            return false;
+        }
+        element.instance.clickHandler(event);
+        return true;
     }
     stopBlinkIfNeed() {
         this.isBlink = false;
@@ -3661,6 +3686,7 @@ class WindowImpl extends WindowBase {
             return;
         }
         super.destroy();
+        this.elementsDestroy();
         this._container.removeEventListener('click', this.mouseClickHandlerProxy, true);
         this._container.removeEventListener('mousedown', this.mouseDownHandlerProxy);
         if (!_.isNil(this.content)) {
@@ -3940,7 +3966,12 @@ class BottomSheetImpl extends DestroyableContainer {
         return this.properties.reference;
     }
     isNeedClickStopPropagation(event) {
-        return this.elements.some(item => item.location.nativeElement === event.target);
+        let element = _.find(this.elements, item => item.location.nativeElement === event.target);
+        if (_.isNil(element)) {
+            return false;
+        }
+        element.instance.clickHandler(event);
+        return true;
     }
     stopBlinkIfNeed() {
         this.isBlink = false;
@@ -4154,6 +4185,14 @@ class WindowElement extends DestroyableContainer {
     }
     // --------------------------------------------------------------------------
     //
+    // 	Event Handlers
+    //
+    // --------------------------------------------------------------------------
+    clickHandler(event) {
+        event.stopPropagation();
+    }
+    // --------------------------------------------------------------------------
+    //
     // 	Protected Properties
     //
     // --------------------------------------------------------------------------
@@ -4193,17 +4232,6 @@ class BottomSheetCloseElementComponent extends WindowElement {
     // --------------------------------------------------------------------------
     constructor(element) {
         super(element);
-        // --------------------------------------------------------------------------
-        //
-        // 	Event Handlers
-        //
-        // --------------------------------------------------------------------------
-        this.mouseClickHandler = (event) => {
-            event.stopPropagation();
-            if (!_.isNil(this.window)) {
-                this.window.close();
-            }
-        };
     }
     // --------------------------------------------------------------------------
     //
@@ -4219,11 +4247,17 @@ class BottomSheetCloseElementComponent extends WindowElement {
             ViewUtil.addClasses(this.nativeElement, BottomSheetCloseElementComponent.ICON_CLASS);
         }
         ViewUtil.addClass(this.nativeElement, 'mouse-active');
-        this.nativeElement.addEventListener('click', this.mouseClickHandler, true);
     }
-    destroyChildren() {
-        super.destroyChildren();
-        this.nativeElement.removeEventListener('click', this.mouseClickHandler, true);
+    // --------------------------------------------------------------------------
+    //
+    // 	Event Handlers
+    //
+    // --------------------------------------------------------------------------
+    clickHandler(event) {
+        super.clickHandler(event);
+        if (!_.isNil(this.window)) {
+            this.window.close();
+        }
     }
 }
 // --------------------------------------------------------------------------
@@ -4247,11 +4281,11 @@ class BottomSheetBaseComponent extends BottomSheetImpl {
     //
     // --------------------------------------------------------------------------
     elementsCreate() {
+        super.elementsCreate();
         if (!(this.content.container instanceof ViewContainerRef)) {
             return;
         }
         if (!this.config.disableClose) {
-            // let factory = this.resolver.resolveComponentFactory(BottomSheetBaseComponent.CLOSE_COMPONENT);
             this.elementAdd(this.content.container.createComponent(BottomSheetBaseComponent.CLOSE_COMPONENT));
         }
     }
@@ -4271,9 +4305,6 @@ class BottomSheetBaseComponent extends BottomSheetImpl {
     //  Protected Properties
     //
     // --------------------------------------------------------------------------
-    get resolver() {
-        return APPLICATION_INJECTOR().get(ComponentFactoryResolver);
-    }
     get blinkClass() {
         return 'vi-blink';
     }
@@ -4818,17 +4849,25 @@ class BottomSheetService extends Destroyable {
         this.dialog = dialog;
         this.language = language;
         this.observer = new Subject();
-        this.factory = new WindowFactory(BottomSheetBaseComponent);
+        this.defaultFactory = new WindowFactory(BottomSheetBaseComponent);
         this.questionComponent = WindowQuestionComponent;
     }
     // --------------------------------------------------------------------------
     //
+    // 	Protected Methods
+    //
+    // --------------------------------------------------------------------------
+    getFactory(component, config) {
+        return this.defaultFactory;
+    }
+    // --------------------------------------------------------------------------
+    //
     // 	Public Methods
     //
     // --------------------------------------------------------------------------
     open(component, config) {
         let reference = this.dialog.open(component, config);
-        let window = this.factory.create({ config, reference: reference, overlay: reference._overlayRef });
+        let window = this.getFactory(component, config).create({ config, reference: reference, overlay: reference._overlayRef });
         this.observer.next(new ObservableData(WindowServiceEvent.OPEN_STARTED, window));
         let subscription = window.events.subscribe(event => {
             switch (event) {
@@ -4855,7 +4894,7 @@ class BottomSheetService extends Destroyable {
             this.observer.complete();
             this.observer = null;
         }
-        this.factory = null;
+        this.defaultFactory = null;
         this.questionComponent = null;
         this.dialog = null;
         this.language = null;
@@ -6473,17 +6512,6 @@ class WindowCloseElementComponent extends WindowElement {
     // --------------------------------------------------------------------------
     constructor(element) {
         super(element);
-        // --------------------------------------------------------------------------
-        //
-        // 	Event Handlers
-        //
-        // --------------------------------------------------------------------------
-        this.mouseClickHandler = (event) => {
-            event.stopPropagation();
-            if (!_.isNil(this.window)) {
-                this.window.close();
-            }
-        };
     }
     // --------------------------------------------------------------------------
     //
@@ -6499,11 +6527,17 @@ class WindowCloseElementComponent extends WindowElement {
             ViewUtil.addClasses(this.nativeElement, WindowCloseElementComponent.ICON_CLASS);
         }
         ViewUtil.addClass(this.nativeElement, 'mouse-active');
-        this.nativeElement.addEventListener('click', this.mouseClickHandler, true);
     }
-    destroyChildren() {
-        super.destroyChildren();
-        this.nativeElement.removeEventListener('click', this.mouseClickHandler, true);
+    // --------------------------------------------------------------------------
+    //
+    // 	Event Handlers
+    //
+    // --------------------------------------------------------------------------
+    clickHandler(event) {
+        super.clickHandler(event);
+        if (!_.isNil(this.window)) {
+            this.window.close();
+        }
     }
 }
 // --------------------------------------------------------------------------
@@ -6528,17 +6562,6 @@ class WindowResizeElementComponent extends WindowElement {
     // --------------------------------------------------------------------------
     constructor(element) {
         super(element);
-        // --------------------------------------------------------------------------
-        //
-        // 	Event Handlers
-        //
-        // --------------------------------------------------------------------------
-        this.mouseClickHandler = (event) => {
-            event.stopPropagation();
-            if (!_.isNil(this.window)) {
-                this.window.isMinimized = !this.window.isMinimized;
-            }
-        };
     }
     // --------------------------------------------------------------------------
     //
@@ -6554,10 +6577,16 @@ class WindowResizeElementComponent extends WindowElement {
             ViewUtil.addClasses(this.nativeElement, WindowResizeElementComponent.ICON_CLASS);
         }
         ViewUtil.setStyle(this.nativeElement, 'cursor', 'pointer');
-        this.nativeElement.addEventListener('click', this.mouseClickHandler, true);
     }
-    destroyChildren() {
-        this.nativeElement.removeEventListener('click', this.mouseClickHandler, true);
+    // --------------------------------------------------------------------------
+    //
+    // 	Event Handlers
+    //
+    // --------------------------------------------------------------------------
+    clickHandler(event) {
+        super.clickHandler(event);
+        if (!_.isNil(this.window)) {
+        }
     }
 }
 // --------------------------------------------------------------------------
@@ -6591,17 +6620,6 @@ class WindowMinimizeElementComponent extends WindowElement {
             let icon = this.window.isMinimized ? WindowMinimizeElementComponent.ICON_MAXIMIZE_VALUE : WindowMinimizeElementComponent.ICON_MINIMIZE_VALUE;
             ViewUtil.setProperty(this.nativeElement, 'innerHTML', icon);
         };
-        // --------------------------------------------------------------------------
-        //
-        // 	Event Handlers
-        //
-        // --------------------------------------------------------------------------
-        this.mouseClickHandler = (event) => {
-            event.stopPropagation();
-            if (!_.isNil(this.window)) {
-                this.window.isMinimized = !this.window.isMinimized;
-            }
-        };
     }
     // --------------------------------------------------------------------------
     //
@@ -6625,11 +6643,17 @@ class WindowMinimizeElementComponent extends WindowElement {
             ViewUtil.addClasses(this.nativeElement, WindowMinimizeElementComponent.ICON_CLASS);
         }
         ViewUtil.addClass(this.nativeElement, 'mouse-active');
-        this.nativeElement.addEventListener('click', this.mouseClickHandler, true);
     }
-    destroyChildren() {
-        super.destroyChildren();
-        this.nativeElement.removeEventListener('click', this.mouseClickHandler, true);
+    // --------------------------------------------------------------------------
+    //
+    // 	Event Handlers
+    //
+    // --------------------------------------------------------------------------
+    clickHandler(event) {
+        super.clickHandler(event);
+        if (!_.isNil(this.window)) {
+            this.window.isMinimized = !this.window.isMinimized;
+        }
     }
 }
 // --------------------------------------------------------------------------
@@ -6803,28 +6827,19 @@ class WindowBaseComponent extends WindowDragable {
     //  Protected Methods
     //
     // --------------------------------------------------------------------------
-    setProperties() {
-        super.setProperties();
-        this.createWindowComponents();
-    }
-    createWindowComponents() {
+    elementsCreate() {
+        super.elementsCreate();
         if (!(this.content.container instanceof ViewContainerRef)) {
             return;
         }
-        if (!this.config.disableClose && !this.closeWindow) {
-            let factory = this.resolver.resolveComponentFactory(WindowBaseComponent.CLOSE_COMPONENT);
-            this.closeWindow = this.content.container.createComponent(factory);
-            this.closeWindow.instance.window = this;
+        if (!this.config.disableClose) {
+            this.elementAdd(this.content.container.createComponent(WindowBaseComponent.CLOSE_COMPONENT));
         }
-        if (this.config.isResizeable && !this.resizedWindow) {
-            let factory = this.resolver.resolveComponentFactory(WindowBaseComponent.RESIZE_COMPONENT);
-            this.resizedWindow = this.content.container.createComponent(factory);
-            this.resizedWindow.instance.window = this;
+        if (this.config.isResizeable) {
+            this.elementAdd(this.content.container.createComponent(WindowBaseComponent.RESIZE_COMPONENT));
         }
-        if (this.config.isMinimizable && !this.minimizeWindow) {
-            let factory = this.resolver.resolveComponentFactory(WindowBaseComponent.MINIMIZE_COMPONENT);
-            this.minimizeWindow = this.content.container.createComponent(factory);
-            this.minimizeWindow.instance.window = this;
+        if (this.config.isMinimizable) {
+            this.elementAdd(this.content.container.createComponent(WindowBaseComponent.MINIMIZE_COMPONENT));
         }
     }
     commitIsBlinkProperties() {
@@ -6843,23 +6858,11 @@ class WindowBaseComponent extends WindowDragable {
         ViewUtil.toggleClass(this.content.element, this.minimizedClass, this.isMinimized);
         ViewUtil.toggleClass(this.content.element.nativeElement.parentElement, this.minimizedClass, this.isMinimized);
     }
-    isNeedClickStopPropagation(event) {
-        if (!super.isNeedClickStopPropagation(event)) {
-            return false;
-        }
-        if (this.closeWindow && this.closeWindow.location.nativeElement === event.target) {
-            return false;
-        }
-        return true;
-    }
     // --------------------------------------------------------------------------
     //
     //  Protected Properties
     //
     // --------------------------------------------------------------------------
-    get resolver() {
-        return APPLICATION_INJECTOR().get(ComponentFactoryResolver);
-    }
     get blinkClass() {
         return 'vi-blink';
     }
@@ -6872,21 +6875,6 @@ class WindowBaseComponent extends WindowDragable {
     get shakingClass() {
         return 'shake-constant shake-horizontal';
     }
-    // --------------------------------------------------------------------------
-    //
-    //  Public Methods
-    //
-    // --------------------------------------------------------------------------
-    destroy() {
-        if (this.isDestroyed) {
-            return;
-        }
-        super.destroy();
-        // Components will destroy automatically
-        this.closeWindow = null;
-        this.resizedWindow = null;
-        this.minimizeWindow = null;
-    }
 }
 // --------------------------------------------------------------------------
 //