1 files changed, 13 insertions, 9 deletions

diff --git a/src/client/views/nodes/calendarBox/CalendarBox.tsx b/src/client/views/nodes/calendarBox/CalendarBox.tsx
index 2b20a666d..c1198f328 100644
--- a/src/client/views/nodes/calendarBox/CalendarBox.tsx
+++ b/src/client/views/nodes/calendarBox/CalendarBox.tsx
@@ -17,6 +17,7 @@ import { ContextMenu } from '../../ContextMenu';
 import { DocumentView } from '../DocumentView';
 import { OpenWhere } from '../OpenWhere';
 import './CalendarBox.scss';
+import { undoable } from '../../../util/UndoManager';
 
 type CalendarView = 'multiMonth' | 'dayGridMonth' | 'timeGridWeek' | 'timeGridDay';
 
@@ -27,15 +28,15 @@ export class CalendarBox extends CollectionSubView() {
     _observer: ResizeObserver | undefined;
     _eventsDisposer: IReactionDisposer | undefined;
     _selectDisposer: IReactionDisposer | undefined;
+    _isMultiMonth: boolean | undefined;
+
+    @observable _multiMonth = 0;
 
     constructor(props: SubCollectionViewProps) {
         super(props);
         makeObservable(this);
     }
 
-    @observable _multiMonth = 0;
-    isMultiMonth: boolean | undefined;
-
     componentDidMount(): void {
         this._props.setContentViewBox?.(this);
         this._eventsDisposer = reaction(
@@ -52,7 +53,7 @@ export class CalendarBox extends CollectionSubView() {
                         type: 'CHANGE_DATE',
                         dateMarker: state.dateEnv.createMarker(initialDate.start),
                     });
-                setTimeout(() => (initialDate.start.toISOString() !== initialDate.end.toISOString() ? this._calendar?.select(initialDate.start, initialDate.end) : this._calendar?.select(initialDate.start)));
+                setTimeout(() => initialDate.start.toISOString() !== initialDate.end.toISOString() && this._calendar?.select(initialDate.start, initialDate.end));
             },
             { fireImmediately: true }
         );
@@ -95,7 +96,7 @@ export class CalendarBox extends CollectionSubView() {
     // Choose a calendar view based on the date range
     @computed get calendarViewType(): CalendarView {
         if (this.dataDoc[this.fieldKey + '_calendarType']) return StrCast(this.dataDoc[this.fieldKey + '_calendarType']) as CalendarView;
-        if (this.isMultiMonth) return 'multiMonth';
+        if (this._isMultiMonth) return 'multiMonth';
         const { start, end } = this.dateRangeStrDates;
         if (start.getFullYear() !== end.getFullYear() || start.getMonth() !== end.getMonth()) return 'multiMonth';
         if (Math.abs(start.getDay() - end.getDay()) > 7) return 'dayGridMonth';
@@ -122,10 +123,13 @@ export class CalendarBox extends CollectionSubView() {
         return false;
     };
 
-    handleEventDrop = (arg: EventDropArg) => {
+    handleEventDrop = undoable((arg: EventDropArg) => {
         const doc = DocServer.GetCachedRefField(arg.event._def.groupId ?? '');
-        doc && arg.event.start && (doc.date_range = arg.event.start?.toString() + '|' + (arg.event.end ?? arg.event.start).toString());
-    };
+        if (doc && arg.event.start) {
+            doc.$allDay = false;
+            doc.$date_range = arg.event.start?.toString() + '|' + (arg.event.end ?? arg.event.start).toString();
+        }
+    }, 'change event date');
 
     handleEventClick = (arg: EventClickArg) => {
         const doc = DocServer.GetCachedRefField(arg.event._def.groupId ?? '');
@@ -163,7 +167,7 @@ export class CalendarBox extends CollectionSubView() {
                   displayEventEnd: false,
                   select: info => {
                       const start = dateRangeStrToDates(info.startStr).start.toISOString();
-                      const end = dateRangeStrToDates(info.endStr).start.toISOString();
+                      const end = info.allDay ? start : dateRangeStrToDates(info.endStr).start.toISOString();
                       this.dataDoc.date = start + '|' + end;
                   },
                   aspectRatio: NumCast(this.Document.width) / NumCast(this.Document.height),