primereact 10.5.2 → 10.6.0

package/calendar/calendar.esm.js

@@ -593,7 +593,7 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     }
   };
   var onPickerKeyDown = function onPickerKeyDown(event, type, direction) {
-    if (event.code === 'Enter' || event.code === 'Space') {
+    if (event.key === 'Enter' || event.key === 'Space') {
       onTimePickerElementMouseDown(event, type, direction);
       event.preventDefault();
       return;
@@ -601,7 +601,7 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     onContainerButtonKeydown(event);
   };
   var onPickerKeyUp = function onPickerKeyUp(event) {
-    if (event.code === 'Enter' || event.code === 'Space') {
+    if (event.key === 'Enter' || event.key === 'Space') {
       onTimePickerElementMouseUp();
       event.preventDefault();
       return;
@@ -616,9 +616,15 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
       } else {
         var focusedIndex = focusableElements.indexOf(document.activeElement);
         if (event !== null && event !== void 0 && event.shiftKey) {
-          if (focusedIndex === -1 || focusedIndex === 0) focusableElements[focusableElements.length - 1].focus();else focusableElements[focusedIndex - 1].focus();
+          if (focusedIndex === -1 || focusedIndex === 0) {
+            focusableElements[focusableElements.length - 1].focus();
+          } else {
+            focusableElements[focusedIndex - 1].focus();
+          }
+        } else if (focusedIndex === -1 || focusedIndex === focusableElements.length - 1) {
+          focusableElements[0].focus();
         } else {
-          if (focusedIndex === -1 || focusedIndex === focusableElements.length - 1) focusableElements[0].focus();else focusableElements[focusedIndex + 1].focus();
+          focusableElements[focusedIndex + 1].focus();
         }
       }
     }
@@ -627,7 +633,11 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     if (navigation.current) {
       if (navigation.current.button) {
         initFocusableCell();
-        if (navigation.current.backward) previousButton.current.focus();else nextButton.current.focus();
+        if (navigation.current.backward) {
+          previousButton.current.focus();
+        } else {
+          nextButton.current.focus();
+        }
       } else {
         var cell;
         if (navigation.current.backward) {
@@ -856,16 +866,32 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     }, interval || 500);
     switch (type) {
       case 0:
-        if (direction === 1) incrementHour(event);else decrementHour(event);
+        if (direction === 1) {
+          incrementHour(event);
+        } else {
+          decrementHour(event);
+        }
         break;
       case 1:
-        if (direction === 1) incrementMinute(event);else decrementMinute(event);
+        if (direction === 1) {
+          incrementMinute(event);
+        } else {
+          decrementMinute(event);
+        }
         break;
       case 2:
-        if (direction === 1) incrementSecond(event);else decrementSecond(event);
+        if (direction === 1) {
+          incrementSecond(event);
+        } else {
+          decrementSecond(event);
+        }
         break;
       case 3:
-        if (direction === 1) incrementMilliSecond(event);else decrementMilliSecond(event);
+        if (direction === 1) {
+          incrementMilliSecond(event);
+        } else {
+          decrementMilliSecond(event);
+        }
         break;
     }
   };
@@ -874,6 +900,12 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
       clearTimeout(timePickerTimer.current);
     }
   };
+  var roundMinutesToStep = function roundMinutesToStep(minutes) {
+    if (props.stepMinute) {
+      return Math.round(minutes / props.stepMinute) * props.stepMinute;
+    }
+    return minutes;
+  };
   var incrementHour = function incrementHour(event) {
     var currentTime = getCurrentDateTime();
     var currentHour = currentTime.getHours();
@@ -902,10 +934,10 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
             updateTime(event, newHour, props.maxDate.getMinutes(), currentTime.getSeconds(), currentTime.getMilliseconds());
           }
         } else {
-          updateTime(event, newHour, currentTime.getMinutes(), currentTime.getSeconds(), currentTime.getMilliseconds());
+          updateTime(event, newHour, roundMinutesToStep(currentTime.getMinutes()), currentTime.getSeconds(), currentTime.getMilliseconds());
         }
       } else {
-        updateTime(event, newHour, currentTime.getMinutes(), currentTime.getSeconds(), currentTime.getMilliseconds());
+        updateTime(event, newHour, roundMinutesToStep(currentTime.getMinutes()), currentTime.getSeconds(), currentTime.getMilliseconds());
       }
     }
     event.preventDefault();
