@effing/canvas 0.20.1 → 0.21.1

package/dist/index.js

@@ -880,37 +880,133 @@ function drawBorders(ctx, x, y, width, height, style, borderRadius) {
     }
     return;
   }
-  if (tw > 0) {
-    ctx.strokeStyle = tc;
-    ctx.lineWidth = tw;
-    ctx.beginPath();
-    ctx.moveTo(x, y + tw / 2);
-    ctx.lineTo(x + width, y + tw / 2);
-    ctx.stroke();
-  }
-  if (rw > 0) {
-    ctx.strokeStyle = rc;
-    ctx.lineWidth = rw;
-    ctx.beginPath();
-    ctx.moveTo(x + width - rw / 2, y);
-    ctx.lineTo(x + width - rw / 2, y + height);
-    ctx.stroke();
-  }
-  if (bw > 0) {
-    ctx.strokeStyle = bc;
-    ctx.lineWidth = bw;
-    ctx.beginPath();
-    ctx.moveTo(x, y + height - bw / 2);
-    ctx.lineTo(x + width, y + height - bw / 2);
-    ctx.stroke();
-  }
-  if (lw > 0) {
-    ctx.strokeStyle = lc;
-    ctx.lineWidth = lw;
-    ctx.beginPath();
-    ctx.moveTo(x + lw / 2, y);
-    ctx.lineTo(x + lw / 2, y + height);
-    ctx.stroke();
+  if (hasRoundedCorners) {
+    const maxR = Math.min(width, height) / 2;
+    const tl = Math.min(borderRadius.topLeft, maxR);
+    const tr = Math.min(borderRadius.topRight, maxR);
+    const br = Math.min(borderRadius.bottomRight, maxR);
+    const bl = Math.min(borderRadius.bottomLeft, maxR);
+    const top = y + tw / 2;
+    const right = x + width - rw / 2;
+    const bottom = y + height - bw / 2;
+    const left = x + lw / 2;
+    const eTL = Math.max(0, tl - Math.max(tw, lw) / 2);
+    const eTR = Math.max(0, tr - Math.max(tw, rw) / 2);
+    const eBR = Math.max(0, br - Math.max(bw, rw) / 2);
+    const eBL = Math.max(0, bl - Math.max(bw, lw) / 2);
+    if (tw > 0) {
+      ctx.strokeStyle = tc;
+      ctx.lineWidth = tw;
+      ctx.beginPath();
+      if (eTL > 0 && lw === 0) {
+        ctx.moveTo(left, top + eTL);
+        ctx.arcTo(left, top, left + eTL, top, eTL);
+      } else if (eTL > 0) {
+        ctx.moveTo(left + eTL, top);
+      } else {
+        ctx.moveTo(x, top);
+      }
+      if (eTR > 0) {
+        ctx.lineTo(right - eTR, top);
+        ctx.arcTo(right, top, right, top + eTR, eTR);
+      } else {
+        ctx.lineTo(x + width, top);
+      }
+      ctx.stroke();
+    }
+    if (rw > 0) {
+      ctx.strokeStyle = rc;
+      ctx.lineWidth = rw;
+      ctx.beginPath();
+      if (eTR > 0 && tw === 0) {
+        ctx.moveTo(right - eTR, top);
+        ctx.arcTo(right, top, right, top + eTR, eTR);
+      } else if (eTR > 0) {
+        ctx.moveTo(right, top + eTR);
+      } else {
+        ctx.moveTo(right, y);
+      }
+      if (eBR > 0) {
+        ctx.lineTo(right, bottom - eBR);
+        ctx.arcTo(right, bottom, right - eBR, bottom, eBR);
+      } else {
+        ctx.lineTo(right, y + height);
+      }
+      ctx.stroke();
+    }
+    if (bw > 0) {
+      ctx.strokeStyle = bc;
+      ctx.lineWidth = bw;
+      ctx.beginPath();
+      if (eBR > 0 && rw === 0) {
+        ctx.moveTo(right, bottom - eBR);
+        ctx.arcTo(right, bottom, right - eBR, bottom, eBR);
+      } else if (eBR > 0) {
+        ctx.moveTo(right - eBR, bottom);
+      } else {
+        ctx.moveTo(x + width, bottom);
+      }
+      if (eBL > 0) {
+        ctx.lineTo(left + eBL, bottom);
+        ctx.arcTo(left, bottom, left, bottom - eBL, eBL);
+      } else {
+        ctx.lineTo(x, bottom);
+      }
+      ctx.stroke();
+    }
+    if (lw > 0) {
+      ctx.strokeStyle = lc;
+      ctx.lineWidth = lw;
+      ctx.beginPath();
+      if (eBL > 0 && bw === 0) {
+        ctx.moveTo(left + eBL, bottom);
+        ctx.arcTo(left, bottom, left, bottom - eBL, eBL);
+      } else if (eBL > 0) {
+        ctx.moveTo(left, bottom - eBL);
+      } else {
+        ctx.moveTo(left, y + height);
+      }
+      if (eTL > 0) {
+        ctx.lineTo(left, top + eTL);
+        ctx.arcTo(left, top, left + eTL, top, eTL);
+      } else {
+        ctx.lineTo(left, y);
+      }
+      ctx.stroke();
+    }
+  } else {
+    if (tw > 0) {
+      ctx.strokeStyle = tc;
+      ctx.lineWidth = tw;
+      ctx.beginPath();
+      ctx.moveTo(x, y + tw / 2);
+      ctx.lineTo(x + width, y + tw / 2);
+      ctx.stroke();
+    }
+    if (rw > 0) {
+      ctx.strokeStyle = rc;
+      ctx.lineWidth = rw;
+      ctx.beginPath();
+      ctx.moveTo(x + width - rw / 2, y);
+      ctx.lineTo(x + width - rw / 2, y + height);
+      ctx.stroke();
+    }
+    if (bw > 0) {
+      ctx.strokeStyle = bc;
+      ctx.lineWidth = bw;
+      ctx.beginPath();
+      ctx.moveTo(x, y + height - bw / 2);
+      ctx.lineTo(x + width, y + height - bw / 2);
+      ctx.stroke();
+    }
+    if (lw > 0) {
+      ctx.strokeStyle = lc;
+      ctx.lineWidth = lw;
+      ctx.beginPath();
+      ctx.moveTo(x + lw / 2, y);
+      ctx.lineTo(x + lw / 2, y + height);
+      ctx.stroke();
+    }
   }
 }
 function drawBoxShadow(ctx, x, y, width, height, boxShadow, borderRadius) {
@@ -2853,36 +2949,6 @@ async function buildNode(element, parentStyle, yogaNode, viewportWidth, viewport
       yogaNode
     };
   }
