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

# Conflicts:
#	example/src/screens/index.ts
#	tsconfig.json

Author: Inbal-Tish

example/src/screens/agenda.tsx renamed to example/src/screens/agendaScreen.tsx

@@ -5,7 +5,7 @@ import testIDs from '../testIDs';
 
 const INITIAL_DATE = '2020-02-02';
 
-const CalendarsScreen = () => {
+const CalendarScreen = () => {
   const [selected, setSelected] = useState(INITIAL_DATE);
 
   const onDayPress: CalendarProps['onDayPress'] = useCallback(day => {
@@ -484,7 +484,7 @@ const CalendarsScreen = () => {
   );
 };
 
-export default CalendarsScreen;
+export default CalendarScreen;
 
 const styles = StyleSheet.create({
   calendar: {

example/src/screens/calendars.tsx renamed to example/src/screens/calendarScreen.tsx

@@ -1,12 +1,12 @@
 import {Navigation} from 'react-native-navigation';
 
-import MenuScreen from './menu';
-import CalendarsScreen from './calendars';
-import AgendaScreen from './agenda';
+import MenuScreen from './menuScreen';
+import CalendarsScreen from './calendarScreen';
+import AgendaScreen from './agendaScreen';
 import CalendarsList from './calendarsList';
 import HorizontalCalendarList from './horizontalCalendarList';
-import ExpandableCalendarScreen from './ExpandableCalendarScreen';
-import TimelineCalendar from './timelineCalendar';
+import ExpandableCalendar from './expandableCalendar';
+import TimelineCalendar from './timelineCalendarScreen';
 
 export function registerScreens() {
   Navigation.registerComponent('Menu', () => MenuScreen);

example/src/screens/index.ts

@@ -114,8 +114,8 @@ export default class Agenda extends Component<AgendaProps, State> {
       calendarIsReady: false,
       calendarScrollable: false,
       firstReservationLoad: false,
-      selectedDay: this.getSelectedDate(),
-      topDay: this.getSelectedDate()
+      selectedDay: this.getSelectedDate(props.selected),
+      topDay: this.getSelectedDate(props.selected)
     };
 
     this.currentMonth = this.state.selectedDay.clone();
@@ -135,9 +135,13 @@ export default class Agenda extends Component<AgendaProps, State> {
   }
 
   componentDidUpdate(prevProps: AgendaProps, prevState: State) {
-    const newSelectedDate = this.getSelectedDate();
+    const newSelectedDate = this.getSelectedDate(this.props.selected);
+    
     if (!sameDate(newSelectedDate, prevState.selectedDay)) {
-      this.setState({selectedDay: newSelectedDate});
+      const prevSelectedDate = this.getSelectedDate(prevProps.selected);
+      if (!sameDate(newSelectedDate, prevSelectedDate)) {
+        this.setState({selectedDay: newSelectedDate});
+      }
     } else if (!prevProps.items) {
       this.loadReservations(this.props);
     }
@@ -150,8 +154,7 @@ export default class Agenda extends Component<AgendaProps, State> {
     return null;
   }
 
-  getSelectedDate() {
-    const {selected} = this.props;
+  getSelectedDate(selected?: string) {
     return selected ? parseDate(selected) : new XDate(true);
   }
 

example/src/screens/menu.tsx renamed to example/src/screens/menuScreen.tsx

@@ -1,9 +1,11 @@
 import {StyleSheet, Platform} from 'react-native';
 import * as defaultStyle from '../../style';
 import {Theme} from '../../types';
+import constants from '../../commons/constants';
 
 export default function (theme: Theme = {}) {
   const appStyle = {...defaultStyle, ...theme};
+  const flipStyle = constants.isRTL ? {transform: [{scaleX: -1}]} : undefined;
   return StyleSheet.create({
     header: {
       flexDirection: 'row',
@@ -28,6 +30,7 @@ export default function (theme: Theme = {}) {
       ...appStyle.arrowStyle
     },
     arrowImage: {
+      ...flipStyle,
       tintColor: appStyle.arrowColor,
       ...Platform.select({
         web: {
@@ -37,6 +40,7 @@ export default function (theme: Theme = {}) {
       })
     },
     disabledArrowImage: {
+      ...flipStyle,
       tintColor: appStyle.disabledArrowColor
     },
     // @ts-expect-error

example/src/screens/timelineCalendar.tsx renamed to example/src/screens/timelineCalendarScreen.tsx

@@ -17,7 +17,7 @@ export {default as asCalendarConsumer} from './expandableCalendar/asCalendarCons
 export {default as Timeline} from './timeline/Timeline';
 export type {TimelineProps, TimelineEventProps, TimelinePackedEventProps} from './timeline/Timeline';
 export {default as TimelineList} from './timeline-list';
-export {TimelineListProps, TimelineListRenderItemInfo} from './timeline-list';
+export type {TimelineListProps, TimelineListRenderItemInfo} from './timeline-list';
 export {default as CalendarUtils} from './services';
 export type {DateData, AgendaEntry, AgendaSchedule} from './types';
 export {default as LocaleConfig} from 'xdate';

src/agenda/index.tsx

@@ -25,10 +25,10 @@
   // "include": ["src/calendar/day/basic", "src/global.d.ts"],
   "include": [
     "src/**/*",
-    "example/src/screens/calendars.tsx",
-    "example/src/screens/ExpandableCalendarScreen.tsx",
-    "example/src/screens/agenda.tsx",
-    "example/src/screens/timelineCalendar.tsx"
+    "example/src/screens/calendarScreen.tsx",
+    "example/src/screens/expandableCalendarScreen.tsx",
+    "example/src/screens/agendaScreen.tsx",
+    "example/src/screens/timelineCalendarScreen.tsx"
   ],
   "exclude": ["node_modules", "testUtils"]
 }