mount-observer 0.0.83 → 0.0.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mount-observer",
-  "version": "0.0.83",
+  "version": "0.0.85",
   "description": "Observe and act on css matches.",
   "main": "MountObserver.js",
   "module": "MountObserver.js",

package/preloadContent.js

@@ -9,7 +9,7 @@ Object.defineProperty(HTMLTemplateElement.prototype, 'remoteContent', {
             if (window[remoteTemplElSym] === undefined) {
                 window[remoteTemplElSym] = 0;
             }
-            const id = window[remoteTemplElSym]++;
+            const id = templ.id || window[remoteTemplElSym]++;
             const sourceTempl = document.createElement('template');
             sourceTempl.id = '' + id;
             sourceTempl.content.appendChild(templ.content);
@@ -23,7 +23,7 @@ Object.defineProperty(HTMLTemplateElement.prototype, 'remoteContent', {
         {
             const test = templ[remoteTemplElSym]?.deref();
             if (test !== undefined)
-                return test;
+                return test.content;
             if (templ.getAttribute('rel') !== 'preload')
                 throw 'NI';
             const isIntraDoc = src[0] === '#';
@@ -34,6 +34,7 @@ Object.defineProperty(HTMLTemplateElement.prototype, 'remoteContent', {
             if (!(remoteTempl instanceof HTMLTemplateElement))
                 throw 404; //not found
             templ[remoteTemplElSym] = new WeakRef(remoteTempl);
+            return remoteTempl.content;
             //templ.dispatchEvent(new Event('load'));
         }
     }

package/preloadContent.ts

@@ -11,7 +11,7 @@ Object.defineProperty(HTMLTemplateElement.prototype, 'remoteContent', {
             if((<any>window)[remoteTemplElSym] === undefined ){
                 (<any>window)[remoteTemplElSym] = 0;
             }
-            const id = (<any>window)[remoteTemplElSym]++;
+            const id = templ.id || (<any>window)[remoteTemplElSym]++;
             const sourceTempl = document.createElement('template');
             sourceTempl.id = '' + id;
             sourceTempl.content.appendChild(templ.content);
@@ -24,7 +24,7 @@ Object.defineProperty(HTMLTemplateElement.prototype, 'remoteContent', {
         }
         {
             const test = (<any>templ)[remoteTemplElSym]?.deref();
-            if(test !== undefined) return test;
+            if(test !== undefined) return test.content;
             if(templ.getAttribute('rel') !== 'preload') throw 'NI';
             const isIntraDoc = src[0] === '#';
             if(!isIntraDoc) throw 'NI';
@@ -32,6 +32,7 @@ Object.defineProperty(HTMLTemplateElement.prototype, 'remoteContent', {
             const remoteTempl = upShadowSearch(templ, id);
             if(!(remoteTempl instanceof HTMLTemplateElement)) throw 404; //not found
             (<any>templ)[remoteTemplElSym] = new WeakRef(remoteTempl);
+            return remoteTempl.content;
             //templ.dispatchEvent(new Event('load'));
         }
 

package/upShadowSearch.js

@@ -13,6 +13,10 @@ export function upShadowSearch(ref, id) {
         else if (rn === document) {
             return null;
         }
-        return null;
+        else if (!rn.isConnected) {
+            //TODO:  search first for targetFragment
+            rn = document;
+        }
+        //return null;
     }
 }

package/upShadowSearch.ts

@@ -9,8 +9,12 @@ export function upShadowSearch(ref: Element, id: string){
             rn = rn.host.getRootNode() as (DocumentFragment | ShadowRoot) & { host?: Element };
         }else if(rn === document){
             return null;
+        }else if(!rn.isConnected){
+            //TODO:  search first for targetFragment
+            rn = document;
+
         }
-        return null;
+        //return null;
     }
 }