@vived/host 3.9.3 → 3.10.1

package/lib/Components/Apps/UCs/StartAppUC.js

@@ -35,7 +35,7 @@ class StartAppUCImp extends StartAppUC {
     constructor(appObject) {
         super(appObject, StartAppUC.type);
         this.start = (container) => {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             if (!this.stateMachine)
                 return;
             if (!this.dispatchStart)
@@ -43,20 +43,26 @@ class StartAppUCImp extends StartAppUC {
             if (!this.editStateEntity)
                 return;
             this.dispatchStart.doDispatch(container);
-            let stateString = "";
-            if (this.stateMachine.activeState && this.stateMachine.activeState) {
-                const state = this.stateMachine.getStateByID(this.stateMachine.activeState);
-                if (state) {
-                    stateString = JSON.stringify(state.stateData);
-                }
+            let state;
+            if (this.stateMachine.activeState) {
+                state = (_a = this.stateMachine.getStateByID(this.stateMachine.activeState)) === null || _a === void 0 ? void 0 : _a.stateData;
             }
-            (_a = this.dispatchSetState) === null || _a === void 0 ? void 0 : _a.doDispatch(stateString);
+            const hideNavigation = this.stateMachine.states.length <= 1;
+            const hasNextSlide = this.stateMachine.nextState !== undefined;
+            const hasPreviousSlide = this.stateMachine.previousState !== undefined;
+            const dto = {
+                finalState: state,
+                hideNavigation,
+                hasNextSlide,
+                hasPreviousSlide
+            };
+            (_b = this.dispatchSetState) === null || _b === void 0 ? void 0 : _b.doDispatch(dto);
             let isAuthoring = this.editStateEntity.isEditing;
             if (this.stateMachine.activeState === undefined) {
                 isAuthoring = true;
             }
-            (_b = this.dispatchSetIsAuthoring) === null || _b === void 0 ? void 0 : _b.doDispatch(isAuthoring);
-            (_c = this.dispatchThemeColors) === null || _c === void 0 ? void 0 : _c.doDispatch();
+            (_c = this.dispatchSetIsAuthoring) === null || _c === void 0 ? void 0 : _c.doDispatch(isAuthoring);
+            (_d = this.dispatchThemeColors) === null || _d === void 0 ? void 0 : _d.doDispatch();
         };
     }
     get stateMachine() {

package/lib/Components/Dispatcher/UCs/DispatchSetStateUC.d.ts

@@ -1,9 +1,27 @@
 import { HostAppObject, HostAppObjectRepo, HostAppObjectUC } from "../../../HostAppObject";
+export interface DispatchStateDTO {
+    finalState?: object;
+    hideNavigation: boolean;
+    hasNextSlide: boolean;
+    hasPreviousSlide: boolean;
+    duration?: number;
+}
 export declare abstract class DispatchSetStateUC extends HostAppObjectUC {
     static readonly type = "DispatchSetStateUC";
     readonly requestType = "SET_APP_STATE";
-    abstract doDispatch(finalState: string, duration?: number | undefined): void;
+    abstract doDispatch(dto: DispatchStateDTO): void;
     static get(appObject: HostAppObject): DispatchSetStateUC | undefined;
     static getByID(id: string, appObjects: HostAppObjectRepo): DispatchSetStateUC | undefined;
 }
 export declare function makeDispatchSetStateUC(appObject: HostAppObject): DispatchSetStateUC;
+export interface SetStatePayloadV2 {
+    finalState: string;
+    duration?: number;
+}
+export interface SetStatePayloadV3 {
+    hideNavigation: boolean;
+    hasNextSlide: boolean;
+    hasPreviousSlide: boolean;
+    duration?: number;
+    finalState?: object;
+}

package/lib/Components/Dispatcher/UCs/DispatchSetStateUC.js

@@ -31,22 +31,37 @@ function makeDispatchSetStateUC(appObject) {
 }
 exports.makeDispatchSetStateUC = makeDispatchSetStateUC;
 class DispatchSetStateUCImp extends DispatchSetStateUC {
-    constructor(appObject) {
-        super(appObject, DispatchSetStateUC.type);
-        this.requestVersion = 2;
-        this.dispatcher = appObject.getComponent(Entities_1.HostDispatchEntity.type);
-        if (!this.dispatcher) {
-            this.error("UC has been added to an App Object that does not have a HostDispatchEntity. Add a dispatcher first");
-            this.dispose();
-        }
+    get dispatcher() {
+        return this.getCachedLocalComponent(Entities_1.HostDispatchEntity.type);
     }
-    doDispatch(finalState, duration) {
+    doDispatch(dto) {
         if (!this.dispatcher)
             return;
+        const { finalState, duration, hasNextSlide, hasPreviousSlide, hideNavigation } = dto;
+        const requestedPayload = this.dispatcher.getRequestPayloadVersion(this.requestType);
+        if (!requestedPayload || requestedPayload <= 2) {
+            this.dispatchV2(finalState, duration);
+            return;
+        }
+        const payload = {
+            finalState,
+            duration,
+            hasNextSlide,
+            hasPreviousSlide,
+            hideNavigation
+        };
+        this.dispatcher.formRequestAndDispatch(this.requestType, 3, payload);
+    }
+    dispatchV2(state, duration) {
+        var _a;
+        const finalState = state ? JSON.stringify(state) : "";
         const payload = {
             finalState,
             duration
         };
-        this.dispatcher.formRequestAndDispatch(this.requestType, this.requestVersion, payload);
+        (_a = this.dispatcher) === null || _a === void 0 ? void 0 : _a.formRequestAndDispatch(this.requestType, 2, payload);
+    }
+    constructor(appObject) {
+        super(appObject, DispatchSetStateUC.type);
     }
 }

package/lib/Components/StateMachine/UCs/CancelEditing/CancelSandboxEditingUC.js

@@ -30,8 +30,16 @@ class CancelSandboxEditingUC extends CancelEditingUC_1.CancelEditingUC {
             if (this.stateMachine.activeState) {
                 const state = this.stateMachine.getStateByID(this.stateMachine.activeState);
                 if (state) {
-                    const stateData = JSON.stringify(state.stateData);
-                    dispatchSetState.doDispatch(stateData);
+                    const hideNavigation = this.stateMachine.states.length <= 1;
+                    const hasNextSlide = this.stateMachine.nextState !== undefined;
+                    const hasPreviousSlide = this.stateMachine.previousState !== undefined;
+                    const dto = {
+                        finalState: state.stateData,
+                        hideNavigation,
+                        hasNextSlide,
+                        hasPreviousSlide
+                    };
+                    dispatchSetState.doDispatch(dto);
                 }
             }
             else {

package/lib/Components/StateMachine/UCs/EditActiveState/EditActiveSandboxStateUC.js

@@ -34,8 +34,16 @@ class EditActiveSandboxStateUCImp extends EditActiveStateUC_1.EditActiveStateUC
                 this.warn("Unable to find state");
                 return;
             }
-            const stateStr = JSON.stringify(state.stateData);
-            dispatchSetState.doDispatch(stateStr);
+            const hideNavigation = this.stateMachine.states.length <= 1;
+            const hasNextSlide = this.stateMachine.nextState !== undefined;
+            const hasPreviousSlide = this.stateMachine.previousState !== undefined;
+            const dto = {
+                finalState: state.stateData,
+                hideNavigation,
+                hasNextSlide,
+                hasPreviousSlide
+            };
+            dispatchSetState.doDispatch(dto);
             dispatchSetIsAuthoring.doDispatch(true);
             this.editStateEntity.startEditing(state);
         };

package/lib/Components/StateMachine/UCs/TransitionToState/TransitionToSandboxStateUC.js

@@ -31,9 +31,18 @@ class TransitionToSandboxStateUCImp extends TransitionToStateUC_1.TransitionToSt
             return;
         }
         stateMachine.setActiveStateByID(id);
-        const stateStr = JSON.stringify(state.stateData);
         const duration = stateMachine.transitionDuration;
-        dispatchSetState.doDispatch(stateStr, duration);
+        const hideNavigation = stateMachine.states.length <= 1;
+        const hasNextSlide = stateMachine.nextState !== undefined;
+        const hasPreviousSlide = stateMachine.previousState !== undefined;
+        const dto = {
+            finalState: state.stateData,
+            duration,
+            hideNavigation,
+            hasNextSlide,
+            hasPreviousSlide
+        };
+        dispatchSetState.doDispatch(dto);
     }
     constructor(appObject) {
         super(appObject, TransitionToStateUC_1.TransitionToStateUC.type);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vived/host",
-  "version": "3.9.3",
+  "version": "3.10.1",
   "description": "Public Host package for the VIVED Learning App system",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",