fix(addon-mobile): emit TuiDay on first click in mobile-calendar[sing…

…le=false]
taiga-family · Aug 1, 2024 · 3e54360 · 3e54360
1 parent 3356d63
commit 3e54360
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/projects/addon-mobile/components/mobile-calendar/mobile-calendar.component.ts b/projects/addon-mobile/components/mobile-calendar/mobile-calendar.component.ts
@@ -213,12 +213,14 @@ export class TuiMobileCalendarComponent implements AfterViewInit {
             this.value = day;
         } else if (this.isMultiValue(this.value)) {
             this.value = tuiImmutableUpdateInputDateMulti(this.value, day);
-        } else if (this.isSingleValue(this.value)) {
-            this.value = new TuiDayRange(day, day);
+        } else if (this.value instanceof TuiDay) {
+            this.value = TuiDayRange.sort(this.value, day);
+        } else if (this.value instanceof TuiDayRange && !this.value.isSingleDay) {
+            this.value = day;
         } else if (this.value instanceof TuiDayRange) {
             this.value = TuiDayRange.sort(this.value.from, day);
         } else if (!this.value) {
-            this.value = new TuiDayRange(day, day);
+            this.value = day;
         }
     }
 
@@ -279,10 +281,6 @@ export class TuiMobileCalendarComponent implements AfterViewInit {
         return !(day instanceof TuiDay) && !(day instanceof TuiDayRange) && this.multi;
     }
 
-    private isSingleValue(day: any): day is TuiDay {
-        return day instanceof TuiDay || (day instanceof TuiDayRange && !day.isSingleDay);
-    }
-
     private get initialYear(): number {
         if (!this.value) {
             return this.today.year;

diff --git a/projects/demo/src/modules/components/mobile-calendar/mobile-calendar.component.ts b/projects/demo/src/modules/components/mobile-calendar/mobile-calendar.component.ts
@@ -80,6 +80,8 @@ export class ExampleTuiMobileCalendarComponent {
 
     single = true;
 
+    multi = false;
+
     readonly disabledItemHandlerVariants: ReadonlyArray<TuiBooleanHandler<TuiDay>> = [
         ALWAYS_FALSE_HANDLER,
         ({day}) => day % 3 === 0,

diff --git a/projects/demo/src/modules/components/mobile-calendar/mobile-calendar.template.html b/projects/demo/src/modules/components/mobile-calendar/mobile-calendar.template.html
@@ -100,6 +100,7 @@
                 [disabledItemHandler]="disabledItemHandler"
                 [max]="max"
                 [min]="min"
+                [multi]="multi"
                 [single]="single"
                 (cancel)="documentationPropertyCancel.emitEvent($event)"
                 (confirm)="documentationPropertyConfirm.emitEvent($event)"
@@ -151,6 +152,14 @@
             >
                 Single date or a range
             </ng-template>
+            <ng-template
+                documentationPropertyMode="input"
+                documentationPropertyName="multi"
+                documentationPropertyType="boolean"
+                [(documentationPropertyValue)]="multi"
+            >
+                Multi date or a range
+            </ng-template>
             <ng-template
                 #documentationPropertyCancel="documentationProperty"
                 documentationPropertyMode="output"