-  if (Array.isArray(element)) {
-    const style2 = resolveStyle(void 0, parentStyle);
-    const children2 = [];
-    for (let i = 0; i < element.length; i++) {
-      const child = element[i];
-      if (child === null || child === void 0 || typeof child === "boolean")
-        continue;
-      const childYogaNode = createYogaNode();
-      yogaNode.insertChild(childYogaNode, children2.length);
-      children2.push(
-        await buildNode(
-          child,
-          style2,
-          childYogaNode,
-          viewportWidth,
-          viewportHeight,
-          ctx,
-          emojiEnabled,
-          fontFamilies
-        )
-      );
-    }
-    return {
-      type: "div",
-      style: style2,
-      children: children2,
-      props: {},
-      yogaNode
-    };
-  }
   const el = element;
   const type = el.type;
   if (typeof type === "function") {
@@ -3006,7 +3072,7 @@ async function buildNode(element, parentStyle, yogaNode, viewportWidth, viewport
   const children = [];
   const rawChildren = props.children;
   if (rawChildren !== void 0 && rawChildren !== null) {
-    const childArray = Array.isArray(rawChildren) ? rawChildren : [rawChildren];
+    const childArray = Array.isArray(rawChildren) ? rawChildren.flat(Infinity) : [rawChildren];
     for (const child of childArray) {
       if (child === null || child === void 0 || typeof child === "boolean")
         continue;