Fix isValueOrValueArray propType not working well with TypeScript

wojtekmaj · May 28, 2023 · d47fd29 · d47fd29
1 parent e255387
commit d47fd29
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Calendar.tsx b/src/Calendar.tsx
@@ -16,6 +16,7 @@ import {
   isMinDate,
   isRef,
   isView,
+  rangeOf,
 } from './shared/propTypes';
 import { between } from './shared/utils';
 
@@ -308,7 +309,7 @@ const isActiveStartDate = PropTypes.instanceOf(Date);
 
 const isValue = PropTypes.oneOfType([PropTypes.string, PropTypes.instanceOf(Date)]);
 
-const isValueOrValueArray = PropTypes.oneOfType([isValue, PropTypes.arrayOf(isValue)]);
+const isValueOrValueArray = PropTypes.oneOfType([isValue, rangeOf(isValue)]);
 
 export default class Calendar extends Component<CalendarProps, CalendarState> {
   static defaultProps = defaultProps;

diff --git a/src/shared/propTypes.ts b/src/shared/propTypes.ts
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { CALENDAR_TYPES } from './const';
 
 import type { Requireable, Validator } from 'prop-types';
-import type { View } from './types';
+import type { Range, View } from './types';
 
 const calendarTypes = Object.values(CALENDAR_TYPES);
 const allViews = ['century', 'decade', 'year', 'month'];
@@ -118,6 +118,10 @@ isView.isRequired = function isViewIsRequired(
   return isView(props, propName, componentName, location, propFullName);
 };
 
+export const rangeOf = <T>(type: Requireable<T>): Requireable<Range<T>> => {
+  return PropTypes.arrayOf(type) as Requireable<Range<T>>;
+};
+
 export const tileGroupProps = {
   activeStartDate: PropTypes.instanceOf(Date).isRequired,
   hover: PropTypes.instanceOf(Date),