@unocss/preset-icons 0.49.3 → 0.49.5

package/dist/browser.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const cdn = require('./shared/preset-icons.6dc3d443.cjs');
+const cdn = require('./shared/preset-icons.b2d93e3f.cjs');
 const core = require('./core.cjs');
 require('ofetch');
 require('@unocss/core');

package/dist/browser.mjs

@@ -1,4 +1,4 @@
-import { c as createCDNLoader, l as loadIcon } from './shared/preset-icons.903721a3.mjs';
+import { c as createCDNLoader, l as loadIcon } from './shared/preset-icons.a568b68a.mjs';
 import { createPresetIcons } from './core.mjs';
 export { combineLoaders, createPresetIcons } from './core.mjs';
 import 'ofetch';

package/dist/index.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const cdn = require('./shared/preset-icons.6dc3d443.cjs');
+const cdn = require('./shared/preset-icons.b2d93e3f.cjs');
 const core = require('./core.cjs');
 require('ofetch');
 require('@unocss/core');

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { c as createCDNLoader, l as loadIcon } from './shared/preset-icons.903721a3.mjs';
+import { c as createCDNLoader, l as loadIcon } from './shared/preset-icons.a568b68a.mjs';
 import { createPresetIcons, combineLoaders } from './core.mjs';
 export { combineLoaders, createPresetIcons } from './core.mjs';
 import 'ofetch';

package/dist/shared/{preset-icons.903721a3.mjs → preset-icons.a568b68a.mjs}

@@ -28,7 +28,9 @@ const defaultIconSizeCustomisations = Object.freeze({
   height: null
 });
 const defaultIconCustomisations = Object.freeze({
+  // Dimensions
   ...defaultIconSizeCustomisations,
+  // Transformations
   ...defaultIconTransformations
 });
 
@@ -157,6 +159,7 @@ function calculateSize(size, ratio, precision) {
   }
 }
 
