Merge remote-tracking branch 'origin/master' into benelan/6284-tree-expand

* origin/master:
  test(date): add test for dateToISO utility function (#6308)

Author: benelan

src/components/input-date-picker/input-date-picker.tsx

@@ -854,18 +854,18 @@ export class InputDatePicker
     inputEl.value = newValue;
   };
 
-  private setRangeValue = (value: Date[] | string): void => {
+  private setRangeValue = (valueAsDate: Date[]): void => {
     if (!this.range) {
       return;
     }
 
     const { value: oldValue } = this;
     const oldValueIsArray = Array.isArray(oldValue);
-    const valueIsArray = Array.isArray(value);
+    const valueIsArray = Array.isArray(valueAsDate);
 
-    const newStartDate = valueIsArray ? value[0] : "";
+    const newStartDate = valueIsArray ? valueAsDate[0] : null;
     const newStartDateISO = valueIsArray ? dateToISO(newStartDate) : "";
-    const newEndDate = valueIsArray ? value[1] : "";
+    const newEndDate = valueIsArray ? valueAsDate[1] : null;
     const newEndDateISO = valueIsArray ? dateToISO(newEndDate) : "";
 
     const newValue = newStartDateISO || newEndDateISO ? [newStartDateISO, newEndDateISO] : "";

src/utils/date.spec.ts

@@ -1,5 +1,15 @@
 import { DateLocaleData } from "../components/date-picker/utils";
-import { dateFromISO, dateFromRange, getOrder, inRange, nextMonth, parseDateString, prevMonth, sameDate } from "./date";
+import {
+  dateFromISO,
+  dateFromRange,
+  dateToISO,
+  getOrder,
+  inRange,
+  nextMonth,
+  parseDateString,
+  prevMonth,
+  sameDate
+} from "./date";
 
 import arabic from "../components/date-picker/assets/date-picker/nls/ar.json";
 import english from "../components/date-picker/assets/date-picker/nls/en.json";
@@ -63,6 +73,23 @@ describe("dateFromISO", () => {
   });
 });
 
+describe("dateToISO", () => {
+  it("returns empty string from bad input", () => {
+    expect(dateToISO("" as any)).toEqual("");
+    expect(dateToISO("asdflkjasdhoui" as any)).toEqual("");
+  });
+  it("correctly returns string in simplified ISO format (YYYY-MM-DD)", () => {
+    const date = new Date(2011, 10, 29);
+    const expectedValue = "2011-11-29";
+    expect(dateToISO(date)).toEqual(expectedValue);
+  });
+  it("correctly returns zero-padded month and day values when less than 10", () => {
+    const date = new Date(2011, 2, 5);
+    const expectedValue = "2011-03-05";
+    expect(dateToISO(date)).toEqual(expectedValue);
+  });
+});
+
 describe("sameDate", () => {
   it("returns false for bad input", () => {
     expect(sameDate(1 as any, "hey" as any)).toEqual(false);

src/utils/date.ts

@@ -126,10 +126,7 @@ export function datePartsFromLocalizedString(
  *
  * @param date
  */
-export function dateToISO(date?: Date | string): string {
-  if (typeof date === "string") {
-    return date;
-  }
+export function dateToISO(date?: Date): string {
   if (date instanceof Date) {
     return new Date(date.getTime() - date.getTimezoneOffset() * 60000).toISOString().split("T")[0];
   }