react-native-ll-calendar 0.15.0 → 0.16.0

package/src/calendar/month-calendar/view/MonthCalendarViewItem.tsx

@@ -27,6 +27,7 @@ import {
   forwardRef,
   useImperativeHandle,
   useRef,
+  type ReactNode,
 } from 'react';
 import { MonthCalendarWeekDayRow } from './MonthCalendarWeekDayRow';
 
@@ -63,7 +64,9 @@ type MonthCalendarViewItemProps = {
   eventHeight?: number;
   eventTextStyle?: (event: CalendarEvent) => TextStyle;
   eventEllipsizeMode?: 'head' | 'middle' | 'tail' | 'clip';
+  renderEventOverlay?: (event: CalendarEvent) => ReactNode;
   bottomSpacing?: number;
+  prioritizeCellInteraction?: boolean;
 };
 
 export const MonthCalendarViewItem = forwardRef<
@@ -228,6 +231,8 @@ export const MonthCalendarViewItem = forwardRef<
               eventHeight={props.eventHeight}
               eventTextStyle={props.eventTextStyle}
               eventEllipsizeMode={props.eventEllipsizeMode}
+              renderEventOverlay={props.renderEventOverlay}
+              prioritizeCellInteraction={props.prioritizeCellInteraction}
               onLayout={(e) => {
                 weekHeights.current.set(weekId, e.nativeEvent.layout.height);
               }}

package/src/calendar/month-calendar/view/MonthCalendarWeekRow.tsx

@@ -1,5 +1,7 @@
 import dayjs from 'dayjs';
