@sprucelabs/spruce-calendar-components 22.3.15 → 22.3.18

package/build/.spruce/schemas/schemas.types.d.ts

@@ -1033,6 +1033,87 @@ declare module '@sprucelabs/spruce-core-schemas/build/.spruce/schemas/core.schem
         interface CreateCalendarResponsePayloadEntity extends SchemaEntity<SpruceSchemas.Calendar.v2021_05_19.CreateCalendarResponsePayloadSchema> {
         }
     }
+    namespace SpruceSchemas.Calendar.v2021_05_19 {
+        interface DeleteCalendarEmitTarget {
+            'organizationId': string;
+            'calendarId': string;
+        }
+        interface DeleteCalendarEmitTargetSchema extends SpruceSchema.Schema {
+            id: 'deleteCalendarEmitTarget';
+            version: 'v2021_05_19';
+            namespace: 'Calendar';
+            name: '';
+            fields: {
+                /** . */
+                'organizationId': {
+                    type: 'id';
+                    isRequired: true;
+                    options: undefined;
+                };
+                /** . */
+                'calendarId': {
+                    type: 'id';
+                    isRequired: true;
+                    options: undefined;
+                };
+            };
+        }
+        interface DeleteCalendarEmitTargetEntity extends SchemaEntity<SpruceSchemas.Calendar.v2021_05_19.DeleteCalendarEmitTargetSchema> {
+        }
+    }
+    namespace SpruceSchemas.Calendar.v2021_05_19 {
+        interface DeleteCalendarEmitTargetAndPayload {
+            /** Source. */
+            'source'?: SpruceSchemas.SpruceEventUtils.v2021_09_13.EventSource | undefined | null;
+            'target': SpruceSchemas.Calendar.v2021_05_19.DeleteCalendarEmitTarget;
+        }
+        interface DeleteCalendarEmitTargetAndPayloadSchema extends SpruceSchema.Schema {
+            id: 'deleteCalendarEmitTargetAndPayload';
+            version: 'v2021_05_19';
+            namespace: 'Calendar';
+            name: '';
+            fields: {
+                /** Source. */
+                'source': {
+                    label: 'Source';
+                    type: 'schema';
+                    options: {
+                        schema: SpruceSchemas.SpruceEventUtils.v2021_09_13.EventSourceSchema;
+                    };
+                };
+                /** . */
+                'target': {
+                    type: 'schema';
+                    isRequired: true;
+                    options: {
+                        schema: SpruceSchemas.Calendar.v2021_05_19.DeleteCalendarEmitTargetSchema;
+                    };
+                };
+            };
+        }
+        interface DeleteCalendarEmitTargetAndPayloadEntity extends SchemaEntity<SpruceSchemas.Calendar.v2021_05_19.DeleteCalendarEmitTargetAndPayloadSchema> {
+        }
+    }
+    namespace SpruceSchemas.Calendar.v2021_05_19 {
+        interface DeleteCalendarResponsePayload {
+            'totalDeleted'?: number | undefined | null;
+        }
+        interface DeleteCalendarResponsePayloadSchema extends SpruceSchema.Schema {
+            id: 'deleteCalendarResponsePayload';
+            version: 'v2021_05_19';
+            namespace: 'Calendar';
+            name: '';
+            fields: {
+                /** . */
+                'totalDeleted': {
+                    type: 'number';
+                    options: undefined;
+                };
+            };
+        }
+        interface DeleteCalendarResponsePayloadEntity extends SchemaEntity<SpruceSchemas.Calendar.v2021_05_19.DeleteCalendarResponsePayloadSchema> {
+        }
+    }
     namespace SpruceSchemas.Calendar.v2021_05_19 {
         interface CreateCalendarEventTypeEmitPayload {
             'name': string;
@@ -1542,87 +1623,6 @@ declare module '@sprucelabs/spruce-core-schemas/build/.spruce/schemas/core.schem
         interface CreateCalendarEventTypeResponsePayloadEntity extends SchemaEntity<SpruceSchemas.Calendar.v2021_05_19.CreateCalendarEventTypeResponsePayloadSchema> {
         }
     }
-    namespace SpruceSchemas.Calendar.v2021_05_19 {
-        interface DeleteCalendarEmitTarget {
-            'organizationId': string;
-            'calendarId': string;
-        }
-        interface DeleteCalendarEmitTargetSchema extends SpruceSchema.Schema {
-            id: 'deleteCalendarEmitTarget';
-            version: 'v2021_05_19';
-            namespace: 'Calendar';
-            name: '';
-            fields: {
-                /** . */
-                'organizationId': {
-                    type: 'id';
-                    isRequired: true;
-                    options: undefined;
-                };
-                /** . */
-                'calendarId': {
-                    type: 'id';
-                    isRequired: true;
-                    options: undefined;
-                };
-            };
-        }
-        interface DeleteCalendarEmitTargetEntity extends SchemaEntity<SpruceSchemas.Calendar.v2021_05_19.DeleteCalendarEmitTargetSchema> {
-        }
-    }
-    namespace SpruceSchemas.Calendar.v2021_05_19 {
-        interface DeleteCalendarEmitTargetAndPayload {
-            /** Source. */
-            'source'?: SpruceSchemas.SpruceEventUtils.v2021_09_13.EventSource | undefined | null;
-            'target': SpruceSchemas.Calendar.v2021_05_19.DeleteCalendarEmitTarget;
-        }
-        interface DeleteCalendarEmitTargetAndPayloadSchema extends SpruceSchema.Schema {
-            id: 'deleteCalendarEmitTargetAndPayload';
-            version: 'v2021_05_19';
-            namespace: 'Calendar';
-            name: '';
-            fields: {
-                /** Source. */
-                'source': {
-                    label: 'Source';
-                    type: 'schema';
-                    options: {
-                        schema: SpruceSchemas.SpruceEventUtils.v2021_09_13.EventSourceSchema;
-                    };
-                };
-                /** . */
-                'target': {
-                    type: 'schema';
-                    isRequired: true;
-                    options: {
-                        schema: SpruceSchemas.Calendar.v2021_05_19.DeleteCalendarEmitTargetSchema;
-                    };
-                };
-            };
-        }
-        interface DeleteCalendarEmitTargetAndPayloadEntity extends SchemaEntity<SpruceSchemas.Calendar.v2021_05_19.DeleteCalendarEmitTargetAndPayloadSchema> {
-        }
-    }
-    namespace SpruceSchemas.Calendar.v2021_05_19 {
-        interface DeleteCalendarResponsePayload {
-            'totalDeleted'?: number | undefined | null;
-        }
-        interface DeleteCalendarResponsePayloadSchema extends SpruceSchema.Schema {
-            id: 'deleteCalendarResponsePayload';
-            version: 'v2021_05_19';
-            namespace: 'Calendar';
-            name: '';
-            fields: {
-                /** . */
-                'totalDeleted': {
-                    type: 'number';
-                    options: undefined;
-                };
-            };
-        }
-        interface DeleteCalendarResponsePayloadEntity extends SchemaEntity<SpruceSchemas.Calendar.v2021_05_19.DeleteCalendarResponsePayloadSchema> {
-        }
-    }
     namespace SpruceSchemas.Calendar.v2021_05_19 {
         interface DidCancelCalendarEventEmitTarget {
             'locationId': string;

package/build/esm/.spruce/schemas/schemas.types.d.ts

@@ -1033,6 +1033,87 @@ declare module '@sprucelabs/spruce-core-schemas/build/.spruce/schemas/core.schem
         interface CreateCalendarResponsePayloadEntity extends SchemaEntity<SpruceSchemas.Calendar.v2021_05_19.CreateCalendarResponsePayloadSchema> {
         }
     }
+    namespace SpruceSchemas.Calendar.v2021_05_19 {
+        interface DeleteCalendarEmitTarget {
+            'organizationId': string;
+            'calendarId': string;
+        }
+        interface DeleteCalendarEmitTargetSchema extends SpruceSchema.Schema {
+            id: 'deleteCalendarEmitTarget';
+            version: 'v2021_05_19';
+            namespace: 'Calendar';
+            name: '';
+            fields: {
+                /** . */
+                'organizationId': {
+                    type: 'id';
+                    isRequired: true;
+                    options: undefined;
+                };
+                /** . */
+                'calendarId': {
+                    type: 'id';
+                    isRequired: true;
+                    options: undefined;
+                };
+            };
+        }
+        interface DeleteCalendarEmitTargetEntity extends SchemaEntity<SpruceSchemas.Calendar.v2021_05_19.DeleteCalendarEmitTargetSchema> {
+        }
+    }
+    namespace SpruceSchemas.Calendar.v2021_05_19 {
+        interface DeleteCalendarEmitTargetAndPayload {
+            /** Source. */
+            'source'?: SpruceSchemas.SpruceEventUtils.v2021_09_13.EventSource | undefined | null;
+            'target': SpruceSchemas.Calendar.v2021_05_19.DeleteCalendarEmitTarget;
+        }
+        interface DeleteCalendarEmitTargetAndPayloadSchema extends SpruceSchema.Schema {
+            id: 'deleteCalendarEmitTargetAndPayload';
+            version: 'v2021_05_19';
+            namespace: 'Calendar';
+            name: '';
+            fields: {
+                /** Source. */
+                'source': {
+                    label: 'Source';
+                    type: 'schema';
+                    options: {
+                        schema: SpruceSchemas.SpruceEventUtils.v2021_09_13.EventSourceSchema;
+                    };
+                };
+                /** . */
+                'target': {
+                    type: 'schema';
+                    isRequired: true;
+                    options: {
+                        schema: SpruceSchemas.Calendar.v2021_05_19.DeleteCalendarEmitTargetSchema;
+                    };
+                };
+            };
+        }
+        interface DeleteCalendarEmitTargetAndPayloadEntity extends SchemaEntity<SpruceSchemas.Calendar.v2021_05_19.DeleteCalendarEmitTargetAndPayloadSchema> {
+        }
+    }
+    namespace SpruceSchemas.Calendar.v2021_05_19 {
+        interface DeleteCalendarResponsePayload {
+            'totalDeleted'?: number | undefined | null;
+        }
+        interface DeleteCalendarResponsePayloadSchema extends SpruceSchema.Schema {
+            id: 'deleteCalendarResponsePayload';
+            version: 'v2021_05_19';
+            namespace: 'Calendar';
+            name: '';
+            fields: {
+                /** . */
+                'totalDeleted': {
+                    type: 'number';
+                    options: undefined;
+                };
+            };
+        }
+        interface DeleteCalendarResponsePayloadEntity extends SchemaEntity<SpruceSchemas.Calendar.v2021_05_19.DeleteCalendarResponsePayloadSchema> {
+        }
+    }
     namespace SpruceSchemas.Calendar.v2021_05_19 {
         interface CreateCalendarEventTypeEmitPayload {
             'name': string;
@@ -1542,87 +1623,6 @@ declare module '@sprucelabs/spruce-core-schemas/build/.spruce/schemas/core.schem
         interface CreateCalendarEventTypeResponsePayloadEntity extends SchemaEntity<SpruceSchemas.Calendar.v2021_05_19.CreateCalendarEventTypeResponsePayloadSchema> {
         }
     }
-    namespace SpruceSchemas.Calendar.v2021_05_19 {
-        interface DeleteCalendarEmitTarget {
-            'organizationId': string;
-            'calendarId': string;
-        }
-        interface DeleteCalendarEmitTargetSchema extends SpruceSchema.Schema {
-            id: 'deleteCalendarEmitTarget';
-            version: 'v2021_05_19';
-            namespace: 'Calendar';
-            name: '';
-            fields: {
-                /** . */
-                'organizationId': {
-                    type: 'id';
-                    isRequired: true;
-                    options: undefined;
-                };
-                /** . */
-                'calendarId': {
-                    type: 'id';
-                    isRequired: true;
-                    options: undefined;
-                };
-            };
-        }
-        interface DeleteCalendarEmitTargetEntity extends SchemaEntity<SpruceSchemas.Calendar.v2021_05_19.DeleteCalendarEmitTargetSchema> {
-        }
-    }
-    namespace SpruceSchemas.Calendar.v2021_05_19 {
-        interface DeleteCalendarEmitTargetAndPayload {
-            /** Source. */
-            'source'?: SpruceSchemas.SpruceEventUtils.v2021_09_13.EventSource | undefined | null;
-            'target': SpruceSchemas.Calendar.v2021_05_19.DeleteCalendarEmitTarget;
-        }
-        interface DeleteCalendarEmitTargetAndPayloadSchema extends SpruceSchema.Schema {
-            id: 'deleteCalendarEmitTargetAndPayload';
-            version: 'v2021_05_19';
-            namespace: 'Calendar';
-            name: '';
-            fields: {
-                /** Source. */
-                'source': {
-                    label: 'Source';
-                    type: 'schema';
-                    options: {
-                        schema: SpruceSchemas.SpruceEventUtils.v2021_09_13.EventSourceSchema;
-                    };
-                };
-                /** . */
-                'target': {
-                    type: 'schema';
-                    isRequired: true;
-                    options: {
-                        schema: SpruceSchemas.Calendar.v2021_05_19.DeleteCalendarEmitTargetSchema;
-                    };
-                };
-            };
-        }
-        interface DeleteCalendarEmitTargetAndPayloadEntity extends SchemaEntity<SpruceSchemas.Calendar.v2021_05_19.DeleteCalendarEmitTargetAndPayloadSchema> {
-        }
-    }
-    namespace SpruceSchemas.Calendar.v2021_05_19 {
-        interface DeleteCalendarResponsePayload {
-            'totalDeleted'?: number | undefined | null;
-        }
-        interface DeleteCalendarResponsePayloadSchema extends SpruceSchema.Schema {
-            id: 'deleteCalendarResponsePayload';
-            version: 'v2021_05_19';
-            namespace: 'Calendar';
-            name: '';
-            fields: {
-                /** . */
-                'totalDeleted': {
-                    type: 'number';
-                    options: undefined;
-                };
-            };
-        }
-        interface DeleteCalendarResponsePayloadEntity extends SchemaEntity<SpruceSchemas.Calendar.v2021_05_19.DeleteCalendarResponsePayloadSchema> {
-        }
-    }
     namespace SpruceSchemas.Calendar.v2021_05_19 {
         interface DidCancelCalendarEventEmitTarget {
             'locationId': string;

package/build/esm/skillViewControllers/Root.svc.js

@@ -249,6 +249,7 @@ export default class RootSkillViewController extends AbstractSkillViewController
     }
     handleDraftEventAdded(event) {
         return __awaiter(this, void 0, void 0, function* () {
+            console.log('handle draft event added');
             yield this.events.addDraftEvent(event, !event.eventTypeSlug);
             if (!event.eventTypeSlug) {
                 this.toolBeltVc.open({ shouldStayOpen: true });
@@ -256,9 +257,9 @@ export default class RootSkillViewController extends AbstractSkillViewController
             }
         });
     }
-    handleEventSwapped(event) {
+    handleEventSwapped(draft, event) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.events.silentlySwapEvent(this.sm.getContext().event.id, event);
+            yield this.events.silentlySwapEvent(draft.id, event);
         });
     }
     handleDropEvent(id, updates) {

package/build/esm/toolBelt/states/AbstractCalendarEventToolBeltState.d.ts

@@ -12,8 +12,10 @@ export default abstract class AbstractCalendarEventToolBeltState implements Tool
     private vcs;
     private pendingContextUpdates;
     private controlsVc;
-    private _isLoaded;
+    private isLoaded;
+    private events;
     load(sm: CalendarToolBeltStateMachine): Promise<void>;
+    getIsLoaded(): boolean;
     protected loadRemoteCards(): Promise<void>;
     protected handleClickSave(): Promise<void>;
     private deselectEvent;

package/build/esm/toolBelt/states/AbstractCalendarEventToolBeltState.js

@@ -14,15 +14,20 @@ export default class AbstractCalendarEventToolBeltState {
     constructor() {
         this.vcs = [];
         this.pendingContextUpdates = {};
-        //@ts-ignore
-        this._isLoaded = false;
+        this.isLoaded = false;
     }
     load(sm) {
         return __awaiter(this, void 0, void 0, function* () {
             this.sm = sm;
             this.toolBeltVc = sm.getToolBeltVc();
-            this._isLoaded = true;
+            this.isLoaded = true;
             this.controlsVc = sm.Controller('calendar.event-controls-card', Object.assign(Object.assign({ onCancel: this.clearPendingContextChanges.bind(this), onSave: this.handleClickSave.bind(this) }, this.buildVcConstructorOptions('controls')), { onCancelEvent: this.sm.getContext().cancelEvent }));
+            this.events = sm.getContext().events;
+            this.events.setUpdateContextHandler((updates) => __awaiter(this, void 0, void 0, function* () {
+                return this.handleUpdateContextFromTool(updates, 'eventManager', {
+                    shouldPersistContextChangesImmediately: true,
+                });
+            }));
             this.toolBeltVc.clearTools();
             this.toolBeltVc.setStickyTool({
                 card: this.controlsVc.render(),
@@ -33,6 +38,9 @@ export default class AbstractCalendarEventToolBeltState {
             yield this.sm.on('did-update-context', this.handleDidUpdateContext);
         });
     }
+    getIsLoaded() {
+        return this.isLoaded;
+    }
     loadRemoteCards() {
         return __awaiter(this, void 0, void 0, function* () {
             const registrar = new CalendarToolRegistrar(this.sm, (vc) => {
@@ -173,6 +181,7 @@ export default class AbstractCalendarEventToolBeltState {
     destroy() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.sm.off('did-update-context', this.handleDidUpdateContext);
+            this.events.clearUpdateContextHandler();
         });
     }
 }

package/build/esm/utilities/CalendarEventManager.d.ts

@@ -3,7 +3,7 @@ import { CalendarEvent } from '@sprucelabs/heartwood-view-controllers';
 import { RemoteViewControllerFactory } from '@sprucelabs/spruce-heartwood-utils';
 import { RemoteEventStore } from '../stores/RemoteEventStore';
 import RemotePreferencesStore from '../stores/RemotePreferencesStore';
-import { CalendarToolBeltStateMachine, UpdateEvent, UpdateRepeatingStrategyWithCancel } from '../types/calendar.types';
+import { CalendarToolBeltContext, CalendarToolBeltStateMachine, UpdateCalendarToolBeltContextHandler, UpdateEvent, UpdateRepeatingStrategyWithCancel } from '../types/calendar.types';
 import CalendarViewController from '../viewControllers/Calendar.vc';
 export declare class CalendarEventManager {
     private calendarVc;
@@ -23,6 +23,7 @@ export declare class CalendarEventManager {
     private calendars;
     private shouldUpdateContextOnNextSave;
     private isLoaded;
+    protected updateContext?: UpdateCalendarToolBeltContextHandler<CalendarToolBeltContext>;
     protected get calendarIds(): string[];
     protected get visibleCalendarIds(): string[];
     constructor(options: CalendarEventManagerOptions);
@@ -54,8 +55,35 @@ export declare class CalendarEventManager {
     setCalendarVisibility(calendarId: string, shouldBeVisible: boolean): Promise<void>;
     setupVcForEventType(vcId: string, typeSlug: string): Promise<void>;
     private assertValidCalendarId;
-    private updateEventInContext;
+    protected updateEventInContext(updates: Partial<CalendarEvent>): Promise<{
+        isBusy: boolean;
+        id: string;
+        target: import("@sprucelabs/calendar-utils").SpruceSchemas.CalendarUtils.v2021_05_19.CalendarEventTarget;
+        calendarId: string;
+        eventTypeSlug?: string | null | undefined;
+        startDateTimeMs: number;
+        isResizeable?: boolean | null | undefined;
+        style?: "active" | "blocked" | "draft" | "tentative" | "upcoming" | "unavailable" | "past" | "warn" | "critical" | null | undefined;
+        groupId?: string | null | undefined;
+        timeBlocks: import("@sprucelabs/calendar-utils").SpruceSchemas.CalendarUtils.v2021_05_19.EventTimeBlock[];
+        repeats?: "weekly" | "monthly" | "daily" | null | undefined;
+        daysOfWeek?: ("sun" | "mon" | "tue" | "wed" | "thur" | "fri" | "sat")[] | null | undefined;
+        daysOfMonth?: ("1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" | "10" | "11" | "12" | "13" | "14" | "15" | "16" | "17" | "18" | "19" | "20" | "21" | "22" | "23" | "24" | "25" | "26" | "27" | "28" | "29" | "30" | "31")[] | null | undefined;
+        repeatsUntil?: number | null | undefined;
+        occurrences?: number | null | undefined;
+        interval?: number | null | undefined;
+        nthOccurrences?: number[] | null | undefined;
+        activeUntilDate?: number | null | undefined;
+        exclusionDates?: import("@sprucelabs/calendar-utils").SpruceSchemas.CalendarUtils.v2021_05_19.EventExclusionDate[] | null | undefined;
+        nthInRepeating?: number | null | undefined;
+        totalInRepeating?: number | null | undefined;
+        error?: Error | null | undefined;
+        isSelected?: boolean | null | undefined;
+        controller?: import("@sprucelabs/heartwood-view-controllers").CalendarEventViewController | null | undefined;
+    }>;
     private setEventInContext;
+    setUpdateContextHandler(handler: UpdateCalendarToolBeltContextHandler<CalendarToolBeltContext>): void;
+    clearUpdateContextHandler(): void;
     selectEvent(eventId: string): Promise<void>;
     load(): Promise<void>;
     getEvent(id: string): CalendarEvent;

package/build/esm/utilities/CalendarEventManager.js

@@ -235,14 +235,21 @@ export class CalendarEventManager {
         });
     }
     setEventInContext(newEvent, options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             this.shouldIgnoreNextContextUpdate =
                 (options === null || options === void 0 ? void 0 : options.shouldHandleDidUpdateContext) !== false;
-            yield this.sm.updateContext({
+            yield ((_a = this.updateContext) !== null && _a !== void 0 ? _a : this.sm.updateContext.bind(this.sm))({
                 event: newEvent,
             });
         });
     }
+    setUpdateContextHandler(handler) {
+        this.updateContext = handler;
+    }
+    clearUpdateContextHandler() {
+        delete this.updateContext;
+    }
     selectEvent(eventId) {
         return __awaiter(this, void 0, void 0, function* () {
             const lastSelected = this.calendarVc.getSelectedEvent();

package/build/esm/viewControllers/Calendar.vc.d.ts

@@ -4,7 +4,7 @@ import { UpdateEvent } from '../types/calendar.types';
 declare type Calendar = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Calendar;
 declare type Event = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarEvent;
 declare type DraftAddedHandler = (event: Event) => void | Promise<void>;
-declare type EventSwappedHandler = (event: Event) => void | Promise<void>;
+declare type EventSwappedHandler = (draft: Event, saved: Event) => void | Promise<void>;
 declare type EventDroppedHandler = (id: string, updates: Partial<Event>) => boolean | Promise<boolean>;
 declare type DraftRemovedHandler = () => void | Promise<void>;
 declare type ClickEventHandler = (options: ClickEventOptions) => void | Promise<void>;

package/build/esm/viewControllers/Calendar.vc.js

@@ -28,14 +28,14 @@ export default class CalendarViewController extends CoreCalendarViewController {
         super(Object.assign(Object.assign({ view: 'day' }, rest), { onDropEvent: (options) => {
                 return this.handleDropEvent(options);
             } }));
-        this.activelyPersisting = 0;
+        this.activelyPersisting = {};
         this.isSwapping = false;
         assertOptions(options, ['onAddDraftEvent']);
-        const { onAddDraftEvent, onRemoveDraftEvent, onEventSwapped: onDraftEventSaved, } = rest;
+        const { onAddDraftEvent, onRemoveDraftEvent, onEventSwapped } = rest;
         this.sorter = new PeopleSorter();
         this.draftAddedHandler = onAddDraftEvent;
         this.draftRemovedHandler = onRemoveDraftEvent;
-        this.eventSwappedHandler = onDraftEventSaved;
+        this.eventSwappedHandler = onEventSwapped;
         this.dropEventHandler = onDropEvent;
         this.remoteEventStore = remoteEventStore;
         this.model.onClick = this.handleClick.bind(this);
@@ -189,9 +189,14 @@ export default class CalendarViewController extends CoreCalendarViewController {
             const id = event.id;
             const isBusy = (options === null || options === void 0 ? void 0 : options.isBusy) === true;
             try {
-                this.activelyPersisting++;
+                if (!this.activelyPersisting[id]) {
+                    this.activelyPersisting[id] = 1;
+                }
+                else {
+                    this.activelyPersisting[id]++;
+                }
                 const saved = yield ((_a = this.remoteEventStore) === null || _a === void 0 ? void 0 : _a.persist(Object.assign(Object.assign({}, event), { isBusy })));
-                this.activelyPersisting--;
+                this.activelyPersisting[id]--;
                 if (!saved) {
                     return;
                 }
@@ -203,8 +208,8 @@ export default class CalendarViewController extends CoreCalendarViewController {
                         this.lastSwappedId = id;
                         yield this.swapEvent(event, saved);
                     }
-                    if (this.activelyPersisting === 0) {
-                        yield ((_b = this.eventSwappedHandler) === null || _b === void 0 ? void 0 : _b.call(this, saved));
+                    if (this.activelyPersisting[id] === 0) {
+                        yield ((_b = this.eventSwappedHandler) === null || _b === void 0 ? void 0 : _b.call(this, event, saved));
                     }
                 }
                 else {

package/build/skillViewControllers/Root.svc.js

@@ -220,14 +220,15 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
         }
     }
     async handleDraftEventAdded(event) {
+        console.log('handle draft event added');
         await this.events.addDraftEvent(event, !event.eventTypeSlug);
         if (!event.eventTypeSlug) {
             this.toolBeltVc.open({ shouldStayOpen: true });
             await this.sm.transitionTo(this.toolBeltStates.prerequisites);
         }
     }
-    async handleEventSwapped(event) {
-        await this.events.silentlySwapEvent(this.sm.getContext().event.id, event);
+    async handleEventSwapped(draft, event) {
+        await this.events.silentlySwapEvent(draft.id, event);
     }
     async handleDropEvent(id, updates) {
         return this.events.handleDropEvent(id, updates);

package/build/toolBelt/states/AbstractCalendarEventToolBeltState.d.ts

@@ -12,8 +12,10 @@ export default abstract class AbstractCalendarEventToolBeltState implements Tool
     private vcs;
     private pendingContextUpdates;
     private controlsVc;
-    private _isLoaded;
+    private isLoaded;
+    private events;
     load(sm: CalendarToolBeltStateMachine): Promise<void>;
+    getIsLoaded(): boolean;
     protected loadRemoteCards(): Promise<void>;
     protected handleClickSave(): Promise<void>;
     private deselectEvent;

package/build/toolBelt/states/AbstractCalendarEventToolBeltState.js

@@ -10,14 +10,19 @@ class AbstractCalendarEventToolBeltState {
     constructor() {
         this.vcs = [];
         this.pendingContextUpdates = {};
-        //@ts-ignore
-        this._isLoaded = false;
+        this.isLoaded = false;
     }
     async load(sm) {
         this.sm = sm;
         this.toolBeltVc = sm.getToolBeltVc();
-        this._isLoaded = true;
+        this.isLoaded = true;
         this.controlsVc = sm.Controller('calendar.event-controls-card', Object.assign(Object.assign({ onCancel: this.clearPendingContextChanges.bind(this), onSave: this.handleClickSave.bind(this) }, this.buildVcConstructorOptions('controls')), { onCancelEvent: this.sm.getContext().cancelEvent }));
+        this.events = sm.getContext().events;
+        this.events.setUpdateContextHandler(async (updates) => {
+            return this.handleUpdateContextFromTool(updates, 'eventManager', {
+                shouldPersistContextChangesImmediately: true,
+            });
+        });
         this.toolBeltVc.clearTools();
         this.toolBeltVc.setStickyTool({
             card: this.controlsVc.render(),
@@ -27,6 +32,9 @@ class AbstractCalendarEventToolBeltState {
         this.handleDidUpdateContext = this.handleDidUpdateContext.bind(this);
         await this.sm.on('did-update-context', this.handleDidUpdateContext);
     }
+    getIsLoaded() {
+        return this.isLoaded;
+    }
     async loadRemoteCards() {
         const registrar = new CalendarToolRegistrar_1.default(this.sm, (vc) => {
             //@ts-ignore
@@ -148,6 +156,7 @@ class AbstractCalendarEventToolBeltState {
     }
     async destroy() {
         await this.sm.off('did-update-context', this.handleDidUpdateContext);
+        this.events.clearUpdateContextHandler();
     }
 }
 exports.default = AbstractCalendarEventToolBeltState;

package/build/utilities/CalendarEventManager.d.ts

@@ -3,7 +3,7 @@ import { CalendarEvent } from '@sprucelabs/heartwood-view-controllers';
 import { RemoteViewControllerFactory } from '@sprucelabs/spruce-heartwood-utils';
 import { RemoteEventStore } from '../stores/RemoteEventStore';
 import RemotePreferencesStore from '../stores/RemotePreferencesStore';
-import { CalendarToolBeltStateMachine, UpdateEvent, UpdateRepeatingStrategyWithCancel } from '../types/calendar.types';
+import { CalendarToolBeltContext, CalendarToolBeltStateMachine, UpdateCalendarToolBeltContextHandler, UpdateEvent, UpdateRepeatingStrategyWithCancel } from '../types/calendar.types';
 import CalendarViewController from '../viewControllers/Calendar.vc';
 export declare class CalendarEventManager {
     private calendarVc;
@@ -23,6 +23,7 @@ export declare class CalendarEventManager {
     private calendars;
     private shouldUpdateContextOnNextSave;
     private isLoaded;
+    protected updateContext?: UpdateCalendarToolBeltContextHandler<CalendarToolBeltContext>;
     protected get calendarIds(): string[];
     protected get visibleCalendarIds(): string[];
     constructor(options: CalendarEventManagerOptions);
@@ -54,8 +55,35 @@ export declare class CalendarEventManager {
     setCalendarVisibility(calendarId: string, shouldBeVisible: boolean): Promise<void>;
     setupVcForEventType(vcId: string, typeSlug: string): Promise<void>;
     private assertValidCalendarId;
-    private updateEventInContext;
+    protected updateEventInContext(updates: Partial<CalendarEvent>): Promise<{
+        isBusy: boolean;
+        id: string;
+        target: import("@sprucelabs/calendar-utils").SpruceSchemas.CalendarUtils.v2021_05_19.CalendarEventTarget;
+        calendarId: string;
+        eventTypeSlug?: string | null | undefined;
+        startDateTimeMs: number;
+        isResizeable?: boolean | null | undefined;
+        style?: "active" | "blocked" | "draft" | "tentative" | "upcoming" | "unavailable" | "past" | "warn" | "critical" | null | undefined;
+        groupId?: string | null | undefined;
+        timeBlocks: import("@sprucelabs/calendar-utils").SpruceSchemas.CalendarUtils.v2021_05_19.EventTimeBlock[];
+        repeats?: "weekly" | "monthly" | "daily" | null | undefined;
+        daysOfWeek?: ("sun" | "mon" | "tue" | "wed" | "thur" | "fri" | "sat")[] | null | undefined;
+        daysOfMonth?: ("1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" | "10" | "11" | "12" | "13" | "14" | "15" | "16" | "17" | "18" | "19" | "20" | "21" | "22" | "23" | "24" | "25" | "26" | "27" | "28" | "29" | "30" | "31")[] | null | undefined;
+        repeatsUntil?: number | null | undefined;
+        occurrences?: number | null | undefined;
+        interval?: number | null | undefined;
+        nthOccurrences?: number[] | null | undefined;
+        activeUntilDate?: number | null | undefined;
+        exclusionDates?: import("@sprucelabs/calendar-utils").SpruceSchemas.CalendarUtils.v2021_05_19.EventExclusionDate[] | null | undefined;
+        nthInRepeating?: number | null | undefined;
+        totalInRepeating?: number | null | undefined;
+        error?: Error | null | undefined;
+        isSelected?: boolean | null | undefined;
+        controller?: import("@sprucelabs/heartwood-view-controllers").CalendarEventViewController | null | undefined;
+    }>;
     private setEventInContext;
+    setUpdateContextHandler(handler: UpdateCalendarToolBeltContextHandler<CalendarToolBeltContext>): void;
+    clearUpdateContextHandler(): void;
     selectEvent(eventId: string): Promise<void>;
     load(): Promise<void>;
     getEvent(id: string): CalendarEvent;

package/build/utilities/CalendarEventManager.js

@@ -208,12 +208,19 @@ class CalendarEventManager {
         return updated;
     }
     async setEventInContext(newEvent, options) {
+        var _a;
         this.shouldIgnoreNextContextUpdate =
             (options === null || options === void 0 ? void 0 : options.shouldHandleDidUpdateContext) !== false;
-        await this.sm.updateContext({
+        await ((_a = this.updateContext) !== null && _a !== void 0 ? _a : this.sm.updateContext.bind(this.sm))({
             event: newEvent,
         });
     }
+    setUpdateContextHandler(handler) {
+        this.updateContext = handler;
+    }
+    clearUpdateContextHandler() {
+        delete this.updateContext;
+    }
     async selectEvent(eventId) {
         const lastSelected = this.calendarVc.getSelectedEvent();
         const event = this.calendarVc.getEvent(eventId);

package/build/viewControllers/Calendar.vc.d.ts

@@ -4,7 +4,7 @@ import { UpdateEvent } from '../types/calendar.types';
 declare type Calendar = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Calendar;
 declare type Event = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarEvent;
 declare type DraftAddedHandler = (event: Event) => void | Promise<void>;
-declare type EventSwappedHandler = (event: Event) => void | Promise<void>;
+declare type EventSwappedHandler = (draft: Event, saved: Event) => void | Promise<void>;
 declare type EventDroppedHandler = (id: string, updates: Partial<Event>) => boolean | Promise<boolean>;
 declare type DraftRemovedHandler = () => void | Promise<void>;
 declare type ClickEventHandler = (options: ClickEventOptions) => void | Promise<void>;

package/build/viewControllers/Calendar.vc.js

@@ -24,14 +24,14 @@ class CalendarViewController extends heartwood_view_controllers_1.CalendarViewCo
         super(Object.assign(Object.assign({ view: 'day' }, rest), { onDropEvent: (options) => {
                 return this.handleDropEvent(options);
             } }));
-        this.activelyPersisting = 0;
+        this.activelyPersisting = {};
         this.isSwapping = false;
         (0, schema_1.assertOptions)(options, ['onAddDraftEvent']);
-        const { onAddDraftEvent, onRemoveDraftEvent, onEventSwapped: onDraftEventSaved, } = rest;
+        const { onAddDraftEvent, onRemoveDraftEvent, onEventSwapped } = rest;
         this.sorter = new calendar_utils_1.PeopleSorter();
         this.draftAddedHandler = onAddDraftEvent;
         this.draftRemovedHandler = onRemoveDraftEvent;
-        this.eventSwappedHandler = onDraftEventSaved;
+        this.eventSwappedHandler = onEventSwapped;
         this.dropEventHandler = onDropEvent;
         this.remoteEventStore = remoteEventStore;
         this.model.onClick = this.handleClick.bind(this);
@@ -166,9 +166,14 @@ class CalendarViewController extends heartwood_view_controllers_1.CalendarViewCo
         const id = event.id;
         const isBusy = (options === null || options === void 0 ? void 0 : options.isBusy) === true;
         try {
-            this.activelyPersisting++;
+            if (!this.activelyPersisting[id]) {
+                this.activelyPersisting[id] = 1;
+            }
+            else {
+                this.activelyPersisting[id]++;
+            }
             const saved = await ((_a = this.remoteEventStore) === null || _a === void 0 ? void 0 : _a.persist(Object.assign(Object.assign({}, event), { isBusy })));
-            this.activelyPersisting--;
+            this.activelyPersisting[id]--;
             if (!saved) {
                 return;
             }
@@ -180,8 +185,8 @@ class CalendarViewController extends heartwood_view_controllers_1.CalendarViewCo
                     this.lastSwappedId = id;
                     await this.swapEvent(event, saved);
                 }
-                if (this.activelyPersisting === 0) {
-                    await ((_b = this.eventSwappedHandler) === null || _b === void 0 ? void 0 : _b.call(this, saved));
+                if (this.activelyPersisting[id] === 0) {
+                    await ((_b = this.eventSwappedHandler) === null || _b === void 0 ? void 0 : _b.call(this, event, saved));
                 }
             }
             else {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sprucelabs/spruce-calendar-components",
   "description": "Calendar components for working with calendars and Sprucebot.",
-  "version": "22.3.15",
+  "version": "22.3.18",
   "skill": {
     "namespace": "calendar"
   },