@fluid-topics/ft-app-context 1.2.73 → 1.3.1

package/build/redux-stores/FtAppInfoStore.d.ts

@@ -1,5 +1,5 @@
 import { FtReduxStore, Optional } from "@fluid-topics/ft-wc-utils";
-import { FtDefaultLocales, FtMetadataConfiguration, FtSession, FtUiLocale, FtPrivacyPolicyConfiguration } from "@fluid-topics/public-api";
+import { FtDefaultLocales, FtMetadataConfiguration, FtPrivacyPolicyConfiguration, FtSession, FtUiLocale } from "@fluid-topics/public-api";
 import { PayloadAction } from "@reduxjs/toolkit";
 export declare const FtAppInfoStoreName = "ft-app-info";
 export interface FtAppInfoState {
@@ -20,6 +20,7 @@ export interface FtAppInfoState {
     forcedOffline: boolean;
 }
 export declare class AuthenticationChangeEvent extends CustomEvent<Optional<FtSession>> {
+    static eventName: string;
     constructor(session: Optional<FtSession>);
 }
 declare const reducers: {

package/build/redux-stores/FtAppInfoStore.js

@@ -1,17 +1,19 @@
 import { deepEqual, FtReduxStore } from "@fluid-topics/ft-wc-utils";
 export const FtAppInfoStoreName = "ft-app-info";
-export class AuthenticationChangeEvent extends CustomEvent {
+class AuthenticationChangeEvent extends CustomEvent {
     constructor(session) {
-        super("authentication-change", { detail: session });
+        super(AuthenticationChangeEvent.eventName, { detail: session });
     }
 }
+AuthenticationChangeEvent.eventName = "authentication-change";
+export { AuthenticationChangeEvent };
 const reducers = {
     session: (state, action) => {
         if (!deepEqual(state.session, action.payload)) {
             state.session = action.payload;
             setTimeout(() => ftAppInfoStore.dispatchEvent(new AuthenticationChangeEvent(action.payload)), 0);
         }
-    }
+    },
 };
 export const ftAppInfoStore = FtReduxStore.get({
     name: FtAppInfoStoreName,
@@ -32,5 +34,5 @@ export const ftAppInfoStore = FtReduxStore.get({
         openExternalDocumentInNewTab: false,
         navigatorOnline: true,
         forcedOffline: false,
-    }
+    },
 });

package/build/redux-stores/FtUserAssetsStore.js

@@ -7,8 +7,8 @@ export const ftUserAssetsStore = FtReduxStore.get({
     name: FtUserAssetsStoreName,
     initialState: {
         savedSearches: undefined,
-        bookmarks: undefined
-    }
+        bookmarks: undefined,
+    },
 });
 class UserAssetsActions {
     constructor() {

package/build/services/FtI18nService.d.ts

@@ -24,7 +24,7 @@ export declare class FtI18nServiceInternalClass extends FtServiceWithCache {
     getAllContexts(): Array<FtMessageContext>;
     prepareContext(name: string, defaultMessages?: Record<string, string>): Promise<FtMessageContext | undefined>;
     private resolveContext;
-    resolveRawMessage(contextName: string, messageKey: string): any;
+    resolveRawMessage(contextName: string, messageKey: string): string;
     resolveMessage(contextName: string, message: string, ...args: any[]): string;
     private fetchContext;
     subscribe(contextName: string, callback: Function): Unsubscribe;

package/build/services/history/HistoryService.d.ts

@@ -17,18 +17,18 @@ export declare class HistoryService extends WithEventBus {
     private installProxies;
     private initEventListeners;
     private initData;
-    updateCurrentState(update?: HistoryStateUpdate, forceMajorStateFromUpdate?: boolean): void;
+    updateCurrentState(update?: HistoryStateUpdate): void;
     addHistoryChangeListener(listener: (event: HistoryChangeEvent) => void): void;
     removeHistoryChangeListener(listener: (event: HistoryChangeEvent) => void): void;
     currentItem(): HistoryState;
     back(): void;
     backwardItem(): HistoryState | undefined;
-    private previousMajorPosition;
+    private previousDifferentMajorPosition;
     forward(): void;
     forwardItem(): HistoryState | undefined;
     private nextMajorPosition;
-    private previousExistingPosition;
+    private getHigherPositionInTheSameState;
     private buildCurrentState;
     private hasState;
-    private isMajorState;
+    private isDifferentMajorState;
 }

package/build/services/history/HistoryService.js

@@ -68,20 +68,14 @@ export class HistoryService extends WithEventBus {
             }
         }
     }
-    updateCurrentState(update, forceMajorStateFromUpdate = false) {
-        var _a, _b, _c;
+    updateCurrentState(update) {
+        var _a;
         const newState = {
             ...this.buildCurrentState(),
             ...update,
             index: this.currentIndex,
             title: (_a = update === null || update === void 0 ? void 0 : update.title) !== null && _a !== void 0 ? _a : this.currentState.title,
         };
-        const majorState = forceMajorStateFromUpdate
-            ? ((_b = update === null || update === void 0 ? void 0 : update.majorState) !== null && _b !== void 0 ? _b : this.currentState.majorState)
-            : ((_c = this.currentState.majorState) !== null && _c !== void 0 ? _c : update === null || update === void 0 ? void 0 : update.majorState);
-        if (majorState != undefined) {
-            newState.majorState = majorState;
-        }
         this.setCurrentState(newState);
     }
     addHistoryChangeListener(listener) {
@@ -94,7 +88,7 @@ export class HistoryService extends WithEventBus {
         return deepCopy(this.currentState);
     }
     back() {
-        const previousMajorPosition = this.previousMajorPosition();
+        const previousMajorPosition = this.previousDifferentMajorPosition();
         if (previousMajorPosition >= 0) {
             this.history.go(previousMajorPosition - this.currentIndex);
         }
@@ -106,18 +100,18 @@ export class HistoryService extends WithEventBus {
         }
     }
     backwardItem() {
-        return deepCopy(this.states[this.previousMajorPosition()]);
+        return deepCopy(this.states[this.previousDifferentMajorPosition()]);
     }
-    previousMajorPosition() {
-        let position = this.currentIndex;
-        while (position > 0 && !this.isMajorState(position)) {
+    previousDifferentMajorPosition() {
+        let position = this.currentIndex > 0 ? this.currentIndex - 1 : 0;
+        while (position > 0 && !this.isDifferentMajorState(position)) {
             position--;
         }
-        return this.previousExistingPosition(position);
+        return position;
     }
     forward() {
         const nextMajorPosition = this.nextMajorPosition();
-        if (nextMajorPosition < this.states.length) {
+        if (nextMajorPosition && nextMajorPosition < this.states.length) {
             this.history.go(nextMajorPosition - this.currentIndex);
         }
         else {
@@ -125,24 +119,40 @@ export class HistoryService extends WithEventBus {
         }
     }
     forwardItem() {
-        return deepCopy(this.states[this.nextMajorPosition()]);
+        const nextMajorPosition = this.nextMajorPosition();
+        if (!nextMajorPosition) {
+            return undefined;
+        }
+        return deepCopy(this.states[nextMajorPosition]);
     }
     nextMajorPosition() {
         let position = this.currentIndex;
+        if (position >= this.states.length) {
+            return undefined;
+        }
         do {
             position++;
-        } while (position < this.states.length && !this.isMajorState(position));
-        do {
+        } while (position < this.states.length && !this.isDifferentMajorState(position));
+        return this.getHigherPositionInTheSameState(position);
+    }
+    getHigherPositionInTheSameState(fromPosition) {
+        var _a;
+        const majorStateIdRef = (_a = this.states[fromPosition]) === null || _a === void 0 ? void 0 : _a.majorStateId;
+        if (!majorStateIdRef) {
+            // When no major Id, the state is alone on its "Major" reference
+            return fromPosition;
+        }
+        let higherDefinedStatePositionInTheSameMajorState = fromPosition;
+        let position = fromPosition + 1;
+        // Go to the last state with the same majorStateId
+        while (this.states.length > position && !this.isDifferentMajorState(position, majorStateIdRef)) {
+            // If state is undefined, still check next position until different majorState but do not update higherDefinedStatePositionInTheSameMajorState
+            if (this.hasState(position)) {
+                higherDefinedStatePositionInTheSameMajorState = position;
+            }
             position++;
-        } while (position < this.states.length && !this.isMajorState(position));
-        return this.previousExistingPosition(position);
-    }
-    previousExistingPosition(fromIndex) {
-        let position = fromIndex;
-        do {
-            position--;
-        } while (position > 0 && !this.hasState(position));
-        return position;
+        }
+        return higherDefinedStatePositionInTheSameMajorState;
     }
     buildCurrentState() {
         var _a, _b;
@@ -156,8 +166,13 @@ export class HistoryService extends WithEventBus {
     hasState(index) {
         return this.states[index] != undefined;
     }
-    isMajorState(index) {
-        var _a, _b;
-        return this.hasState(index) && ((_b = (_a = this.states[index]) === null || _a === void 0 ? void 0 : _a.majorState) !== null && _b !== void 0 ? _b : true);
+    isDifferentMajorState(index, majorStateId) {
+        var _a;
+        if (!this.hasState(index)) {
+            return false;
+        }
+        const referenceMajorStateId = (majorStateId !== null && majorStateId !== void 0 ? majorStateId : this.currentState.majorStateId);
+        const evaluatedMajorStateId = (_a = this.states[index]) === null || _a === void 0 ? void 0 : _a.majorStateId;
+        return evaluatedMajorStateId == undefined || evaluatedMajorStateId != referenceMajorStateId;
     }
 }

package/build/services/history/HistoryService.models.d.ts

@@ -3,14 +3,14 @@ export interface HistoryState {
     href: string;
     token?: string;
     title: string;
-    majorState?: boolean;
+    majorStateId?: string;
     category?: string;
     [additionalInfo: string]: any;
 }
 export interface HistoryStateUpdate {
     token?: string;
     title?: string;
-    majorState?: boolean;
+    majorStateId?: string;
     category?: string;
     [additionalInfo: string]: any;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-topics/ft-app-context",
-  "version": "1.2.73",
+  "version": "1.3.1",
   "description": "Global application context for Fluid Topics integrations",
   "keywords": [
     "Lit"
@@ -19,11 +19,11 @@
     "url": "ssh://git@scm.mrs.antidot.net:2222/fluidtopics/ft-web-components.git"
   },
   "dependencies": {
-    "@fluid-topics/ft-wc-utils": "1.2.73",
+    "@fluid-topics/ft-wc-utils": "1.3.1",
     "lit": "3.1.0"
   },
   "devDependencies": {
-    "@fluid-topics/public-api": "1.0.98"
+    "@fluid-topics/public-api": "1.0.99"
   },
-  "gitHead": "4f8924d376dd8e1fc58e1cde50904618bfe6ac1d"
+  "gitHead": "ba07775e09d57ec38038f07f9c03b52aea08376b"
 }