@@ -938,10 +970,10 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
             updateTime(event, newHour, props.minDate.getMinutes(), currentTime.getSeconds(), currentTime.getMilliseconds());
           }
         } else {
-          updateTime(event, newHour, currentTime.getMinutes(), currentTime.getSeconds(), currentTime.getMilliseconds());
+          updateTime(event, newHour, roundMinutesToStep(currentTime.getMinutes()), currentTime.getSeconds(), currentTime.getMilliseconds());
         }
       } else {
-        updateTime(event, newHour, currentTime.getMinutes(), currentTime.getSeconds(), currentTime.getMilliseconds());
+        updateTime(event, newHour, roundMinutesToStep(currentTime.getMinutes()), currentTime.getSeconds(), currentTime.getMilliseconds());
       }
     }
     event.preventDefault();
@@ -1062,7 +1094,7 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     var currentTime = getCurrentDateTime();
     var currentHour = currentTime.getHours();
     var newHour = currentHour >= 12 ? currentHour - 12 : currentHour + 12;
-    if (validateHour(convertTo24Hour(newHour, !(currentHour > 11)), currentTime)) {
+    if (validateHour(convertTo24Hour(newHour, currentHour > 11), currentTime)) {
       updateTime(event, newHour, currentTime.getMinutes(), currentTime.getSeconds(), currentTime.getMilliseconds());
     }
     event.preventDefault();
@@ -1430,7 +1462,9 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
         }
       case 'Tab':
         {
-          if (!props.inline) trapFocus(event);
+          if (!props.inline) {
+            trapFocus(event);
+          }
           break;
         }
       case 'Home':
@@ -1469,7 +1503,9 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
               backward: true
             };
             navBackward(event);
-          } else navigateToMonth(groupIndex, true, event);
+          } else {
+            navigateToMonth(groupIndex, true, event);
+          }
           event.preventDefault();
           break;
         }
@@ -1481,7 +1517,9 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
               backward: false
             };
             navForward(event);
-          } else navigateToMonth(groupIndex, false, event);
+          } else {
+            navigateToMonth(groupIndex, false, event);
+          }
           event.preventDefault();
           break;
         }
@@ -1501,18 +1539,16 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
         focusCell.tabIndex = '0';
         focusCell.focus();
       }
