@sprucelabs/spruce-calendar-components 25.5.0 → 25.5.2

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

@@ -272,7 +272,9 @@ class CalendarViewController extends CoreCalendarViewController {
         });
     }
     render() {
-        return Object.assign(Object.assign({}, super.render()), { onLongPressEvent: () => this.getDevice().vibrate(), onLongPressView: () => this.getDevice().vibrate() });
+        var _a, _b;
+        const model = super.render();
+        return Object.assign(Object.assign({}, model), { onLongPressEvent: () => this.getDevice().vibrate(), onLongPressView: () => this.getDevice().vibrate(), shouldEnableSwipeNav: ((_b = (_a = model.people) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) === 1 });
     }
 }
 CalendarViewController.id = 'calendar';

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

@@ -39,6 +39,7 @@ export default class CalendarEventManager {
     getCalendars(): import("@sprucelabs/calendar-utils").SpruceSchemas.Calendar.v2021_05_19.Calendar[];
     addDraftEvent(event: CalendarEvent, shouldSelectEvent?: boolean): Promise<void>;
     addEvent(event: CalendarEvent): void;
+    addEvents(events: CalendarEvent[]): void;
     silentlySwapEvent(oldId: string, event: CalendarEvent): Promise<void>;
     handleDropEvent(id: string, updates: Partial<CalendarEvent>): Promise<boolean>;
     reset(): Promise<void>;
@@ -52,7 +53,7 @@ export default class CalendarEventManager {
         shouldUpdateAllEventsGoingForward?: boolean;
         shouldPersist?: boolean;
     }): void;
-    loadEvents(startDate: number, endDate: number, peopleIds: string[]): Promise<void>;
+    loadEvents(startDate: number, endDate: number, peopleIds: string[]): Promise<import("@sprucelabs/calendar-utils").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarEvent[]>;
     setCalendarVisibility(calendarId: string, shouldBeVisible: boolean): Promise<void>;
     setupVcForEventType(vcId: string, typeSlug: string): Promise<void>;
     private assertValidCalendarId;

package/build/esm/calendar/CalendarEventManager.js

@@ -102,6 +102,10 @@ export default class CalendarEventManager {
         this.allEvents.push(Object.assign({}, event));
         this.calendarVc.addEvent(event);
     }
+    addEvents(events) {
+        this.allEvents.push(...events);
+        this.calendarVc.mixinEvents(events);
+    }
     silentlySwapEvent(oldId, event) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -215,7 +219,6 @@ export default class CalendarEventManager {
                 peopleIds,
             });
             yield this.calendarVc.renderOnce(() => __awaiter(this, void 0, void 0, function* () {
-                this.replaceEventsInRange(events, startDate, endDate);
                 if (!this.eventTypes) {
                     this.eventTypes = yield this.events.getEventTypes();
                 }
@@ -226,7 +229,9 @@ export default class CalendarEventManager {
                         yield this.setupVcForEventType(type.viewControllerId, type.slug);
                     }
                 })));
+                this.replaceEventsInRange(events, startDate, endDate);
             }));
