Bläddra i källkod

fix some require problems from core. rename timegrids buildDayTableModel -> buildTimeColsModel

Adam Shaw 6 år sedan
förälder
incheckning
6e0272a041

+ 1 - 1
packages/core/src/interactions/event-dragging.ts

@@ -3,7 +3,7 @@ import { EventMutation } from '../structs/event-mutation'
 import { Hit } from './hit'
 import { EventDef } from '../structs/event'
 import { EventUi } from '../component/event-ui'
-import { View } from '@fullcalendar/core'
+import View from '../View'
 
 export type eventDragMutationMassager = (mutation: EventMutation, hit0: Hit, hit1: Hit) => void
 export type EventDropTransformers = (mutation: EventMutation, calendar: Calendar) => any

+ 1 - 1
packages/core/src/structs/view-config.ts

@@ -1,7 +1,7 @@
 import View, { ViewProps } from '../View'
 import { refineProps } from '../util/misc'
 import { mapHash } from '../util/object'
-import { ComponentContext } from '@fullcalendar/core'
+import ComponentContext from '../component/ComponentContext'
 
 /*
 A view-config represents information for either:

+ 1 - 1
packages/core/src/util/scrollbar-side.ts

@@ -1,4 +1,4 @@
-import { removeElement, applyStyle } from '@fullcalendar/core'
+import { removeElement, applyStyle } from '../util/dom-manip'
 
 
 let _isRtlScrollbarOnLeft: boolean | null = null

+ 3 - 3
packages/timegrid/src/DayTimeColsView.tsx

@@ -16,7 +16,7 @@ import DayTimeCols from './DayTimeCols'
 
 export default class DayTimeColsView extends TimeColsView {
 
-  private buildDayTableModel = memoize(buildDayTableModel)
+  private buildTimeColsModel = memoize(buildTimeColsModel)
   private dayTableRef = createRef<DayTable>()
   private timeColsRef = createRef<DayTimeCols>()
 
@@ -24,7 +24,7 @@ export default class DayTimeColsView extends TimeColsView {
   render(props: ViewProps, state: {}, context: ComponentContext) {
     let { dateProfile, dateProfileGenerator } = props
     let { nextDayThreshold, options } = context
-    let dayTableModel = this.buildDayTableModel(dateProfile, dateProfileGenerator)
+    let dayTableModel = this.buildTimeColsModel(dateProfile, dateProfileGenerator)
     let splitProps = this.allDaySplitter.splitProps(props)
 
     return this.renderLayout(
@@ -78,7 +78,7 @@ export default class DayTimeColsView extends TimeColsView {
 }
 
 
-export function buildDayTableModel(dateProfile: DateProfile, dateProfileGenerator: DateProfileGenerator) {
+export function buildTimeColsModel(dateProfile: DateProfile, dateProfileGenerator: DateProfileGenerator) {
   let daySeries = new DaySeries(dateProfile.renderRange, dateProfileGenerator)
 
   return new DayTableModel(daySeries, false)

+ 2 - 2
packages/timegrid/src/main.ts

@@ -1,11 +1,11 @@
 import { createPlugin } from '@fullcalendar/core'
 import TimeColsView from './TimeColsView'
-import DayTimeColsView, { buildDayTableModel } from './DayTimeColsView'
+import DayTimeColsView, { buildTimeColsModel } from './DayTimeColsView'
 import { TimeColsSeg } from './TimeCols'
 import { default as DayTimeCols, DayTimeColsSlicer, buildDayRanges } from './DayTimeCols'
 import './main.scss'
 
-export { DayTimeCols, DayTimeColsView, TimeColsView, buildDayTableModel, buildDayRanges, DayTimeColsSlicer, TimeColsSeg }
+export { DayTimeCols, DayTimeColsView, TimeColsView, buildTimeColsModel, buildDayRanges, DayTimeColsSlicer, TimeColsSeg }
 export { default as TimeCols, TIME_COLS_NOW_INDICATOR_UNIT } from './TimeCols'
 
 export default createPlugin({