fix: DatePicker month off by 1 in Android (#4872)

NativeScript · Sep 26, 2017 · 1e47117 · 1e47117
1 parent 6d7c1ff
commit 1e47117
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/tests/app/ui/date-picker/date-picker-tests.ts b/tests/app/ui/date-picker/date-picker-tests.ts
@@ -99,6 +99,24 @@ export class DatePickerTest extends testModule.UITest<datePickerModule.DatePicke
         TKUnit.assertEqual(actualValue, expectedValue);
     }
 
+    public test_WhenCreated_NativeYearIsCurrentYear() {
+        const actualValue = datePickerTestsNative.getNativeYear(this.testView);
+        const expectedValue = currentDate.getFullYear();
+        TKUnit.assertEqual(actualValue, expectedValue);
+    }
+
+    public test_WhenCreated_NativeMonthIsCurrentMonth() {
+        const actualValue = datePickerTestsNative.getNativeMonth(this.testView);
+        const expectedValue = currentDate.getMonth() + 1;
+        TKUnit.assertEqual(actualValue, expectedValue);
+    }
+
+    public test_WhenCreated_NativeDayIsCurrentDay() {
+        const actualValue = datePickerTestsNative.getNativeDay(this.testView);;
+        const expectedValue = currentDate.getDate();
+        TKUnit.assertEqual(actualValue, expectedValue);
+    }
+
     public testYearFromLocalToNative() {
         const expectedValue = 1980;
         this.testView.year = expectedValue;

diff --git a/tns-core-modules/ui/date-picker/date-picker.android.ts b/tns-core-modules/ui/date-picker/date-picker.android.ts
@@ -59,7 +59,7 @@ export class DatePicker extends DatePickerBase {
         picker.setCalendarViewShown(false);
         const listener = new DateChangedListener(this);
 
-        picker.init(this.year, this.month, this.day, listener);
+        picker.init(this.year, this.month - 1, this.day, listener);
         (<any>picker).listener = listener;
         return picker;
     }