DayTable, no more mixin

src/agenda/TimeGrid.ts

@@ -1,6 +1,6 @@
 import { htmlEscape } from '../util/html'
 import { htmlToElement, findElements, createElement, removeElement, applyStyle } from '../util/dom-manip'
-import { default as DayTableMixin } from '../component/DayTableMixin'
+import DayTable from '../component/DayTable'
 import PositionCache from '../common/PositionCache'
 import { DateRange, intersectRanges } from '../datelib/date-range'
 import TimeGridEventRenderer from './TimeGridEventRenderer'
@@ -34,7 +34,7 @@ const AGENDA_STOCK_SUB_DURATIONS = [
 
 export default class TimeGrid extends StandardDateComponent {
 
-  dayTable: DayTableMixin
+  dayTable: DayTable
   mirrorRenderer: any
 
   dayRanges: DateRange[] // of start-end of each day
@@ -216,7 +216,7 @@ export default class TimeGrid extends StandardDateComponent {
 
 
   renderDates(dateProfile) {
-    this.dayTable = new DayTableMixin(
+    this.dayTable = new DayTable(
       dateProfile,
       this.view.dateProfileGenerator,
       false

src/basic/DayGrid.ts

@@ -9,7 +9,7 @@ import {
 import { computeRect } from '../util/dom-geom'
 import PositionCache from '../common/PositionCache'
 import Popover from '../common/Popover'
-import { default as DayTableMixin } from '../component/DayTableMixin'
+import DayTable from '../component/DayTable'
 import DayGridEventRenderer from './DayGridEventRenderer'
 import DayGridMirrorRenderer from './DayGridMirrorRenderer'
 import DayGridFillRenderer from './DayGridFillRenderer'
@@ -40,7 +40,7 @@ export interface DayGridProps extends StandardDateComponent {
 
 export default class DayGrid extends StandardDateComponent {
 
-  dayTable: DayTableMixin
+  dayTable: DayTable
   eventRenderer: DayGridEventRenderer
 
   cellWeekNumbersVisible: boolean = false // display week numbers in day cell?
@@ -129,7 +129,7 @@ export default class DayGrid extends StandardDateComponent {
 
 
   renderDates(dateProfile) {
-    this.dayTable = new DayTableMixin(
+    this.dayTable = new DayTable(
       dateProfile,
       this.view.dateProfileGenerator,
       (this.props as any).breakOnWeeks // HACK

src/exports.ts

@@ -92,7 +92,7 @@ export { default as DateComponent, Seg } from './component/DateComponent'
 export { default as Calendar } from './Calendar'
 export { default as View } from './View'
 export { defineView, getViewConfig } from './ViewRegistry'
-export { default as DayTableMixin } from './component/DayTableMixin'
+export { default as DayTable } from './component/DayTable'
 export { default as FgEventRenderer } from './component/renderers/FgEventRenderer'
 export { default as FillRenderer } from './component/renderers/FillRenderer'
 export { default as AgendaView } from './agenda/AgendaView'