Handle empty string and null for margin and padding subparts

Fixes jsdom/jsdom#2504.
jsdom · Dec 28, 2023 · 792877d · 792877d
1 parent f8cf3e6
commit 792877d
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 0 deletions.
diff --git a/lib/CSSStyleDeclaration.test.js b/lib/CSSStyleDeclaration.test.js
@@ -402,6 +402,43 @@ describe('CSSStyleDeclaration', () => {
     expect(style.marginTop).toEqual('0.5ex');
   });
 
+  test('setting empty string and null to a padding or margin works', () => {
+    var style = new CSSStyleDeclaration();
+    var parts = ['Top', 'Right', 'Bottom', 'Left'];
+    function testParts(base, nullValue) {
+      var props = [base].concat(parts.map((part) => base + part));
+      for (let prop of props) {
+        expect(style[prop]).toEqual('');
+        style[prop] = '10px';
+        expect(style[prop]).toEqual('10px');
+        style[prop] = nullValue;
+        expect(style[prop]).toEqual('');
+      }
+    }
+
+    testParts('margin', '');
+    testParts('margin', null);
+    testParts('padding', '');
+    testParts('padding', null);
+  });
+
+  test('setting undefined to a padding or margin does nothing', () => {
+    var style = new CSSStyleDeclaration();
+    var parts = ['Top', 'Right', 'Bottom', 'Left'];
+    function testParts(base) {
+      var props = [base].concat(parts.map((part) => base + part));
+      for (let prop of props) {
+        style[prop] = '10px';
+        expect(style[prop]).toEqual('10px');
+        style[prop] = undefined;
+        expect(style[prop]).toEqual('10px');
+      }
+    }
+
+    testParts('margin');
+    testParts('padding');
+  });
+
   test('setting null to background works', () => {
     var style = new CSSStyleDeclaration();
     style.background = 'red';

diff --git a/lib/parsers.js b/lib/parsers.js
@@ -683,6 +683,9 @@ exports.subImplicitSetter = function (prefix, part, isValid, parser) {
     if (typeof v === 'number') {
       v = v.toString();
     }
+    if (v === null) {
+      v = '';
+    }
     if (typeof v !== 'string') {
       return undefined;
     }

diff --git a/lib/properties/margin.js b/lib/properties/margin.js
@@ -9,6 +9,7 @@ var isValid = function (v) {
   }
   var type = parsers.valueType(v);
   return (
+    type === TYPES.NULL_OR_EMPTY_STR ||
     type === TYPES.LENGTH ||
     type === TYPES.PERCENT ||
     (type === TYPES.INTEGER && (v === '0' || v === 0))
@@ -40,6 +41,9 @@ module.exports.definition = {
     if (typeof v === 'number') {
       v = String(v);
     }
+    if (v === null) {
+      v = '';
+    }
     if (typeof v !== 'string') {
       return;
     }

diff --git a/lib/properties/padding.js b/lib/properties/padding.js
@@ -6,6 +6,7 @@ var TYPES = parsers.TYPES;
 var isValid = function (v) {
   var type = parsers.valueType(v);
   return (
+    type === TYPES.NULL_OR_EMPTY_STR ||
     type === TYPES.LENGTH ||
     type === TYPES.PERCENT ||
     (type === TYPES.INTEGER && (v === '0' || v === 0))
@@ -33,6 +34,9 @@ module.exports.definition = {
     if (typeof v === 'number') {
       v = String(v);
     }
+    if (v === null) {
+      v = '';
+    }
     if (typeof v !== 'string') {
       return;
     }