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

Author: Inbal-Tish

src/calendar-list/index.tsx

@@ -137,6 +137,12 @@ const CalendarList = (props: CalendarListProps & ContextProp, ref: any) => {
     });
   }, [items]);
 
+  const getDateIndex = useCallback((date: string) => {
+    return findIndex(items, function(item) {
+      return item.toString() === date.toString();
+    });
+  }, [items]);
+
   useEffect(() => {
     if (current) {
       scrollToMonth(new XDate(current));
@@ -188,7 +194,7 @@ const CalendarList = (props: CalendarListProps & ContextProp, ref: any) => {
 
   const addMonth = useCallback((count: number) => {
     const day = currentMonth?.clone().addMonths(count, true);
-    if (sameMonth(day, currentMonth)) {
+    if (sameMonth(day, currentMonth) || getDateIndex(day) === -1) {
       return;
     }
     scrollToMonth(day);
@@ -280,7 +286,7 @@ const CalendarList = (props: CalendarListProps & ContextProp, ref: any) => {
       onViewableItemsChanged
     },
   ]);
-
+ 
   return (
     <View style={style.current.flatListContainer} testID={testID}>
       <FlatList

src/expandableCalendar/Context/Provider.tsx

@@ -120,7 +120,7 @@ const CalendarProvider = (props: CalendarContextProviderProps) => {
 
   return (
     <CalendarContext.Provider value={contextValue}>
-      <View style={wrapperStyle}>{children}</View>
+      <View style={wrapperStyle} key={numberOfDays}>{children}</View>
       {showTodayButton && renderTodayButton()}
     </CalendarContext.Provider>
   );

src/expandableCalendar/agendaList.tsx

@@ -176,7 +176,7 @@ const AgendaList = (props: AgendaListProps) => {
       list?.current.scrollToLocation({
         animated: true,
         sectionIndex: sectionIndex,
-        itemIndex: 0,
+        itemIndex: 1,
         viewPosition: 0, // position at the top
         viewOffset: (constants.isAndroid ? sectionHeight.current : 0) + viewOffset
       });

src/expandableCalendar/index.tsx

@@ -154,6 +154,11 @@ const ExpandableCalendar = (props: ExpandableCalendarProps) => {
     return false;
   };
 
+  useEffect(() => {
+    // date was changed from AgendaList, arrows or scroll
+    scrollToDate(date);
+  }, [date]);
+
   /** Number of weeks */
 
   const getNumberOfWeeksInMonth = (month: string) => {
@@ -163,9 +168,9 @@ const ExpandableCalendar = (props: ExpandableCalendarProps) => {
   const numberOfWeeks = useRef(getNumberOfWeeksInMonth(date));
 
   /** Position */
+
   const [position, setPosition] = useState(numberOfDays ? Positions.CLOSED : initialPosition);
   const isOpen = position === Positions.OPEN;
-
   const getOpenHeight = () => {
     if (!horizontal) {
       return Math.max(constants.screenHeight, constants.screenWidth);
@@ -174,17 +179,16 @@ const ExpandableCalendar = (props: ExpandableCalendarProps) => {
   };
   const openHeight = useRef(getOpenHeight());
   const closedHeight = useMemo(() => CLOSED_HEIGHT + (hideKnob || Number(numberOfDays) > 1 ? 0 : KNOB_CONTAINER_HEIGHT), [numberOfDays, hideKnob]);
-
   const startHeight = useMemo(() => isOpen ? openHeight.current : closedHeight, [closedHeight, isOpen]);
   const _height = useRef(startHeight);
   const deltaY = useMemo(() => new Animated.Value(startHeight), [startHeight]);
+  const headerDeltaY = useRef(new Animated.Value(isOpen ? -HEADER_HEIGHT : 0));
 
   useEffect(() => {
     _height.current = startHeight;
     deltaY.setValue(startHeight);
   }, [startHeight]);
 
-  const headerDeltaY = useRef(new Animated.Value(isOpen ? -HEADER_HEIGHT : 0));
 
   useEffect(() => {
     if (numberOfDays) {
@@ -249,7 +253,17 @@ const ExpandableCalendar = (props: ExpandableCalendarProps) => {
     return {height: deltaY};
   }, [deltaY]);
 
-  /** Effects */
+  const numberOfDaysHeaderStyle = useMemo(() => {
+    if (numberOfDays && numberOfDays > 1) {
+      return {paddingHorizontal: 0};
+    }
+  }, [numberOfDays]);
+
+  const _headerStyle = useMemo(() => {
+    return [numberOfDaysHeaderStyle, props.headerStyle];
+  }, [props.headerStyle, numberOfDaysHeaderStyle]);
+
+  /** AccessibilityInfo */
 
   useEffect(() => {
     if (AccessibilityInfo) {
@@ -262,11 +276,6 @@ const ExpandableCalendar = (props: ExpandableCalendarProps) => {
     }
   }, []);
 
-  useEffect(() => {
-    // date was changed from AgendaList, arrows or scroll
-    scrollToDate(date);
-  }, [date]);
-
   const handleScreenReaderStatus = (screenReaderEnabled: any) => {
     setScreenReaderEnabled(screenReaderEnabled);
   };
@@ -303,7 +312,6 @@ const ExpandableCalendar = (props: ExpandableCalendarProps) => {
           const firstDayOfWeek = (next ? 7 : -7) - dayOfTheWeek + firstDay;
           d.addDays(firstDayOfWeek);
         }
-
       }
 
       setDate?.(toMarkingFormat(d), UpdateSources.PAGE_SCROLL);
@@ -328,8 +336,8 @@ const ExpandableCalendar = (props: ExpandableCalendarProps) => {
   };
 
   const handlePanResponderMove = (_: GestureResponderEvent, gestureState: PanResponderGestureState) => {
-    // limit min height to closed height
-    _wrapperStyles.current.style.height = Math.max(closedHeight, _height.current + gestureState.dy);
+    // limit min height to closed height and max to open height
+    _wrapperStyles.current.style.height = Math.min(Math.max(closedHeight, _height.current + gestureState.dy), openHeight.current);
 
     if (!horizontal) {
       // vertical CalenderList header
@@ -338,6 +346,8 @@ const ExpandableCalendar = (props: ExpandableCalendarProps) => {
       // horizontal Week view
       if (!isOpen) {
         _weekCalendarStyles.style.opacity = Math.min(1, Math.max(1 - gestureState.dy / 100, 0));
+      } else if (gestureState.dy < 0) {
+        _weekCalendarStyles.style.opacity = Math.max(0, Math.min(Math.abs(gestureState.dy / 200), 1));
       }
     }
 
@@ -358,7 +368,7 @@ const ExpandableCalendar = (props: ExpandableCalendarProps) => {
     onPanResponderMove: handlePanResponderMove,
     onPanResponderRelease: handlePanResponderEnd,
     onPanResponderTerminate: handlePanResponderEnd
-  }) : PanResponder.create({}), [numberOfDays]);
+  }) : PanResponder.create({}), [numberOfDays, position]);
 
   /** Animated */
 
@@ -554,16 +564,6 @@ const ExpandableCalendar = (props: ExpandableCalendarProps) => {
     );
   };
 
-  const numberOfDaysHeaderStyle = useMemo(() => {
-    if (numberOfDays && numberOfDays > 1) {
-      return {paddingHorizontal: 0};
-    }
-  }, [numberOfDays]);
-
-  const _headerStyle = useMemo(() => {
-    return [numberOfDaysHeaderStyle, props.headerStyle];
-  }, [props.headerStyle, numberOfDaysHeaderStyle]);
-
   const renderCalendarList = () => {
     return (
       <CalendarList

src/timeline-list/index.tsx

@@ -162,7 +162,6 @@ const TimelineList = (props: TimelineListProps) => {
       scrollViewProps={{
         onMomentumScrollEnd
       }}
-      key={numberOfDays}
     />
   );
 };