@jsenv/dom 0.5.1 → 0.5.3

package/dist/jsenv_dom.js

@@ -418,20 +418,15 @@ const normalizeNumber = (value, context, unit, propertyName) => {
     return value;
   }
   if (typeof value === "string") {
-    if (value === "auto") {
-      return "auto";
-    }
-    if (value === "none") {
-      return "none";
-    }
-    const numericValue = parseFloat(value);
-    if (isNaN(numericValue)) {
-      console.warn(
-        `"${propertyName}": ${value} cannot be converted to number, returning value as-is.`,
-      );
-      return value;
+    // For js context, only convert px values to numbers
+    if (unit === "px" && value.endsWith("px")) {
+      const numericValue = parseFloat(value);
+      if (!isNaN(numericValue)) {
+        return numericValue;
+      }
     }
-    return numericValue;
+    // Keep all other strings as-is (including %, em, rem, auto, none, etc.)
+    return value;
   }
   return value;
 };
@@ -668,6 +663,8 @@ const mergeStyles = (stylesA, stylesB, context = "js") => {
   }
   const result = {};
   const aKeys = Object.keys(stylesA);
+  // in case stylesB is a string we first parse it
+  stylesB = normalizeStyles(stylesB, context);
   const bKeyToVisitSet = new Set(Object.keys(stylesB));
   for (const aKey of aKeys) {
     const bHasKey = bKeyToVisitSet.has(aKey);
@@ -679,7 +676,7 @@ const mergeStyles = (stylesA, stylesB, context = "js") => {
     }
   }
   for (const bKey of bKeyToVisitSet) {
-    result[bKey] = normalizeStyle(stylesB[bKey], bKey, context);
+    result[bKey] = stylesB[bKey];
   }
   return result;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/dom",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "DOM utilities for writing frontend code",
   "repository": {
     "type": "git",

package/src/style/style_composition.js

@@ -15,6 +15,8 @@ export const mergeStyles = (stylesA, stylesB, context = "js") => {
   }
   const result = {};
   const aKeys = Object.keys(stylesA);
+  // in case stylesB is a string we first parse it
+  stylesB = normalizeStyles(stylesB, context);
   const bKeyToVisitSet = new Set(Object.keys(stylesB));
   for (const aKey of aKeys) {
     const bHasKey = bKeyToVisitSet.has(aKey);
@@ -26,7 +28,7 @@ export const mergeStyles = (stylesA, stylesB, context = "js") => {
     }
   }
   for (const bKey of bKeyToVisitSet) {
-    result[bKey] = normalizeStyle(stylesB[bKey], bKey, context);
+    result[bKey] = stylesB[bKey];
   }
   return result;
 };

package/src/style/style_parsing.js

@@ -136,20 +136,15 @@ const normalizeNumber = (value, context, unit, propertyName) => {
     return value;
   }
   if (typeof value === "string") {
-    if (value === "auto") {
-      return "auto";
-    }
-    if (value === "none") {
-      return "none";
-    }
-    const numericValue = parseFloat(value);
-    if (isNaN(numericValue)) {
-      console.warn(
-        `"${propertyName}": ${value} cannot be converted to number, returning value as-is.`,
-      );
-      return value;
+    // For js context, only convert px values to numbers
+    if (unit === "px" && value.endsWith("px")) {
+      const numericValue = parseFloat(value);
+      if (!isNaN(numericValue)) {
+        return numericValue;
+      }
     }
-    return numericValue;
+    // Keep all other strings as-is (including %, em, rem, auto, none, etc.)
+    return value;
   }
   return value;
 };