+    } else if (props.numberOfMonths === 1 || groupIndex === props.numberOfMonths - 1) {
+      navigation.current = {
+        backward: false
+      };
+      navForward(event);
     } else {
-      if (props.numberOfMonths === 1 || groupIndex === props.numberOfMonths - 1) {
-        navigation.current = {
-          backward: false
-        };
-        navForward(event);
-      } else {
-        var nextMonthContainer = overlayRef.current.children[groupIndex + 1];
-        var _focusCell6 = DomHandler.findSingle(nextMonthContainer, 'table td span:not([data-p-disabled="true"])');
-        _focusCell6.tabIndex = '0';
-        _focusCell6.focus();
-      }
+      var nextMonthContainer = overlayRef.current.children[groupIndex + 1];
+      var _focusCell6 = DomHandler.findSingle(nextMonthContainer, 'table td span:not([data-p-disabled="true"])');
+      _focusCell6.tabIndex = '0';
+      _focusCell6.focus();
     }
   };
   var onMonthCellKeydown = function onMonthCellKeydown(event, index) {
@@ -1567,7 +1603,9 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
         }
       case 'PageUp':
         {
-          if (event.shiftKey) return;
+          if (event.shiftKey) {
+            return;
+          }
           navigation.current = {
             backward: true
           };
@@ -1576,7 +1614,9 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
         }
       case 'PageDown':
         {
-          if (event.shiftKey) return;
+          if (event.shiftKey) {
+            return;
+          }
           navigation.current = {
             backward: false
           };
@@ -1587,7 +1627,9 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
       case 'NumpadEnter':
       case 'Space':
         {
-          if (props.view !== 'month') viewChangedWithKeyDown.current = true;
+          if (props.view !== 'month') {
+            viewChangedWithKeyDown.current = true;
+          }
           onMonthSelect(event, index);
           event.preventDefault();
           break;
@@ -1657,7 +1699,9 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
         }
       case 'PageUp':
         {
-          if (event.shiftKey) return;
+          if (event.shiftKey) {
+            return;
+          }
           navigation.current = {
             backward: true
           };
@@ -1666,7 +1710,9 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
         }
       case 'PageDown':
         {
-          if (event.shiftKey) return;
+          if (event.shiftKey) {
+            return;
+          }
           navigation.current = {
             backward: false
           };
@@ -1677,7 +1723,9 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
       case 'NumpadEnter':
       case 'Space':
         {
-          if (props.view !== 'year') viewChangedWithKeyDown.current = true;
+          if (props.view !== 'year') {
+            viewChangedWithKeyDown.current = true;
+          }
           onYearSelect(event, index);
           event.preventDefault();
           break;
@@ -1729,7 +1777,10 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
   };
   var selectTime = function selectTime(date, timeMeta) {
     if (props.showTime) {
-      var hours, minutes, seconds, milliseconds;
+      var hours;
+      var minutes;
+      var seconds;
+      var milliseconds;
       if (timeMeta) {
         hours = timeMeta.hours;
         minutes = timeMeta.minutes;
@@ -1810,14 +1861,14 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     return _currentYear;
   };
   var switchToMonthView = function switchToMonthView(event) {
-    if (event && event.code && (event.code === 'Enter' || event.code === 'Space')) {
+    if (event && event.code && (event.code === 'Enter' || event.code === 'NumpadEnter' || event.code === 'Space')) {
       viewChangedWithKeyDown.current = true;
     }
     setCurrentView('month');
     event.preventDefault();
   };
   var switchToYearView = function switchToYearView(event) {
-    if (event && event.code && (event.code === 'Enter' || event.code === 'Space')) {
+    if (event && event.code && (event.code === 'Enter' || event.code === 'NumpadEnter' || event.code === 'Space')) {
       viewChangedWithKeyDown.current = true;
     }
     setCurrentView('year');
@@ -1873,10 +1924,10 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
         originalEvent: event,
         value: newValue,
         stopPropagation: function stopPropagation() {
-          event.stopPropagation();
+          event === null || event === void 0 || event.stopPropagation();
         },
         preventDefault: function preventDefault() {
-          event.preventDefault();
+          event === null || event === void 0 || event.preventDefault();
         },
         target: {
           name: props.name,
@@ -2067,7 +2118,8 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     return date;
   };
   var getPreviousMonthAndYear = function getPreviousMonthAndYear(month, year) {
-    var m, y;
+    var m;
+    var y;
     if (month === 0) {
       m = 11;
       y = year - 1;
@@ -2081,7 +2133,8 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     };
   };
   var getNextMonthAndYear = function getNextMonthAndYear(month, year) {
-    var m, y;
+    var m;
+    var y;
     if (month === 11) {
       m = 0;
       y = year + 1;
@@ -2302,9 +2355,10 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
         }
         return selected;
       } else if (isRangeSelection()) {
-        if (props.value[1]) return isDateEquals(props.value[0], dateMeta) || isDateEquals(props.value[1], dateMeta) || isDateBetween(props.value[0], props.value[1], dateMeta);else {
-          return isDateEquals(props.value[0], dateMeta);
+        if (props.value[1]) {
+          return isDateEquals(props.value[0], dateMeta) || isDateEquals(props.value[1], dateMeta) || isDateBetween(props.value[0], props.value[1], dateMeta);
         }
+        return isDateEquals(props.value[0], dateMeta);
       }
     } else {
       return false;
@@ -2320,9 +2374,8 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
         return value.some(function (currentValue) {
           return currentValue.getMonth() === month && currentValue.getFullYear() === currentYear;
         });
-      } else {
-        return value.getMonth() === month && value.getFullYear() === currentYear;
       }
+      return value.getMonth() === month && value.getFullYear() === currentYear;
     }
     return false;
   };
@@ -2333,9 +2386,8 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
         return value.some(function (currentValue) {
           return currentValue.getFullYear() === year;
         });
-      } else {
-        return value.getFullYear() === year;
       }
+      return value.getFullYear() === year;
     }
     return false;
   };
@@ -2343,7 +2395,10 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     return props.numberOfMonths > 1 || props.disabled;
   };
   var isDateEquals = function isDateEquals(value, dateMeta) {
-    if (value && value instanceof Date) return value.getDate() === dateMeta.day && value.getMonth() === dateMeta.month && value.getFullYear() === dateMeta.year;else return false;
+    if (value && value instanceof Date) {
+      return value.getDate() === dateMeta.day && value.getMonth() === dateMeta.month && value.getFullYear() === dateMeta.year;
+    }
+    return false;
   };
   var isDateBetween = function isDateBetween(start, end, dateMeta) {
     var between = false;
@@ -2429,9 +2484,9 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
           for (var i = 0; i < value.length; i++) {
             var selectedValue = value[i];
             var dateAsString = isValidDate(selectedValue) ? formatDateTime(selectedValue) : '';
-            formattedValue += dateAsString;
+            formattedValue = formattedValue + dateAsString;
             if (i !== value.length - 1) {
-              formattedValue += ', ';
+              formattedValue = formattedValue + ', ';
             }
           }
         } else if (isRangeSelection()) {
@@ -2440,7 +2495,7 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
             var endDate = value[1];
             formattedValue = isValidDate(startDate) ? formatDateTime(startDate) : '';
             if (endDate) {
-              formattedValue += isValidDate(endDate) ? ' - ' + formatDateTime(endDate) : '';
+              formattedValue = formattedValue + (isValidDate(endDate) ? ' - ' + formatDateTime(endDate) : '');
             }
           }
         }
