related -> relevant (includes self events)

src/interactions/EventDragging.ts

@@ -7,7 +7,7 @@ import browserContext from '../common/browser-context'
 import { startOfDay } from '../datelib/marker'
 import { elementClosest } from '../util/dom-manip'
 import FeaturefulElementDragging from '../dnd/FeaturefulElementDragging'
-import { EventStore, getRelatedEvents, createEmptyEventStore } from '../structs/event-store'
+import { EventStore, getRelevantEvents, createEmptyEventStore } from '../structs/event-store'
 import Calendar from '../Calendar'
 import { EventInteractionState } from '../interactions/event-interaction-state'
 import { diffDates, enableCursor, disableCursor } from '../util/misc'
@@ -26,10 +26,10 @@ export default class EventDragging { // TODO: rename to EventSelectingAndDraggin
   subjectSeg: Seg | null = null // the seg being selected/dragged
   isDragging: boolean = false
   eventRange: EventRenderRange | null = null
-  relatedEvents: EventStore | null = null
+  relevantEvents: EventStore | null = null
   receivingCalendar: Calendar | null = null
   validMutation: EventMutation | null = null
-  mutatedRelatedEvents: EventStore | null = null
+  mutatedRelevantEvents: EventStore | null = null
 
   constructor(component: DateComponent) {
     this.component = component
@@ -61,7 +61,7 @@ export default class EventDragging { // TODO: rename to EventSelectingAndDraggin
     let eventRange = this.eventRange = subjectSeg.eventRange!
     let eventInstanceId = eventRange.instance!.instanceId
 
-    this.relatedEvents = getRelatedEvents(
+    this.relevantEvents = getRelevantEvents(
       initialCalendar.state.eventStore,
       eventInstanceId
     )
@@ -122,14 +122,14 @@ export default class EventDragging { // TODO: rename to EventSelectingAndDraggin
       return
     }
 
-    let relatedEvents = this.relatedEvents!
+    let relevantEvents = this.relevantEvents!
     let initialHit = this.hitDragging.initialHit!
     let initialCalendar = this.component.getCalendar()
 
     // states based on new hit
     let receivingCalendar: Calendar | null = null
     let mutation: EventMutation | null = null
-    let mutatedRelatedEvents: EventStore | null = null
+    let mutatedRelevantEvents: EventStore | null = null
     let isInvalid = false
 
     if (hit) {
@@ -137,19 +137,19 @@ export default class EventDragging { // TODO: rename to EventSelectingAndDraggin
       mutation = computeEventMutation(initialHit, hit)
 
       if (mutation) {
-        mutatedRelatedEvents = applyMutationToEventStore(relatedEvents, mutation, receivingCalendar)
+        mutatedRelevantEvents = applyMutationToEventStore(relevantEvents, mutation, receivingCalendar)
 
-        if (!this.component.isEventsValid(mutatedRelatedEvents)) {
+        if (!this.component.isEventsValid(mutatedRelevantEvents)) {
           isInvalid = true
           mutation = null
-          mutatedRelatedEvents = null
+          mutatedRelevantEvents = null
         }
       }
     }
 
     this.displayDrag(receivingCalendar, {
-      affectedEvents: relatedEvents,
-      mutatedEvents: mutatedRelatedEvents || createEmptyEventStore(),
+      affectedEvents: relevantEvents,
+      mutatedEvents: mutatedRelevantEvents || createEmptyEventStore(),
       isEvent: true,
       origSeg: this.subjectSeg
     })
@@ -180,7 +180,7 @@ export default class EventDragging { // TODO: rename to EventSelectingAndDraggin
       // assign states based on new hit
       this.receivingCalendar = receivingCalendar
       this.validMutation = mutation
-      this.mutatedRelatedEvents = mutatedRelatedEvents
+      this.mutatedRelevantEvents = mutatedRelevantEvents
     }
   }
 
@@ -199,8 +199,8 @@ export default class EventDragging { // TODO: rename to EventSelectingAndDraggin
       let eventDef = this.eventRange!.def
       let eventInstance = this.eventRange!.instance
       let eventApi = new EventApi(initialCalendar, eventDef, eventInstance)
-      let relatedEvents = this.relatedEvents!
-      let mutatedRelatedEvents = this.mutatedRelatedEvents!
+      let relevantEvents = this.relevantEvents!
+      let mutatedRelevantEvents = this.mutatedRelevantEvents!
 
       this.clearDrag() // must happen after revert animation
 
@@ -220,7 +220,7 @@ export default class EventDragging { // TODO: rename to EventSelectingAndDraggin
 
           initialCalendar.dispatch({
             type: 'MERGE_EVENTS',
-            eventStore: mutatedRelatedEvents
+            eventStore: mutatedRelevantEvents
           })
 
           initialCalendar.publiclyTrigger('eventDrop', [
@@ -230,13 +230,13 @@ export default class EventDragging { // TODO: rename to EventSelectingAndDraggin
               prevEvent: eventApi,
               event: new EventApi( // the data AFTER the mutation
                 initialCalendar,
-                mutatedRelatedEvents.defs[eventDef.defId],
-                eventInstance ? mutatedRelatedEvents.instances[eventInstance.instanceId] : null
+                mutatedRelevantEvents.defs[eventDef.defId],
+                eventInstance ? mutatedRelevantEvents.instances[eventInstance.instanceId] : null
               ),
               revert: function() {
                 initialCalendar.dispatch({
                   type: 'MERGE_EVENTS',
-                  eventStore: relatedEvents
+                  eventStore: relevantEvents
                 })
               },
               jsEvent: ev.origEvent,
@@ -250,12 +250,12 @@ export default class EventDragging { // TODO: rename to EventSelectingAndDraggin
 
           initialCalendar.dispatch({
             type: 'REMOVE_EVENT_INSTANCES',
-            instances: this.mutatedRelatedEvents!.instances
+            instances: this.mutatedRelevantEvents!.instances
           })
 
           receivingCalendar.dispatch({
             type: 'MERGE_EVENTS',
-            eventStore: this.mutatedRelatedEvents!
+            eventStore: this.mutatedRelevantEvents!
           })
 
           if (ev.isTouch) {
@@ -324,10 +324,10 @@ export default class EventDragging { // TODO: rename to EventSelectingAndDraggin
     this.subjectSeg = null
     this.isDragging = false
     this.eventRange = null
-    this.relatedEvents = null
+    this.relevantEvents = null
     this.receivingCalendar = null
     this.validMutation = null
-    this.mutatedRelatedEvents = null
+    this.mutatedRelevantEvents = null
   }
 
 }

src/interactions/EventResizing.ts

@@ -5,7 +5,7 @@ import { elementClosest } from '../util/dom-manip'
 import FeaturefulElementDragging from '../dnd/FeaturefulElementDragging'
 import { PointerDragEvent } from '../dnd/PointerDragging'
 import { getElSeg } from '../component/renderers/EventRenderer'
-import { EventStore, getRelatedEvents } from '../structs/event-store'
+import { EventStore, getRelevantEvents } from '../structs/event-store'
 import { diffDates, enableCursor, disableCursor } from '../util/misc'
 import { DateRange } from '../datelib/date-range'
 import EventApi from '../api/EventApi'
@@ -21,9 +21,9 @@ export default class EventDragging {
   // internal state
   draggingSeg: Seg | null = null // TODO: rename to resizingSeg? subjectSeg?
   eventRange: EventRenderRange | null = null
-  relatedEvents: EventStore | null = null
+  relevantEvents: EventStore | null = null
   validMutation: EventMutation | null = null
-  mutatedRelatedEvents: EventStore | null = null
+  mutatedRelevantEvents: EventStore | null = null
 
   constructor(component: DateComponent) {
     this.component = component
@@ -61,7 +61,7 @@ export default class EventDragging {
     let calendar = this.component.getCalendar()
     let eventRange = this.eventRange!
 
-    this.relatedEvents = getRelatedEvents(
+    this.relevantEvents = getRelevantEvents(
       calendar.state.eventStore,
       this.eventRange.instance!.instanceId
     )
@@ -81,11 +81,11 @@ export default class EventDragging {
 
   handleHitUpdate = (hit: Hit | null, isFinal: boolean, ev: PointerDragEvent) => {
     let calendar = this.component.getCalendar()
-    let relatedEvents = this.relatedEvents!
+    let relevantEvents = this.relevantEvents!
     let initialHit = this.hitDragging.initialHit!
     let eventInstance = this.eventRange.instance!
     let mutation: EventMutation | null = null
-    let mutatedRelatedEvents: EventStore | null = null
+    let mutatedRelevantEvents: EventStore | null = null
     let isInvalid = false
 
     if (hit) {
@@ -98,21 +98,21 @@ export default class EventDragging {
     }
 
     if (mutation) {
-      mutatedRelatedEvents = applyMutationToEventStore(relatedEvents, mutation, calendar)
+      mutatedRelevantEvents = applyMutationToEventStore(relevantEvents, mutation, calendar)
 
-      if (!this.component.isEventsValid(mutatedRelatedEvents)) {
+      if (!this.component.isEventsValid(mutatedRelevantEvents)) {
         isInvalid = true
         mutation = null
-        mutatedRelatedEvents = null
+        mutatedRelevantEvents = null
       }
     }
 
-    if (mutatedRelatedEvents) {
+    if (mutatedRelevantEvents) {
       calendar.dispatch({
         type: 'SET_EVENT_RESIZE',
         state: {
-          affectedEvents: relatedEvents,
-          mutatedEvents: mutatedRelatedEvents,
+          affectedEvents: relevantEvents,
+          mutatedEvents: mutatedRelevantEvents,
           isEvent: true,
           origSeg: this.draggingSeg
         }
@@ -134,7 +134,7 @@ export default class EventDragging {
       }
 
       this.validMutation = mutation
-      this.mutatedRelatedEvents = mutatedRelatedEvents
+      this.mutatedRelevantEvents = mutatedRelevantEvents
     }
   }
 
@@ -144,8 +144,8 @@ export default class EventDragging {
     let eventDef = this.eventRange!.def
     let eventInstance = this.eventRange!.instance
     let eventApi = new EventApi(calendar, eventDef, eventInstance)
-    let relatedEvents = this.relatedEvents!
-    let mutatedRelatedEvents = this.mutatedRelatedEvents!
+    let relevantEvents = this.relevantEvents!
+    let mutatedRelevantEvents = this.mutatedRelevantEvents!
 
     calendar.publiclyTrigger('eventResizeStop', [
       {
@@ -159,7 +159,7 @@ export default class EventDragging {
     if (this.validMutation) {
       calendar.dispatch({
         type: 'MERGE_EVENTS',
-        eventStore: mutatedRelatedEvents
+        eventStore: mutatedRelevantEvents
       })
 
       calendar.publiclyTrigger('eventResize', [
@@ -170,13 +170,13 @@ export default class EventDragging {
           prevEvent: eventApi,
           event: new EventApi( // the data AFTER the mutation
             calendar,
-            mutatedRelatedEvents.defs[eventDef.defId],
-            eventInstance ? mutatedRelatedEvents.instances[eventInstance.instanceId] : null
+            mutatedRelevantEvents.defs[eventDef.defId],
+            eventInstance ? mutatedRelevantEvents.instances[eventInstance.instanceId] : null
           ),
           revert: function() {
             calendar.dispatch({
               type: 'MERGE_EVENTS',
-              eventStore: relatedEvents
+              eventStore: relevantEvents
             })
           },
           jsEvent: ev.origEvent,
@@ -190,7 +190,7 @@ export default class EventDragging {
 
     // reset all internal state
     this.draggingSeg = null
-    this.relatedEvents = null
+    this.relevantEvents = null
     this.validMutation = null
 
     // okay to keep eventInstance around. useful to set it in handlePointerDown

src/reducers/eventStore.ts

@@ -5,7 +5,7 @@ import { EventDef, EventInstance, EventInput, EventInstanceHash } from '../struc
 import {
   EventStore,
   mergeEventStores,
-  getRelatedEvents,
+  getRelevantEvents,
   createEmptyEventStore,
   filterEventStoreDefs,
   transformRawEvents,
@@ -146,9 +146,9 @@ function rezoneDates(eventStore: EventStore, oldDateEnv: DateEnv, newDateEnv: Da
 
 
 function applyMutationToRelated(eventStore: EventStore, instanceId: string, mutation: EventMutation, calendar: Calendar): EventStore {
-  let related = getRelatedEvents(eventStore, instanceId)
-  related = applyMutationToEventStore(related, mutation, calendar)
-  return mergeEventStores(eventStore, related)
+  let relevant = getRelevantEvents(eventStore, instanceId)
+  relevant = applyMutationToEventStore(relevant, mutation, calendar)
+  return mergeEventStores(eventStore, relevant)
 }
 
 

src/structs/event-store.ts

@@ -95,8 +95,7 @@ export function expandRecurring(eventStore: EventStore, framingRange: DateRange,
 // retrieves events that have the same groupId as the instance specified by `instanceId`
 // or they are the same as the instance.
 // why might instanceId not be in the store? an event from another calendar?
-// TODO: rename to getRelevantEvents and rename other stuff too
-export function getRelatedEvents(eventStore: EventStore, instanceId: string): EventStore {
+export function getRelevantEvents(eventStore: EventStore, instanceId: string): EventStore {
   let instance = eventStore.instances[instanceId]
 
   if (instance) {