Skip to content

Commit 5a21e3d

Browse files
committed
Merge branch 'master' of github.com:wix/react-native-calendars into release
2 parents 29d8631 + a6119a6 commit 5a21e3d

File tree

4 files changed

+22
-37
lines changed

4 files changed

+22
-37
lines changed

README.md

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Basic usage examples of the library
8080
### Importing the `Calendar` component
8181

8282
```javascript
83-
import {`[Calendar](#calendar), [CalendarList](#calendarlist), [Agenda](#agenda)`} from 'react-native-calendars';
83+
import {Calendar, CalendarList, Agenda} from 'react-native-calendars';
8484
```
8585

8686
### Use the `Calendar` component in your app:
@@ -154,20 +154,6 @@ import React, {useState} from 'react';
154154
import {Calendar, LocaleConfig} from 'react-native-calendars';
155155

156156
LocaleConfig.locales['fr'] = {
157-
monthNames: [
158-
'Janvier',
159-
'Février',
160-
'Mars',
161-
'Avril',
162-
'Mai',
163-
'Juin',
164-
'Juillet',
165-
'Août',
166-
'Septembre',
167-
'Octobre',
168-
'Novembre',
169-
'Décembre'
170-
],
171157
monthNames: [
172158
'Janvier',
173159
'Février',

docsRNC/docs/Components/WeekCalendar.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Week calendar component
1+
Week calendar component. You MUST wrap it inside a CalendarProvider component.
22
[(code example)](https://github.com/wix/react-native-calendars/blob/master/example/src/screens/expandableCalendarScreen.tsx)
33
:::info
44
This component extends **[CalendarList](https://github.com/wix/react-native-calendars/blob/master/src/calendar-list/index.tsx)** props.

src/expandableCalendar/infiniteAgendaList.tsx

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,26 +30,24 @@ import {AgendaSectionHeader, AgendaListProps} from "./AgendaListsCommon";
3030
* @extends: InfiniteList
3131
* @example: https://github.com/wix/react-native-calendars/blob/master/example/src/screens/expandableCalendar.js
3232
*/
33-
const InfiniteAgendaList = (props: AgendaListProps) => {
34-
const {
35-
theme,
36-
sections,
37-
scrollToNextEvent,
38-
avoidDateUpdates,
39-
onScroll,
40-
renderSectionHeader,
41-
sectionStyle,
42-
dayFormatter,
43-
dayFormat = 'dddd, MMM d',
44-
useMoment,
45-
markToday = true,
46-
infiniteListProps,
47-
renderItem,
48-
onEndReached,
49-
onEndReachedThreshold,
50-
refreshControl
51-
} = props;
52-
33+
const InfiniteAgendaList = ({
34+
theme,
35+
sections,
36+
scrollToNextEvent,
37+
avoidDateUpdates,
38+
onScroll,
39+
renderSectionHeader,
40+
sectionStyle,
41+
dayFormatter,
42+
dayFormat = 'dddd, MMM d',
43+
useMoment,
44+
markToday = true,
45+
infiniteListProps,
46+
renderItem,
47+
onEndReached,
48+
onEndReachedThreshold,
49+
...others
50+
}: Omit<AgendaListProps, 'viewOffset'>) => {
5351
const {date, updateSource, setDate} = useContext(Context);
5452

5553
const style = useRef(styleConstructor(theme));
@@ -244,7 +242,7 @@ const InfiniteAgendaList = (props: AgendaListProps) => {
244242
layoutProvider={layoutProvider}
245243
onScroll={_onScroll}
246244
onVisibleIndicesChanged={_onVisibleIndicesChanged}
247-
scrollViewProps={{onMomentumScrollEnd: _onMomentumScrollEnd, nestedScrollEnabled: true, refreshControl}}
245+
scrollViewProps={{nestedScrollEnabled: true, ...others, onMomentumScrollEnd: _onMomentumScrollEnd}}
248246
onEndReached={_onEndReached}
249247
onEndReachedThreshold={onEndReachedThreshold as number | undefined}
250248
disableScrollOnDataChange

src/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ export interface Theme {
7474
arrowHeight?: number;
7575
arrowWidth?: number;
7676
weekVerticalMargin?: number;
77+
reservationsBackgroundColor?: string;
7778
stylesheet?: {
7879
calendar?: {
7980
main?: object;

0 commit comments

Comments
 (0)