+const isUnsetKeyword = (value) => value === "unset" || value === "undefined" || value === "none";
 function iconToSVG(icon, customisations) {
   const fullIcon = {
     ...defaultIconProps,
@@ -248,15 +251,19 @@ function iconToSVG(icon, customisations) {
     width = customisationsWidth === "auto" ? boxWidth : customisationsWidth;
     height = customisationsHeight === null ? calculateSize(width, boxHeight / boxWidth) : customisationsHeight === "auto" ? boxHeight : customisationsHeight;
   }
-  const result = {
-    attributes: {
-      width: width.toString(),
-      height: height.toString(),
-      viewBox: box.left.toString() + " " + box.top.toString() + " " + boxWidth.toString() + " " + boxHeight.toString()
-    },
+  const attributes = {};
+  const setAttr = (prop, value) => {
+    if (!isUnsetKeyword(value)) {
+      attributes[prop] = value.toString();
+    }
+  };
+  setAttr("width", width);
+  setAttr("height", height);
+  attributes.viewBox = box.left.toString() + " " + box.top.toString() + " " + boxWidth.toString() + " " + boxHeight.toString();
+  return {
+    attributes,
     body
   };
-  return result;
 }
 
 "IconifyId" + Date.now().toString(16) + (Math.random() * 16777216 | 0).toString(16);
@@ -441,30 +448,27 @@ add("whitesmoke", [245]);
 add("yellow", [255, 255, 0]);
 add("yellowgreen", [154, 205, 50]);
 
-const svgWidthRegex = /width\s*=\s*["'](\w+)["']/;
-const svgHeightRegex = /height\s*=\s*["'](\w+)["']/;
+const svgWidthRegex = /\swidth\s*=\s*["'](\w+)["']/;
+const svgHeightRegex = /\sheight\s*=\s*["'](\w+)["']/;
 const svgTagRegex = /<svg\s+/;
 function configureSvgSize(svg, props, scale) {
   const svgNode = svg.slice(0, svg.indexOf(">"));
-  let result = svgWidthRegex.exec(svgNode);
-  const w = result != null;
-  if (typeof props.width === "undefined" || props.width === null) {
-    if (typeof scale === "number") {
-      props.width = `${scale}em`;
-    } else if (result) {
-      props.width = result[1];
-    }
-  }
-  result = svgHeightRegex.exec(svgNode);
-  const h = result != null;
-  if (typeof props.height === "undefined" || props.height === null) {
-    if (typeof scale === "number") {
-      props.height = `${scale}em`;
-    } else if (result) {
-      props.height = result[1];
+  const check = (prop, regex) => {
+    const result = regex.exec(svgNode);
+    const isSet = result != null;
+    const propValue = props[prop];
+    if (!propValue && !isUnsetKeyword(propValue)) {
+      if (typeof scale === "number") {
+        if (scale > 0) {
+          props[prop] = `${scale}em`;
+        }
+      } else if (result) {
+        props[prop] = result[1];
+      }
     }
-  }
-  return [w, h];
+    return isSet;
+  };
+  return [check("width", svgWidthRegex), check("height", svgHeightRegex)];
 }
 async function mergeIconProps(svg, collection, icon, options, propsProvider, afterCustomizations) {
   const { scale, addXmlNs = false } = options ?? {};
@@ -563,6 +567,7 @@ async function searchForIcon(iconSet, collection, ids, options) {
       } = iconToSVG(iconData, defaultCustomizations);
       const scale = options?.scale;
       return await mergeIconProps(
+        // DON'T remove space on <svg >
         `<svg >${body}</svg>`,
         collection,
         id,
@@ -571,20 +576,29 @@ async function searchForIcon(iconSet, collection, ids, options) {
           return { ...restAttributes };
         },
         (props) => {
-          if (typeof props.width === "undefined" || props.width === null) {
-            if (typeof scale === "number") {
-              props.width = `${scale}em`;
-            } else {
-              props.width = width;
+          const check = (prop, defaultValue) => {
+            const propValue = props[prop];
+            let value;
+            if (!isUnsetKeyword(propValue)) {
+              if (propValue) {
+                return;
+              }
+              if (typeof scale === "number") {
+                if (scale) {
+                  value = `${scale}em`;
+                }
+              } else {
+                value = defaultValue;
+              }
             }
-          }
-          if (typeof props.height === "undefined" || props.height === null) {
-            if (typeof scale === "number") {
-              props.height = `${scale}em`;
+            if (!value) {
+              delete props[prop];
             } else {
-              props.height = height;
+              props[prop] = value;
             }
-          }
+          };
+          check("width", width);
+          check("height", height);
         }
       );
     }
@@ -631,6 +645,7 @@ var collections = [
 	"akar-icons",
 	"ant-design",
 	"arcticons",
+	"basil",
 	"bi",
 	"bpmn",
 	"brandico",
@@ -723,10 +738,12 @@ var collections = [
 	"mdi-light",
 	"mdi",
 	"medical-icon",
+	"memory",
 	"mi",
 	"mingcute",
 	"mono-icons",
 	"nimbus",
+	"nonicons",
 	"noto-v1",
 	"noto",
 	"octicon",
@@ -748,7 +765,9 @@ var collections = [
 	"si-glyph",
 	"simple-icons",
 	"simple-line-icons",
+	"skill-icons",
 	"subway",
+	"svg-spinners",
 	"system-uicons",
 	"tabler",
 	"teenyicons",

package/dist/shared/{preset-icons.6dc3d443.cjs → preset-icons.b2d93e3f.cjs}

@@ -30,7 +30,9 @@ const defaultIconSizeCustomisations = Object.freeze({
   height: null
 });
 const defaultIconCustomisations = Object.freeze({
+  // Dimensions
   ...defaultIconSizeCustomisations,
+  // Transformations
   ...defaultIconTransformations
 });
 
@@ -159,6 +161,7 @@ function calculateSize(size, ratio, precision) {
   }
 }
 
+const isUnsetKeyword = (value) => value === "unset" || value === "undefined" || value === "none";
 function iconToSVG(icon, customisations) {
   const fullIcon = {
     ...defaultIconProps,
@@ -250,15 +253,19 @@ function iconToSVG(icon, customisations) {
     width = customisationsWidth === "auto" ? boxWidth : customisationsWidth;
     height = customisationsHeight === null ? calculateSize(width, boxHeight / boxWidth) : customisationsHeight === "auto" ? boxHeight : customisationsHeight;
   }
-  const result = {
-    attributes: {
-      width: width.toString(),
-      height: height.toString(),
-      viewBox: box.left.toString() + " " + box.top.toString() + " " + boxWidth.toString() + " " + boxHeight.toString()
-    },
+  const attributes = {};
+  const setAttr = (prop, value) => {
+    if (!isUnsetKeyword(value)) {
+      attributes[prop] = value.toString();
+    }
+  };
+  setAttr("width", width);
+  setAttr("height", height);
+  attributes.viewBox = box.left.toString() + " " + box.top.toString() + " " + boxWidth.toString() + " " + boxHeight.toString();
+  return {
+    attributes,
     body
   };
-  return result;
 }
 
 "IconifyId" + Date.now().toString(16) + (Math.random() * 16777216 | 0).toString(16);
@@ -443,30 +450,27 @@ add("whitesmoke", [245]);
 add("yellow", [255, 255, 0]);
 add("yellowgreen", [154, 205, 50]);
 
-const svgWidthRegex = /width\s*=\s*["'](\w+)["']/;
-const svgHeightRegex = /height\s*=\s*["'](\w+)["']/;
+const svgWidthRegex = /\swidth\s*=\s*["'](\w+)["']/;
+const svgHeightRegex = /\sheight\s*=\s*["'](\w+)["']/;
 const svgTagRegex = /<svg\s+/;
 function configureSvgSize(svg, props, scale) {
   const svgNode = svg.slice(0, svg.indexOf(">"));
-  let result = svgWidthRegex.exec(svgNode);
-  const w = result != null;
-  if (typeof props.width === "undefined" || props.width === null) {
-    if (typeof scale === "number") {
-      props.width = `${scale}em`;
-    } else if (result) {
-      props.width = result[1];
-    }
-  }
-  result = svgHeightRegex.exec(svgNode);
-  const h = result != null;
-  if (typeof props.height === "undefined" || props.height === null) {
-    if (typeof scale === "number") {
-      props.height = `${scale}em`;
-    } else if (result) {
-      props.height = result[1];
+  const check = (prop, regex) => {
+    const result = regex.exec(svgNode);
+    const isSet = result != null;
+    const propValue = props[prop];
+    if (!propValue && !isUnsetKeyword(propValue)) {
+      if (typeof scale === "number") {
+        if (scale > 0) {
+          props[prop] = `${scale}em`;
+        }
+      } else if (result) {
+        props[prop] = result[1];
+      }
     }
-  }
-  return [w, h];
+    return isSet;
+  };
+  return [check("width", svgWidthRegex), check("height", svgHeightRegex)];
 }
 async function mergeIconProps(svg, collection, icon, options, propsProvider, afterCustomizations) {
   const { scale, addXmlNs = false } = options ?? {};
@@ -565,6 +569,7 @@ async function searchForIcon(iconSet, collection, ids, options) {
       } = iconToSVG(iconData, defaultCustomizations);
       const scale = options?.scale;
       return await mergeIconProps(
+        // DON'T remove space on <svg >
         `<svg >${body}</svg>`,
         collection,
         id,
@@ -573,20 +578,29 @@ async function searchForIcon(iconSet, collection, ids, options) {
           return { ...restAttributes };
         },
         (props) => {
-          if (typeof props.width === "undefined" || props.width === null) {
-            if (typeof scale === "number") {
-              props.width = `${scale}em`;
-            } else {
-              props.width = width;
+          const check = (prop, defaultValue) => {
+            const propValue = props[prop];
+            let value;
+            if (!isUnsetKeyword(propValue)) {
+              if (propValue) {
+                return;
+              }
+              if (typeof scale === "number") {
+                if (scale) {
+                  value = `${scale}em`;
+                }
+              } else {
+                value = defaultValue;
+              }
             }
-          }
-          if (typeof props.height === "undefined" || props.height === null) {
-            if (typeof scale === "number") {
-              props.height = `${scale}em`;
+            if (!value) {
+              delete props[prop];
             } else {
-              props.height = height;
+              props[prop] = value;
             }
-          }
+          };
+          check("width", width);
+          check("height", height);
         }
       );
     }
@@ -633,6 +647,7 @@ var collections = [
 	"akar-icons",
 	"ant-design",
 	"arcticons",
+	"basil",
 	"bi",
 	"bpmn",
 	"brandico",
@@ -725,10 +740,12 @@ var collections = [
 	"mdi-light",
 	"mdi",
 	"medical-icon",
+	"memory",
 	"mi",
 	"mingcute",
 	"mono-icons",
 	"nimbus",
+	"nonicons",
 	"noto-v1",
 	"noto",
 	"octicon",
@@ -750,7 +767,9 @@ var collections = [
 	"si-glyph",
 	"simple-icons",
 	"simple-line-icons",
+	"skill-icons",
 	"subway",
+	"svg-spinners",
 	"system-uicons",
 	"tabler",
 	"teenyicons",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/preset-icons",
-  "version": "0.49.3",
+  "version": "0.49.5",
   "description": "Pure CSS Icons for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -47,9 +47,9 @@
     "*.css"
   ],
   "dependencies": {
-    "@iconify/utils": "^2.0.10",
-    "@unocss/core": "0.49.3",
-    "ofetch": "^0.4.21"
+    "@iconify/utils": "^2.1.3",
+    "@unocss/core": "0.49.5",
+    "ofetch": "^1.0.0"
   },
   "devDependencies": {
     "@iconify/types": "^2.0.0"