small fixes

packages/core/src/Calendar.tsx

@@ -348,7 +348,6 @@ export default class Calendar {
 
     calendarComponent.updateSize(false)
     this.drainAfterSizingCallbacks()
-    this.releaseAfterSizingTriggers()
 
     if (this.isViewUpdated) {
       this.isViewUpdated = false
@@ -373,6 +372,8 @@ export default class Calendar {
     if (this.isEventsUpdated) {
       this.isEventsUpdated = false
     }
+
+    this.releaseAfterSizingTriggers()
   }
 
 

packages/core/src/CalendarComponent.tsx

@@ -71,26 +71,24 @@ export default class CalendarComponent extends BaseComponent<CalendarComponentPr
 
     return (
       <Fragment>
-        {header ?
+        {header &&
           <Toolbar
             ref={this.headerRef}
             extraClassName='fc-header-toolbar'
             model={header}
             { ...toolbarProps }
-            /> :
-          null
+            />
         }
         <div class='fc-view-container' ref={this.setViewContainerEl} onClick={this.handleNavLinkClick}>
           {this.renderView(props, this.context)}
         </div>
-        {footer ?
+        {footer &&
           <Toolbar
             ref={this.footerRef}
             extraClassName='fc-footer-toolbar'
             model={footer}
             { ...toolbarProps }
-            /> :
-          null
+            />
         }
       </Fragment>
     )
@@ -110,6 +108,7 @@ export default class CalendarComponent extends BaseComponent<CalendarComponentPr
 
 
   componentWillUnmount() {
+    this.subrenderDestroy()
     this.resizeRunner.clear()
     window.removeEventListener('resize', this.handleWindowResize)
   }

packages/core/src/component/GotoAnchor.tsx

@@ -40,6 +40,7 @@ export default class GotoAnchor extends BaseComponent<GotoAnchorProps> {
     }
 
     let attrs = {} as any
+    let children = props.children
 
     if (props.extraAttrs) {
       __assign(attrs, props.extraAttrs)
@@ -47,15 +48,16 @@ export default class GotoAnchor extends BaseComponent<GotoAnchorProps> {
 
     if (typeof props.htmlContent === 'string') {
       attrs.dangerouslySetInnerHTML = { __html: props.htmlContent }
+      children = null
     }
 
     if (!forceOff && props.navLinks) {
       return (
-        <a {...attrs} data-goto={JSON.stringify(finalOptions)}>{props.children}</a>
+        <a {...attrs} data-goto={JSON.stringify(finalOptions)}>{children}</a>
       )
     } else {
       return (
-        <span {...attrs}>{props.children}</span>
+        <span {...attrs}>{children}</span>
       )
     }
   }

packages/core/src/component/renderers/FgEventRenderer.ts

@@ -365,8 +365,9 @@ export function sortEventSegs(segs, eventOrderSpecs): Seg[] {
 
 // returns a object with all primitive props that can be compared
 export function buildSegCompareObj(seg: Seg) {
-  let eventDef = seg.eventRange.def
-  let range = seg.eventRange.instance.range
+  let { eventRange } = seg
+  let eventDef = eventRange.def
+  let range = eventRange.instance ? eventRange.instance.range : eventRange.range
   let start = range.start ? range.start.valueOf() : 0 // TODO: better support for open-range events
   let end = range.end ? range.end.valueOf() : 0 // "
 

packages/core/src/util/runner.ts

@@ -1,9 +1,10 @@
 
 export class DelayedRunner {
 
-  private isDirty: boolean = false
-  private timeoutId: number = 0
+  private isRunning = false
   private pauseDepth: number = 0
+  private isDirty = false
+  private timeoutId: number = 0
 
   constructor(
     private drainedOption?: () => void
@@ -61,9 +62,15 @@ export class DelayedRunner {
   }
 
   drain() {
-    if (this.isDirty && !this.pauseDepth) {
-      this.isDirty = false
-      this.drained()
+    if (!this.isRunning && !this.pauseDepth) {
+      this.isRunning = true
+
+      while (this.isDirty) {
+        this.isDirty = false
+        this.drained() // might set isDirty to true again
+      }
+
+      this.isRunning = false
     }
   }
 
@@ -84,7 +91,7 @@ export class DelayedRunner {
 export class TaskRunner<Task> {
 
   private isRunning = false
-  private isPaused = false
+  private pauseDepth = 0
   private queue: Task[] = []
   private delayedRunner: DelayedRunner
 
@@ -103,29 +110,50 @@ export class TaskRunner<Task> {
   drain() {
     let { queue } = this
 
-    if (!this.isRunning && !this.isPaused && queue.length) {
+    if (!this.isRunning && !this.pauseDepth) {
       this.isRunning = true
 
-      let completedTasks: Task[] = []
-      let task: Task
+      while (queue.length) {
+        let completedTasks: Task[] = []
+        let task: Task
 
-      while (task = queue.shift()) {
-        this.runTask(task)
-        completedTasks.push(task)
+        while (task = queue.shift()) {
+          this.runTask(task)
+          completedTasks.push(task)
+        }
+
+        this.drained(completedTasks)
       }
 
       this.isRunning = false
-      this.drained(completedTasks)
     }
   }
 
   pause() {
-    this.isPaused = true
+    this.setPauseDepth(1)
   }
 
   resume() {
-    this.isPaused = false
-    this.drain()
+    this.setPauseDepth(0)
+  }
+
+  whilePaused(func) {
+    this.setPauseDepth(this.pauseDepth + 1)
+    func()
+    this.setPauseDepth(this.pauseDepth - 1)
+  }
+
+  private setPauseDepth(depth: number) {
+    let oldDepth = this.pauseDepth
+    this.pauseDepth = depth // for this.drain() call
+
+    if (depth) { // wants to pause
+      ;
+    } else { // wants to unpause
+      if (oldDepth) {
+        this.drain()
+      }
+    }
   }
 
   protected runTask(task: Task) {

packages/daygrid/src/Table.tsx

@@ -169,7 +169,7 @@ export default class Table extends BaseComponent<TableProps, TableState> {
     let { props, rowEls } = this
     let colCnt = props.cells[0].length
 
-    if (props.eventDrag) {
+    if (props.eventDrag && props.eventDrag.segs.length) { // messy check
       this.renderHighlight({
         type: 'highlight',
         renderIntro: props.renderIntro,

packages/timegrid/src/TimeCols.tsx

@@ -231,7 +231,7 @@ export default class TimeCols extends BaseComponent<TimeColsProps> {
 
 
   subrenderMirror(props: TimeColsProps, mirrorContainerEls: HTMLElement[], options): TimeColsEvents | null {
-    if (props.eventDrag) {
+    if (props.eventDrag && props.eventDrag.segs.length) { // messy check
       return this.renderMirrorEvents({
         containerEls: mirrorContainerEls,
         segs: props.eventDrag.segs,

packages/timegrid/src/TimeColsView.tsx

@@ -83,6 +83,7 @@ export default abstract class TimeColsView extends View {
                   ref={this.scrollerRef}
                   overflowX='hidden'
                   overflowY='auto'
+                  extraClassName='fc-time-grid-container'
                 >
                   {timeChildren}
                 </Scroller>
@@ -347,15 +348,17 @@ export default abstract class TimeColsView extends View {
   renderTableBgIntro = () => {
     let { theme, options } = this.context
     let spanAttrs = {} as any
+    let child = options.allDayText
 
     if (typeof options.allDayHtml === 'string') {
       spanAttrs.dangerouslySetInnerHTML = { __html: options.allDayHtml }
+      child = null
     }
 
     return [
       <td class={'fc-axis ' + theme.getClass('widgetContent')} style={this.getAxisStyles()}>
         <span {...spanAttrs}>
-          {options.allDayText}
+          {child}
         </span>
       </td>
     ]