dom-expressions 0.34.6 → 0.34.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dom-expressions",
   "description": "A Fine-Grained Runtime for Performant DOM Rendering",
-  "version": "0.34.6",
+  "version": "0.34.8",
   "author": "Ryan Carniato",
   "license": "MIT",
   "repository": {
@@ -23,8 +23,8 @@
     "csstype": "^3.0"
   },
   "devDependencies": {
-    "babel-plugin-jsx-dom-expressions": "^0.34.5",
+    "babel-plugin-jsx-dom-expressions": "^0.34.7",
     "csstype": "^3.1.0"
   },
-  "gitHead": "7d33b4bf7aa18a6aad5ab2d7bfd627ad899eb22f"
+  "gitHead": "95d455fc37c0ebab653f5d80edf50492900f5eae"
 }

package/src/client.js

@@ -369,10 +369,10 @@ function eventHandler(e) {
 
 function spreadExpression(node, props, prevProps = {}, isSVG, skipChildren) {
   props || (props = {});
-  if (!skipChildren && "children" in props) {
+  if (!skipChildren) {
     effect(() => (prevProps.children = insertExpression(node, props.children, prevProps.children)));
   }
-  props.ref && props.ref(node);
+  effect(() => props.ref && props.ref(node));
   effect(() => assign(node, props, isSVG, true, prevProps, true));
   return prevProps;
 }

package/src/server.js

@@ -91,7 +91,9 @@ export function renderToStream(code, options = {}) {
     suspense: {},
     assets: [],
     nonce,
-    block(p) { if (!firstFlushed) blockingResources.push(p); },
+    block(p) {
+      if (!firstFlushed) blockingResources.push(p);
+    },
     replace(id, payloadFn) {
       if (firstFlushed) return;
       const placeholder = `<!${id}>`;
@@ -286,7 +288,8 @@ export function ssrStyle(value) {
 
 export function ssrElement(tag, props, children, needsId) {
   let result = `<${tag}${needsId ? ssrHydrationKey() : ""} `;
-  if (typeof props === "function") props = props();
+  if (props == null) props = {};
+  else if (typeof props === "function") props = props();
   const keys = Object.keys(props);
   let classResolved;
   for (let i = 0; i < keys.length; i++) {
@@ -333,6 +336,11 @@ export function escape(s, attr) {
   const t = typeof s;
   if (t !== "string") {
     if (!attr && t === "function") return escape(s(), attr);
+    if (!attr && Array.isArray(s)) {
+      let r = "";
+      for (let i = 0; i < s.length; i++) r += resolveSSRNode(escape(s[i], attr));
+      return { t: r };
+    }
     if (attr && t === "boolean") return String(s);
     return s;
   }