addressed review comments

Hacker0x01 · Aug 16, 2023 · 7fe8386 · 7fe8386
1 parent 7a25cb3
commit 7fe8386
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 19 deletions.
diff --git a/src/date_utils.js b/src/date_utils.js
@@ -736,13 +736,7 @@ function arraysAreEqual(array1, array2) {
     return false;
   }
 
-  for (let i = 0; i < array1.length; i++) {
-    if (array1[i] !== array2[i]) {
-      return false;
-    }
-  }
-
-  return true;
+  return array1.every((value, index) => value === array2[index]);
 }
 
 /**
@@ -767,14 +761,14 @@ export function getHolidaysMap(
     if (
       "className" in classNamesObj &&
       classNamesObj["className"] === defaultClassName &&
-      arraysAreEqual(classNamesObj["holidayName"], [holidayName])
+      arraysAreEqual(classNamesObj["holidayNames"], [holidayName])
     ) {
       return;
     }
 
     classNamesObj["className"] = defaultClassName;
-    const holidayNameArr = classNamesObj["holidayName"];
-    classNamesObj["holidayName"] = holidayNameArr
+    const holidayNameArr = classNamesObj["holidayNames"];
+    classNamesObj["holidayNames"] = holidayNameArr
       ? [...holidayNameArr, holidayName]
       : [holidayName];
     dateClasses.set(key, classNamesObj);

diff --git a/src/day.jsx b/src/day.jsx
@@ -299,8 +299,8 @@ export default class Day extends React.Component {
     const { day, holidays = new Map() } = this.props;
     const compareDt = formatDate(day, "MM.dd.yyyy");
     if (holidays.has(compareDt)) {
-      return holidays.get(compareDt).holidayName
-        ? `${holidays.get(compareDt).holidayName}`
+      return holidays.get(compareDt).holidayNames.length > 0
+        ? holidays.get(compareDt).holidayNames.join(", ")
         : "";
     }
     return "";

diff --git a/test/day_test.js b/test/day_test.js
@@ -1070,14 +1070,14 @@ describe("Day", () => {
           "08.15.2023",
           {
             className: "react-datepicker__day--holidays",
-            holidayName: ["India's Independence Day"],
+            holidayNames: ["India's Independence Day"],
           },
         ],
         [
           "12.25.2023",
           {
             className: "react-datepicker__day--holidays",
-            holidayName: ["Christmas"],
+            holidayNames: ["Christmas"],
           },
         ],
       ]);
@@ -1095,23 +1095,24 @@ describe("Day", () => {
           "08.15.2023",
           {
             className: "react-datepicker__day--holidays",
-            holidayName: ["Holiday 1", "Holiday 2"],
+            holidayNames: ["Holiday 1", "Holiday 2"],
           },
         ],
         [
           "12.25.2023",
           {
             className: "react-datepicker__day--holidays",
-            holidayName: ["Christmas"],
+            holidayNames: ["Christmas"],
           },
         ],
       ]);
 
       const shallowDay = renderDay(day, {
         holidays: holidays,
       });
+      console.log("TANMAY: ", shallowDay.debug());
       expect(
-        shallowDay.html().indexOf('title="Holiday 1,Holiday 2"'),
+        shallowDay.html().indexOf('title="Holiday 1, Holiday 2"'),
       ).not.equal(-1);
     });
 
@@ -1122,14 +1123,14 @@ describe("Day", () => {
           "08.15.2023",
           {
             className: "react-datepicker__day--holidays",
-            holidayName: ["India's Independence Day"],
+            holidayNames: ["India's Independence Day"],
           },
         ],
         [
           "12.25.2023",
           {
             className: "react-datepicker__day--holidays",
-            holidayName: ["Christmas"],
+            holidayNames: ["Christmas"],
           },
         ],
       ]);