@@ -2461,7 +2516,7 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
       } else {
         formattedValue = formatDate(date, getDateFormat());
         if (props.showTime) {
-          formattedValue += ' ' + formatTime(date);
+          formattedValue = formattedValue + (' ' + formatTime(date));
         }
       }
     }
@@ -2473,24 +2528,24 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     }
     var iFormat;
     var lookAhead = function lookAhead(match) {
-        var matches = iFormat + 1 < format.length && format.charAt(iFormat + 1) === match;
-        if (matches) {
-          iFormat++;
-        }
-        return matches;
-      },
-      formatNumber = function formatNumber(match, value, len) {
-        var num = '' + value;
-        if (lookAhead(match)) {
-          while (num.length < len) {
-            num = '0' + num;
-          }
+      var matches = iFormat + 1 < format.length && format.charAt(iFormat + 1) === match;
+      if (matches) {
+        iFormat++;
+      }
+      return matches;
+    };
+    var formatNumber = function formatNumber(match, value, len) {
+      var num = '' + value;
+      if (lookAhead(match)) {
+        while (num.length < len) {
+          num = '0' + num;
         }
-        return num;
-      },
-      formatName = function formatName(match, value, shortNames, longNames) {
-        return lookAhead(match) ? longNames[value] : shortNames[value];
-      };
+      }
+      return num;
+    };
+    var formatName = function formatName(match, value, shortNames, longNames) {
+      return lookAhead(match) ? longNames[value] : shortNames[value];
+    };
     var output = '';
     var literal = false;
     var _localeOptions2 = localeOptions(props.locale),
@@ -2504,43 +2559,43 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
           if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
             literal = false;
           } else {
-            output += format.charAt(iFormat);
+            output = output + format.charAt(iFormat);
           }
         } else {
           switch (format.charAt(iFormat)) {
             case 'd':
-              output += formatNumber('d', date.getDate(), 2);
+              output = output + formatNumber('d', date.getDate(), 2);
               break;
             case 'D':
-              output += formatName('D', date.getDay(), dayNamesShort, dayNames);
+              output = output + formatName('D', date.getDay(), dayNamesShort, dayNames);
               break;
             case 'o':
-              output += formatNumber('o', Math.round((new Date(date.getFullYear(), date.getMonth(), date.getDate()).getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 86400000), 3);
+              output = output + formatNumber('o', Math.round((new Date(date.getFullYear(), date.getMonth(), date.getDate()).getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 86400000), 3);
               break;
             case 'm':
-              output += formatNumber('m', date.getMonth() + 1, 2);
+              output = output + formatNumber('m', date.getMonth() + 1, 2);
               break;
             case 'M':
-              output += formatName('M', date.getMonth(), monthNamesShort, monthNames);
+              output = output + formatName('M', date.getMonth(), monthNamesShort, monthNames);
               break;
             case 'y':
-              output += lookAhead('y') ? date.getFullYear() : (date.getFullYear() % 100 < 10 ? '0' : '') + date.getFullYear() % 100;
+              output = output + (lookAhead('y') ? date.getFullYear() : (date.getFullYear() % 100 < 10 ? '0' : '') + date.getFullYear() % 100);
               break;
             case '@':
-              output += date.getTime();
+              output = output + date.getTime();
               break;
             case '!':
-              output += date.getTime() * 10000 + ticksTo1970;
+              output = output + (date.getTime() * 10000 + ticksTo1970);
               break;
             case "'":
               if (lookAhead("'")) {
-                output += "'";
+                output = output + "'";
               } else {
                 literal = true;
               }
               break;
             default:
-              output += format.charAt(iFormat);
+              output = output + format.charAt(iFormat);
           }
         }
       }
@@ -2557,25 +2612,25 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     var seconds = date.getSeconds();
     var milliseconds = date.getMilliseconds();
     if (props.hourFormat === '12' && hours > 11 && hours !== 12) {
-      hours -= 12;
+      hours = hours - 12;
     }
     if (props.hourFormat === '12') {
-      output += hours === 0 ? 12 : hours < 10 ? '0' + hours : hours;
+      output = output + (hours === 0 ? 12 : hours < 10 ? '0' + hours : hours);
     } else {
-      output += hours < 10 ? '0' + hours : hours;
+      output = output + (hours < 10 ? '0' + hours : hours);
     }
-    output += ':';
-    output += minutes < 10 ? '0' + minutes : minutes;
+    output = output + ':';
+    output = output + (minutes < 10 ? '0' + minutes : minutes);
     if (props.showSeconds) {
-      output += ':';
-      output += seconds < 10 ? '0' + seconds : seconds;
+      output = output + ':';
+      output = output + (seconds < 10 ? '0' + seconds : seconds);
     }
     if (props.showMillisec) {
-      output += '.';
-      output += milliseconds < 100 ? (milliseconds < 10 ? '00' : '0') + milliseconds : milliseconds;
+      output = output + '.';
+      output = output + (milliseconds < 100 ? (milliseconds < 10 ? '00' : '0') + milliseconds : milliseconds);
     }
     if (props.hourFormat === '12') {
-      output += date.getHours() > 11 ? ' PM' : ' AM';
+      output = output + (date.getHours() > 11 ? ' PM' : ' AM');
     }
     return output;
   };
