Adam Shaw 7 vuotta sitten
vanhempi
sitoutus
a0d9efcf0a
2 muutettua tiedostoa jossa 5 lisäystä ja 9 poistoa
  1. 2 2
      src/interactions/EventResizing.ts
  2. 3 7
      src/reducers/event-mutation.ts

+ 2 - 2
src/interactions/EventResizing.ts

@@ -125,11 +125,11 @@ function computeMutation(hit0: Hit, hit1: Hit, isFromStart: boolean, instanceRan
 
   if (isFromStart) {
     if (dateEnv.add(instanceRange.start, delta) > instanceRange.end) {
-      return { startDelta: delta }
+      return { startDelta: delta, standardProps: { hasEnd: true } }
     }
   } else {
     if (dateEnv.add(instanceRange.end, delta) > instanceRange.start) {
-      return { endDelta: delta }
+      return { endDelta: delta, standardProps: { hasEnd: true } }
     }
   }
 }

+ 3 - 7
src/reducers/event-mutation.ts

@@ -29,7 +29,7 @@ export function applyMutationToAll(eventStore: EventStore, mutation: EventMutati
 
   for (let instanceId in eventStore.instances) {
     let instance = eventStore.instances[instanceId]
-    let def = eventStore.defs[instance.defId]
+    let def = newStore.defs[instance.defId] // the newly MODIFIED def
 
     newStore.instances[instanceId] = applyMutationToInstance(instance, def, mutation, calendar)
   }
@@ -82,10 +82,6 @@ function applyMutationToDef(eventDef: EventDef, mutation: EventMutation) {
     assignTo(copy, mutation.standardProps)
   }
 
-  if (mutation.startDelta || mutation.endDelta) {
-    copy.hasEnd = true
-  }
-
   if (mutation.extendedProps) {
     copy.extendedProps = assignTo({}, copy.extendedProps, mutation.extendedProps)
   }
@@ -100,11 +96,11 @@ function applyMutationToInstance(
   calendar: Calendar
 ) {
   let dateEnv = calendar.dateEnv
-  let forceIsAllDay = mutation.standardProps && mutation.standardProps.isAllDay === true
+  let forceAllDay = mutation.standardProps && mutation.standardProps.isAllDay === true
   let clearEnd = mutation.standardProps && mutation.standardProps.hasEnd === false
   let copy = assignTo({}, eventInstance)
 
-  if (forceIsAllDay) {
+  if (forceAllDay) {
     // TODO: make a util for this?
     let dayCnt = Math.floor(diffDays(copy.range.start, copy.range.end)) || 1
     let start = startOfDay(copy.range.start)