initialEvents

fullcalendar · Jun 13, 2020 · 380e104 · 380e104
1 parent bbc78ee
commit 380e104
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/packages-premium b/packages-premium
diff --git a/packages/common/src/options.ts b/packages/common/src/options.ts
@@ -323,6 +323,7 @@ export const CALENDAR_OPTION_REFINERS = { // does not include base nor calendar
   buttonText: identity as Identity<ButtonTextCompoundInput>,
   views: identity as Identity<{ [viewId: string]: ViewOptions }>,
   plugins: identity as Identity<PluginDef[]>,
+  initialEvents: identity as Identity<EventSourceInput>,
   events: identity as Identity<EventSourceInput>,
   eventSources: identity as Identity<EventSourceInput[]>
 }

diff --git a/packages/common/src/reducers/eventSources.ts b/packages/common/src/reducers/eventSources.ts
@@ -6,6 +6,7 @@ import { DateProfile } from '../DateProfileGenerator'
 import { Action } from './Action'
 import { guid } from '../util/misc'
 import { CalendarContext } from '../CalendarContext'
+import { CalendarOptions } from '../options'
 
 
 export function initEventSources(calendarOptions, dateProfile: DateProfile, context: CalendarContext) {
@@ -247,14 +248,17 @@ function excludeStaticSources(eventSources: EventSourceHash, context: CalendarCo
 }
 
 
-function parseInitialSources(rawOptions, context: CalendarContext) {
+function parseInitialSources(rawOptions: CalendarOptions, context: CalendarContext) {
   let refiners = buildEventSourceRefiners(context)
-  let rawSources = rawOptions.eventSources || []
-  let singleRawSource = rawOptions.events
+  let rawSources = [].concat(rawOptions.eventSources || [])
   let sources = [] // parsed
 
-  if (singleRawSource) {
-    rawSources.unshift(singleRawSource)
+  if (rawOptions.initialEvents) {
+    rawSources.unshift(rawOptions.initialEvents)
+  }
+
+  if (rawOptions.events) {
+    rawSources.unshift(rawOptions.events)
   }
 
   for (let rawSource of rawSources) {