@@ -2619,13 +2674,11 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     if (props.timeOnly) {
       date = new Date();
       populateTime(date, parts[0], parts[1]);
+    } else if (props.showTime) {
+      date = parseDate(parts[0], getDateFormat());
+      populateTime(date, parts[1], parts[2]);
     } else {
-      if (props.showTime) {
-        date = parseDate(parts[0], getDateFormat());
-        populateTime(date, parts[1], parts[2]);
-      } else {
-        date = parseDate(text, getDateFormat());
-      }
+      date = parseDate(text, getDateFormat());
     }
     return date;
   };
@@ -2656,10 +2709,10 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     } else {
       if (props.hourFormat === '12') {
         if (h !== 12 && ampm === 'PM') {
-          h += 12;
+          h = h + 12;
         }
         if (h === 12 && ampm === 'AM') {
-          h -= 12;
+          h = h - 12;
         }
       }
       return {
@@ -2680,66 +2733,65 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     if (value === '') {
       return null;
     }
-    var iFormat,
-      dim,
-      extra,
-      iValue = 0,
-      shortYearCutoff = typeof props.shortYearCutoff !== 'string' ? props.shortYearCutoff : new Date().getFullYear() % 100 + parseInt(props.shortYearCutoff, 10),
-      year = -1,
-      month = -1,
-      day = -1,
-      doy = -1,
-      literal = false,
-      date,
-      lookAhead = function lookAhead(match) {
-        var matches = iFormat + 1 < format.length && format.charAt(iFormat + 1) === match;
-        if (matches) {
-          iFormat++;
-        }
-        return matches;
-      },
-      getNumber = function getNumber(match) {
-        var isDoubled = lookAhead(match),
-          size = match === '@' ? 14 : match === '!' ? 20 : match === 'y' && isDoubled ? 4 : match === 'o' ? 3 : 2,
-          minSize = match === 'y' ? size : 1,
-          digits = new RegExp('^\\d{' + minSize + ',' + size + '}'),
-          num = value.substring(iValue).match(digits);
-        if (!num) {
-          throw new Error('Missing number at position ' + iValue);
-        }
-        iValue += num[0].length;
-        return parseInt(num[0], 10);
-      },
-      getName = function getName(match, shortNames, longNames) {
-        var index = -1;
-        var arr = lookAhead(match) ? longNames : shortNames;
-        var names = [];
-        for (var i = 0; i < arr.length; i++) {
-          names.push([i, arr[i]]);
-        }
-        names.sort(function (a, b) {
-          return -(a[1].length - b[1].length);
-        });
-        for (var _i = 0; _i < names.length; _i++) {
-          var name = names[_i][1];
-          if (value.substr(iValue, name.length).toLowerCase() === name.toLowerCase()) {
-            index = names[_i][0];
-            iValue += name.length;
-            break;
-          }
-        }
-        if (index !== -1) {
-          return index + 1;
-        } else {
-          throw new Error('Unknown name at position ' + iValue);
-        }
-      },
-      checkLiteral = function checkLiteral() {
-        if (value.charAt(iValue) !== format.charAt(iFormat)) {
-          throw new Error('Unexpected literal at position ' + iValue);
+    var iFormat;
+    var dim;
+    var extra;
+    var iValue = 0;
+    var shortYearCutoff = typeof props.shortYearCutoff !== 'string' ? props.shortYearCutoff : new Date().getFullYear() % 100 + parseInt(props.shortYearCutoff, 10);
+    var year = -1;
+    var month = -1;
+    var day = -1;
+    var doy = -1;
+    var literal = false;
+    var date;
+    var lookAhead = function lookAhead(match) {
+      var matches = iFormat + 1 < format.length && format.charAt(iFormat + 1) === match;
+      if (matches) {
+        iFormat++;
+      }
+      return matches;
+    };
+    var getNumber = function getNumber(match) {
+      var isDoubled = lookAhead(match);
+      var size = match === '@' ? 14 : match === '!' ? 20 : match === 'y' && isDoubled ? 4 : match === 'o' ? 3 : 2;
+      var minSize = match === 'y' ? size : 1;
+      var digits = new RegExp('^\\d{' + minSize + ',' + size + '}');
+      var num = value.substring(iValue).match(digits);
+      if (!num) {
+        throw new Error('Missing number at position ' + iValue);
+      }
+      iValue = iValue + num[0].length;
+      return parseInt(num[0], 10);
+    };
+    var getName = function getName(match, shortNames, longNames) {
+      var index = -1;
+      var arr = lookAhead(match) ? longNames : shortNames;
+      var names = [];
+      for (var i = 0; i < arr.length; i++) {
+        names.push([i, arr[i]]);
+      }
+      names.sort(function (a, b) {
+        return -(a[1].length - b[1].length);
+      });
+      for (var _i = 0; _i < names.length; _i++) {
+        var name = names[_i][1];
+        if (value.substr(iValue, name.length).toLowerCase() === name.toLowerCase()) {
+          index = names[_i][0];
+          iValue = iValue + name.length;
+          break;
         }
-        iValue++;
-      };
+      }
+      if (index !== -1) {
+        return index + 1;
+      }
+      throw new Error('Unknown name at position ' + iValue);
+    };
+    var checkLiteral = function checkLiteral() {
+      if (value.charAt(iValue) !== format.charAt(iFormat)) {
+        throw new Error('Unexpected literal at position ' + iValue);
+      }
+      iValue++;
+    };
     if (props.view === 'month') {
       day = 1;
     }
@@ -2812,7 +2864,7 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     if (year === -1) {
       year = new Date().getFullYear();
     } else if (year < 100) {
-      year += new Date().getFullYear() - new Date().getFullYear() % 100 + (year <= shortYearCutoff ? 0 : -100);
+      year = year + (new Date().getFullYear() - new Date().getFullYear() % 100 + (year <= shortYearCutoff ? 0 : -100));
     }
     if (doy > -1) {
       month = 1;
@@ -2823,7 +2875,7 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
           break;
         }
         month++;
-        day -= dim;
+        day = day - dim;
       } while (true);
     }
     date = daylightSavingAdjust(new Date(year, month - 1, day));
@@ -3418,9 +3470,8 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     if (!props.timeOnly) {
       if (props.view === 'date') {
         return createDateView();
-      } else {
-        return createMonthYearView();
       }
+      return createMonthYearView();
     }
     return null;
   };
@@ -3440,7 +3491,11 @@ var Calendar = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (
     // #3770 account for step minutes rolling to next hour
     hour = minute > 59 ? hour + 1 : hour;
     if (props.hourFormat === '12') {
-      if (hour === 0) hour = 12;else if (hour > 11 && hour !== 12) hour = hour - 12;
+      if (hour === 0) {
+        hour = 12;
+      } else if (hour > 11 && hour !== 12) {
+        hour = hour - 12;
+      }
     }
     var hourProps = mergeProps(ptm('hour'));
     var _localeOptions6 = localeOptions(props.locale),