some renames and exports

src/agenda/SimpleTimeGrid.ts

@@ -27,7 +27,7 @@ export interface SimpleTimeGridProps {
   eventResize: EventInteractionState | null
 }
 
-interface SlicerArgs {
+export interface SimpleTimeGridSlicerArgs {
   component: TimeGrid // TODO: kill
   dayRanges: DateRange[]
 }
@@ -39,7 +39,7 @@ export default class SimpleTimeGrid extends DateComponent<SimpleTimeGridProps> {
   offsetTracker: OffsetTracker
 
   private buildDayRanges = reselector(buildDayRanges)
-  private slicer = memoizeSlicer(new Slicer(sliceSegs))
+  private slicer = memoizeSlicer(new Slicer(sliceTimeGridSegs))
 
   constructor(context, timeGrid: TimeGrid) {
     super(context, timeGrid.el)
@@ -52,7 +52,7 @@ export default class SimpleTimeGrid extends DateComponent<SimpleTimeGridProps> {
     let { dateProfile, dayTable } = props
 
     let dayRanges = this.dayRanges = this.buildDayRanges(dayTable, dateProfile, this.dateEnv)
-    let slicerArgs: SlicerArgs = { dayRanges, component: this.timeGrid }
+    let slicerArgs: SimpleTimeGridSlicerArgs = { dayRanges, component: this.timeGrid }
     let segRes = slicer.eventStoreToSegs(
       props.eventStore,
       props.eventUiBases,
@@ -79,7 +79,7 @@ export default class SimpleTimeGrid extends DateComponent<SimpleTimeGridProps> {
     this.timeGrid.renderNowIndicator(
       // seg system might be overkill, but it handles scenario where line needs to be rendered
       //  more than once because of columns with the same date (resources columns for example)
-      sliceSegs({
+      sliceTimeGridSegs({
         start: date,
         end: addMs(date, 1) // protect against null range
       }, { dayRanges: this.dayRanges, component: this.timeGrid }),
@@ -142,7 +142,7 @@ export function buildDayRanges(dayTable: DayTable, dateProfile: DateProfile, dat
   return ranges
 }
 
-export function sliceSegs(range: DateRange, slicerArgs: SlicerArgs): TimeGridSeg[] {
+export function sliceTimeGridSegs(range: DateRange, slicerArgs: SimpleTimeGridSlicerArgs): TimeGridSeg[] {
   let { dayRanges } = slicerArgs
   let segs: TimeGridSeg[] = []
 

src/basic/SimpleDayGrid.ts

@@ -27,7 +27,7 @@ export interface SimpleDayGridProps {
   isRigid: boolean
 }
 
-interface SlicerArgs {
+export interface SimpleDayGridSlicerArgs {
   component: DayGrid // TODO: kill
   dayTable: DayTable
   isRtl: boolean
@@ -38,7 +38,7 @@ export default class SimpleDayGrid extends DateComponent<SimpleDayGridProps> {
   dayGrid: DayGrid
   offsetTracker: OffsetTracker
 
-  private slicer = memoizeSlicer(new Slicer(sliceSegs))
+  private slicer = memoizeSlicer(new Slicer(sliceDayGridSegs))
 
   constructor(context, dayGrid: DayGrid) {
     super(context, dayGrid.el)
@@ -116,7 +116,7 @@ export default class SimpleDayGrid extends DateComponent<SimpleDayGridProps> {
 SimpleDayGrid.prototype.isInteractable = true
 
 
-export function sliceSegs(range: DateRange, slicerArgs: SlicerArgs): DayGridSeg[] {
+export function sliceDayGridSegs(range: DateRange, slicerArgs: SimpleDayGridSlicerArgs): DayGridSeg[] {
   let { dayTable, isRtl } = slicerArgs
 
   return dayTable.sliceRange(range).map(function(seg) {

src/component/event-ui.ts

@@ -114,10 +114,10 @@ export function processScopedUiProps(rawProps: ScopedEventUiInput, calendar: Cal
 }
 
 export function combineEventUis(uis: EventUi[]): EventUi {
-  return uis.reduce(mergeEventUis)
+  return uis.reduce(combineTwoEventUis)
 }
 
-function mergeEventUis(item0: EventUi, item1: EventUi): EventUi { // hash1 has higher precedence
+function combineTwoEventUis(item0: EventUi, item1: EventUi): EventUi { // hash1 has higher precedence
   return {
     startEditable: item1.startEditable != null ? item1.startEditable : item0.startEditable,
     durationEditable: item1.durationEditable != null ? item1.durationEditable : item0.durationEditable,

src/exports.ts

@@ -43,9 +43,7 @@ export {
   intersectRects
 } from './util/geom'
 
-export {
-  assignTo
-} from './util/object'
+export { assignTo, isPropsEqual } from './util/object'
 
 export {
   findElements,
@@ -64,7 +62,7 @@ export {
 
 export { EventStore, filterEventStoreDefs, createEmptyEventStore } from './structs/event-store'
 export { hasBgRendering } from './component/event-rendering'
-export { EventUiHash, EventUi } from './component/event-ui'
+export { EventUiHash, EventUi, processScopedUiProps, ScopedEventUiInput, combineEventUis } from './component/event-ui'
 export { Splitter, memoizeSplitter } from './component/event-splitting'
 export { buildGotoAnchorHtml, getAllDayHtml, getDayClasses } from './component/date-rendering'
 
@@ -100,8 +98,8 @@ export { default as AgendaView, buildDayTable as buildAgendaDayTable } from './a
 export { default as AbstractAgendaView} from './agenda/AbstractAgendaView'
 export { default as AbstractBasicView} from './basic/AbstractBasicView'
 export { default as TimeGrid, TimeGridSeg } from './agenda/TimeGrid'
-export { buildDayRanges, sliceSegs as sliceTimeGridSegs } from './agenda/SimpleTimeGrid'
-export { sliceSegs as sliceDayGridSegs } from './basic/SimpleDayGrid'
+export { buildDayRanges, sliceTimeGridSegs, SimpleTimeGridSlicerArgs } from './agenda/SimpleTimeGrid'
+export { sliceDayGridSegs, SimpleDayGridSlicerArgs } from './basic/SimpleDayGrid'
 export { default as DayGrid, DayGridSeg } from './basic/DayGrid'
 export { default as BasicView, buildDayTable as buildBasicDayTable } from './basic/BasicView'
 export { default as ListView } from './list/ListView'