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

package/README.md

@@ -43,11 +43,11 @@ root.render(
 ```tsx
 // app/wizard/page.tsx
 'use client';
-import { AppNextJS } from "@legalplace/wizardx-core";
+import { App } from "@legalplace/wizardx-core";
 
 export default function WizardPage() {
   return (
-    <AppNextJS
+    <App
       loadPlugin={loadPlugin}
       loadTheme={loadTheme}
       wizardParams={wizardParams}
@@ -56,7 +56,7 @@ export default function WizardPage() {
 }
 ```
 
-**Important**: Use `AppNextJS` instead of `App` for Next.js projects.
+**Note**: The same `App` component works in both CRA and Next.js!
 
 See [NEXTJS-INTEGRATION.md](./NEXTJS-INTEGRATION.md) for complete Next.js setup including URL rewrites.
 
@@ -71,28 +71,14 @@ See [NEXTJS-INTEGRATION.md](./NEXTJS-INTEGRATION.md) for complete Next.js setup
 ### Components
 
 #### `App` Component
-The main component for Create React App that uses React Router with ConnectedRouter.
+The main component that uses React Router (BrowserRouter) for client-side routing.
+Works in both Create React App and Next.js.
 
 ```tsx
 import { App } from "@legalplace/wizardx-core";
 
 <App
-  historyType="browser" // or "memory"
-  loadPlugin={loadPlugin}
-  loadTheme={loadTheme}
-  wizardParams={wizardParams}
-  model={initialModel}
-  user={user}
-/>
-```
-
-#### `AppNextJS` Component
-Optimized component for Next.js that uses BrowserRouter instead of ConnectedRouter.
-
-```tsx
-import { AppNextJS } from "@legalplace/wizardx-core";
-
-<AppNextJS
+  historyType="browser" // optional, defaults to browser
   loadPlugin={loadPlugin}
   loadTheme={loadTheme}
   wizardParams={wizardParams}
@@ -168,8 +154,7 @@ const wizardParams = {
 
 ```typescript
 // Components
-export { App } from "@legalplace/wizardx-core";           // For CRA
-export { AppNextJS } from "@legalplace/wizardx-core";     // For Next.js
+export { App } from "@legalplace/wizardx-core";  // Works in both CRA and Next.js
 
 // Configuration
 export { getConfig, updateConfig } from "@legalplace/wizardx-core";

package/dist/App.js

@@ -1,10 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from "react";
-import { Route, Switch, Redirect } from "react-router-dom";
+import { BrowserRouter, Route, Switch, Redirect } from "react-router-dom";
 import { Provider } from "react-redux";
-import { ConnectedRouter } from "connected-react-router";
 import { getStore, createAppStore } from "./redux/store";
-import { getHistory } from "./redux/routerHistory";
 import Globals, { setGlobals } from "./Globals";
 import { getConfig, updateConfig } from "./config";
 import { fetchModelPrerequisitesAction } from "./redux/actions/sagas/model";
@@ -12,6 +10,7 @@ import { preloadTheme } from "./helpers/preloadTheme";
 import ViewComponent from "./components/View";
 import PluginRoute from "./components/PluginRoute";
 import SmartScriptComponent from "./components/SmartScript";
+import RouteWatcher from "./components/RouteWatcher";
 import { clearPlugins } from "./PluginLoader";
 import { PathReader } from "./libs/PathReader";
 import { resetStateAction } from "./redux/actions/app";
@@ -34,7 +33,7 @@ class WizardXCore extends React.Component {
         var _a;
         super(props);
         clearPlugins();
-        const historyType = typeof props.historyType === "string" ? props.historyType : "browser";
+        const historyType = "memory";
         const params = Object.assign(Object.assign({}, Globals), { loadTheme: props.loadTheme, loadPlugin: props.loadPlugin });
         if (props.model) {
             params.model = props.model;
@@ -77,7 +76,7 @@ class WizardXCore extends React.Component {
         getStore().dispatch(resetStateAction());
     }
     render() {
-        return (_jsx(Provider, { store: getStore(), children: _jsx(ConnectedRouter, { history: getHistory(), children: _jsxs(Switch, { children: [_jsx(Route, { path: "/p/:path", component: PluginRoute }), _jsx(Route, { path: getConfig().router.smartscriptPath, exact: true, strict: true, component: SmartScriptComponent }), _jsx(Route, { path: getConfig().router.wizardInstancePath, component: ViewComponent }), _jsx(Route, { path: getConfig().router.wizardPath, component: ViewComponent }), !window.location.href.includes("smartscript") && (_jsx(Route, { component: RedirectHandler }))] }) }) }));
+        return (_jsx(Provider, { store: getStore(), children: _jsxs(BrowserRouter, { children: [_jsx(RouteWatcher, {}), _jsxs(Switch, { children: [_jsx(Route, { path: "/p/:path", component: PluginRoute }), _jsx(Route, { path: getConfig().router.smartscriptPath, exact: true, strict: true, component: SmartScriptComponent }), _jsx(Route, { path: getConfig().router.wizardInstancePath, component: ViewComponent }), _jsx(Route, { path: getConfig().router.wizardPath, component: ViewComponent }), !window.location.href.includes("smartscript") && (_jsx(Route, { component: RedirectHandler }))] })] }) }));
     }
 }
 export default WizardXCore;

package/dist/components/RouteWatcher.d.ts

@@ -0,0 +1,2 @@
+declare const RouteWatcher: React.FC;
+export default RouteWatcher;

package/dist/components/RouteWatcher.js

@@ -0,0 +1,23 @@
+import { useEffect } from "react";
+import { useLocation } from "react-router-dom";
+import { useDispatch } from "react-redux";
+const RouteWatcher = () => {
+    const location = useLocation();
+    const dispatch = useDispatch();
+    useEffect(() => {
+        dispatch({
+            type: "@@router/LOCATION_CHANGE",
+            payload: {
+                location: {
+                    pathname: location.pathname,
+                    search: location.search,
+                    hash: location.hash,
+                },
+                action: "PUSH",
+                isFirstRendering: false,
+            },
+        });
+    }, [location.pathname, location.search, location.hash, dispatch]);
+    return null;
+};
+export default RouteWatcher;

package/dist/index.d.ts

@@ -1,7 +1,5 @@
 export { default as App } from "./App";
 export * from "./App";
-export { default as AppNextJS } from "./AppNextJS";
-export * from "./AppNextJS";
 export * from "./config";
 export * from "./Globals";
 export * from "./PluginLoader";

package/dist/index.js

@@ -1,7 +1,5 @@
 export { default as App } from "./App";
 export * from "./App";
-export { default as AppNextJS } from "./AppNextJS";
-export * from "./AppNextJS";
 export * from "./config";
 export * from "./Globals";
 export * from "./PluginLoader";

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.20251126115542",
+  "version": "4.42.10-nightly.20251126122442",
   "author": "Moncef Hammou (moncef@legalplace.fr)",
   "license": "MIT",
   "files": [
@@ -23,12 +23,6 @@
       "require": "./dist/App.js",
       "default": "./dist/App.js"
     },
-    "./AppNextJS": {
-      "types": "./dist/AppNextJS.d.ts",
-      "import": "./dist/AppNextJS.js",
-      "require": "./dist/AppNextJS.js",
-      "default": "./dist/AppNextJS.js"
-    },
     "./package.json": "./package.json"
   },
   "scripts": {

package/dist/AppNextJS.d.ts

@@ -1,21 +0,0 @@
-import React from "react";
-import type { ModelV3 } from "@legalplace/models-v3-types";
-import type { StateType } from "./types/State.type";
-import type { IWizardParams } from "./types/config.type";
-export interface AppNextJSProps {
-    model?: ModelV3;
-    meta?: StateType.App.Meta;
-    instance?: StateType.App.Instance;
-    user?: StateType.User;
-    wizardParams?: IWizardParams;
-    preloadTheme?: boolean;
-    loadPlugin: (plugin: string) => Promise<any>;
-    loadTheme: (theme: string) => Promise<any>;
-}
-declare class AppNextJS extends React.Component<AppNextJSProps> {
-    constructor(props: AppNextJSProps);
-    componentDidMount(): void;
-    componentWillUnmount(): void;
-    render(): import("react/jsx-runtime").JSX.Element;
-}
-export default AppNextJS;

package/dist/AppNextJS.js

@@ -1,81 +0,0 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import React from "react";
-import { BrowserRouter, Route, Switch, Redirect } from "react-router-dom";
-import { Provider } from "react-redux";
-import { getStore, createAppStore } from "./redux/store";
-import Globals, { setGlobals } from "./Globals";
-import { getConfig, updateConfig } from "./config";
-import { fetchModelPrerequisitesAction } from "./redux/actions/sagas/model";
-import { preloadTheme } from "./helpers/preloadTheme";
-import ViewComponent from "./components/View";
-import PluginRoute from "./components/PluginRoute";
-import SmartScriptComponent from "./components/SmartScript";
-import { clearPlugins } from "./PluginLoader";
-import { PathReader } from "./libs/PathReader";
-import { resetStateAction } from "./redux/actions/app";
-import { callInitDataSmartscriptAction } from "./redux";
-import { externalPartnerRedirectUrl } from "./helpers/redirectionConfig";
-import { autoSave } from "./helpers/autosave.helper";
-import { NOT_FOUND_PAGE_LINK } from "./constants/links.constant";
-const RedirectHandler = () => {
-    const matchedPartner = Object.keys(externalPartnerRedirectUrl).find((partner) => window.location.origin.toLowerCase().includes(partner));
-    if (matchedPartner) {
-        window.location.href = externalPartnerRedirectUrl[matchedPartner];
-    }
-    else {
-        window.location.href = NOT_FOUND_PAGE_LINK;
-    }
-    return _jsx(Redirect, { to: getConfig().router.notFoundPath });
-};
-class AppNextJS extends React.Component {
-    constructor(props) {
-        var _a;
-        super(props);
-        clearPlugins();
-        const historyType = "memory";
-        const params = Object.assign(Object.assign({}, Globals), { loadTheme: props.loadTheme, loadPlugin: props.loadPlugin });
-        if (props.model) {
-            params.model = props.model;
-        }
-        if (props.meta) {
-            params.meta = props.meta;
-        }
-        if (props.instance) {
-            params.instance = props.instance;
-        }
-        if (props.user) {
-            params.user = props.user;
-        }
-        setGlobals(params);
-        if (props.wizardParams)
-            updateConfig(props.wizardParams);
-        if (props.preloadTheme && ((_a = props.wizardParams) === null || _a === void 0 ? void 0 : _a.theme.name))
-            preloadTheme(props.wizardParams.theme.name);
-        createAppStore(historyType);
-    }
-    componentDidMount() {
-        const { dispatch, getState } = getStore();
-        const state = getState();
-        let parent = null;
-        window.addEventListener("message", ({ data, source }) => {
-            if (parent === null || data.from === "BO") {
-                parent = source;
-            }
-            if (data.from && data.from === "BO") {
-                const { variables } = data;
-                autoSave(variables, getStore());
-            }
-        });
-        dispatch(callInitDataSmartscriptAction());
-        if (!PathReader.isSmartScriptPath()) {
-            dispatch(fetchModelPrerequisitesAction(getConfig().permalink || state.app.meta.permalink, getConfig().prefix || state.app.meta.prefix || ""));
-        }
-    }
-    componentWillUnmount() {
-        getStore().dispatch(resetStateAction());
-    }
-    render() {
-        return (_jsx(Provider, { store: getStore(), children: _jsx(BrowserRouter, { children: _jsxs(Switch, { children: [_jsx(Route, { path: "/p/:path", component: PluginRoute }), _jsx(Route, { path: getConfig().router.smartscriptPath, exact: true, strict: true, component: SmartScriptComponent }), _jsx(Route, { path: getConfig().router.wizardInstancePath, component: ViewComponent }), _jsx(Route, { path: getConfig().router.wizardPath, component: ViewComponent }), !window.location.href.includes("smartscript") && (_jsx(Route, { component: RedirectHandler }))] }) }) }));
-    }
-}
-export default AppNextJS;