@shival99/z-ui 1.2.1 → 1.2.6

package/fesm2022/shival99-z-ui-components-z-calendar.mjs

@@ -1,13 +1,14 @@
 import * as i0 from '@angular/core';
 import { Pipe, input, output, viewChild, computed, signal, inject, Injector, DestroyRef, ChangeDetectorRef, effect, forwardRef, ViewEncapsulation, ChangeDetectionStrategy, Component } from '@angular/core';
-import { toSignal, takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { NgControl, NG_VALUE_ACCESSOR } from '@angular/forms';
-import { TranslateService, TranslatePipe } from '@ngx-translate/core';
+import { TranslatePipe } from '@ngx-translate/core';
 import { ZButtonComponent } from '@shival99/z-ui/components/z-button';
 import { ZIconComponent } from '@shival99/z-ui/components/z-icon';
 import { ZPopoverDirective } from '@shival99/z-ui/components/z-popover';
+import { ZTranslateService } from '@shival99/z-ui/services';
 import { zTransform, zUuid, zMergeClasses } from '@shival99/z-ui/utils';
-import { startWith, merge } from 'rxjs';
+import { merge } from 'rxjs';
 import { cva } from 'class-variance-authority';
 
 const createDate = (year, month, day, hour = 0, minute = 0, second = 0) => new Date(year, month, day, hour, minute, second);
@@ -675,8 +676,7 @@ class ZCalendarComponent {
     _injector = inject(Injector);
     _destroyRef = inject(DestroyRef);
     _cdr = inject(ChangeDetectorRef);
-    _translate = inject(TranslateService);
-    _currentLang = toSignal(this._translate.onLangChange.pipe(startWith({ lang: this._translate.currentLang })));
+    _zTranslate = inject(ZTranslateService);
     _onChange = () => void 0;
     _onTouched = () => void 0;
     _ngControl = null;
@@ -714,20 +714,20 @@ class ZCalendarComponent {
     isYearMode = computed(() => this.zMode() === 'year', ...(ngDevMode ? [{ debugName: "isYearMode" }] : []));
     isQuarterMode = computed(() => this.zMode() === 'quarter', ...(ngDevMode ? [{ debugName: "isQuarterMode" }] : []));
     todayButtonText = computed(() => {
-        this._currentLang();
+        this._zTranslate.currentLang();
         if (this.isQuarterMode()) {
-            return this._translate.instant('i18n_z_ui_calendar_this_quarter');
+            return this._zTranslate.instant('i18n_z_ui_calendar_this_quarter');
         }
         if (this.isYearMode()) {
-            return this._translate.instant('i18n_z_ui_calendar_this_year');
+            return this._zTranslate.instant('i18n_z_ui_calendar_this_year');
         }
         if (this.isMonthMode()) {
-            return this._translate.instant('i18n_z_ui_calendar_this_month');
+            return this._zTranslate.instant('i18n_z_ui_calendar_this_month');
         }
         if (this.zShowTime() || this.isTimeMode()) {
-            return this._translate.instant('i18n_z_ui_calendar_now');
+            return this._zTranslate.instant('i18n_z_ui_calendar_now');
         }
-        return this._translate.instant('i18n_z_ui_calendar_today');
+        return this._zTranslate.instant('i18n_z_ui_calendar_today');
     }, ...(ngDevMode ? [{ debugName: "todayButtonText" }] : []));
     currentMonth = computed(() => this._currentMonth(), ...(ngDevMode ? [{ debugName: "currentMonth" }] : []));
     currentYear = computed(() => this._currentMonth().getFullYear(), ...(ngDevMode ? [{ debugName: "currentYear" }] : []));
@@ -1068,8 +1068,8 @@ class ZCalendarComponent {
             }
         }
         if (errors['required']) {
-            this._currentLang();
-            return this._translate.instant('i18n_z_ui_calendar_required');
+            this._zTranslate.currentLang();
+            return this._zTranslate.instant('i18n_z_ui_calendar_required');
         }
         return '';
     }, ...(ngDevMode ? [{ debugName: "errorMessage" }] : []));
@@ -2202,7 +2202,7 @@ class ZCalendarComponent {
         if (isRequired) {
             const hasValidValue = this.isRangeMode() ? !!(this._rangeStart() && this._rangeEnd()) : !!this._selectedDate();
             if (!hasValidValue) {
-                errors.push(this._translate.instant('i18n_z_ui_calendar_required'));
+                errors.push(this._zTranslate.instant('i18n_z_ui_calendar_required'));
             }
         }
         const value = this._getEmitValue();