+            return events;
         });
     }
     setCalendarVisibility(calendarId, shouldBeVisible) {

package/build/esm/skillViewControllers/Root.svc.d.ts

@@ -29,6 +29,7 @@ export default class RootSkillViewController extends AbstractSkillViewController
     protected remoteVc: RemoteViewControllerFactory;
     protected draftEvent?: CalendarEvent;
     private loadEventInterval?;
+    private shouldIgnoreNextDeselectEvent;
     constructor(options: ViewControllerOptions);
     getScope: () => ScopeFlag[];
     private createToolBeltStates;
@@ -63,6 +64,7 @@ export default class RootSkillViewController extends AbstractSkillViewController
     getCalendarSelectVc(): import("../tools/CalendarSelectTool.vc").default | undefined;
     getCalendarVc(): CalendarViewController;
     load(options: SkillViewControllerLoadOptions<RootArgs>): Promise<void>;
+    private optionallyLoadCachedEvents;
     private handleStateChange;
     destroy(): Promise<void>;
     private setupCalendarEventListeners;
@@ -75,6 +77,7 @@ export default class RootSkillViewController extends AbstractSkillViewController
     private syncOffsetWithLocale;
     protected loadEvents(options?: LoadEventOptions): Promise<void>;
     private _loadEvents;
+    private cacheEvents;
     protected transitionToRoot(): Promise<void>;
     private loadLoggedInPerson;
     private getVisibleEvents;

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

@@ -18,6 +18,7 @@ import { RootToolBeltState } from '../toolBelt/states/RootToolBeltState.js';
 class RootSkillViewController extends AbstractSkillViewController {
     constructor(options) {
         super(options);
+        this.shouldIgnoreNextDeselectEvent = false;
         this.getScope = () => ['employed', 'location'];
         this.toolBeltVc = this.ToolBeltVc();
         this.calendarVc = this.CalendarVc();
@@ -215,7 +216,9 @@ class RootSkillViewController extends AbstractSkillViewController {
     }
     handleDeselectEvent() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.calendarVc.getIsSwappingEvent()) {
+            if (this.shouldIgnoreNextDeselectEvent ||
+                this.calendarVc.getIsSwappingEvent()) {
+                this.shouldIgnoreNextDeselectEvent = false;
                 return;
             }
             yield this.resetToRootState();
@@ -231,8 +234,8 @@ class RootSkillViewController extends AbstractSkillViewController {
             this.makeDateSelectMatchSelectedDateFromCalendar();
             this.syncPeopleOnCalendar();
             yield this.transitionPromise;
-            yield this.events.reset();
             yield this.calendarVc.deselectEvent();
+            yield this.events.reset();
             delete this.transitionPromise;
         });
     }
@@ -258,6 +261,9 @@ class RootSkillViewController extends AbstractSkillViewController {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const { event } = options;
+            if (this.events.getSelectedEvent()) {
+                this.shouldIgnoreNextDeselectEvent = true;
+            }
             yield this.events.selectEvent(event.id);
             this.toolBeltVc.open({ shouldStayOpen: true });
             try {
@@ -358,13 +364,13 @@ class RootSkillViewController extends AbstractSkillViewController {
             const { startDate = this.dates.getStartOfDay(), visiblePeopleIds } = args;
             yield this.calendarVc.renderOnce(() => __awaiter(this, void 0, void 0, function* () {
                 this.syncOffsetWithLocale(locale);
-                yield this.events.setCurrentDate(startDate);
-                yield this.transitionToRoot();
+                this.optionallyLoadCachedEvents();
                 if (visiblePeopleIds) {
                     yield this.people.setVisibilityMode('custom');
                     yield this.people.setVisiblePeopleIds(visiblePeopleIds);
                 }
             }));
+            yield this.transitionToRoot();
             if (RootSkillViewController.shouldUpdateOnInterval) {
                 this.loadEventInterval = setInterval(() => {
                     return this.loadEvents({
@@ -373,9 +379,16 @@ class RootSkillViewController extends AbstractSkillViewController {
                 }, RootSkillViewController.refreshInterval);
             }
             yield this.client.on('connection-status-change', this.handleStateChange);
+            yield this.events.setCurrentDate(startDate);
             yield this.waitUntilDoneSaving();
         });
     }
+    optionallyLoadCachedEvents() {
+        const events = this.getDevice().getCachedValue('calendarEvents');
+        if (events) {
+            this.events.addEvents(events);
+        }
+    }
     handleStateChange(options) {
         return __awaiter(this, void 0, void 0, function* () {
             const { status } = options.payload;
@@ -463,6 +476,7 @@ class RootSkillViewController extends AbstractSkillViewController {
     }
     loadEvents(options) {
         return __awaiter(this, void 0, void 0, function* () {
+            console.log('loading events');
             this.loadEventsPromise = this._loadEvents(options);
             yield this.loadEventsPromise;
         });
@@ -475,8 +489,9 @@ class RootSkillViewController extends AbstractSkillViewController {
                     const date = this.getStartDate();
                     const startDate = this.dates.getStartOfDay(date);
                     const endDate = this.dates.getEndOfDay(date);
-                    yield this.events.loadEvents(startDate, endDate, this.people.getTeam().map((t) => t.id));
+                    const events = yield this.events.loadEvents(startDate, endDate, this.people.getTeam().map((t) => t.id));
                     yield this.people.emitDidUpdate();
+                    this.cacheEvents(events);
                 }
             }
             catch (err) {
@@ -493,6 +508,9 @@ class RootSkillViewController extends AbstractSkillViewController {
             }
         });
     }
+    cacheEvents(events) {
+        this.getDevice().setCachedValue('calendarEvents', events);
+    }
     transitionToRoot() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.sm.transitionTo(this.toolBeltStates.root);

package/build/esm/tools/EventTitleTool.vc.js

@@ -60,9 +60,10 @@ class EventTitleToolViewController extends AbstractViewController {
     }
     handleUpdateContext(context) {
         return __awaiter(this, void 0, void 0, function* () {
+            const firstBlock = context.event.timeBlocks[0];
             yield this.formVc.setValues({
-                title: context.event.timeBlocks[0].title,
-                subtitle: context.event.timeBlocks[0].subtitle,
+                title: firstBlock.title,
+                subtitle: firstBlock.subtitle,
             });
         });
     }

package/build/skillViewControllers/Root.svc.d.ts

@@ -29,6 +29,7 @@ export default class RootSkillViewController extends AbstractSkillViewController
     protected remoteVc: RemoteViewControllerFactory;
     protected draftEvent?: CalendarEvent;
     private loadEventInterval?;
+    private shouldIgnoreNextDeselectEvent;
     constructor(options: ViewControllerOptions);
     getScope: () => ScopeFlag[];
     private createToolBeltStates;
@@ -63,6 +64,7 @@ export default class RootSkillViewController extends AbstractSkillViewController
     getCalendarSelectVc(): import("../tools/CalendarSelectTool.vc").default | undefined;
     getCalendarVc(): CalendarViewController;
     load(options: SkillViewControllerLoadOptions<RootArgs>): Promise<void>;
+    private optionallyLoadCachedEvents;
     private handleStateChange;
     destroy(): Promise<void>;
     private setupCalendarEventListeners;
@@ -75,6 +77,7 @@ export default class RootSkillViewController extends AbstractSkillViewController
     private syncOffsetWithLocale;
     protected loadEvents(options?: LoadEventOptions): Promise<void>;
     private _loadEvents;
+    private cacheEvents;
     protected transitionToRoot(): Promise<void>;
     private loadLoggedInPerson;
     private getVisibleEvents;

package/build/skillViewControllers/Root.svc.js

@@ -14,6 +14,7 @@ const RootToolBeltState_1 = require("../toolBelt/states/RootToolBeltState");
 class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkillViewController {
     constructor(options) {
         super(options);
+        this.shouldIgnoreNextDeselectEvent = false;
         this.getScope = () => ['employed', 'location'];
         this.toolBeltVc = this.ToolBeltVc();
         this.calendarVc = this.CalendarVc();
@@ -190,7 +191,9 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
         return (_a = this.calendarVc.getStartDate()) !== null && _a !== void 0 ? _a : this.dates.date();
     }
     async handleDeselectEvent() {
-        if (this.calendarVc.getIsSwappingEvent()) {
+        if (this.shouldIgnoreNextDeselectEvent ||
+            this.calendarVc.getIsSwappingEvent()) {
+            this.shouldIgnoreNextDeselectEvent = false;
             return;
         }
         await this.resetToRootState();
@@ -204,8 +207,8 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
         this.makeDateSelectMatchSelectedDateFromCalendar();
         this.syncPeopleOnCalendar();
         await this.transitionPromise;
-        await this.events.reset();
         await this.calendarVc.deselectEvent();
+        await this.events.reset();
         delete this.transitionPromise;
     }
     ToolBeltVc() {
@@ -227,6 +230,9 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
     async handleClickEvent(options) {
         var _a, _b;
         const { event } = options;
+        if (this.events.getSelectedEvent()) {
+            this.shouldIgnoreNextDeselectEvent = true;
+        }
         await this.events.selectEvent(event.id);
         this.toolBeltVc.open({ shouldStayOpen: true });
         try {
@@ -317,13 +323,13 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
         const { startDate = this.dates.getStartOfDay(), visiblePeopleIds } = args;
         await this.calendarVc.renderOnce(async () => {
             this.syncOffsetWithLocale(locale);
-            await this.events.setCurrentDate(startDate);
-            await this.transitionToRoot();
+            this.optionallyLoadCachedEvents();
             if (visiblePeopleIds) {
                 await this.people.setVisibilityMode('custom');
                 await this.people.setVisiblePeopleIds(visiblePeopleIds);
             }
         });
+        await this.transitionToRoot();
         if (RootSkillViewController.shouldUpdateOnInterval) {
             this.loadEventInterval = setInterval(() => {
                 return this.loadEvents({
@@ -332,8 +338,15 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
             }, RootSkillViewController.refreshInterval);
         }
         await this.client.on('connection-status-change', this.handleStateChange);
+        await this.events.setCurrentDate(startDate);
         await this.waitUntilDoneSaving();
     }
+    optionallyLoadCachedEvents() {
+        const events = this.getDevice().getCachedValue('calendarEvents');
+        if (events) {
+            this.events.addEvents(events);
+        }
+    }
     async handleStateChange(options) {
         const { status } = options.payload;
         if (status === 'connected') {
@@ -404,6 +417,7 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
         this.calendarVc.setTimezoneOffsetMs(offset * 60 * 1000);
     }
     async loadEvents(options) {
+        console.log('loading events');
         this.loadEventsPromise = this._loadEvents(options);
         await this.loadEventsPromise;
     }
@@ -414,8 +428,9 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
                 const date = this.getStartDate();
                 const startDate = this.dates.getStartOfDay(date);
                 const endDate = this.dates.getEndOfDay(date);
-                await this.events.loadEvents(startDate, endDate, this.people.getTeam().map((t) => t.id));
+                const events = await this.events.loadEvents(startDate, endDate, this.people.getTeam().map((t) => t.id));
                 await this.people.emitDidUpdate();
+                this.cacheEvents(events);
             }
         }
         catch (err) {
@@ -431,6 +446,9 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
             });
         }
     }
+    cacheEvents(events) {
+        this.getDevice().setCachedValue('calendarEvents', events);
+    }
     async transitionToRoot() {
         await this.sm.transitionTo(this.toolBeltStates.root);
     }

package/build/tools/EventTitleTool.vc.js

@@ -50,9 +50,10 @@ class EventTitleToolViewController extends heartwood_view_controllers_1.Abstract
         });
     }
     async handleUpdateContext(context) {
+        const firstBlock = context.event.timeBlocks[0];
         await this.formVc.setValues({
-            title: context.event.timeBlocks[0].title,
-            subtitle: context.event.timeBlocks[0].subtitle,
+            title: firstBlock.title,
+            subtitle: firstBlock.subtitle,
         });
     }
     getFormVc() {

package/package.json

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