@legalplace/wizardx-core 4.42.10-nightly.20251126120203 → 4.42.10-nightly.20251126122442

package/dist/libs/PathReader.js

@@ -1,4 +1,3 @@
-import { createMatchSelector } from "connected-react-router";
 import queryString from "query-string";
 import { matchPath, generatePath } from "react-router";
 import { getConfig } from "../config";
@@ -19,12 +18,16 @@ export class PathReader {
         }
     }
     matchWithoutUniqId(state) {
-        var _a;
-        const matchSelector = createMatchSelector(getConfig().router.wizardPath);
-        const matchResult = matchSelector(state);
-        if (matchResult) {
+        var _a, _b, _c;
+        const pathname = ((_b = (_a = state.router) === null || _a === void 0 ? void 0 : _a.location) === null || _b === void 0 ? void 0 : _b.pathname) || window.location.pathname;
+        const matchResult = matchPath(pathname, {
+            path: getConfig().router.wizardPath,
+            exact: false,
+            strict: false,
+        });
+        if (matchResult && matchResult.params) {
             const { permalink, page, view, prefix } = matchResult.params;
-            const modelVersion = (_a = getQueryStringValues()) === null || _a === void 0 ? void 0 : _a.version;
+            const modelVersion = (_c = getQueryStringValues()) === null || _c === void 0 ? void 0 : _c.version;
             this.currentPrefix = prefix || "";
             this.currentPermalink = Globals.permalink || permalink;
             this.currentPage = this.getPageNumber(page);
@@ -36,12 +39,16 @@ export class PathReader {
         }
     }
     matchWithUniqId(state) {
-        var _a;
-        const matchSelector = createMatchSelector(getConfig().router.wizardInstancePath);
-        const matchResult = matchSelector(state);
-        if (matchResult) {
+        var _a, _b, _c;
+        const pathname = ((_b = (_a = state.router) === null || _a === void 0 ? void 0 : _a.location) === null || _b === void 0 ? void 0 : _b.pathname) || window.location.pathname;
+        const matchResult = matchPath(pathname, {
+            path: getConfig().router.wizardInstancePath,
+            exact: false,
+            strict: false,
+        });
+        if (matchResult && matchResult.params) {
             const { permalink, page, uniqid, view, prefix } = matchResult.params;
-            const modelVersion = (_a = getQueryStringValues()) === null || _a === void 0 ? void 0 : _a.version;
+            const modelVersion = (_c = getQueryStringValues()) === null || _c === void 0 ? void 0 : _c.version;
             this.currentPermalink = Globals.permalink || permalink;
             this.currentPrefix = prefix || "";
             this.currentPage = this.getPageNumber(page);

package/dist/redux/middlewares/paginationWatcherMiddleware.d.ts

@@ -1,5 +1,17 @@
-import type { LocationChangeAction } from "connected-react-router";
 import type { MiddlewareAPI, Dispatch } from "redux";
+declare const LOCATION_CHANGE = "@@router/LOCATION_CHANGE";
+interface LocationChangeAction {
+    type: typeof LOCATION_CHANGE;
+    payload: {
+        location: {
+            pathname: string;
+            search: string;
+            hash: string;
+        };
+        action: string;
+        isFirstRendering: boolean;
+    };
+}
 import type { ActionsType } from "../../types/Actions.type";
 export type WatcherActions = ActionsType.Conditions.updateSectionCondition | LocationChangeAction;
 declare const paginationWatcherMiddleware: (mpi: MiddlewareAPI) => (next: Dispatch) => (action: WatcherActions) => any;

package/dist/redux/middlewares/paginationWatcherMiddleware.js

@@ -1,4 +1,4 @@
-import { LOCATION_CHANGE } from "connected-react-router";
+const LOCATION_CHANGE = "@@router/LOCATION_CHANGE";
 import { goPageAction, updateAvailableSectionsAction, initMetaAction, initInstanceAction, } from "../actions/app";
 import { UPDATE_SECTION_CONDITION } from "../constants/conditions";
 import { selectAllSectionsReferences, selectUserEmailSectionVariableIds, } from "../selectors/references";

package/dist/redux/reducers/router.d.ts

@@ -0,0 +1,11 @@
+export interface RouterLocation {
+    pathname: string;
+    search: string;
+    hash: string;
+}
+export interface RouterState {
+    location: RouterLocation;
+    action: string;
+}
+declare const routerReducer: (state: RouterState | undefined, action: any) => RouterState;
+export default routerReducer;

package/dist/redux/reducers/router.js

@@ -0,0 +1,15 @@
+const initialState = {
+    location: {
+        pathname: typeof window !== "undefined" ? window.location.pathname : "/",
+        search: typeof window !== "undefined" ? window.location.search : "",
+        hash: typeof window !== "undefined" ? window.location.hash : "",
+    },
+    action: "POP",
+};
+const routerReducer = (state = initialState, action) => {
+    if (action.type === "@@router/LOCATION_CHANGE") {
+        return Object.assign(Object.assign({}, state), { location: action.payload.location, action: action.payload.action || "PUSH" });
+    }
+    return state;
+};
+export default routerReducer;

package/dist/redux/store.js

@@ -1,5 +1,4 @@
 import { combineReducers, legacy_createStore as createStore, applyMiddleware } from "redux";
-import { connectRouter, routerMiddleware } from "connected-react-router";
 import { composeWithDevTools } from "redux-devtools-extension";
 import { appReducer } from "./reducers/app";
 import { userReducer } from "./reducers/user";
@@ -24,6 +23,7 @@ import smartscriptMiddleware from "./middlewares/smartscriptMiddleware";
 import thirdPartyScriptsMiddleware from "./middlewares/thirdpartyScriptsMiddleware";
 import { pluginsStoreReducer } from "./reducers/pluginsStore";
 import { getSagaMiddleware } from "./sagas/middleware";
+import routerReducer from "./reducers/router";
 let store;
 export const createAppStore = (historyType = "browser") => {
     if (store !== undefined) {
@@ -32,7 +32,7 @@ export const createAppStore = (historyType = "browser") => {
     }
     const history = createHistory(historyType);
     const wizardxReducers = combineReducers({
-        router: connectRouter(history),
+        router: routerReducer,
         app: appReducer,
         user: userReducer,
         references: referencesReducer,
@@ -43,7 +43,7 @@ export const createAppStore = (historyType = "browser") => {
         pluginsStore: pluginsStoreReducer,
     });
     const sagaMiddleware = getSagaMiddleware();
-    const appliedMiddlewares = applyMiddleware(pluginsHookMiddleware, routerMiddleware(history), sagaMiddleware, paginationWatcherMiddleware, selectorsMiddleware, conditionsWatcherMiddleware, prefillerWatcherMiddleware, evaluationsWatcherMiddleware, multiplesActionsMiddleware, mandatoriesWatcherMiddleware, smartscriptMiddleware, thirdPartyScriptsMiddleware);
+    const appliedMiddlewares = applyMiddleware(pluginsHookMiddleware, sagaMiddleware, paginationWatcherMiddleware, selectorsMiddleware, conditionsWatcherMiddleware, prefillerWatcherMiddleware, evaluationsWatcherMiddleware, multiplesActionsMiddleware, mandatoriesWatcherMiddleware, smartscriptMiddleware, thirdPartyScriptsMiddleware);
     const middlewares = Globals.appEnv !== "production"
         ? composeWithDevTools(appliedMiddlewares)
         : appliedMiddlewares;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/wizardx-core",
-  "version": "4.42.10-nightly.20251126120203",
+  "version": "4.42.10-nightly.20251126122442",
   "author": "Moncef Hammou (moncef@legalplace.fr)",
   "license": "MIT",
   "files": [