@iconify/tools 2.1.0-beta.6 → 2.1.0-beta.7

package/lib/colors/attribs.cjs

@@ -22,7 +22,12 @@ const defaultColorValues = {
   "stop-color": defaultBlackColor,
   "flood-color": defaultBlackColor
 };
+const allowDefaultColorValue = {
+  "stop-color": true,
+  "flood-color": "flood-opacity"
+};
 
+exports.allowDefaultColorValue = allowDefaultColorValue;
 exports.commonColorAttributes = commonColorAttributes;
 exports.defaultBlackColor = defaultBlackColor;
 exports.defaultColorValues = defaultColorValues;

package/lib/colors/attribs.d.ts

@@ -15,5 +15,11 @@ declare type ColorAttributes = CommonColorAttributes | ShapeColorAttributes | Sp
  */
 declare const defaultBlackColor: Color;
 declare const defaultColorValues: Record<ColorAttributes, Color>;
+/**
+ * Ignore default color for some tags:
+ * - If value is true, allow default color
+ * - If value is attribute name, allow default color if attribute is set
+ */
+declare const allowDefaultColorValue: Partial<Record<ColorAttributes, string | true>>;
 
-export { ColorAttributes, CommonColorAttributes, ShapeColorAttributes, SpecialColorAttributes, commonColorAttributes, defaultBlackColor, defaultColorValues, shapeColorAttributes, specialColorAttributes };
+export { ColorAttributes, CommonColorAttributes, ShapeColorAttributes, SpecialColorAttributes, allowDefaultColorValue, commonColorAttributes, defaultBlackColor, defaultColorValues, shapeColorAttributes, specialColorAttributes };

package/lib/colors/attribs.mjs

@@ -18,5 +18,9 @@ const defaultColorValues = {
   "stop-color": defaultBlackColor,
   "flood-color": defaultBlackColor
 };
+const allowDefaultColorValue = {
+  "stop-color": true,
+  "flood-color": "flood-opacity"
+};
 
-export { commonColorAttributes, defaultBlackColor, defaultColorValues, shapeColorAttributes, specialColorAttributes };
+export { allowDefaultColorValue, commonColorAttributes, defaultBlackColor, defaultColorValues, shapeColorAttributes, specialColorAttributes };

package/lib/colors/parse.cjs

