@cyberalien/svg-utils 1.2.4 → 1.2.5

package/lib/components/prepare/states.js

@@ -29,7 +29,7 @@ function prepareComponentFactoryStatefulIcon(icon, options) {
 		defaultStateValues[stateName] = defaultValue;
 		if (customConfig?.[stateName]) config[stateName] = customConfig[stateName];
 		else {
-			if (state === "focus") config[stateName] = ".svg-focus-anchor:focus-within, .svg-hover-anchor:hover, &.state-focus";
+			if (state === "focus") config[stateName] = `input:not(:disabled):focus-visible, input:not(:disabled):hover, button:not(:disabled):focus-visible, button:not(:disabled):hover, &.state-${stateName}`;
 			else config[stateName] = `&.state-{state}`;
 			supportedStates.add(stateName);
 			supportedStateValues[stateName] = defaultValue;

package/lib/svg-css/states/selector/sub/split.js

@@ -16,28 +16,21 @@ function splitSelectorToSubParts(selector) {
 		result.combinator = firstChar;
 		selector = selector.slice(1).trim();
 	}
-	const pseudoSelectors = selector.split(":");
-	while (pseudoSelectors.length > 1) {
+	const pseudoMatches = selector.matchAll(/:[a-z-]+(\(:[a-z-]+\))*/g);
+	for (const match of pseudoMatches) {
+		const value = match[0];
+		selector = selector.replace(value, "");
 		const list = result.pseudo || /* @__PURE__ */ new Set();
 		if (!result.pseudo) result.pseudo = list;
-		list.add(":" + pseudoSelectors.pop());
+		list.add(value);
 	}
-	selector = pseudoSelectors[0];
-	let attrStart = selector.indexOf("[");
-	while (attrStart !== -1) {
-		const attrEnd = selector.indexOf("]", attrStart);
-		let attrValue;
-		if (attrEnd === -1) {
-			attrValue = selector.slice(attrStart);
-			selector = selector.slice(0, attrStart);
-		} else {
-			attrValue = selector.slice(attrStart, attrEnd + 1);
-			selector = selector.slice(0, attrStart) + selector.slice(attrEnd + 1);
-		}
+	const attrMatches = selector.matchAll(/\[[^\]]+\]/g);
+	for (const match of attrMatches) {
+		const value = match[0];
+		selector = selector.replace(value, "");
 		const list = result.attr || /* @__PURE__ */ new Set();
 		if (!result.attr) result.attr = list;
-		list.add(attrValue);
-		attrStart = selector.indexOf("[");
+		list.add(value);
 	}
 	const tagMatch = selector.match(/^[a-zA-Z][a-zA-Z0-9-]*/);
 	if (tagMatch) {

package/package.json

@@ -3,7 +3,7 @@
   "type": "module",
   "description": "Common functions for working with SVG used by various packages.",
   "author": "Vjacheslav Trushkin",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "license": "MIT",
   "bugs": "https://github.com/cyberalien/svg-utils/issues",
   "homepage": "https://cyberalien.dev/",