make eventintersection a bit safer

bruceharrison1984 · Jul 29, 2023 · 96fc7a8 · 96fc7a8
1 parent cfcc130
commit 96fc7a8
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/packages/Schedulely/src/providers/EventIntersectionProvider.tsx b/packages/Schedulely/src/providers/EventIntersectionProvider.tsx
@@ -41,7 +41,7 @@ export const EventIntersectionProvider = ({
 
   const [eventVisibility, setEventVisibility] = useState<
     Record<string, InternalCalendarEvent>
-  >({});
+  >(Object.assign({}, ...eventsInWeek.map((x) => ({ [x.id]: x }))));
 
   const getEventsOnDate = useCallback(
     (date: Date) =>
@@ -61,8 +61,6 @@ export const EventIntersectionProvider = ({
   const checkIntersection: IntersectionObserverCallback = useCallback(
     (entries) =>
       entries.map((x) => {
-        var eventId = x.target.attributes.getNamedItem('data-eventid')?.value;
-
         const currentStyle =
           x.target
             .getAttribute('style')
@@ -76,22 +74,23 @@ export const EventIntersectionProvider = ({
           x.target.setAttribute('style', currentStyle.join(';'));
         }
 
-        const matchingEvent = eventsInWeek.find((x) => x.id === eventId);
-        if (matchingEvent === undefined) return;
-
+        // this controls the event data that is sent back to the DayComponent for event visibility
         setEventVisibility((current) => {
-          current[matchingEvent.id] = matchingEvent;
-          current[matchingEvent.id].visible = x.isIntersecting;
+          var eventId = x.target.attributes.getNamedItem('data-eventid')?.value;
+          if (!eventId) return { ...current };
+
+          if (!current[eventId]) {
+            const matchingEvent = eventsInWeek.find((x) => x.id === eventId)!;
+            current[eventId] = matchingEvent;
+          }
+          current[eventId].visible = x.isIntersecting;
           return { ...current };
         });
       }),
     [eventsInWeek]
   );
 
   useEffect(() => {
-    // clear visibility dictionary to avoid stale entries building up
-    setEventVisibility({});
-
     observerRef.current = new IntersectionObserver(checkIntersection, {
       root: parentContainerRef,
       rootMargin: '0px 0px -15% 0px',