@acorex/components 20.7.37 → 20.7.39

package/fesm2022/acorex-components-datetime-input.mjs

@@ -5,7 +5,7 @@ import { AXLocaleService } from '@acorex/core/locale';
 import { AXPlatform } from '@acorex/core/platform';
 import { getWordBoundsAtPosition } from '@acorex/core/utils';
 import * as i0 from '@angular/core';
-import { inject, signal, input, linkedSignal, viewChild, output, effect, untracked, forwardRef, HostBinding, HostListener, ViewEncapsulation, ChangeDetectionStrategy, Component, NgModule } from '@angular/core';
+import { inject, signal, input, computed, linkedSignal, viewChild, output, effect, untracked, forwardRef, HostBinding, HostListener, ViewEncapsulation, ChangeDetectionStrategy, Component, NgModule } from '@angular/core';
 import * as i1 from '@angular/forms';
 import { FormsModule, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { map } from 'rxjs';
@@ -107,7 +107,7 @@ class AXDateTimeInputComponent extends MXInputBaseValueComponent {
          * @description The calendar type to use for the datetime input.
          */
         this.calendar = input(null, ...(ngDevMode ? [{ debugName: "calendar" }] : []));
-        this._calendarSystem = linkedSignal(() => this.calendar(), ...(ngDevMode ? [{ debugName: "_calendarSystem" }] : []));
+        this._calendarSystem = computed(() => this.calendar() ?? this.localeService.activeProfile().calendar.system, ...(ngDevMode ? [{ debugName: "_calendarSystem" }] : []));
         this._activePart = signal(null, ...(ngDevMode ? [{ debugName: "_activePart" }] : []));
         // TODO: fix this
         // #effect = effect(() => {
@@ -127,22 +127,14 @@ class AXDateTimeInputComponent extends MXInputBaseValueComponent {
          */
         this.onClick = output();
         this.picker = input('datetime', ...(ngDevMode ? [{ debugName: "picker" }] : []));
-        this._format = linkedSignal(() => this.format(), ...(ngDevMode ? [{ debugName: "_format" }] : []));
+        this._resolvedFormat = computed(() => this.format() ?? this.localeService.activeProfile().formats[this.picker()]?.short ?? '', ...(ngDevMode ? [{ debugName: "_resolvedFormat" }] : []));
         /**
          * @deprecated use locale & mode instead
          */
         this.format = input(...(ngDevMode ? [undefined, { debugName: "format" }] : []));
         this.#effect = effect(() => {
-            const profile = this.localeService.activeProfile();
-            //
-            if (!this.format()) {
-                this._format.set(this.format() ?? profile.formats[this.picker()]?.short ?? '');
-            }
-            //
-            if (!this.calendar()) {
-                this._calendarSystem.set(profile.calendar.system);
-            }
-            //
+            this._resolvedFormat();
+            this._calendarSystem();
             this._detectParts();
             untracked(() => {
                 this._updateText();
@@ -158,7 +150,7 @@ class AXDateTimeInputComponent extends MXInputBaseValueComponent {
         Object.values(this._editingParts).forEach((e) => {
             e.enabled = false;
         });
-        const formatParts = this._format().split(/[^a-zA-Z]+/);
+        const formatParts = this._resolvedFormat().split(/[^a-zA-Z]+/);
         formatParts.forEach((f) => {
             const found = Object.values(this._editingParts).find((c) => c.placeholders.some((d) => d == f));
             if (found) {
@@ -178,7 +170,7 @@ class AXDateTimeInputComponent extends MXInputBaseValueComponent {
      */
     _getOrderedParts() {
         // TODO: better spliter format
-        const formatParts = this._format().split(/[^a-zA-Z]+/);
+        const formatParts = this._resolvedFormat().split(/[^a-zA-Z]+/);
         const result = [];
         formatParts.forEach((f) => {
             const found = Object.values(this._editingParts).find((c) => c.placeholders.some((d) => d == f));
@@ -197,7 +189,7 @@ class AXDateTimeInputComponent extends MXInputBaseValueComponent {
      *  @ignore
      */
     _updateText() {
-        let text = this._format();
+        let text = this._resolvedFormat();
         //
         Object.values(this._editingParts).forEach((part) => {
             if (this._activePart() == part.key) {
@@ -210,7 +202,7 @@ class AXDateTimeInputComponent extends MXInputBaseValueComponent {
                 }
             }
         });
-        this._editingText.set(text == this._format() ? '' : text);
+        this._editingText.set(text == this._resolvedFormat() ? '' : text);
         if (this._activePart()) {
             this._highlightActivePart();
         }