fix(kit): InputDateRange not reset initial value to min/max and sho…

…w actual in calendar
taiga-family · Jan 27, 2025 · 388e3cc · 388e3cc
1 parent 65be79b
commit 388e3cc
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 5 deletions.
diff --git a/projects/demo-playwright/tests/kit/input-date-range/input-date-range.spec.ts b/projects/demo-playwright/tests/kit/input-date-range/input-date-range.spec.ts
@@ -185,5 +185,22 @@ test.describe('InputDateRange', () => {
                 '08-calendar-correct-selected-period-after-close-open.png',
             );
         });
+
+        test('Actual min/max in calendar', async () => {
+            const example = documentationPage.getExample('#base');
+
+            const inputDateRange = new TuiInputDateRangePO(
+                example.locator('tui-input-date-range'),
+            );
+
+            await inputDateRange.textfield.click();
+
+            await expect(inputDateRange.textfield).toHaveScreenshot(
+                '09-input-date-range-actual-min-max.png',
+            );
+            await expect(inputDateRange.calendarRange).toHaveScreenshot(
+                '09-input-date-range-calendar-actual-min-max.png',
+            );
+        });
     });
 });
diff --git a/projects/demo/src/modules/components/input-date-range/examples/1/index.ts b/projects/demo/src/modules/components/input-date-range/examples/1/index.ts
@@ -17,7 +17,7 @@ export class TuiInputDateRangeExample1 {
         ),
     });
 
-    readonly min = new TuiDay(2000, 2, 20);
+    readonly min = new TuiDay(2018, 2, 25);
 
     readonly max = new TuiDay(2040, 2, 20);
 }
diff --git a/projects/kit/components/input-date-range/input-date-range.component.ts b/projects/kit/components/input-date-range/input-date-range.component.ts
@@ -189,11 +189,31 @@ export class TuiInputDateRangeComponent
     }
 
     get computedMin(): TuiDay {
-        return this.min ?? TUI_FIRST_DAY;
+        /**
+         * TODO: we can delete this workaround in v4.0
+         * after solving this issue:
+         * https://github.com/taiga-family/maskito/issues/604
+         */
+        if (this.value && this.control?.pristine) {
+            return TUI_FIRST_DAY;
+        }
+
+        return this.min ?? this.options.min;
+        // return this.min ?? TUI_FIRST_DAY;
     }
 
     get computedMax(): TuiDay {
-        return this.max ?? TUI_LAST_DAY;
+        /**
+         * TODO: we can delete this workaround in v4.0
+         * after solving this issue:
+         * https://github.com/taiga-family/maskito/issues/604
+         */
+        if (this.value && this.control?.pristine) {
+            return TUI_LAST_DAY;
+        }
+
+        return this.max ?? this.options.max;
+        // return this.max ?? TUI_LAST_DAY;
     }
 
     get nativeFocusableElement(): HTMLInputElement | null {

diff --git a/projects/kit/components/input-date-range/input-date-range.template.html b/projects/kit/components/input-date-range/input-date-range.template.html
@@ -60,9 +60,9 @@
             [disabledItemHandler]="disabledItemHandler"
             [items]="items"
             [markerHandler]="markerHandler"
-            [max]="computedMax"
+            [max]="max"
             [maxLength]="maxLength"
-            [min]="computedMin"
+            [min]="min"
             [minLength]="minLength"
             [value]="value"
             (valueChange)="onRangeChange($event)"