فهرست منبع

change slicer api again. export something

Adam Shaw 7 سال پیش
والد
کامیت
efeb387f03
4فایلهای تغییر یافته به همراه17 افزوده شده و 16 حذف شده
  1. 3 5
      src/agenda/AgendaView.ts
  2. 5 7
      src/basic/BasicView.ts
  3. 7 4
      src/basic/DayGridSlicer.ts
  4. 2 0
      src/exports.ts

+ 3 - 5
src/agenda/AgendaView.ts

@@ -92,11 +92,9 @@ export default class AgendaView extends AbstractAgendaView {
 
   buildDayGridSlicer = reselector(function(this: AgendaView, dateProfile: DateProfile) {
     return new DayGridSlicer(
-      new DayTable(
-        new DaySeries(this.props.dateProfile.renderRange, this.dateProfileGenerator), // TODO: reuse!!!
-        false // breakOnWeeks
-      ),
-      this.isRtl
+      new DaySeries(dateProfile.renderRange, this.dateProfileGenerator), // TODO: reuse!!!
+      this.isRtl,
+      false // breakOnWeeks
     )
   })
 

+ 5 - 7
src/basic/BasicView.ts

@@ -131,14 +131,12 @@ export default class BasicView extends View {
 
   buildSlicer = reselector(function(this: BasicView, dateProfile: DateProfile) {
     return new DayGridSlicer(
-      new DayTable(
-        new DaySeries(
-          this.props.dateProfile.renderRange,
-          this.dateProfileGenerator
-        ),
-        /year|month|week/.test(dateProfile.currentRangeUnit)
+      new DaySeries(
+        this.props.dateProfile.renderRange,
+        this.dateProfileGenerator
       ),
-      this.isRtl
+      this.isRtl,
+      /year|month|week/.test(dateProfile.currentRangeUnit)
     )
   })
 

+ 7 - 4
src/basic/DayGridSlicer.ts

@@ -2,8 +2,9 @@ import { DateRange, intersectRanges } from '../datelib/date-range'
 import { Seg } from '../component/DateComponent'
 import { addDays, DateMarker } from '../datelib/marker'
 import DayTable from '../common/DayTable'
-import { EventRenderRange } from '../component/event-rendering';
-import { DateSpan } from '../structs/date-span';
+import { EventRenderRange } from '../component/event-rendering'
+import { DateSpan } from '../structs/date-span'
+import DaySeries from '../common/DaySeries'
 
 export default class DayGridSlicer {
 
@@ -14,11 +15,13 @@ export default class DayGridSlicer {
   private isRtl: boolean
 
 
-  constructor(dayTable: DayTable, isRtl: boolean) {
-    this.dayTable = dayTable
+  constructor(daySeries: DaySeries, isRtl: boolean, breakOnWeeks: boolean) {
+    let dayTable = new DayTable(daySeries, breakOnWeeks)
+
     this.rowCnt = dayTable.rowCnt
     this.colCnt = dayTable.colCnt
     this.isRtl = isRtl
+    this.dayTable = dayTable
   }
 
 

+ 2 - 0
src/exports.ts

@@ -144,3 +144,5 @@ export { createPlugin, PluginDef, PluginDefInput } from './plugin-system'
 export { reducerFunc, Action, CalendarState } from './reducers/types'
 
 export { computeFallbackHeaderFormat, renderDateCell } from './common/table-utils'
+
+export { default as DaySeries } from './common/DaySeries'