@torpor/view 0.4.3 → 0.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@torpor/view",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "Torpor's view library, for writing and mounting components",
   "type": "module",
   "exports": {

package/src/compile/build/client/replaceForVarNames.ts

@@ -8,7 +8,7 @@ export default function replaceForVarNames(value: string, status: BuildStatus):
 	// get it from the loop data to trigger an update when it is changed
 	for (let varName of status.forVarNames) {
 		value = value.replaceAll(
-			new RegExp(`(^|\\s|\\(|\\[|\\{|!)${varName[0]}($|\\s|\\.|\\(|\\)|\\[|\\]|\\}|;)`, "g"),
+			new RegExp(`(^|\\s|\\(|\\[|\\{|!)${varName[0]}($|\\s|\\.|,|\\(|\\)|\\[|\\]|\\}|;)`, "g"),
 			`$1${varName[1]}$2`,
 		);
 	}

package/src/compile/parse/scopeStyles.ts

@@ -20,24 +20,25 @@ export default function scopeStyles(status: ParseStatus): void {
 
 function scopeStylesOnNode(node: TemplateNode, selectors: string[]) {
 	if (isElementNode(node) || isComponentNode(node)) {
-		let scopeStyles = selectors.includes(node.tagName);
-		if (!scopeStyles) {
-			for (let a of node.attributes) {
+		node.scopeStyles =
+			selectors.includes(node.tagName) ||
+			node.attributes.find((a) => {
 				if (a.name === "class" && a.reactive) {
 					// Any reactivity in a class attribute makes it scoped,
 					// because we can't tell what's going on in there
-					scopeStyles = true;
+					return true;
 				} else if (a.name === "id" && a.value) {
-					scopeStyles = selectors.includes(`#${trimQuotes(a.value)}`);
+					if (selectors.includes(`#${trimQuotes(a.value)}`)) {
+						return true;
+					}
 				} else if (a.name === "class" && a.value) {
-					scopeStyles = selectors.includes(`.${trimQuotes(a.value)}`);
+					for (let classname of trimQuotes(a.value).split(/\s+/)) {
+						if (selectors.includes(`.${classname}`)) {
+							return true;
+						}
+					}
 				}
-				if (scopeStyles) {
-					break;
-				}
-			}
-		}
-		node.scopeStyles = scopeStyles;
+			}) !== undefined;
 	}
 
 	if (isParentNode(node)) {