Fixes an issue where normalizeProps overrides explicitly defined

className (cherry picked from commit 4408cf7)
infernojs · Aug 21, 2021 · 592e065 · 592e065
1 parent 6480b05
commit 592e065
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/packages/inferno/__tests__/rendering.spec.jsx b/packages/inferno/__tests__/rendering.spec.jsx
@@ -169,6 +169,18 @@ describe('rendering routine', () => {
     });
   });
 
+  describe('className', () => {
+    it('Should override destructured property when defined', function () {
+      const testObj = {
+        className: 'test'
+      };
+
+      render(<div {...testObj} className="bar" />, container);
+
+      expect(container.innerHTML).toEqual('<div class="bar"></div>');
+    });
+  });
+
   describe('Swapping children', () => {
     it('Swapping children in component should affect hoisted children', () => {
       class Hello extends Component {

diff --git a/packages/inferno/src/core/implementation.ts b/packages/inferno/src/core/implementation.ts
@@ -179,7 +179,9 @@ export function normalizeProps(vNode) {
         normalizeChildren(vNode, props.children);
       }
       if (props.className !== void 0) {
-        vNode.className = props.className || null;
+        if (isNullOrUndef(vNode.className)) {
+          vNode.className = props.className || null;
+        }
         props.className = undefined;
       }
     }