ntk 8.24.0 → 8.25.0

package/lib/widgets/svgview.js

@@ -33,6 +33,8 @@ const INHERITED = {
   lineCap: 'butt',
   lineJoin: 'miter',
   miterLimit: 4,
+  dashArray: 'none',
+  dashOffset: 0,
   fillRule: 'nonzero',
   clipRule: 'nonzero',
   fillOpacity: 1,
@@ -61,6 +63,8 @@ const STYLE_ATTRS = {
   'stroke-linecap': 'lineCap',
   'stroke-linejoin': 'lineJoin',
   'stroke-miterlimit': 'miterLimit',
+  'stroke-dasharray': 'dashArray',
+  'stroke-dashoffset': 'dashOffset',
   'fill-rule': 'fillRule',
   'clip-rule': 'clipRule',
   'fill-opacity': 'fillOpacity',
@@ -578,6 +582,12 @@ function resolveStyle(node, parent) {
         case 'textAnchor':
           value = v.toLowerCase();
           break;
+        case 'dashArray':
+          value = dashArrayValue(v);
+          break;
+        case 'dashOffset':
+          value = dashLength(v, true) ?? undefined;
+          break;
         case 'markerStart':
         case 'markerMid':
         case 'markerEnd':
@@ -596,6 +606,42 @@ function resolveStyle(node, parent) {
   return style;
 }
 
+/**
+ * A length in a dash pattern or its offset, in user units: a number, or one
+ * in `px` (SVG 2, 13.5.6). A percentage of the viewport's diagonal, or a
+ * length in another unit, is none this reads. A negative one is an error in
+ * a pattern, and fine in an offset (`signed`).
+ */
+function dashLength(value, signed = false) {
+  const m = /^([-+]?(?:\d+\.?\d*|\.\d+)(?:e[-+]?\d+)?)(px)?$/i.exec(value.trim());
+  if (!m) return null;
+  const n = Number(m[1]);
+  if (!Number.isFinite(n) || (!signed && n < 0)) return null;
+  return n;
+}
+
+/**
+ * `stroke-dasharray` as `setLineDash` takes it (SVG 2, 13.5.5): `none`, or
+ * its lengths, split on commas and white space. One that is not a length,
+ * or is negative, makes the value an error, which leaves the property as it
+ * was (undefined); lengths that come to nothing draw the stroke solid, as
+ * `none` does. An odd count is repeated by `setLineDash`, as the property
+ * has it.
+ */
+function dashArrayValue(value) {
+  const v = value.trim();
+  if (v.toLowerCase() === 'none') return 'none';
+  const parts = v.split(/[\s,]+/).filter(Boolean);
+  if (!parts.length) return undefined;
+  const out = [];
+  for (const part of parts) {
+    const n = dashLength(part);
+    if (n === null) return undefined;
+    out.push(n);
+  }
+  return out.some((n) => n > 0) ? out : 'none';
+}
+
 /**
  * How many distinct colours a document actually commits to, decided once at
  * parse time.
@@ -1179,7 +1225,17 @@ export default class SvgView {
           ctx.lineCap = style.lineCap;
           ctx.lineJoin = style.lineJoin;
           ctx.miterLimit = style.miterLimit;
+          // dashed where it says so, and nothing after it is
+          const dashed = style.dashArray !== 'none' && typeof ctx.setLineDash === 'function';
+          if (dashed) {
+            ctx.setLineDash(style.dashArray);
+            ctx.lineDashOffset = style.dashOffset;
+          }
           this._ink(ctx, 'stroke', style.stroke, style, path, nodeAlpha * style.strokeOpacity, () => ctx.stroke(path));
+          if (dashed) {
+            ctx.setLineDash([]);
+            ctx.lineDashOffset = 0;
+          }
         }
         ctx.globalAlpha = 1;
         // over its fill and its stroke, which is the default paint order

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ntk",
-  "version": "8.24.0",
+  "version": "8.25.0",
   "description": "Desktop UI toolkit for X11 with canvas-like 2d and OpenGL rendering",
   "author": "Andrey Sidorov <sidorares@yandex.ru>",
   "license": "MIT",
@@ -68,7 +68,7 @@
     "x11-dri": ">=0.5.0 <1"
   },
   "scripts": {
-    "test": "NTK_STRICT_COLORS=1 node --test",
+    "test": "NTK_STRICT_COLORS=1 node --import ./test/helpers/exit-watchdog.js --test",
     "check-release-message": "node scripts/check-release-message.mjs"
   },
   "devDependencies": {