fix(datetime): default to current date when value is null (#18105)

fixes #18099
ionic-team · Apr 23, 2019 · ca233b5 · ca233b5
1 parent 464ec3b
commit ca233b5
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/core/src/components/datetime/datetime-util.ts b/core/src/components/datetime/datetime-util.ts
@@ -248,6 +248,17 @@ export function parseDate(val: string | undefined | null): DatetimeData | undefi
  * such as "01:47"
  */
 export const getLocalDateTime = (dateString: any = ''): Date => {
+  /**
+   * If user passed in undefined
+   * or null, convert it to the
+   * empty string since the rest
+   * of this functions expects
+   * a string
+   */
+  if (dateString === undefined || dateString === null) {
+    dateString = '';
+  }
+
   /**
    * Ensures that YYYY-MM-DD, YYYY-MM,
    * YYYY-DD, etc does not get affected

diff --git a/core/src/components/datetime/test/datetime.spec.ts b/core/src/components/datetime/test/datetime.spec.ts
@@ -1,4 +1,4 @@
-import { DatetimeData, daysInMonth, getDateValue, getLocalDateTime } from '../datetime-util';
+import { DatetimeData, daysInMonth, getDateValue, getLocalDateTime, renderDatetime } from '../datetime-util';
 
 describe('Datetime', () => {
   describe('getDateValue()', () => {
@@ -69,6 +69,17 @@ describe('Datetime', () => {
         expect(convertToLocal.toISOString()).toContain(test.expectedOutput);
       });
     });
+
+    it('should default to today for null and undefined cases', () => {
+      const today = new Date();
+      const todayString = renderDatetime('YYYY-MM-DD', { year: today.getFullYear(), month: today.getMonth() + 1, day: today.getDate() } )
+
+      const convertToLocalUndefined = getLocalDateTime(undefined);
+      expect(convertToLocalUndefined.toISOString()).toContain(todayString);
+
+      const convertToLocalNull = getLocalDateTime(null);
+      expect(convertToLocalNull.toISOString()).toContain(todayString);
+    });
   });
 
   describe('daysInMonth()', () => {