#8149 wip

Author: tobiu

apps/portal/service/Seo.mjs

@@ -34,12 +34,12 @@ class Seo extends Base {
     }
 
     /**
-     * Stores the most recent route hash received from `onRouteChanged()`.
+     * Stores the most recent route received from `onRouteChanged()`.
      * This is used to process a pending route update if the service becomes ready after a route change occurred.
-     * @member {String|null} #lastRouteHash=null
+     * @member {Object|null} #lastRouteHash=null
      * @private
      */
-    #lastRouteHash = null
+    #lastRoute = null
     /**
      * Caches the SEO metadata fetched from `apps/portal/resources/data/seo.json`.
      * This object maps route hash strings to their corresponding title and description.
@@ -57,8 +57,8 @@ class Seo extends Base {
      * @protected
      */
     afterSetIsReady(value, oldValue) {
-        if (value && this.#lastRouteHash) {
-            this.#updateDocumentHeadIfNeeded(this.#lastRouteHash)
+        if (value && this.#lastRoute) {
+            this.#updateDocumentHeadIfNeeded(this.#lastRoute)
         }
     }
 
@@ -86,7 +86,7 @@ class Seo extends Base {
             if (!response.ok) {
                 throw new Error(`HTTP error with status: ${response.status}`)
             }
-            this.#metadata = await response.json();
+            this.#metadata = await response.json()
         } catch (error) {
             console.error('Error fetching SEO metadata:', error)
         }
@@ -97,11 +97,13 @@ class Seo extends Base {
      * This method stores the new route hash and attempts to update the document head.
      * If the service is not yet ready (i.e., `initAsync` is still running), the update
      * is deferred until `isReady` becomes true.
-     * @param {String} hash The new route hash string.
+     * @param {Object} config          The configuration object.
+     * @param {String} config.hash     The new route hash string.
+     * @param {String} config.windowId The windowId matching the route.
      */
-    onRouteChanged(hash) {
-        this.#lastRouteHash = hash;
-        this.#updateDocumentHeadIfNeeded(hash)
+    onRouteChanged(config) {
+        this.#lastRoute = config;
+        this.#updateDocumentHeadIfNeeded(config)
     }
 
     /**
@@ -111,12 +113,11 @@ class Seo extends Base {
      * @param {Object} config The configuration object containing `description` and `title`.
      * @param {String} config.description The new meta-description for the document.
      * @param {String} config.title The new title for the document.
+     * @param {String} config.windowId The new title for the document.
      * @private
      */
-    async #updateDocumentHead({description, title}) {
-        let {windowId}   = this,
-            DocumentHead = await Neo.currentWorker.getAddon('DocumentHead', windowId);
-
+    async #updateDocumentHead({description, title, windowId}) {
+        let DocumentHead = await Neo.currentWorker.getAddon('DocumentHead', windowId);
         await DocumentHead.update({description, title, windowId})
     }
 
@@ -126,18 +127,18 @@ class Seo extends Base {
      * and call `#updateDocumentHead`. If an update occurs, it clears `#lastRouteHash`.
      * This prevents multiple updates for the same route if `onRouteChanged` is called
      * before `initAsync` completes.
-     * @param {String} hash The route hash for which to update the document head.
+     * @param {Object} config The route hash for which to update the document head.
      * @private
      */
-    #updateDocumentHeadIfNeeded(hash) {
+    #updateDocumentHeadIfNeeded(config) {
         let me = this;
 
         if (me.isReady) {
-            let metadata = me.getMetadata(hash);
+            let metadata = me.getMetadata(config.hashString);
 
             if (metadata) {
-                me.#updateDocumentHead(metadata);
-                me.#lastRouteHash = null
+                me.#updateDocumentHead({...metadata, windowId: config.windowId});
+                me.#lastRoute = null
             }
         }
     }

apps/portal/view/ViewportController.mjs

@@ -235,7 +235,7 @@ class ViewportController extends Controller {
      */
     async onHashChange(value, oldValue) {
         await super.onHashChange(value, oldValue);
-        SeoService.onRouteChanged(value?.hashString)
+        SeoService.onRouteChanged(value)
     }
 
     /**

src/manager/DomEvent.mjs

@@ -78,14 +78,16 @@ class DomEvent extends Base {
      * @param {Neo.component.Base} component
      * @param {data} event
      */
-    addResizeObserver(component, event) {
-        if (!Neo.main.addon.ResizeObserver) {
-            console.error('For using resize domListeners, you must include main.addon.ResizeObserver.', event)
-        }
+    async addResizeObserver(component, event) {
+        let {id, windowId} = component,
+            ResizeObserver = await Neo.currentWorker.getAddon('ResizeObserver', windowId);
 
-        let {id, windowId} = component;
+        // ResizeObservers need to get registered to a specific target id
+        if (event.delegate?.startsWith('#')) {
+            id = event.delegate.substring(1)
+        }
 
-        Neo.main.addon.ResizeObserver.register({id, windowId})
+        ResizeObserver.register({id, windowId})
     }
 
     /**
@@ -292,11 +294,10 @@ class DomEvent extends Base {
             });
 
             if (localEvents.length > 0) {
-                Neo.worker.App.promiseMessage('main', {
-                    action  : 'addDomListener',
-                    appName : component.appName,
-                    events  : localEvents,
-                    windowId: component.windowId
+                Neo.worker.App.promiseMessage(component.windowId, {
+                    action : 'addDomListener',
+                    appName: component.appName,
+                    events : localEvents
                 }).then(data => {
                     // console.log('added domListener', data);
                 }).catch(err => {

src/worker/Base.mjs

@@ -166,7 +166,7 @@ class Worker extends Base {
         // core.Base: initRemote() subscribes to this event for the SharedWorkers context
         me.fire('connected');
 
-        me.sendMessage('main', {action: 'workerConstructed', port: id});
+        me.sendMessage(id, {action: 'workerConstructed', port: id});
 
         me.afterConnect()
     }
@@ -180,7 +180,7 @@ class Worker extends Base {
         let me = this;
 
         if (!me.isSharedWorker) {
-            me.sendMessage('main', {action: 'workerConstructed'});
+            me.sendMessage(Neo.config.windowId, {action: 'workerConstructed'});
             me.afterConnect()
         }
     }