Adam Shaw 6 лет назад
Родитель
Сommit
ed7d7f1c9d

+ 1 - 1
packages-premium

@@ -1 +1 @@
-Subproject commit 9ad064f8cb7ae8d01237ef5610c2a7400af74d0b
+Subproject commit 5778875cca3cf53c70d33d0fa9ccd442eaeb3878

+ 1 - 2
packages/core/src/common/slicing-utils.ts

@@ -145,8 +145,7 @@ export default abstract class Slicer<SegType extends Seg, ExtraArgs extends any[
     return {
       segs: this.sliceEventRanges(rangeRes.fg, extraArgs),
       affectedInstances: interaction.affectedEvents.instances,
-      isEvent: interaction.isEvent,
-      interactingSeg: interaction.interactingSeg
+      isEvent: interaction.isEvent
     }
   }
 

+ 0 - 1
packages/core/src/component/DateComponent.ts

@@ -26,7 +26,6 @@ export interface EventSegUiInteractionState {
   affectedInstances: EventInstanceHash
   segs: Seg[]
   isEvent: boolean
-  interactingSeg: any
 }
 
 /*

+ 1 - 2
packages/core/src/component/event-splitting.ts

@@ -153,8 +153,7 @@ export default abstract class Splitter<PropsType extends SplittableProps = Split
           splitStates[key] = {
             affectedEvents: affectedStores[key] || EMPTY_EVENT_STORE,
             mutatedEvents: mutatedStores[key] || EMPTY_EVENT_STORE,
-            isEvent: interaction.isEvent,
-            interactingSeg: interaction.interactingSeg
+            isEvent: interaction.isEvent
           }
         }
       }

+ 0 - 2
packages/core/src/interactions/event-interaction-state.ts

@@ -1,9 +1,7 @@
 import { EventStore } from '../structs/event-store'
-import { Seg } from '../component/DateComponent'
 
 export interface EventInteractionState { // is this ever used alone?
   affectedEvents: EventStore
   mutatedEvents: EventStore
   isEvent: boolean
-  interactingSeg: Seg | null
 }

+ 2 - 4
packages/core/src/reducers/main.ts

@@ -160,8 +160,7 @@ function reduceEventDrag(currentDrag: EventInteractionState | null, action: Acti
       return {
         affectedEvents: newDrag.affectedEvents,
         mutatedEvents: newDrag.mutatedEvents,
-        isEvent: newDrag.isEvent,
-        interactingSeg: newDrag.interactingSeg
+        isEvent: newDrag.isEvent
       }
 
     case 'UNSET_EVENT_DRAG':
@@ -181,8 +180,7 @@ function reduceEventResize(currentResize: EventInteractionState | null, action:
       return {
         affectedEvents: newResize.affectedEvents,
         mutatedEvents: newResize.mutatedEvents,
-        isEvent: newResize.isEvent,
-        interactingSeg: newResize.interactingSeg
+        isEvent: newResize.isEvent
       }
 
     case 'UNSET_EVENT_RESIZE':

+ 0 - 1
packages/daygrid/src/TableSeg.ts

@@ -53,7 +53,6 @@ export function splitInteractionByRow(ui: EventSegUiInteractionState | null, row
       byRow[i] = {
         affectedInstances: ui.affectedInstances,
         isEvent: ui.isEvent,
-        interactingSeg: ui.interactingSeg,
         segs: []
       }
     }

+ 1 - 2
packages/interaction/src/interactions-external/ExternalElementDragging.ts

@@ -74,8 +74,7 @@ export default class ExternalElementDragging {
     let interaction: EventInteractionState = {
       affectedEvents: createEmptyEventStore(),
       mutatedEvents: createEmptyEventStore(),
-      isEvent: this.dragMeta!.create,
-      interactingSeg: null
+      isEvent: this.dragMeta!.create
     }
 
     if (hit) {

+ 2 - 4
packages/interaction/src/interactions/EventDragging.ts

@@ -144,8 +144,7 @@ export default class EventDragging extends Interaction { // TODO: rename to Even
     let interaction: EventInteractionState = {
       affectedEvents: relevantEvents,
       mutatedEvents: createEmptyEventStore(),
-      isEvent: true,
-      interactingSeg: this.subjectSeg
+      isEvent: true
     }
 
     if (hit) {
@@ -350,8 +349,7 @@ export default class EventDragging extends Interaction { // TODO: rename to Even
           state: {
             affectedEvents: state.affectedEvents,
             mutatedEvents: createEmptyEventStore(),
-            isEvent: true,
-            interactingSeg: state.interactingSeg
+            isEvent: true
           }
         })
 

+ 1 - 2
packages/interaction/src/interactions/EventResizing.ts

@@ -97,8 +97,7 @@ export default class EventDragging extends Interaction {
     let interaction: EventInteractionState = {
       affectedEvents: relevantEvents,
       mutatedEvents: createEmptyEventStore(),
-      isEvent: true,
-      interactingSeg: this.draggingSeg
+      isEvent: true
     }
 
     if (hit) {

+ 0 - 1
packages/timegrid/src/TimeColsSeg.ts

@@ -42,7 +42,6 @@ export function splitInteractionByCol(ui: EventSegUiInteractionState | null, col
       byRow[i] = {
         affectedInstances: ui.affectedInstances,
         isEvent: ui.isEvent,
-        interactingSeg: ui.interactingSeg,
         segs: []
       }
     }