diff --git a/src/components/appRouter.js b/src/components/appRouter.js index cab40043b..f2bc0e27b 100644 --- a/src/components/appRouter.js +++ b/src/components/appRouter.js @@ -9,7 +9,6 @@ import loading from './loading/loading'; import viewManager from './viewManager/viewManager'; import ServerConnections from './ServerConnections'; import alert from './alert'; -import reactControllerFactory from './reactControllerFactory'; export const history = createHashHistory(); @@ -264,9 +263,7 @@ class AppRouter { this.#sendRouteToViewManager(ctx, next, route, controllerFactory); }; - if (route.pageComponent) { - onInitComplete(reactControllerFactory); - } else if (route.controller) { + if (route.controller) { import('../controllers/' + route.controller).then(onInitComplete); } else { onInitComplete(); @@ -293,7 +290,6 @@ class AppRouter { fullscreen: route.fullscreen, controllerFactory: controllerFactory, options: { - pageComponent: route.pageComponent, supportsThemeMedia: route.supportsThemeMedia || false, enableMediaControl: route.enableMediaControl !== false }, diff --git a/src/components/reactControllerFactory.js b/src/components/reactControllerFactory.js deleted file mode 100644 index 9611b706e..000000000 --- a/src/components/reactControllerFactory.js +++ /dev/null @@ -1,17 +0,0 @@ -import React from 'react'; -import ReactDOM from 'react-dom'; - -export default (view, params, { detail }) => { - if (detail.options?.pageComponent) { - // Fetch and render the page component to the view - import(/* webpackChunkName: "[request]" */ `./pages/${detail.options.pageComponent}`) - .then(({ default: component }) => { - ReactDOM.render(React.createElement(component, params), view); - }); - - // Unmount component when view is destroyed - view.addEventListener('viewdestroy', () => { - ReactDOM.unmountComponentAtNode(view); - }); - } -}; diff --git a/src/components/viewManager/viewManager.js b/src/components/viewManager/viewManager.js index 5073cccf8..48c708d2a 100644 --- a/src/components/viewManager/viewManager.js +++ b/src/components/viewManager/viewManager.js @@ -21,9 +21,9 @@ viewContainer.setOnBeforeChange(function (newView, isRestored, options) { newView.initComplete = true; if (typeof options.controllerFactory === 'function') { - new options.controllerFactory(newView, eventDetail.detail.params, eventDetail); + new options.controllerFactory(newView, eventDetail.detail.params); } else if (options.controllerFactory && typeof options.controllerFactory.default === 'function') { - new options.controllerFactory.default(newView, eventDetail.detail.params, eventDetail); + new options.controllerFactory.default(newView, eventDetail.detail.params); } if (!options.controllerFactory || dispatchPageEvents) {