flesh out app state more

src/Calendar.ts

@@ -526,8 +526,8 @@ export default class Calendar {
         this.currentDate = newDateProfile.date // might have been constrained by view dates
         this.updateToolbarButtons(newDateProfile)
         this.dispatch({
-          type: 'SET_ACTIVE_RANGE',
-          range: newDateProfile.activeUnzonedRange
+          type: 'SET_DATE_PROFILE',
+          dateProfile: newDateProfile
         })
       }
 

src/component/DateComponent.ts

@@ -438,7 +438,6 @@ export default abstract class DateComponent extends Component {
 
 
   // Renders a visual indication of the selection
-  // TODO: rename to `renderSelection` after legacy is gone
   renderSelection(selection: Selection) {
     this.renderHighlightSegs(this.selectionToSegs(selection))
 

src/reducers/event-sources.ts

@@ -101,11 +101,11 @@ export function reduceEventSourceHash(sourceHash: EventSourceHash, action: any,
       eventSource = parseSource(action.rawSource)
 
       if (eventSource) {
-        if (calendar.state.activeRange) {
+        if (calendar.state.dateProfile) {
           calendar.dispatch({
             type: 'FETCH_EVENT_SOURCE',
             sourceId: eventSource.sourceId,
-            range: calendar.state.activeRange
+            range: calendar.state.dateProfile.activeUnzonedRange
           })
         }
         return assignTo({}, sourceHash, {
@@ -188,20 +188,22 @@ export function reduceEventSourceHash(sourceHash: EventSourceHash, action: any,
         return sourceHash
       }
 
-    case 'SET_ACTIVE_RANGE':
+    case 'SET_DATE_PROFILE':
+      let activeRange = action.dateProfile.activeUnzonedRange
+
       for (let sourceId in sourceHash) {
         eventSource = sourceHash[sourceId]
 
         if (
           !calendar.opt('lazyFetching') ||
           !eventSource.fetchRange ||
-          eventSource.fetchRange.start < action.range.start ||
-          eventSource.fetchRange.end > action.range.end
+          eventSource.fetchRange.start < activeRange.start ||
+          eventSource.fetchRange.end > activeRange.end
         ) {
           calendar.dispatch({
             type: 'FETCH_EVENT_SOURCE',
             sourceId: eventSource.sourceId,
-            range: action.range
+            range: activeRange
           })
         }
       }

src/reducers/main.ts

@@ -1,40 +1,62 @@
-import UnzonedRange from '../models/UnzonedRange'
 import Calendar from '../Calendar'
+import { DateProfile } from '../DateProfileGenerator'
 import { EventSourceHash, reduceEventSourceHash } from './event-sources'
 import { EventStore, reduceEventStore } from './event-store'
+import { Selection } from './selection'
+import { BusinessHourDef } from './business-hours'
 
 export interface CalendarState {
   loadingLevel: number
-  activeRange: UnzonedRange
+  dateProfile: DateProfile
   eventSources: EventSourceHash
   eventStore: EventStore
+  selection: Selection | null,
+  dragState: {
+    eventStore: EventStore
+    origSeg: any
+    isTouch: boolean
+  } | null
+  eventResizeState: {
+    eventStore: EventStore
+    origSeg: any
+    isTouch: boolean
+  } | null
+  businessHoursDef: BusinessHourDef
 }
 
 export const INITIAL_STATE: CalendarState = {
   loadingLevel: 0,
-  activeRange: null,
+  dateProfile: null,
   eventSources: {},
   eventStore: {
     defs: {},
     instances: {}
-  }
+  },
+  selection: null,
+  dragState: null,
+  eventResizeState: null,
+  businessHoursDef: false
 }
 
 export function reduce(state: CalendarState, action: any, calendar: Calendar): CalendarState {
   return {
     loadingLevel: reduceLoadingLevel(state.loadingLevel, action),
-    activeRange: reduceActiveRange(state.activeRange, action),
+    dateProfile: reduceDateProfile(state.dateProfile, action),
     eventSources: reduceEventSourceHash(state.eventSources, action, calendar),
-    eventStore: reduceEventStore(state.eventStore, action, calendar)
+    eventStore: reduceEventStore(state.eventStore, action, calendar),
+    selection: state.selection,
+    dragState: state.dragState,
+    eventResizeState: state.eventResizeState,
+    businessHoursDef: state.businessHoursDef
   }
 }
 
-function reduceActiveRange(currentActiveRange, action: any) {
+function reduceDateProfile(currentDateProfile, action: any) {
   switch (action.type) {
-    case 'SET_ACTIVE_RANGE':
-      return action.range
+    case 'SET_DATE_PROFILE':
+      return action.dateProfile
     default:
-      return currentActiveRange
+      return currentDateProfile
   }
 }