dce-reactkit 3.2.2-beta.13 → 3.2.2-beta.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dce-reactkit",
-  "version": "3.2.2-beta.13",
+  "version": "3.2.2-beta.15",
   "description": "Shared components for Harvard DCE apps",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

package/src/components/LogReviewer.tsx

@@ -876,13 +876,8 @@ const LogReviewer: React.FC<Props> = (props) => {
               day={dateFilterState.startDate.day}
               chooseFromPast
               onChange={(month, day, year) => {
-                dispatch({
-                  type: ActionType.UpdateDateFilterState,
-                  dateFilterState: {
-                    ...dateFilterState,
-                    startDate: { month, day, year },
-                  },
-                });
+                dateFilterState.startDate = { month, day, year };
+                handleDateRangeUpdated(dateFilterState);
               }}
             />
             {' '}
@@ -896,13 +891,8 @@ const LogReviewer: React.FC<Props> = (props) => {
               day={dateFilterState.endDate.day}
               chooseFromPast
               onChange={(month, day, year) => {
-                dispatch({
-                  type: ActionType.UpdateDateFilterState,
-                  dateFilterState: {
-                    ...dateFilterState,
-                    endDate: { month, day, year },
-                  },
-                });
+                dateFilterState.endDate = { month, day, year };
+                handleDateRangeUpdated(dateFilterState);
               }}
             />
           </TabBox>

package/src/components/SimpleDateChooser.tsx

@@ -111,13 +111,26 @@ const SimpleDateChooser: React.FC<Props> = (props) => {
     // Figure out which days are allowed
     const days = [];
     const numDaysInMonth = (new Date(year, month, 0)).getDate();
-    const firstDay = (
-      month === today.month
-        ? today.day // Current month: start at current date
-        : 1 // Future month: start at beginning of month
-    );
-    for (let day = firstDay; day <= numDaysInMonth; day++) {
-      days.push(day);
+    if (chooseFromPast) {
+      // Past selection
+      const numDaysToAdd = (
+        (month === today.month)
+          ? today.day // Current month, only add up to today
+          : numDaysInMonth // Past month, add all days
+      );
+      for (let day = 1; day <= numDaysToAdd; day++) {
+        days.push(day);
+      }
+    } else {
+      // Future selection: add all remaining days of the month
+      const firstDay = (
+        month === today.month
+          ? today.day // Current month: start at current date
+          : 1 // Future month: start at beginning of month
+      );
+      for (let day = firstDay; day <= numDaysInMonth; day++) {
+        days.push(day);
+      }
     }
 
     choices.push({