ntk 3.3.0 → 3.4.0

package/lib/widgets/htmlview.js

@@ -65,6 +65,9 @@ const VOID_SKIP = new Set(['script', 'style', 'head', 'title', 'meta', 'link', '
  * Standalone (windowless) use mirrors MarkdownView:
  *   const view = new HtmlView(null, { fonts });
  *   view.setHtml(html); view.layout(width); view.draw(ctx, x, y);
+ * Content that arrives asynchronously (images) invalidates the layout —
+ * pass `onInvalidate` to re-layout/redraw when that happens (window mode
+ * repaints automatically).
  */
 export default class HtmlView {
   constructor(window, opts = {}) {
@@ -74,6 +77,10 @@ export default class HtmlView {
 
     /** called with (href, event, element) when a link is activated */
     this.onLink = opts.onLink ?? null;
+    /** called when async content (an image) invalidates the layout;
+     *  standalone hosts re-layout/redraw here — window mode also repaints
+     *  on its own */
+    this.onInvalidate = opts.onInvalidate ?? null;
     /** extra author stylesheet(s) applied after document <style>s */
     this._userSheets = [].concat(opts.stylesheet ?? []);
     /**
@@ -407,13 +414,11 @@ export default class HtmlView {
               if (res instanceof SvgView) entry.svg = res;
               else entry.image = res;
               if (!res) entry.failed = true;
-              this._layoutWidth = -1;
-              if (this.window && this.window._mapped) this.render();
+              this._invalidate();
             },
             () => {
               entry.failed = true;
-              this._layoutWidth = -1;
-              if (this.window && this.window._mapped) this.render();
+              this._invalidate();
             }
           );
         }
@@ -422,6 +427,13 @@ export default class HtmlView {
     for (const child of box.children) this._collectImages(child);
   }
 
+  /** async content arrived: drop the cached layout, repaint and/or notify */
+  _invalidate() {
+    this._layoutWidth = -1;
+    if (this.window && this.window._mapped) this.render();
+    if (this.onInvalidate) this.onInvalidate();
+  }
+
   // decoded bytes -> Image (PNG/JPEG) or SvgView (sniffed SVG markup)
   _decodeResource(buf) {
     const head = buf.subarray(0, 1024).toString('utf8');

package/lib/widgets/markdownview.js

@@ -51,7 +51,10 @@ const DEFAULT_THEME = {
  *   wnd.map();
  *
  * Standalone use (no window attach): `view.layout(width)` then
- * `view.draw(ctx, x, y)`; `view.contentHeight` after layout.
+ * `view.draw(ctx, x, y)`; `view.contentHeight` after layout. Content that
+ * arrives asynchronously (mermaid models) invalidates the layout — pass
+ * `onInvalidate` to re-layout/redraw when that happens (window mode
+ * repaints automatically).
  */
 export default class MarkdownView {
   constructor(window, opts = {}) {
@@ -70,6 +73,10 @@ export default class MarkdownView {
     /** called with (href, event) when a rendered link is clicked (window
      *  mode wires mousedown automatically; standalone callers use linkAt) */
     this.onLink = opts.onLink ?? null;
+    /** called when async content (a mermaid model) invalidates the layout;
+     *  standalone hosts re-layout/redraw here — window mode also repaints
+     *  on its own */
+    this.onInvalidate = opts.onInvalidate ?? null;
 
     if (this.window) {
       this._ctx = this.window.getContext('2d');
@@ -116,8 +123,7 @@ export default class MarkdownView {
       parseMermaid(text).then(
         (model) => {
           entry.model = model;
-          this._layoutWidth = -1;
-          if (this.window && this.window._mapped) this.render();
+          this._invalidate();
         },
         () => {
           entry.failed = true; // unsupported/invalid: stays a code block
@@ -127,6 +133,13 @@ export default class MarkdownView {
     return entry;
   }
 
+  /** async content arrived: drop the cached layout, repaint and/or notify */
+  _invalidate() {
+    this._layoutWidth = -1;
+    if (this.window && this.window._mapped) this.render();
+    if (this.onInvalidate) this.onInvalidate();
+  }
+
   /** lay content out for a container width; returns total content height */
   layout(width) {
     const fonts = this._fonts();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ntk",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "Desktop UI toolkit for X11 with canvas-like 2d and OpenGL rendering",
   "author": "Andrey Sidorov <sidorares@yandex.ru>",
   "license": "MIT",