@sprucelabs/spruce-calendar-components 25.1.4 → 25.2.2

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

@@ -1,6 +1,6 @@
 import { SpruceSchemas, ViewControllerOptions, CalendarViewController as CoreCalendarViewController, ClickCalendarViewOptions, DropEventOptions, ClickEventOptions } from '@sprucelabs/heartwood-view-controllers';
 import { RemoteEventStore } from '../stores/RemoteEventStore';
-import { UpdateEvent } from '../types/calendar.types';
+import { CalendarPerson, UpdateEvent } from '../types/calendar.types';
 export default class CalendarViewController extends CoreCalendarViewController {
     static id: string;
     private remoteEventStore?;
@@ -14,6 +14,7 @@ export default class CalendarViewController extends CoreCalendarViewController {
     private activelyPersisting;
     private persistPromise?;
     constructor(options: ViewControllerOptions & CalendarViewControllerOptions);
+    setPeople(people: CalendarPerson[]): void;
     private handleTapView;
     protected handleLongPressViewDrop(options: ClickCalendarViewOptions): Promise<void>;
     private handleDropEvent;
@@ -33,11 +34,10 @@ export default class CalendarViewController extends CoreCalendarViewController {
     }): any;
     private persist;
     waitForPendingSaves(): Promise<void>;
-    getPeople(): SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarPerson[];
     private _persist;
     render(): {
-        people: SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarPerson[];
         controller?: import("@sprucelabs/heartwood-view-controllers").ViewController<SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Calendar> | null | undefined;
+        people?: SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarPerson[] | null | undefined;
         minTime?: SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarTime | null | undefined;
         maxTime?: SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarTime | null | undefined;
         startDate?: number | null | undefined;

package/build/calendar/Calendar.vc.js

@@ -14,10 +14,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const calendar_utils_1 = require("@sprucelabs/calendar-utils");
 const heartwood_view_controllers_1 = require("@sprucelabs/heartwood-view-controllers");
 const schema_1 = require("@sprucelabs/schema");
 const draftGenerator_1 = __importDefault(require("../utilities/draftGenerator"));
-const StubPeopleSorter_1 = __importDefault(require("./StubPeopleSorter"));
 class CalendarViewController extends heartwood_view_controllers_1.CalendarViewController {
     constructor(options) {
         const { remoteEventStore, onDropEvent } = options, rest = __rest(options, ["remoteEventStore", "onDropEvent"]);
@@ -31,7 +31,7 @@ class CalendarViewController extends heartwood_view_controllers_1.CalendarViewCo
         this.activelyPersisting = {};
         this.isSwapping = false;
         const { onAddDraftEvent, onRemoveDraftEvent, onEventSwapped } = (0, schema_1.assertOptions)(options, ['onAddDraftEvent']);
-        this.sorter = new StubPeopleSorter_1.default();
+        this.sorter = new calendar_utils_1.PeopleSorter();
         this.draftAddedHandler = onAddDraftEvent;
         this.draftRemovedHandler = onRemoveDraftEvent;
         this.eventSwappedHandler = onEventSwapped;
@@ -40,6 +40,11 @@ class CalendarViewController extends heartwood_view_controllers_1.CalendarViewCo
         this.model.onClickView = this.handleClickView.bind(this);
         this.setDefaultControllerForEvents('calendar.universal-calendar-event');
     }
+    setPeople(people) {
+        this.sorter.setPeople(people);
+        const sorted = this.sorter.sort();
+        return super.setPeople(sorted);
+    }
     async handleTapView() {
         await this.renderOnce(async () => {
             await this.deselectEvent();
@@ -194,27 +199,6 @@ class CalendarViewController extends heartwood_view_controllers_1.CalendarViewCo
     async waitForPendingSaves() {
         await this.persistPromise;
     }
-    getPeople() {
-        const people = super.getPeople();
-        this.sorter.setPeople(people !== null && people !== void 0 ? people : []);
-        this.sorter.setEvents(this.getEvents().map((e) => {
-            var _a;
-            return ({
-                id: e.id,
-                groupId: (_a = e.groupId) !== null && _a !== void 0 ? _a : undefined,
-                personId: e.target.personId,
-                startDateTimeMs: e.startDateTimeMs,
-            });
-        }));
-        const selectedEvent = this.getSelectedEvent();
-        if (selectedEvent && !draftGenerator_1.default.isDraftId(selectedEvent.id)) {
-            this.sorter.setSelectedEvents([selectedEvent.id]);
-        }
-        else {
-            this.sorter.setSelectedEvents([]);
-        }
-        return this.sorter.sort();
-    }
     async _persist(event) {
         var _a, _b;
         let updated = event;
@@ -256,7 +240,7 @@ class CalendarViewController extends heartwood_view_controllers_1.CalendarViewCo
         return event;
     }
     render() {
-        return Object.assign(Object.assign({}, super.render()), { people: this.getPeople() });
+        return Object.assign({}, super.render());
     }
 }
 CalendarViewController.id = 'calendar';

package/build/calendar/CalendarEventManager.d.ts

@@ -101,7 +101,7 @@ export default class CalendarEventManager {
     hasEvent(id: string): boolean;
     optionallyAskForUpdateRepeatingStrategy(event: UpdateEvent, action?: RepeatingUpdateAction): Promise<boolean>;
 }
-export type EventManagerCalendarVc = Pick<CalendarViewController, 'replaceEventsInRange' | 'mixinEvents' | 'removeEvent' | 'addEvent' | 'hasEvent' | 'updateEvent' | 'setShifts' | 'getShifts' | 'getEvent' | 'getPeople' | 'setControllerForEventType' | 'setRemoteStore' | 'getSelectedEvent' | 'selectEvent' | 'deselectEvent' | 'removeEvents' | 'setStartDate'>;
+export type EventManagerCalendarVc = Pick<CalendarViewController, 'replaceEventsInRange' | 'mixinEvents' | 'removeEvent' | 'addEvent' | 'hasEvent' | 'updateEvent' | 'setShifts' | 'getShifts' | 'getEvent' | 'getPeople' | 'setControllerForEventType' | 'setRemoteStore' | 'getSelectedEvent' | 'selectEvent' | 'deselectEvent' | 'removeEvents' | 'setStartDate' | 'renderOnce'>;
 type EventManagerRemoteViewControllerFactory = Pick<RemoteViewControllerFactory, 'fetchRemoteController'>;
 export type RepeatingUpdateAction = 'update' | 'cancel';
 export interface CalendarEventManagerOptions {

package/build/calendar/CalendarEventManager.js

@@ -195,17 +195,21 @@ class CalendarEventManager {
             endDate,
             peopleIds,
         });
-        this.replaceEventsInRange(events, startDate, endDate);
-        if (!this.eventTypes) {
-            this.eventTypes = await this.events.getEventTypes();
-        }
-        await Promise.all(events.map(async (e) => {
-            var _a;
-            const type = (_a = this.eventTypes) === null || _a === void 0 ? void 0 : _a.find((t) => t.slug === e.eventTypeSlug);
-            if (type === null || type === void 0 ? void 0 : type.viewControllerId) {
-                await this.setupVcForEventType(type.viewControllerId, type.slug);
+        await this.calendarVc.renderOnce(async () => {
+            console.log('CalendarEventManager.loadEvents triggerRender start');
+            this.replaceEventsInRange(events, startDate, endDate);
+            if (!this.eventTypes) {
+                this.eventTypes = await this.events.getEventTypes();
             }
-        }));
+            await Promise.all(events.map(async (e) => {
+                var _a;
+                const type = (_a = this.eventTypes) === null || _a === void 0 ? void 0 : _a.find((t) => t.slug === e.eventTypeSlug);
+                if (type === null || type === void 0 ? void 0 : type.viewControllerId) {
+                    await this.setupVcForEventType(type.viewControllerId, type.slug);
+                }
+            }));
+            console.log('CalendarEventManager.loadEvents triggerRender end');
+        });
     }
     async setCalendarVisibility(calendarId, shouldBeVisible) {
         if (shouldBeVisible) {
@@ -222,6 +226,7 @@ class CalendarEventManager {
         }
         this.hasVcForEventTypeBeenLoaded[key] = true;
         await this.remoteVc.fetchRemoteController(vcId);
+        console.log('set controller for type');
         this.calendarVc.setControllerForEventType(typeSlug, vcId);
     }
     assertValidCalendarId(calendarId) {
@@ -302,6 +307,7 @@ class CalendarEventManager {
         await this.calendarVc.deselectEvent();
     }
     async setCurrentDate(dateMs) {
+        console.log('CalendarEventManager.setStartDate');
         await this.calendarVc.setStartDate(dateMs);
     }
     async handleDidUpdateContext() {