Skip to content

Commit 47e200b

Browse files
committed
Merge branch 'master' of github.com:wix/react-native-calendars into finalizeTS
2 parents 6cb6848 + 8cdf992 commit 47e200b

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@
725725
## Changed
726726
- Disabling Detox e2e tests.
727727

728-
## [1.1267.0] - 2021-x-x
728+
## [1.1267.0] - 2021-10-5
729729

730730
## Fixed
731731
- CalendarListItem - height issue (PR #1614).
@@ -734,6 +734,7 @@
734734
- ExpandableCalendar - 'today' button bug (PR #1627).
735735
- CalendarHeader - 'renderHeader' updates.
736736
- Calendar - 'customHeader' ref.
737+
- CalendarList - fix types.
737738

738739
## Added
739740
- Calendar - 'allowSelectionOutOfRange' prop (PR #1618).

src/calendar-list/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const CALENDAR_HEIGHT = 360;
2525
const PAST_SCROLL_RANGE = 50;
2626
const FUTURE_SCROLL_RANGE = 50;
2727

28-
interface Props extends CalendarProps, FlatListProps<any> {
28+
interface Props extends CalendarProps, Omit<FlatListProps<any>, 'data' | 'renderItem'> {
2929
/** Max amount of months allowed to scroll to the past. Default = 50 */
3030
pastScrollRange?: number;
3131
/** Max amount of months allowed to scroll to the future. Default = 50 */
@@ -60,7 +60,7 @@ interface Props extends CalendarProps, FlatListProps<any> {
6060
onEndReached?: () => void;
6161
/** onLayout event */
6262
onLayout?: (event: LayoutChangeEvent) => void;
63-
removeClippedSubviews: boolean;
63+
removeClippedSubviews?: boolean;
6464
}
6565
export type CalendarListProps = Props;
6666

0 commit comments

Comments
 (0)