myrta-ui 17.1.72 → 17.1.75

package/fesm2022/myrta-ui.mjs

@@ -340,7 +340,6 @@ class AlertComponent {
         return `${AlertIconClasses[this.color]}`;
     }
     onCloseClick() {
-        console.log(1);
         this.close.emit(null);
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: AlertComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
@@ -4501,44 +4500,68 @@ class PaginatorComponent {
             .fill(1)
             .map((item, index) => ({ index: index + 1, active: index + 1 === this.currentPage }));
     }
+    // TO DO: пока оставлю для тестов
+    // public get getViewItems(): PaginatorItem[] {
+    //   return this.getNumbers.filter((item, index) => {
+    //     if (this.currentPage === 1 && this.currentPage < this.getItems) {
+    //       return item.index === this.currentPage ||
+    //         item.index === this.currentPage + 1 ||
+    //         item.index === this.currentPage + 2 ||
+    //         item.index === this.currentPage + 3 ||
+    //         item.index === this.currentPage + 4;
+    //     } else if (this.currentPage == 2 && this.currentPage < this.getItems) {
+    //       return item.index === this.currentPage - 1 ||
+    //         item.index === this.currentPage ||
+    //         item.index === this.currentPage + 1 ||
+    //         item.index === this.currentPage + 2 ||
+    //         item.index === this.currentPage + 3;
+    //     } else if (this.currentPage == this.getItems - 1 && this.currentPage < this.getItems) {
+    //       return item.index === this.currentPage - 3 ||
+    //         item.index === this.currentPage - 2 ||
+    //         item.index === this.currentPage - 1 ||
+    //         item.index === this.currentPage ||
+    //         item.index === this.currentPage + 1;
+    //     } else if (this.currentPage > 1 && this.currentPage < this.getItems) {
+    //       return item.index === this.currentPage - 2 ||
+    //         item.index === this.currentPage - 1 ||
+    //         item.index === this.currentPage ||
+    //         item.index === this.currentPage + 1 ||
+    //         item.index === this.currentPage + 2;
+    //     } else {
+    //       return item.index === this.currentPage - 4 ||
+    //         item.index === this.currentPage - 3 ||
+    //         item.index === this.currentPage - 2 ||
+    //         item.index === this.currentPage - 1 ||
+    //         item.index === this.currentPage;
+    //     }
+    //   });
+    // }
+    // Упрощенная версия getViewItems()
     get getViewItems() {
-        return this.getNumbers.filter((item, index) => {
-            if (this.currentPage === 1 && this.currentPage < this.getItems) {
-                return item.index === this.currentPage ||
-                    item.index === this.currentPage + 1 ||
-                    item.index === this.currentPage + 2 ||
-                    item.index === this.currentPage + 3 ||
-                    item.index === this.currentPage + 4;
-            }
-            else if (this.currentPage == 2 && this.currentPage < this.getItems) {
-                return item.index === this.currentPage - 1 ||
-                    item.index === this.currentPage ||
-                    item.index === this.currentPage + 1 ||
-                    item.index === this.currentPage + 2 ||
-                    item.index === this.currentPage + 3;
-            }
-            else if (this.currentPage == this.getItems - 1 && this.currentPage < this.getItems) {
-                return item.index === this.currentPage - 3 ||
-                    item.index === this.currentPage - 2 ||
-                    item.index === this.currentPage - 1 ||
-                    item.index === this.currentPage ||
-                    item.index === this.currentPage + 1;
-            }
-            else if (this.currentPage > 1 && this.currentPage < this.getItems) {
-                return item.index === this.currentPage - 2 ||
-                    item.index === this.currentPage - 1 ||
-                    item.index === this.currentPage ||
-                    item.index === this.currentPage + 1 ||
-                    item.index === this.currentPage + 2;
-            }
-            else {
-                return item.index === this.currentPage - 4 ||
-                    item.index === this.currentPage - 3 ||
-                    item.index === this.currentPage - 2 ||
-                    item.index === this.currentPage - 1 ||
-                    item.index === this.currentPage;
-            }
-        });
+        const totalPages = this.getItems;
+        const current = this.currentPage;
+        const delta = 2; // количество страниц по бокам от текущей
+        const range = [];
+        for (let i = Math.max(2, current - delta); i <= Math.min(totalPages - 1, current + delta); i++) {
+            range.push(i);
+        }
+        // Добавляем первую страницу
+        if (current - delta > 1) {
+            range.unshift('...');
+        }
+        range.unshift(1);
+        // Добавляем последнюю страницу
+        if (current + delta < totalPages - 1) {
+            range.push('...');
+        }
+        if (totalPages > 1) {
+            range.push(totalPages);
+        }
+        return range.map((item, index) => ({
+            index: typeof item === 'number' ? item : index,
+            active: item === current,
+            isEllipsis: item === '...'
+        }));
     }
     get getFirstNumberCurrentPage() {
         if (this.total === 0) {
@@ -4565,6 +4588,7 @@ class PaginatorComponent {
         });
     }
     onChangePageSize(value) {
+        console.log(value);
         this.currentPage = 1;
         this.dataStateChanged.emit({
             currentPage: this.currentPage,
@@ -5949,109 +5973,70 @@ var InputTextareaSizesEnum;
 class AutosizeDirective {
     elem;
     renderer;
-    ngZone;
     overflow = 'hidden';
     rows = 1;
-    set autosize(value) {
-        this._autosize = value;
-        if (!value) {
-            this.overflow = 'auto';
-            this.setHeight('auto');
-        }
-    }
-    get autosize() {
-        return this._autosize;
-    }
-    _autosize = true;
-    observer = null;
-    resizeTimeout;
-    lastHeight = 0;
-    constructor(elem, renderer, ngZone) {
+    autosize = true;
+    isInitialized = false;
+    constructor(elem, renderer) {
         this.elem = elem;
         this.renderer = renderer;
-        this.ngZone = ngZone;
     }
     ngAfterViewInit() {
-        this.setupAutoResize();
-        // Первоначальный расчет
-        setTimeout(() => this.resize(), 0);
-    }
-    ngOnDestroy() {
-        this.cleanup();
-    }
-    setupAutoResize() {
-        if (!this.autosize)
-            return;
-        const textarea = this.elem.nativeElement;
-        // Используем MutationObserver вместо ngDoCheck
-        this.ngZone.runOutsideAngular(() => {
-            this.observer = new MutationObserver(() => {
-                this.scheduleResize();
-            });
-            this.observer.observe(textarea, {
-                characterData: true,
-                childList: true,
-                subtree: true
-            });
-        });
-        // Также следим за resize окна
-        this.renderer.listen('window', 'resize', () => this.scheduleResize());
-    }
-    scheduleResize() {
-        if (!this.autosize)
-            return;
-        // Debounce для оптимизации
-        clearTimeout(this.resizeTimeout);
-        this.resizeTimeout = setTimeout(() => {
-            this.ngZone.run(() => this.resize());
-        }, 50); // Задержка 50мс
+        this.isInitialized = true;
+        setTimeout(() => this.resize(), 0); // Инициализация после рендера
     }
     onInput() {
-        this.scheduleResize();
+        if (this.autosize && this.isInitialized) {
+            this.resize();
+        }
     }
     resize() {
         if (!this.autosize) {
             this.overflow = 'auto';
+            this.setHeight('auto');
             return;
         }
         const textarea = this.elem.nativeElement;
-        // Временно отключаем transition для предотвращения скачков
+        // Сохраняем текущее значение и стили
+        const originalValue = textarea.value;
         const originalTransition = textarea.style.transition;
+        const originalOverflow = textarea.style.overflow;
+        // Временно убираем transition для мгновенного расчета
         this.renderer.setStyle(textarea, 'transition', 'none');
+        this.renderer.setStyle(textarea, 'overflow', 'hidden');
+        // Сбрасываем высоту для корректного расчета
+        this.renderer.setStyle(textarea, 'height', 'auto');
         // Рассчитываем новую высоту
         const borderHeight = textarea.offsetHeight - textarea.clientHeight;
-        this.setHeight('auto');
         const scrollHeight = textarea.scrollHeight;
-        const newHeight = scrollHeight + borderHeight;
-        // Изменяем высоту только если она действительно изменилась
-        if (Math.abs(newHeight - this.lastHeight) > 2) { // Порог 2px
-            this.setHeight(`${newHeight}px`);
-            this.lastHeight = newHeight;
-        }
-        // Восстанавливаем transition
+        const newHeight = Math.max(textarea.clientHeight, // минимальная высота
+        scrollHeight + borderHeight);
+        // Устанавливаем новую высоту
+        this.renderer.setStyle(textarea, 'height', `${newHeight}px`);
+        // Восстанавливаем стили
         setTimeout(() => {
             this.renderer.setStyle(textarea, 'transition', originalTransition);
+            this.renderer.setStyle(textarea, 'overflow', originalOverflow);
         }, 0);
     }
     setHeight(value) {
         this.renderer.setStyle(this.elem.nativeElement, 'height', value);
     }
-    cleanup() {
-        if (this.observer) {
-            this.observer.disconnect();
-            this.observer = null;
-        }
-        clearTimeout(this.resizeTimeout);
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: AutosizeDirective, deps: [{ token: i0.ElementRef }, { token: i0.Renderer2 }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Directive });
-    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "17.3.12", type: AutosizeDirective, selector: "[mrxAutosize]", inputs: { rows: "rows", autosize: "autosize" }, host: { listeners: { "input": "onInput()" }, properties: { "style.overflow": "this.overflow", "rows": "this.rows" } }, ngImport: i0 });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: AutosizeDirective, deps: [{ token: i0.ElementRef }, { token: i0.Renderer2 }], target: i0.ɵɵFactoryTarget.Directive });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "17.3.12", type: AutosizeDirective, selector: "[mrxAutosize]", inputs: { rows: "rows", autosize: "autosize" }, host: { listeners: { "input": "onInput()", "paste": "onInput()", "cut": "onInput()", "change": "onInput()" }, properties: { "style.overflow": "this.overflow", "rows": "this.rows" } }, ngImport: i0 });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: AutosizeDirective, decorators: [{
             type: Directive,
             args: [{
-                    selector: '[mrxAutosize]'
+                    selector: '[mrxAutosize]',
+                    host: {
+                        '(input)': 'onInput()',
+                        '(paste)': 'onInput()',
+                        '(cut)': 'onInput()',
+                        '(change)': 'onInput()'
+                    }
                 }]
-        }], ctorParameters: () => [{ type: i0.ElementRef }, { type: i0.Renderer2 }, { type: i0.NgZone }], propDecorators: { overflow: [{
+        }], ctorParameters: () => [{ type: i0.ElementRef }, { type: i0.Renderer2 }], propDecorators: { overflow: [{
                 type: HostBinding,
                 args: ['style.overflow']
             }], rows: [{
@@ -6061,9 +6046,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
                 args: ['rows']
             }], autosize: [{
                 type: Input
-            }], onInput: [{
-                type: HostListener,
-                args: ['input']
             }] } });
 
 class InputTextareaComponent {