fix: LivePreview incorrect popout URL and SharedWorker routing issues (#9518)

Author: tobiu

src/code/LivePreview.mjs

@@ -220,7 +220,7 @@ class LivePreview extends Container {
      */
     beforeSetWindowUrl(value, oldValue) {
         if (value.startsWith('./')) {
-            let appPath = Neo.config.appPath.split('/');
+            let appPath = (Neo.windowConfigs?.[this.windowId]?.appPath || Neo.config.appPath).split('/');
             appPath.pop()
 
             return new URL(Neo.config.basePath + appPath.join('/') + value.substring(1), location.href).href

src/component/Circle.mjs

@@ -216,6 +216,27 @@ class Circle extends Component {
         me.update()
     }
 
+    /**
+     * Triggered after the windowId config got changed
+     * @param {Number|String|null} value
+     * @param {Number|String|null} oldValue
+     * @protected
+     */
+    afterSetWindowId(value, oldValue) {
+        super.afterSetWindowId(value, oldValue);
+
+        if (value) {
+            let appConfig = Neo.windowConfigs?.[value] || Neo.config;
+
+            if (this.backsideIconPath === Neo.config.resourcesPath + 'images/circle/') {
+                this.backsideIconPath = appConfig.resourcesPath + 'images/circle/';
+            }
+            if (this.itemImagePath === Neo.config.resourcesPath + 'examples/images/') {
+                this.itemImagePath = appConfig.resourcesPath + 'examples/images/';
+            }
+        }
+    }
+
     /**
      * Triggered after the draggable config got changed
      * @param {Boolean} value

src/component/Gallery.mjs

@@ -407,7 +407,8 @@ class Gallery extends Component {
 
         vdomItem.id = me.getItemVnodeId(me.getRecordId(record));
 
-        imageVdom.src = Neo.config.resourcesPath + 'examples/' + record.image;
+        let appConfig = Neo.windowConfigs?.[me.windowId] || Neo.config;
+        imageVdom.src = appConfig.resourcesPath + 'examples/' + record.image;
 
         imageVdom.style.height = me.itemHeight + 'px';
         imageVdom.style.width  = me.itemWidth  + 'px';

src/component/Helix.mjs

@@ -448,7 +448,8 @@ class Helix extends Component {
         super.afterSetWindowId(value, oldValue);
 
         if (value) {
-            this.imageSource = Neo.config.resourcesPath + 'examples/'
+            let appConfig = Neo.windowConfigs?.[value] || Neo.config;
+            this.imageSource = appConfig.resourcesPath + 'examples/'
         }
     }
 

src/controller/Application.mjs

@@ -77,7 +77,7 @@ class Application extends Base {
         let me     = this,
             {name} = me;
 
-        me.windowId = Neo.config.windowId;
+        me.windowId = config.windowId || Neo.bootingWindowId || Neo.config.windowId;
 
         Neo.apps[me.windowId] = me;
 
@@ -132,11 +132,12 @@ class Application extends Base {
      */
     beforeSetMainView(value, oldValue) {
         if (value) {
-            let {config} = Neo,
+            let me       = this,
+                {config} = Neo,
                 instanceConfig = {
-                    appName : this.name,
-                    parentId: this.parentId,
-                    windowId: config.windowId
+                    appName : me.name,
+                    parentId: me.parentId,
+                    windowId: me.windowId
                 };
 
             if (config.useSSR && config.vnode) {

src/worker/App.mjs

@@ -63,6 +63,12 @@ class App extends Base {
      * @protected
      */
     themeFilesCache = []
+    /**
+     * Ensures we only fetch the theme-map once per worker.
+     * @member {Boolean} themeMapFetchStarted=false
+     * @protected
+     */
+    themeMapFetchStarted = false
     /**
      * @member {String} workerId='app'
      * @protected
@@ -607,14 +613,18 @@ class App extends Base {
     onLoadApplication(data) {
         let me        = this,
             {config}  = Neo,
-            {appPath} = config;
+            windowId  = data.windowId,
+            appConfig = Neo.windowConfigs[windowId] || config,
+            appPath   = appConfig.appPath;
 
-        if (config.environment !== 'development') {
+        if (appConfig.environment !== 'development') {
             appPath = appPath.startsWith('/') ? appPath.substring(1) : appPath
         }
 
         me.importApp(appPath).then(module => {
+            Neo.bootingWindowId = windowId;
             module.onStart();
+            delete Neo.bootingWindowId;
 
             // short delay to ensure Component Controllers are ready
             config.hash && me.timeout(5).then(() => {
@@ -647,29 +657,34 @@ class App extends Base {
             import('../manager/Window.mjs')
         }
 
-        let {config} = Neo,
+        let me       = this,
+            {config} = Neo,
             {data}   = msg,
             url      = 'resources/theme-map.json';
 
         Neo.windowConfigs = Neo.windowConfigs || {};
 
         Neo.windowConfigs[data.windowId] = Neo.clone(data, true);
 
-        if (config.environment === 'development' || config.environment === 'dist/esm') {
-            url = `../../${url}`
-        }
+        if (!me.themeMapFetchStarted) {
+            me.themeMapFetchStarted = true;
 
-        if (config.workerBasePath?.includes('node_modules')) {
-            url = `../../${url}`
-        }
+            if (config.environment === 'development' || config.environment === 'dist/esm') {
+                url = `../../${url}`
+            }
 
-        if (url[0] !== '.') {
-            url = `./${url}`
-        }
+            if (config.workerBasePath?.includes('node_modules')) {
+                url = `../../${url}`
+            }
 
-        fetch(url)
-            .then(response => response.json())
-            .then(data => {this.createThemeMap(data)});
+            if (url[0] !== '.') {
+                url = `./${url}`
+            }
+
+            fetch(url)
+                .then(response => response.json())
+                .then(data => {me.createThemeMap(data)});
+        }
 
         config.remotesApiUrl && import('../remotes/Api.mjs').then(module => module.default.load());
 

src/worker/Base.mjs

@@ -272,7 +272,9 @@ class Worker extends Base {
             }
         }
 
-        Neo.merge(Neo.config, data)
+        if (!Neo.config.windowId) {
+            Neo.merge(Neo.config, data)
+        }
     }
 
     /**

src/worker/Manager.mjs

@@ -407,7 +407,7 @@ class Manager extends Base {
      *
      */
     loadApplication() {
-        this.sendMessage('app', {action: 'loadApplication' })
+        this.sendMessage('app', {action: 'loadApplication', windowId: this.windowId})
     }
 
     /**