babel-plugin-jsx-dom-expressions 0.36.3 → 0.36.5

package/index.js

@@ -600,7 +600,27 @@ function canNativeSpread(key, { checkNameSpaces } = {}) {
   return true;
 }
 
-const alwaysClose = ["a", "table", "textarea", "select", "b", "strong", "small", "i", "em"];
+const alwaysClose = [
+  "title",
+  "style",
+  "a",
+  "strong",
+  "small",
+  "b",
+  "u",
+  "i",
+  "em",
+  "s",
+  "code",
+  "object",
+  "table",
+  "button",
+  "textarea",
+  "select",
+  "iframe",
+  "script",
+  "template"
+];
 
 const BlockElements = [
   "address",
@@ -609,6 +629,7 @@ const BlockElements = [
   "blockquote",
   "canvas",
   "dd",
+  "details",
   "div",
   "dl",
   "dt",
@@ -718,14 +739,43 @@ function setAttr$2(path, elem, name, value, { isSVG, dynamic, prevId, isCE, tagN
     namespace = parts[0];
   }
 
+  // TODO: consider moving to a helper
   if (namespace === "style") {
-    return t__namespace.callExpression(
+    if (t__namespace.isStringLiteral(value)) {
+      return t__namespace.callExpression(
+        t__namespace.memberExpression(
+          t__namespace.memberExpression(elem, t__namespace.identifier("style")),
+          t__namespace.identifier("setProperty")
+        ),
+        [t__namespace.stringLiteral(name), value]
+      );
+    }
+    if (t__namespace.isNullLiteral(value) || t__namespace.isIdentifier(value, { name: "undefined" })) {
+      return t__namespace.callExpression(
+        t__namespace.memberExpression(
+          t__namespace.memberExpression(elem, t__namespace.identifier("style")),
+          t__namespace.identifier("removeProperty")
+        ),
+        [t__namespace.stringLiteral(name)]
+      );
+    }
+    return t__namespace.conditionalExpression(t__namespace.binaryExpression(
+      "!=",
+      value,
+      t__namespace.nullLiteral()
+    ), t__namespace.callExpression(
       t__namespace.memberExpression(
         t__namespace.memberExpression(elem, t__namespace.identifier("style")),
         t__namespace.identifier("setProperty")
       ),
-      [t__namespace.stringLiteral(name), value]
-    );
+      [t__namespace.stringLiteral(name), prevId ? prevId : value]
+    ), t__namespace.callExpression(
+      t__namespace.memberExpression(
+        t__namespace.memberExpression(elem, t__namespace.identifier("style")),
+        t__namespace.identifier("removeProperty")
+      ),
+      [t__namespace.stringLiteral(name)]
+    ));
   }
 
   if (namespace === "class") {
@@ -1283,10 +1333,16 @@ function transformAttributes$2(path, results) {
 }
 
 function findLastElement(children, hydratable) {
-  let lastElement = -1, tagName;
+  let lastElement = -1,
+    tagName;
   for (let i = children.length - 1; i >= 0; i--) {
     const node = children[i].node;
-    if (hydratable || t__namespace.isJSXText(node) || getStaticExpression(children[i]) || (t__namespace.isJSXElement(node) && (tagName = getTagName(node)) && !isComponent(tagName))) {
+    if (
+      hydratable ||
+      t__namespace.isJSXText(node) ||
+      getStaticExpression(children[i]) ||
+      (t__namespace.isJSXElement(node) && (tagName = getTagName(node)) && !isComponent(tagName))
+    ) {
       lastElement = i;
       break;
     }
@@ -1761,6 +1817,7 @@ function wrapDynamics$1(path, dynamics) {
         )
       );
     } else {
+      const prev = key.startsWith("style:") ? identifier : undefined;
       statements.push(
         t__namespace.expressionStatement(
           t__namespace.logicalExpression(
@@ -1771,7 +1828,7 @@ function wrapDynamics$1(path, dynamics) {
               elem,
               key,
               t__namespace.assignmentExpression("=", t__namespace.memberExpression(prevId, identifier), identifier),
-              { isSVG, isCE, tagName, dynamic: true }
+              { isSVG, isCE, tagName, dynamic: true, prevId: prev }
             )
           )
         )

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel-plugin-jsx-dom-expressions",
   "description": "A JSX to DOM plugin that wraps expressions for fine grained change detection",
-  "version": "0.36.3",
+  "version": "0.36.5",
   "author": "Ryan Carniato",
   "license": "MIT",
   "repository": {
@@ -31,5 +31,5 @@
   "devDependencies": {
     "@babel/core": "^7.20.12"
   },
-  "gitHead": "a25b3864d80f6fb4378fa82634a12675a72b6991"
+  "gitHead": "d0146a831acf798245be5f3e459a83a10cb2a3dc"
 }