dce-reactkit 3.2.2-beta.49 → 3.2.2-beta.50

package/package.json

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

package/src/components/LogReviewer.tsx

@@ -1151,7 +1151,7 @@ const LogReviewer: React.FC<Props> = (props) => {
               month={dateFilterState.startDate.month}
               day={dateFilterState.startDate.day}
               chooseFromPast
-              numMonthsToShow={12}
+              numMonthsToShow={36}
               onChange={(month, day, year) => {
                 dateFilterState.startDate = { month, day, year };
                 handleDateRangeUpdated(dateFilterState);
@@ -1434,6 +1434,7 @@ const LogReviewer: React.FC<Props> = (props) => {
                                 text={description}
                                 ariaLabel={`include logs with target "${description}" in results`}
                                 checked={actionErrorFilterState.target[target]}
+                                noMarginOnRight
                                 onChanged={(checked) => {
                                   actionErrorFilterState.target[target] = checked;
                                   console.log(actionErrorFilterState, target, checked);

package/src/components/SimpleDateChooser.tsx

@@ -88,7 +88,7 @@ const SimpleDateChooser: React.FC<Props> = (props) => {
   let startMonth = today.month;
   if (chooseFromPast) {
     startMonth -= Math.max(0, numMonthsToShow - 1);
-    if (startMonth <= 0) {
+    while (startMonth <= 0) {
       startMonth += 12;
       startYear -= 1;
     }
@@ -96,17 +96,13 @@ const SimpleDateChooser: React.FC<Props> = (props) => {
   for (let i = 0; i < numMonthsToShow; i++) {
     // Get month and year info
     const unmoddedMonth = (startMonth + i);
-    const month = (
-      unmoddedMonth > 12
-        ? unmoddedMonth - 12
-        : unmoddedMonth
-    );
+    let month = unmoddedMonth;
+    while (month > 12) {
+      month -= 12;
+    }
     const monthName = getMonthName(month).full;
-    const year = (
-      unmoddedMonth > 12
-        ? startYear + 1
-        : startYear
-    );
+    // Year is start year +1 for each 12 months
+    const year = (startYear + (Math.floor(unmoddedMonth / 12)));
 
     // Figure out which days are allowed
     const days = [];