Merge branch 'master' of github.com:wix/react-native-calendars into release

Inbal-Tish · Inbal-Tish · commit 868e031215ab · 2023-03-09T11:02:48.000+02:00
diff --git a/docsRNC/docs/Agenda.md b/docsRNC/docs/Agenda.md
@@ -1,7 +1,7 @@
 Agenda component  
-[(code example)](https://github.com/wix/react-native-calendars/blob/master/example/src/screens/agenda.tsx)
+[(code example)](https://github.com/wix/react-native-calendars/blob/master/example/src/screens/agendaScreen.tsx)
 :::info
-This component extends **[CalendarList, FlatList](https://github.com/wix/react-native-calendars/blob/master/src/calendar-list/index.tsx,https://reactnative.dev/docs/flatlist)** props.
+This component extends **[CalendarList](https://github.com/wix/react-native-calendars/blob/master/src/calendar-list/index.tsx), [FlatList](https://reactnative.dev/docs/flatlist)** props.
 :::
 
 <div style={{display: 'flex', flexDirection: 'row', overflowX: 'auto', maxHeight: '500px', alignItems: 'center'}}><img style={{maxHeight: '420px'}} src={'https://github.com/wix/react-native-calendars/blob/master/demo/assets/agenda.gif?raw=true'}/>
diff --git a/docsRNC/docs/AgendaList.md b/docsRNC/docs/AgendaList.md
@@ -1,5 +1,5 @@
 Agenda list component for the `ExpandableCalendar` component.  
-[(code example)](https://github.com/wix/react-native-calendars/blob/master/example/src/screens/expandableCalendar.tsx)
+[(code example)](https://github.com/wix/react-native-calendars/blob/master/example/src/screens/expandableCalendarScreen.tsx)
 :::info
 This component extends **[FlatList](https://reactnative.dev/docs/flatlist)** props.
 :::
diff --git a/docsRNC/docs/Calendar.md b/docsRNC/docs/Calendar.md
@@ -1,7 +1,7 @@
 Calendar component  
-[(code example)](https://github.com/wix/react-native-calendars/blob/master/example/src/screens/calendars.tsx)
+[(code example)](https://github.com/wix/react-native-calendars/blob/master/example/src/screens/calendarScreen.tsx)
 :::info
-This component extends **[CalendarHeader, BasicDay](https://github.com/wix/react-native-calendars/blob/master/src/calendar/header/index.tsx,https://github.com/wix/react-native-calendars/blob/master/src/calendar/day/basic/index.tsx)** props.
+This component extends **[CalendarHeader](https://github.com/wix/react-native-calendars/blob/master/src/calendar/header/index.tsx), [BasicDay](https://github.com/wix/react-native-calendars/blob/master/src/calendar/day/basic/index.tsx)** props.
 :::
 
 <div style={{display: 'flex', flexDirection: 'row', overflowX: 'auto', maxHeight: '500px', alignItems: 'center'}}><img style={{maxHeight: '420px'}} src={'https://github.com/wix/react-native-calendars/blob/master/demo/assets/calendar.gif?raw=true'}/>
diff --git a/docsRNC/docs/CalendarList.md b/docsRNC/docs/CalendarList.md
@@ -1,5 +1,5 @@
 Calendar list component  
-[(code example)](https://github.com/wix/react-native-calendars/blob/master/example/src/screens/calendarsList.tsx)
+[(code example)](https://github.com/wix/react-native-calendars/blob/master/example/src/screens/calendarListScreen.tsx)
 :::info
 This component extends **[Calendar](https://github.com/wix/react-native-calendars/blob/master/src/calendar/index.tsx), [FlatList](https://reactnative.dev/docs/flatlist)** props.
 :::
diff --git a/docsRNC/docs/CalendarProvider.md b/docsRNC/docs/CalendarProvider.md
@@ -1,5 +1,5 @@
 Calendar context provider component  
-[(code example)](https://github.com/wix/react-native-calendars/blob/master/example/src/screens/expandableCalendar.tsx)
+[(code example)](https://github.com/wix/react-native-calendars/blob/master/example/src/screens/expandableCalendarScreen.tsx)
 :::info
 This component extends **[Context](https://reactjs.org/docs/context.html)** props.
 :::
diff --git a/docsRNC/docs/ExpandableCalendar.md b/docsRNC/docs/ExpandableCalendar.md
@@ -1,5 +1,5 @@
 Expandable calendar component  
-[(code example)](https://github.com/wix/react-native-calendars/blob/master/example/src/screens/expandableCalendar.tsx)
+[(code example)](https://github.com/wix/react-native-calendars/blob/master/example/src/screens/expandableCalendarScreen.tsx)
 :::info
 This component extends **[CalendarList](https://github.com/wix/react-native-calendars/blob/master/src/calendar-list/index.tsx)** props.
 :::
diff --git a/docsRNC/docs/Timeline.md b/docsRNC/docs/Timeline.md
@@ -1,5 +1,5 @@
 Timeline component  
-[(code example)](https://github.com/wix/react-native-calendars/blob/master/example/src/screens/timelineCalendar.tsx)
+[(code example)](https://github.com/wix/react-native-calendars/blob/master/example/src/screens/timelineCalendarScreen.tsx)
 :::info
 This component extends **[ScrollView](https://reactnative.dev/docs/scrollview)** props.
 :::
diff --git a/docsRNC/docs/WeekCalendar.md b/docsRNC/docs/WeekCalendar.md
@@ -1,5 +1,5 @@
 Week calendar component  
-[(code example)](https://github.com/wix/react-native-calendars/blob/master/example/src/screens/expandableCalendar.tsx)
+[(code example)](https://github.com/wix/react-native-calendars/blob/master/example/src/screens/expandableCalendarScreen.tsx)
 :::info
 This component extends **[CalendarList](https://github.com/wix/react-native-calendars/blob/master/src/calendar-list/index.tsx)** props.
 :::
diff --git a/docsRNC/docusaurus.config.js b/docsRNC/docusaurus.config.js
@@ -25,7 +25,7 @@ const config = {
         docs: {
           sidebarPath: require.resolve('./sidebars.js'),
           // Please change this to your repo.
-          editUrl: 'https://github.com/facebook/docusaurus/tree/main/packages/create-docusaurus/templates/shared/'
+          editUrl: 'https://github.com/wix/react-native-calendars/tree/master/docsRNC'
         },
         blog: {
           showReadingTime: true,
diff --git a/package.json b/package.json
@@ -33,7 +33,6 @@
   "license": "MIT",
   "dependencies": {
     "hoist-non-react-statics": "^3.3.1",
-    "immutable": "^4.0.0-rc.12",
     "lodash": "^4.17.15",
     "memoize-one": "^5.2.1",
     "prop-types": "^15.5.10",
diff --git a/src/expandableCalendar/WeekCalendar/index.tsx b/src/expandableCalendar/WeekCalendar/index.tsx
@@ -3,9 +3,9 @@ import XDate from 'xdate';
 import React, {useCallback, useContext, useMemo, useRef, useState} from 'react';
 import {FlatList, View, ViewToken} from 'react-native';
 
-import {sameWeek, onSameDateRange} from '../../dateutils';
+import {sameWeek, onSameDateRange, getWeekDates} from '../../dateutils';
 import {toMarkingFormat} from '../../interface';
-import {DateData} from '../../types';
+import {DateData, MarkedDates} from '../../types';
 import styleConstructor from '../style';
 import {CalendarListProps} from '../../calendar-list';
 import WeekDaysNames from '../../commons/WeekDaysNames';
@@ -37,6 +37,7 @@ const WeekCalendar = (props: WeekCalendarProps) => {
     current,
     theme,
     testID,
+    markedDates,
   } = props;
   const context = useContext(CalendarContext);
   const {allowShadow = true, ...calendarListProps} = props;
@@ -92,16 +93,34 @@ const WeekCalendar = (props: WeekCalendarProps) => {
     }
   }, [onDayPress]);
 
+  const getCurrentWeekMarkings = useCallback((date: string, markings?: MarkedDates): MarkedDates | undefined => {
+    if (!markings) {
+      return;
+    }
+    const dates = getWeekDates(date, firstDay) as XDate[] | undefined;
+    return dates?.reduce((acc, date) => {
+      const dateString = toMarkingFormat(date);
+      return {
+        ...acc,
+      ...(
+        markings[dateString] && {[dateString]: markings[dateString]}
+      ),
+      };
+    }, {});
+  }, []);
+
   const weekStyle = useMemo(() => {
     return [{width: containerWidth}, propsStyle];
   }, [containerWidth, propsStyle]);
 
   const renderItem = useCallback(({item}: {item: string}) => {
     const currentContext = sameWeek(date, item, firstDay) ? context : undefined;
+    const markings = getCurrentWeekMarkings(item, markedDates);
 
     return (
       <Week
         {...others}
+        markedDates={markings}
         current={item}
         firstDay={firstDay}
         style={weekStyle}
@@ -111,7 +130,7 @@ const WeekCalendar = (props: WeekCalendarProps) => {
         timelineLeftInset={timelineLeftInset}
       />
     );
-  },[firstDay, _onDayPress, context, date]);
+  },[firstDay, _onDayPress, context, date, markedDates]);
 
   const keyExtractor = useCallback((item) => item, []);
 
