@webqit/oohtml 4.1.4 → 4.1.5

package/package.json

@@ -14,7 +14,7 @@
     "wicg-proposal"
   ],
   "homepage": "https://webqit.io/tooling/oohtml",
-  "version": "4.1.4",
+  "version": "4.1.5",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -39,7 +39,7 @@
     "postpublish": "git push && git push --tags"
   },
   "dependencies": {
-    "@webqit/quantum-js": "^4.5.6",
+    "@webqit/quantum-js": "^4.5.8",
     "@webqit/realdom": "^2.1.24",
     "@webqit/util": "^0.8.11"
   },

package/src/context-api/DOMContexts.js

@@ -87,8 +87,10 @@ export default class DOMContexts {
 
             const rootNode = this[ '#' ].host.getRootNode();
             const temp = event => {
-                if ( event.answered ) return;
+                event.stopImmediatePropagation();
+                // Always set thus whether answered or not
                 event.meta.target = event.target;
+                if ( event.answered ) return;
                 if ( !waitListMappings.get( rootNode ) ) { waitListMappings.set( rootNode, new Set ); }
                 if ( event.type === 'contextrequest' && event.live ) {
                     waitListMappings.get( rootNode ).add( event );

package/src/html-imports/index.js

@@ -134,7 +134,7 @@ function realtime( config ) {
         record.entrants.forEach( entry => {
             if ( entry.matches( config.templateSelector ) ) {
                 const htmlModule = HTMLModule.instance( entry );
-                htmlModule.ownerContext = entry.scoped ? record.target : record.target.getRootNode();
+                htmlModule.ownerContext = entry.scoped ? entry.parentNode : entry.getRootNode();
                 const ownerContextModulesObj = getDefs( htmlModule.ownerContext );
                 if ( htmlModule.defId ) { Observer.set( ownerContextModulesObj, htmlModule.defId, entry ); }
                 // The ownerContext's defs - ownerContextModulesObj - has to be populated
@@ -149,13 +149,13 @@ function realtime( config ) {
             if ( entry.matches( config.templateSelector ) ) {
                 const htmlModule = HTMLModule.instance( entry );
                 const ownerContextModulesObj = getDefs( htmlModule.ownerContext );
-                if ( htmlModule.defId ) { Observer.deleteProperty( ownerContextModulesObj, htmlModule.defId ); }
+                if ( htmlModule.defId && htmlModule.ownerContext.isConnected ) { Observer.deleteProperty( ownerContextModulesObj, htmlModule.defId ); }
                 detachImportsContext( htmlModule.ownerContext );
             } else {
                 detachImportsContext( entry );
             }
         } );
-    }, { live: true, subtree: 'cross-roots', timing: 'sync', staticSensitivity: true } );
+    }, { live: true, subtree: 'cross-roots', timing: 'sync', staticSensitivity: true, eventDetails: true } );
     
     // ------------
     // IMPORTS

package/src/namespaced-html/index.js

@@ -313,11 +313,12 @@ function realtime( config ) {
 			if ( entry.isConnected ) { setupBinding( entry, attrName, _( entry, 'attrOriginals' ).get( attrName )/* Saved original value */ || attrValue/* Lest it's ID */, newNamespaceObj ); }
 		};
         record.exits.forEach( entry => {
-			if (!entry.isConnected) return;
-			const namespaceObj = getOwnNamespaceObject.call( window, entry );
-			// Detach ID and IDREF associations
-			for ( const node of new Set( [ ...Object.values( namespaceObj ), ...( _( namespaceObj ).get( 'idrefs' ) || [] ) ] ) ) {
-				for ( const attrName of attrList ) { reAssociate( node, attrName, namespaceObj ); }
+			if ( entry.isConnected ) {
+				const namespaceObj = getOwnNamespaceObject.call( window, entry );
+				// Detach ID and IDREF associations
+				for ( const node of new Set( [ ...Object.values( namespaceObj ), ...( _( namespaceObj ).get( 'idrefs' ) || [] ) ] ) ) {
+					for ( const attrName of attrList ) { reAssociate( node, attrName, namespaceObj ); }
+				}
 			}
 			// Detach ID associations
 			const contextsApi = entry[ configs.CONTEXT_API.api.contexts ];
@@ -341,10 +342,20 @@ function realtime( config ) {
 
 	// DOM realtime
 	realdom.realtime( window.document ).query( `[${ attrList.map( attrName => window.CSS.escape( attrName ) ).join( '],[' ) }]`, record => {
+		// We do some caching to prevent redundanct lookups
+		const namespaceNodesToTest = { forID: new Map, forOther: new Map, };
 		for ( const attrName of attrList ) {
+			// Point to the right cache
+			const _namespaceNodesToTest = attrName === config.attr.lid ? namespaceNodesToTest.forID : namespaceNodesToTest.forOther;
 			record.exits.forEach( entry => {
-				const namespaceNodeToTest = ( attrName === config.attr.lid ? entry.parentNode : entry )?.closest/*can be documentFragment when Shadow DOM*/?.( config.namespaceSelector ) || entry.getRootNode().host;
-				if ( ( namespaceNodeToTest && !namespaceNodeToTest.isConnected ) || !entry.hasAttribute( attrName ) ) return;
+				if ( !entry.hasAttribute( attrName ) ) return;
+				// Point to the right namespace node
+				let namespaceNodeToTest = _namespaceNodesToTest.get( entry );
+				if ( typeof namespaceNodeToTest === 'undefined' ) {
+					namespaceNodeToTest = ( attrName === config.attr.lid ? entry.parentNode : entry )?.closest/*can be documentFragment when Shadow DOM*/?.( config.namespaceSelector ) || entry.getRootNode().host;
+					_namespaceNodesToTest.set( entry, namespaceNodeToTest );
+				}
+				if ( namespaceNodeToTest && !namespaceNodeToTest.isConnected ) return;
 				cleanupBinding( entry, attrName, () => entry.getAttribute( attrName )/* Current resolved value as-is */ );
 			} );
 			record.entrants.forEach( entry => {
@@ -352,6 +363,8 @@ function realtime( config ) {
 				setupBinding( entry, attrName, () => entry.getAttribute( attrName )/* Raw value (as-is) that will be saved as original */ );
 			} );
 		}
+		namespaceNodesToTest.forID.clear();
+		namespaceNodesToTest.forOther.clear();
 	}, { live: true, subtree: 'cross-roots', timing: 'sync' } );
 	// Attr realtime
 	realdom.realtime( window.document, 'attr' ).observe( attrList, records => {