@@ -54,12 +54,18 @@ async function parseColors(svg, options = {}) {
   function getElementColor(prop, item, elements2) {
     function find(prop2) {
       let currentItem = item;
+      const allowDefaultColor = colors_attribs.allowDefaultColorValue[prop2];
       while (currentItem) {
         const element = elements2.get(currentItem.index);
         const color = element._colors?.[prop2];
         if (color !== void 0) {
           return color;
         }
+        if (allowDefaultColor) {
+          if (allowDefaultColor === true || element.attribs[allowDefaultColor]) {
+            return null;
+          }
+        }
         currentItem = currentItem.parent;
         if (currentItem?.usedAsMask) {
           return colors_attribs.defaultColorValues[prop2];
@@ -68,7 +74,7 @@ async function parseColors(svg, options = {}) {
       return colors_attribs.defaultColorValues[prop2];
     }
     let propColor = find(prop);
-    if (typeof propColor === "object" && propColor.type === "current" && prop !== "color") {
+    if (propColor !== null && typeof propColor === "object" && propColor.type === "current" && prop !== "color") {
       propColor = find("color");
     }
     return propColor;

package/lib/colors/parse.mjs

@@ -1,7 +1,7 @@
 import { stringToColor, colorToString, compareColors } from '@iconify/utils/lib/colors';
 import { animateTags, shapeTags } from '../svg/data/tags.mjs';
 import { parseSVGStyle } from '../svg/parse-style.mjs';
-import { specialColorAttributes, defaultBlackColor, defaultColorValues, shapeColorAttributes } from './attribs.mjs';
+import { specialColorAttributes, defaultBlackColor, defaultColorValues, shapeColorAttributes, allowDefaultColorValue } from './attribs.mjs';
 import { tagSpecificPresentationalAttributes } from '../svg/data/attributes.mjs';
 import { analyseSVGStructure } from '../svg/analyse.mjs';
 import '../css/parse.mjs';
@@ -50,12 +50,18 @@ async function parseColors(svg, options = {}) {
   function getElementColor(prop, item, elements2) {
     function find(prop2) {
       let currentItem = item;
+      const allowDefaultColor = allowDefaultColorValue[prop2];
       while (currentItem) {
         const element = elements2.get(currentItem.index);
         const color = element._colors?.[prop2];
         if (color !== void 0) {
           return color;
         }
+        if (allowDefaultColor) {
+          if (allowDefaultColor === true || element.attribs[allowDefaultColor]) {
+            return null;
+          }
+        }
         currentItem = currentItem.parent;
         if (currentItem?.usedAsMask) {
           return defaultColorValues[prop2];
@@ -64,7 +70,7 @@ async function parseColors(svg, options = {}) {
       return defaultColorValues[prop2];
     }
     let propColor = find(prop);
-    if (typeof propColor === "object" && propColor.type === "current" && prop !== "color") {
+    if (propColor !== null && typeof propColor === "object" && propColor.type === "current" && prop !== "color") {
       propColor = find("color");
     }
     return propColor;

package/lib/misc/keyword.cjs

@@ -6,7 +6,7 @@ function cleanupIconKeyword(keyword, convertCamelCase = false) {
   if (convertCamelCase) {
     keyword = keyword.replace(/[A-Z]+/g, (chars) => "_" + chars.toLowerCase());
   }
-  keyword = keyword.toLowerCase().trim().replace(/[_.:]/g, "-").replace(/[^a-z0-9-]/g, "").replace(/[-]+/g, "-");
+  keyword = keyword.toLowerCase().trim().replace(/[\s_.:]/g, "-").replace(/[^a-z0-9-]/g, "").replace(/[-]+/g, "-");
   if (keyword.slice(0, 1) === "-") {
     keyword = keyword.slice(1);
   }

package/lib/misc/keyword.mjs

@@ -2,7 +2,7 @@ function cleanupIconKeyword(keyword, convertCamelCase = false) {
   if (convertCamelCase) {
     keyword = keyword.replace(/[A-Z]+/g, (chars) => "_" + chars.toLowerCase());
   }
-  keyword = keyword.toLowerCase().trim().replace(/[_.:]/g, "-").replace(/[^a-z0-9-]/g, "").replace(/[-]+/g, "-");
+  keyword = keyword.toLowerCase().trim().replace(/[\s_.:]/g, "-").replace(/[^a-z0-9-]/g, "").replace(/[-]+/g, "-");
   if (keyword.slice(0, 1) === "-") {
     keyword = keyword.slice(1);
   }

package/lib/svg/cleanup/inline-style.cjs

@@ -33,6 +33,10 @@ async function cleanupInlineStyle(svg) {
             $element.attr(prop, value);
             return;
           }
+          if (svg_data_attributes.tagSpecificInlineStyles[tagName]?.has(prop)) {
+            newStyle[prop] = value;
+            return;
+          }
           if (svg_data_attributes.insideClipPathAttributes.has(prop)) {
             if (item.parents.find((item2) => item2.tagName === "clipPath")) {
               $element.attr(prop, value);

package/lib/svg/cleanup/inline-style.mjs

@@ -1,5 +1,5 @@
 import { parseInlineStyle } from '../../css/parse.mjs';
-import { badAttributes, tagSpecificNonPresentationalAttributes, tagSpecificAnimatedAttributes, tagSpecificPresentationalAttributes, insideClipPathAttributes, badSoftwareAttributes, badAttributePrefixes } from '../data/attributes.mjs';
+import { badAttributes, tagSpecificNonPresentationalAttributes, tagSpecificAnimatedAttributes, tagSpecificPresentationalAttributes, tagSpecificInlineStyles, insideClipPathAttributes, badSoftwareAttributes, badAttributePrefixes } from '../data/attributes.mjs';
 import { parseSVG } from '../parse.mjs';
 import '../../css/parser/tokens.mjs';
 import '../../css/parser/error.mjs';
@@ -29,6 +29,10 @@ async function cleanupInlineStyle(svg) {
             $element.attr(prop, value);
             return;
           }
+          if (tagSpecificInlineStyles[tagName]?.has(prop)) {
+            newStyle[prop] = value;
+            return;
+          }
           if (insideClipPathAttributes.has(prop)) {
             if (item.parents.find((item2) => item2.tagName === "clipPath")) {
               $element.attr(prop, value);

package/lib/svg/data/attributes.cjs

@@ -327,6 +327,9 @@ const tagSpecificNonPresentationalAttributes = {
     "type"
   ])
 };
+const tagSpecificInlineStyles = {
+  mask: /* @__PURE__ */ new Set(["mask-type"])
+};
 
 exports.animationTimingAttributes = animationTimingAttributes;
 exports.animationValueAttributes = animationValueAttributes;
@@ -349,6 +352,7 @@ exports.presentationalAttributes = presentationalAttributes;
 exports.strokePresentationalAttributes = strokePresentationalAttributes;
 exports.stylingAttributes = stylingAttributes;
 exports.tagSpecificAnimatedAttributes = tagSpecificAnimatedAttributes;
+exports.tagSpecificInlineStyles = tagSpecificInlineStyles;
 exports.tagSpecificNonPresentationalAttributes = tagSpecificNonPresentationalAttributes;
 exports.tagSpecificPresentationalAttributes = tagSpecificPresentationalAttributes;
 exports.urlPresentationalAttributes = urlPresentationalAttributes;

package/lib/svg/data/attributes.d.ts

@@ -69,5 +69,9 @@ declare const feFuncAttributes: Set<string>;
 declare const tagSpecificAnimatedAttributes: Record<string, Set<string>>;
 declare const tagSpecificPresentationalAttributes: Record<string, Set<string>>;
 declare const tagSpecificNonPresentationalAttributes: Record<string, Set<string>>;
+/**
+ * Styles to keep in tags
+ */
+declare const tagSpecificInlineStyles: Record<string, Set<string>>;
 
-export { animationTimingAttributes, animationValueAttributes, badAttributePrefixes, badAttributes, badSoftwareAttributes, commonAttributes, commonColorPresentationalAttributes, commonFeAttributes, commonGradientAttributes, feFuncAttributes, fillPresentationalAttributes, insideClipPathAttributes, junkSVGAttributes, markerAttributes, otherAnimationAttributes, otherPresentationalAttributes, otherShapeAttributes, presentationalAttributes, strokePresentationalAttributes, stylingAttributes, tagSpecificAnimatedAttributes, tagSpecificNonPresentationalAttributes, tagSpecificPresentationalAttributes, urlPresentationalAttributes, visibilityPresentationalAttributes };
+export { animationTimingAttributes, animationValueAttributes, badAttributePrefixes, badAttributes, badSoftwareAttributes, commonAttributes, commonColorPresentationalAttributes, commonFeAttributes, commonGradientAttributes, feFuncAttributes, fillPresentationalAttributes, insideClipPathAttributes, junkSVGAttributes, markerAttributes, otherAnimationAttributes, otherPresentationalAttributes, otherShapeAttributes, presentationalAttributes, strokePresentationalAttributes, stylingAttributes, tagSpecificAnimatedAttributes, tagSpecificInlineStyles, tagSpecificNonPresentationalAttributes, tagSpecificPresentationalAttributes, urlPresentationalAttributes, visibilityPresentationalAttributes };

package/lib/svg/data/attributes.mjs

@@ -323,5 +323,8 @@ const tagSpecificNonPresentationalAttributes = {
     "type"
   ])
 };
+const tagSpecificInlineStyles = {
+  mask: /* @__PURE__ */ new Set(["mask-type"])
+};
 
-export { animationTimingAttributes, animationValueAttributes, badAttributePrefixes, badAttributes, badSoftwareAttributes, commonAttributes, commonColorPresentationalAttributes, commonFeAttributes, commonGradientAttributes, feFuncAttributes, fillPresentationalAttributes, insideClipPathAttributes, junkSVGAttributes, markerAttributes, otherAnimationAttributes, otherPresentationalAttributes, otherShapeAttributes, presentationalAttributes, strokePresentationalAttributes, stylingAttributes, tagSpecificAnimatedAttributes, tagSpecificNonPresentationalAttributes, tagSpecificPresentationalAttributes, urlPresentationalAttributes, visibilityPresentationalAttributes };
+export { animationTimingAttributes, animationValueAttributes, badAttributePrefixes, badAttributes, badSoftwareAttributes, commonAttributes, commonColorPresentationalAttributes, commonFeAttributes, commonGradientAttributes, feFuncAttributes, fillPresentationalAttributes, insideClipPathAttributes, junkSVGAttributes, markerAttributes, otherAnimationAttributes, otherPresentationalAttributes, otherShapeAttributes, presentationalAttributes, strokePresentationalAttributes, stylingAttributes, tagSpecificAnimatedAttributes, tagSpecificInlineStyles, tagSpecificNonPresentationalAttributes, tagSpecificPresentationalAttributes, urlPresentationalAttributes, visibilityPresentationalAttributes };

package/package.json

@@ -3,7 +3,7 @@
 	"type": "module",
 	"description": "Collection of functions for cleaning up and parsing SVG for Iconify project",
 	"author": "Vjacheslav Trushkin",
-	"version": "2.1.0-beta.6",
+	"version": "2.1.0-beta.7",
 	"license": "MIT",
 	"bugs": "https://github.com/iconify/tools/issues",
 	"homepage": "https://github.com/iconify/tools",