+import type { ReactNode } from 'react';
 import {
+  Platform,
   StyleSheet,
   useWindowDimensions,
   type LayoutChangeEvent,
@@ -31,7 +33,9 @@ export const MonthCalendarWeekRow = (props: {
   eventHeight?: number;
   eventTextStyle?: (event: CalendarEvent) => TextStyle;
   eventEllipsizeMode?: 'head' | 'middle' | 'tail' | 'clip';
+  renderEventOverlay?: (event: CalendarEvent) => ReactNode;
   onLayout?: (event: LayoutChangeEvent) => void;
+  prioritizeCellInteraction?: boolean;
 }) => {
   const eventHeight = props.eventHeight || 26;
   const { width: screenWidth } = useWindowDimensions();
@@ -72,7 +76,7 @@ export const MonthCalendarWeekRow = (props: {
             return dayjs(a.start).diff(dayjs(b.start));
           });
 
-        const events: (CalendarEvent | number)[] = [];
+        const cellEvents: (CalendarEvent | number)[] = [];
         if (weekId && props.eventPosition) {
           const rowNums = props.eventPosition.getRowNums({
             weekId,
@@ -82,33 +86,142 @@ export const MonthCalendarWeekRow = (props: {
           let eventIndex = 0;
           for (let ii = 1; ii <= rowsLength; ii++) {
             if (rowNums.includes(ii)) {
-              events.push(ii);
+              cellEvents.push(ii);
             } else {
               const event = filteredEvents[eventIndex];
               if (event) {
-                events.push(event);
+                cellEvents.push(event);
               }
               eventIndex++;
             }
           }
         }
-        return (
-          <TouchableOpacity
-            key={djs.get('date')}
-            style={[
-              styles.dayCellCountainer,
-              { minHeight: props.weekRowMinHeight },
-              { zIndex: 7 - dateIndex },
-              { borderColor: props.cellBorderColor ?? 'lightslategrey' },
-            ]}
-            onPress={() => {
-              props.onPressCell?.(djs.toDate());
-            }}
-            onLongPress={() => {
-              props.onLongPressCell?.(djs.toDate());
-            }}
-            delayLongPress={props.delayLongPressCell}
-          >
+
+        const showPrioritizedCellOverlay =
+          props.prioritizeCellInteraction === true &&
+          (props.onPressCell != null || props.onLongPressCell != null);
+
+        const cellWrapperStyle = [
+          styles.dayCellCountainer,
+          { minHeight: props.weekRowMinHeight },
+          { zIndex: 7 - dateIndex },
+          { borderColor: props.cellBorderColor ?? 'lightslategrey' },
+        ];
+
+        const eventRows = cellEvents.map((event, rowIndex) => {
+          if (typeof event === 'number') {
+            return (
+              <View
+                key={`spacer-${rowIndex}`}
+                style={{ height: eventHeight, marginBottom: EVENT_GAP }}
+              />
+            );
+          }
+
+          const rawStartDjs = dayjs(event.start);
+          const startDjs = dateIndex === 0 ? djs : dayjs(event.start);
+          const endDjs = dayjs(event.end);
+          const isEndOnDayBoundary =
+            endDjs.hour() === 0 &&
+            endDjs.minute() === 0 &&
+            endDjs.second() === 0 &&
+            endDjs.millisecond() === 0;
+          const diffDays = Math.max(
+            0,
+            endDjs.startOf('day').diff(startDjs.startOf('day'), 'day') -
+              (isEndOnDayBoundary ? 1 : 0)
+          );
+
+          const isPrevDateEvent = dateIndex === 0 && rawStartDjs.isBefore(djs);
+          let width =
+            (diffDays + 1) * dateColumnWidth -
+            EVENT_GAP * 2 -
+            CELL_BORDER_WIDTH * 2;
+
+          if (isPrevDateEvent) {
+            width += EVENT_GAP + 1;
+          }
+
+          const isLastRow = rowIndex === cellEvents.length - 1;
+
+          if (props.eventPosition && weekId) {
+            props.eventPosition.push({
+              weekId,
+              startDate: startDjs.toDate(),
+              days: diffDays + 1,
+              rowNum: rowIndex + 1,
+            });
+          }
+
+          const eventOverlayNode = props.renderEventOverlay?.(event);
+          const showEventOverlay =
+            props.renderEventOverlay != null &&
+            eventOverlayNode != null &&
+            eventOverlayNode !== false;
+
+          return (
+            <View
+              key={event.id}
+              pointerEvents={showPrioritizedCellOverlay ? 'none' : 'auto'}
+              style={[
+                styles.eventOuter,
+                {
+                  width,
+                  height: eventHeight,
+                },
+                isPrevDateEvent ? styles.prevDateEvent : {},
+                isLastRow ? styles.lastRowEvent : {},
+              ]}
+            >
+              <TouchableOpacity
+                style={[
+                  styles.event,
+                  {
+                    backgroundColor: event.backgroundColor,
+                    borderColor: event.borderColor,
+                    ...(event.borderStyle !== undefined && {
+                      borderStyle: event.borderStyle,
+                    }),
+                    ...(event.borderWidth !== undefined && {
+                      borderWidth: event.borderWidth,
+                    }),
+                    ...(event.borderRadius !== undefined && {
+                      borderRadius: event.borderRadius,
+                    }),
+                  },
+                ]}
+                onPress={() => {
+                  props.onPressEvent?.(event);
+                }}
+                onLongPress={() => {
+                  props.onLongPressEvent?.(event);
+                }}
+                delayLongPress={props.delayLongPressEvent}
+              >
+                <Text
+                  numberOfLines={1}
+                  ellipsizeMode={props.eventEllipsizeMode ?? 'tail'}
+                  style={[
+                    styles.eventTitle,
+                    { color: event.color },
+                    props.eventTextStyle?.(event),
+                  ]}
+                  allowFontScaling={props.allowFontScaling}
+                >
+                  {event.title}
+                </Text>
+              </TouchableOpacity>
+              {showEventOverlay ? (
+                <View style={styles.eventOverlayHost} pointerEvents="box-none">
+                  {eventOverlayNode}
+                </View>
+              ) : null}
+            </View>
+          );
+        });
+
+        const cellInner = (
+          <>
             <View
               style={[
                 styles.dayCellInner,
@@ -129,90 +242,39 @@ export const MonthCalendarWeekRow = (props: {
                 {text}
               </Text>
             </View>
-            {events.map((event, rowIndex) => {
-              if (typeof event === 'number') {
-                return (
-                  <View
-                    key={event}
-                    style={{ height: eventHeight, marginBottom: EVENT_GAP }}
-                  />
-                );
-              }
-
-              const rawStartDjs = dayjs(event.start);
-              const startDjs = dateIndex === 0 ? djs : dayjs(event.start);
-              const endDjs = dayjs(event.end);
-              const diffDays = endDjs
-                .startOf('day')
-                .diff(startDjs.startOf('day'), 'day');
-              const isPrevDateEvent =
-                dateIndex === 0 && rawStartDjs.isBefore(djs);
-              let width =
-                (diffDays + 1) * dateColumnWidth -
-                EVENT_GAP * 2 -
-                CELL_BORDER_WIDTH * 2;
-
-              if (isPrevDateEvent) {
-                width += EVENT_GAP + 1;
-              }
-
-              const isLastRow = rowIndex === events.length - 1;
-
-              if (props.eventPosition && weekId) {
-                props.eventPosition.push({
-                  weekId,
-                  startDate: startDjs.toDate(),
-                  days: diffDays + 1,
-                  rowNum: rowIndex + 1,
-                });
-              }
+            {eventRows}
+          </>
+        );
 
-              return (
-                <TouchableOpacity
-                  key={event.id}
-                  style={[
-                    styles.event,
-                    {
-                      backgroundColor: event.backgroundColor,
-                      borderColor: event.borderColor,
-                      width: width,
-                      height: eventHeight,
-                      ...(event.borderStyle !== undefined && {
-                        borderStyle: event.borderStyle,
-                      }),
-                      ...(event.borderWidth !== undefined && {
-                        borderWidth: event.borderWidth,
-                      }),
-                      ...(event.borderRadius !== undefined && {
-                        borderRadius: event.borderRadius,
-                      }),
-                    },
-                    isPrevDateEvent ? styles.prevDateEvent : {},
-                    isLastRow ? styles.lastRowEvent : {},
-                  ]}
-                  onPress={() => {
-                    props.onPressEvent?.(event);
-                  }}
-                  onLongPress={() => {
-                    props.onLongPressEvent?.(event);
-                  }}
-                  delayLongPress={props.delayLongPressEvent}
-                >
-                  <Text
-                    numberOfLines={1}
-                    ellipsizeMode={props.eventEllipsizeMode ?? 'tail'}
-                    style={[
-                      styles.eventTitle,
-                      { color: event.color },
-                      props.eventTextStyle?.(event),
-                    ]}
-                    allowFontScaling={props.allowFontScaling}
-                  >
-                    {event.title}
-                  </Text>
-                </TouchableOpacity>
-              );
-            })}
+        return showPrioritizedCellOverlay ? (
+          <View key={djs.valueOf()} style={cellWrapperStyle}>
+            {cellInner}
+            <TouchableOpacity
+              accessible={false}
+              style={styles.cellInteractionOverlay}
+              activeOpacity={1}
+              onPress={() => {
+                props.onPressCell?.(djs.toDate());
+              }}
+              onLongPress={() => {
+                props.onLongPressCell?.(djs.toDate());
+              }}
+              delayLongPress={props.delayLongPressCell}
+            />
+          </View>
+        ) : (
+          <TouchableOpacity
+            key={djs.valueOf()}
+            style={cellWrapperStyle}
+            onPress={() => {
+              props.onPressCell?.(djs.toDate());
+            }}
+            onLongPress={() => {
+              props.onLongPressCell?.(djs.toDate());
+            }}
+            delayLongPress={props.delayLongPressCell}
+          >
+            {cellInner}
           </TouchableOpacity>
         );
       })}
@@ -251,15 +313,25 @@ const styles = StyleSheet.create({
     textAlign: 'center',
     fontSize: 14,
   },
+  eventOuter: {
+    position: 'relative',
+    marginTop: EVENT_GAP,
+    marginLeft: EVENT_GAP,
+  },
   event: {
+    flex: 1,
+    width: '100%',
+    height: '100%',
     borderWidth: 0.5,
     borderRadius: 4,
     paddingHorizontal: 4,
     flexDirection: 'row',
     alignItems: 'center',
     boxShadow: '0 0 2px 0 rgba(0, 0, 0, 0.1)',
-    marginTop: EVENT_GAP,
-    marginLeft: EVENT_GAP,
+  },
+  eventOverlayHost: {
+    ...StyleSheet.absoluteFillObject,
+    pointerEvents: 'box-none',
   },
   prevDateEvent: {
     marginLeft: -1,
@@ -272,4 +344,13 @@ const styles = StyleSheet.create({
   eventTitle: {
     fontSize: 12,
   },
+  cellInteractionOverlay: {
+    ...StyleSheet.absoluteFillObject,
+    zIndex: 1000,
+    backgroundColor: 'transparent',
+    ...Platform.select({
+      android: { elevation: 12 },
+      default: {},
+    }),
+  },
 });