@opentui/core 0.1.16 → 0.1.18

package/3d.js

@@ -5,7 +5,7 @@ import {
   __export,
   __require,
   __toESM
-} from "./index-sw194bbj.js";
+} from "./index-grak7z0n.js";
 
 // ../../node_modules/omggif/omggif.js
 var require_omggif = __commonJS((exports) => {

package/Renderable.d.ts

@@ -95,6 +95,7 @@ export declare abstract class Renderable extends EventEmitter {
     static renderablesByNumber: Map<number, Renderable>;
     readonly id: string;
     readonly num: number;
+    private _isDestroyed;
     protected _ctx: RenderContext;
     protected _translateX: number;
     protected _translateY: number;
@@ -231,6 +232,7 @@ export declare abstract class Renderable extends EventEmitter {
         height: number;
     };
     protected renderSelf(buffer: OptimizedBuffer, deltaTime: number): void;
+    get isDestroyed(): boolean;
     destroy(): void;
     destroyRecursively(): void;
     protected destroySelf(): void;

package/{index-sw194bbj.js → index-grak7z0n.js}

@@ -5823,6 +5823,7 @@ class Renderable extends EventEmitter3 {
   static renderablesByNumber = new Map;
   id;
   num;
+  _isDestroyed = false;
   _ctx;
   _translateX = 0;
   _translateY = 0;
@@ -6549,34 +6550,52 @@ class Renderable extends EventEmitter3 {
     obj.parent = this;
   }
   add(obj, index) {
-    obj = ensureRenderable(this._ctx, obj);
-    if (this.renderableMap.has(obj.id)) {
-      console.warn(`A renderable with id ${obj.id} already exists in ${this.id}, removing it`);
-      this.remove(obj.id);
+    if (!obj) {
+      return -1;
     }
-    this.replaceParent(obj);
-    const childLayoutNode = obj.getLayoutNode();
+    const renderable = maybeMakeRenderable(this._ctx, obj);
+    if (!renderable) {
+      return -1;
+    }
+    if (renderable.isDestroyed) {
+      if (true) {
+        console.warn(`Renderable with id ${renderable.id} was already destroyed, skipping add`);
+      }
+      return -1;
+    }
+    if (this.renderableMap.has(renderable.id)) {
+      console.warn(`A renderable with id ${renderable.id} already exists in ${this.id}, removing it`);
+      this.remove(renderable.id);
+    }
+    this.replaceParent(renderable);
+    const childLayoutNode = renderable.getLayoutNode();
     let insertedIndex;
     if (index !== undefined) {
-      this.renderableArray.splice(index, 0, obj);
+      this.renderableArray.splice(index, 0, renderable);
       insertedIndex = this.layoutNode.insertChild(childLayoutNode, index);
     } else {
-      this.renderableArray.push(obj);
+      this.renderableArray.push(renderable);
       insertedIndex = this.layoutNode.addChild(childLayoutNode);
     }
     this.needsZIndexSort = true;
     this.childrenPrimarySortDirty = true;
-    this.renderableMap.set(obj.id, obj);
-    if (obj._liveCount > 0) {
-      this.propagateLiveCount(obj._liveCount);
+    this.renderableMap.set(renderable.id, renderable);
+    if (renderable._liveCount > 0) {
+      this.propagateLiveCount(renderable._liveCount);
     }
     this.requestRender();
     return insertedIndex;
   }
   insertBefore(obj, anchor) {
-    obj = ensureRenderable(this._ctx, obj);
+    if (!obj) {
+      return -1;
+    }
+    const renderable = maybeMakeRenderable(this._ctx, obj);
+    if (!renderable) {
+      return -1;
+    }
     if (!anchor) {
-      return this.add(obj);
+      return this.add(renderable);
     }
     if (!this.renderableMap.has(anchor.id)) {
       throw new Error("Anchor does not exist");
@@ -6585,7 +6604,7 @@ class Renderable extends EventEmitter3 {
     if (anchorIndex === -1) {
       throw new Error("Anchor does not exist");
     }
-    return this.add(obj, anchorIndex);
+    return this.add(renderable, anchorIndex);
   }
   getRenderable(id) {
     return this.renderableMap.get(id);
@@ -6668,7 +6687,14 @@ class Renderable extends EventEmitter3 {
     };
   }
   renderSelf(buffer, deltaTime) {}
+  get isDestroyed() {
+    return this._isDestroyed;
+  }
   destroy() {
+    if (this._isDestroyed) {
+      return;
+    }
+    this._isDestroyed = true;
     if (this.parent) {
       this.parent.remove(this.id);
     }
@@ -6677,16 +6703,15 @@ class Renderable extends EventEmitter3 {
       this.frameBuffer = null;
     }
     for (const child of this.renderableArray) {
-      child.parent = null;
-      child.destroy();
+      this.remove(child.id);
     }
     this.renderableArray = [];
     this.renderableMap.clear();
     Renderable.renderablesByNumber.delete(this.num);
-    this.layoutNode.destroy();
     this.blur();
     this.removeAllListeners();
     this.destroySelf();
+    this.layoutNode.destroy();
   }
   destroyRecursively() {
     this.destroy();
@@ -6841,11 +6866,12 @@ class RootRenderable extends Renderable {
     try {
       this.yogaConfig.free();
     } catch (error) {}
-    super.destroySelf();
   }
 }
 
 // src/renderables/composition/vnode.ts
+import util from "util";
+var BrandedVNode = Symbol.for("@opentui/core/VNode");
 function isRenderableConstructor(value) {
   return typeof value === "function" && value.prototype && Renderable.prototype.isPrototypeOf(value.prototype);
 }
@@ -6865,7 +6891,7 @@ function h(type, props, ...children) {
     throw new TypeError("h() received an invalid vnode type");
   }
   const vnode = {
-    __isVNode: true,
+    [BrandedVNode]: true,
     type,
     props,
     children: flattenChildren(children),
@@ -6907,12 +6933,17 @@ function h(type, props, ...children) {
   return vnode;
 }
 function isVNode(node) {
-  return node && node.__isVNode;
+  return node && node[BrandedVNode];
 }
-function ensureRenderable(ctx, node) {
+function maybeMakeRenderable(ctx, node) {
   if (isRenderable(node))
     return node;
-  return instantiate(ctx, node);
+  if (isVNode(node))
+    return instantiate(ctx, node);
+  if (true) {
+    console.warn("maybeMakeRenderable received an invalid node", util.inspect(node, { depth: 2 }));
+  }
+  return null;
 }
 function wrapWithDelegates(instance, delegateMap) {
   if (!delegateMap || Object.keys(delegateMap).length === 0)
@@ -7009,7 +7040,7 @@ import { EventEmitter as EventEmitter5 } from "events";
 import { Console } from "console";
 import fs from "fs";
 import path from "path";
-import util from "util";
+import util2 from "util";
 
 // src/lib/output.capture.ts
 import { Writable } from "stream";
@@ -7425,13 +7456,13 @@ class TerminalConsole extends EventEmitter5 {
       }
       if (typeof arg === "object" && arg !== null) {
         try {
-          return util.inspect(arg, { depth: 2 });
+          return util2.inspect(arg, { depth: 2 });
         } catch (e) {
           return String(arg);
         }
       }
       try {
-        return util.inspect(arg, { depth: 2 });
+        return util2.inspect(arg, { depth: 2 });
       } catch (e) {
         return String(arg);
       }
@@ -7703,9 +7734,13 @@ class MouseEvent {
   target;
   isSelecting;
   _propagationStopped = false;
+  _defaultPrevented = false;
   get propagationStopped() {
     return this._propagationStopped;
   }
+  get defaultPrevented() {
+    return this._defaultPrevented;
+  }
   constructor(target, attributes) {
     this.target = target;
     this.type = attributes.type;
@@ -7720,6 +7755,9 @@ class MouseEvent {
   stopPropagation() {
     this._propagationStopped = true;
   }
+  preventDefault() {
+    this._defaultPrevented = true;
+  }
 }
 var MouseButton;
 ((MouseButton2) => {
@@ -7845,6 +7883,7 @@ class CliRenderer extends EventEmitter6 {
   mouseParser = new MouseParser;
   sigwinchHandler = null;
   _capabilities = null;
+  _latestPointer = { x: 0, y: 0 };
   constructor(lib, rendererPtr, stdin, stdout, width, height, config = {}) {
     super();
     this.stdin = stdin;
@@ -7897,6 +7936,8 @@ class CliRenderer extends EventEmitter6 {
         }, 100);
       }).then(() => {
         this.realStdoutWrite.call(this.stdout, `
+`.repeat(this._terminalHeight));
+        this.realStdoutWrite.call(this.stdout, `
 === FATAL ERROR OCCURRED ===
 `);
         this.realStdoutWrite.call(this.stdout, `Console cache:
@@ -8181,12 +8222,14 @@ Error details:
         }
         mouseEvent.y -= this.renderOffset;
       }
+      this._latestPointer.x = mouseEvent.x;
+      this._latestPointer.y = mouseEvent.y;
       if (mouseEvent.type === "scroll") {
         const maybeRenderableId2 = this.lib.checkHit(this.rendererPtr, mouseEvent.x, mouseEvent.y);
         const maybeRenderable2 = Renderable.renderablesByNumber.get(maybeRenderableId2);
         if (maybeRenderable2) {
-          const event = new MouseEvent(maybeRenderable2, mouseEvent);
-          maybeRenderable2.processMouseEvent(event);
+          const event2 = new MouseEvent(maybeRenderable2, mouseEvent);
+          maybeRenderable2.processMouseEvent(event2);
         }
         return true;
       }
@@ -8197,23 +8240,23 @@ Error details:
       if (mouseEvent.type === "down" && mouseEvent.button === 0 /* LEFT */ && !this.currentSelection?.isSelecting && !mouseEvent.modifiers.ctrl) {
         if (maybeRenderable && maybeRenderable.selectable && maybeRenderable.shouldStartSelection(mouseEvent.x, mouseEvent.y)) {
           this.startSelection(maybeRenderable, mouseEvent.x, mouseEvent.y);
-          const event = new MouseEvent(maybeRenderable, mouseEvent);
-          maybeRenderable.processMouseEvent(event);
+          const event2 = new MouseEvent(maybeRenderable, mouseEvent);
+          maybeRenderable.processMouseEvent(event2);
           return true;
         }
       }
       if (mouseEvent.type === "drag" && this.currentSelection?.isSelecting) {
         this.updateSelection(maybeRenderable, mouseEvent.x, mouseEvent.y);
         if (maybeRenderable) {
-          const event = new MouseEvent(maybeRenderable, { ...mouseEvent, isSelecting: true });
-          maybeRenderable.processMouseEvent(event);
+          const event2 = new MouseEvent(maybeRenderable, { ...mouseEvent, isSelecting: true });
+          maybeRenderable.processMouseEvent(event2);
         }
         return true;
       }
       if (mouseEvent.type === "up" && this.currentSelection?.isSelecting) {
         if (maybeRenderable) {
-          const event = new MouseEvent(maybeRenderable, { ...mouseEvent, isSelecting: true });
-          maybeRenderable.processMouseEvent(event);
+          const event2 = new MouseEvent(maybeRenderable, { ...mouseEvent, isSelecting: true });
+          maybeRenderable.processMouseEvent(event2);
         }
         this.finishSelection();
         return true;
@@ -8223,59 +8266,61 @@ Error details:
           this.currentSelection.isSelecting = true;
           this.updateSelection(maybeRenderable, mouseEvent.x, mouseEvent.y);
           return true;
-        } else {
-          this.clearSelection();
         }
       }
       if (!sameElement && (mouseEvent.type === "drag" || mouseEvent.type === "move")) {
         if (this.lastOverRenderable && this.lastOverRenderable !== this.capturedRenderable) {
-          const event = new MouseEvent(this.lastOverRenderable, { ...mouseEvent, type: "out" });
-          this.lastOverRenderable.processMouseEvent(event);
+          const event2 = new MouseEvent(this.lastOverRenderable, { ...mouseEvent, type: "out" });
+          this.lastOverRenderable.processMouseEvent(event2);
         }
         this.lastOverRenderable = maybeRenderable;
         if (maybeRenderable) {
-          const event = new MouseEvent(maybeRenderable, {
+          const event2 = new MouseEvent(maybeRenderable, {
             ...mouseEvent,
             type: "over",
             source: this.capturedRenderable
           });
-          maybeRenderable.processMouseEvent(event);
+          maybeRenderable.processMouseEvent(event2);
         }
       }
       if (this.capturedRenderable && mouseEvent.type !== "up") {
-        const event = new MouseEvent(this.capturedRenderable, mouseEvent);
-        this.capturedRenderable.processMouseEvent(event);
+        const event2 = new MouseEvent(this.capturedRenderable, mouseEvent);
+        this.capturedRenderable.processMouseEvent(event2);
         return true;
       }
       if (this.capturedRenderable && mouseEvent.type === "up") {
-        const event = new MouseEvent(this.capturedRenderable, { ...mouseEvent, type: "drag-end" });
-        this.capturedRenderable.processMouseEvent(event);
+        const event2 = new MouseEvent(this.capturedRenderable, { ...mouseEvent, type: "drag-end" });
+        this.capturedRenderable.processMouseEvent(event2);
         this.capturedRenderable.processMouseEvent(new MouseEvent(this.capturedRenderable, mouseEvent));
         if (maybeRenderable) {
-          const event2 = new MouseEvent(maybeRenderable, {
+          const event3 = new MouseEvent(maybeRenderable, {
             ...mouseEvent,
             type: "drop",
             source: this.capturedRenderable
           });
-          maybeRenderable.processMouseEvent(event2);
+          maybeRenderable.processMouseEvent(event3);
         }
         this.lastOverRenderable = this.capturedRenderable;
         this.lastOverRenderableNum = this.capturedRenderable.num;
         this.capturedRenderable = undefined;
         this.requestRender();
       }
+      let event = undefined;
       if (maybeRenderable) {
         if (mouseEvent.type === "drag" && mouseEvent.button === 0 /* LEFT */) {
           this.capturedRenderable = maybeRenderable;
         } else {
           this.capturedRenderable = undefined;
         }
-        const event = new MouseEvent(maybeRenderable, mouseEvent);
+        event = new MouseEvent(maybeRenderable, mouseEvent);
         maybeRenderable.processMouseEvent(event);
-        return true;
+      } else {
+        this.capturedRenderable = undefined;
+        this.lastOverRenderable = undefined;
+      }
+      if (!event?.defaultPrevented && mouseEvent.type === "down" && this.currentSelection) {
+        this.clearSelection();
       }
-      this.capturedRenderable = undefined;
-      this.lastOverRenderable = undefined;
       return true;
     }
     return false;
@@ -8673,11 +8718,10 @@ Error details:
   }
   requestSelectionUpdate() {
     if (this.currentSelection?.isSelecting) {
-      const lastMouseX = this.currentSelection.focus.x;
-      const lastMouseY = this.currentSelection.focus.y;
-      const maybeRenderableId = this.lib.checkHit(this.rendererPtr, lastMouseX, lastMouseY);
+      const pointer = this._latestPointer;
+      const maybeRenderableId = this.lib.checkHit(this.rendererPtr, pointer.x, pointer.y);
       const maybeRenderable = Renderable.renderablesByNumber.get(maybeRenderableId);
-      this.updateSelection(maybeRenderable, lastMouseX, lastMouseY);
+      this.updateSelection(maybeRenderable, pointer.x, pointer.y);
     }
   }
   isWithinContainer(renderable, container) {
@@ -8727,7 +8771,7 @@ Error details:
   }
 }
 
-export { __toESM, __commonJS, __export, __require, Edge, Gutter, MeasureMode, BorderChars, getBorderFromSides, getBorderSides, borderCharsToArray, BorderCharArrays, TrackedNode, createTrackedNode, nonAlphanumericKeys, parseKeypress, KeyHandler, getKeyHandler, RGBA, hexToRgb, rgbToHex, hsvToRgb, parseColor, fonts, measureText, getCharacterPositions, coordinateToCharacterIndex, renderFontToFrameBuffer, TextAttributes, DebugOverlayCorner, createTextAttributes, StyledText, stringToStyledText, black, red, green, yellow, blue, magenta, cyan, white, brightBlack, brightRed, brightGreen, brightYellow, brightBlue, brightMagenta, brightCyan, brightWhite, bgBlack, bgRed, bgGreen, bgYellow, bgBlue, bgMagenta, bgCyan, bgWhite, bold, italic, underline, strikethrough, dim, reverse, blink, fg, bg, tn, t, SyntaxStyle, hastToStyledText, parseAlign, parseBoxSizing, parseDimension, parseDirection, parseDisplay, parseEdge, parseFlexDirection, parseGutter, parseJustify, parseLogLevel, parseMeasureMode, parseOverflow, parsePositionType, parseUnit, parseWrap, MouseParser, Selection, convertGlobalToLocalSelection, ASCIIFontSelectionHelper, TextBuffer, LogLevel2 as LogLevel, setRenderLibPath, resolveRenderLib, OptimizedBuffer, h, isVNode, ensureRenderable, wrapWithDelegates, instantiate, delegate, LayoutEvents, RenderableEvents, isValidPercentage, isMarginType, isPaddingType, isPositionType, isPositionTypeType, isOverflowType, isDimensionType, isFlexBasisType, isSizeType, isRenderable, Renderable, RootRenderable, capture, ConsolePosition, TerminalConsole, MouseEvent, MouseButton, createCliRenderer, CliRenderEvents, CliRenderer };
+export { __toESM, __commonJS, __export, __require, Edge, Gutter, MeasureMode, BorderChars, getBorderFromSides, getBorderSides, borderCharsToArray, BorderCharArrays, TrackedNode, createTrackedNode, nonAlphanumericKeys, parseKeypress, KeyHandler, getKeyHandler, RGBA, hexToRgb, rgbToHex, hsvToRgb, parseColor, fonts, measureText, getCharacterPositions, coordinateToCharacterIndex, renderFontToFrameBuffer, TextAttributes, DebugOverlayCorner, createTextAttributes, StyledText, stringToStyledText, black, red, green, yellow, blue, magenta, cyan, white, brightBlack, brightRed, brightGreen, brightYellow, brightBlue, brightMagenta, brightCyan, brightWhite, bgBlack, bgRed, bgGreen, bgYellow, bgBlue, bgMagenta, bgCyan, bgWhite, bold, italic, underline, strikethrough, dim, reverse, blink, fg, bg, tn, t, SyntaxStyle, hastToStyledText, parseAlign, parseBoxSizing, parseDimension, parseDirection, parseDisplay, parseEdge, parseFlexDirection, parseGutter, parseJustify, parseLogLevel, parseMeasureMode, parseOverflow, parsePositionType, parseUnit, parseWrap, MouseParser, Selection, convertGlobalToLocalSelection, ASCIIFontSelectionHelper, TextBuffer, LogLevel2 as LogLevel, setRenderLibPath, resolveRenderLib, OptimizedBuffer, h, isVNode, maybeMakeRenderable, wrapWithDelegates, instantiate, delegate, LayoutEvents, RenderableEvents, isValidPercentage, isMarginType, isPaddingType, isPositionType, isPositionTypeType, isOverflowType, isDimensionType, isFlexBasisType, isSizeType, isRenderable, Renderable, RootRenderable, capture, ConsolePosition, TerminalConsole, MouseEvent, MouseButton, createCliRenderer, CliRenderEvents, CliRenderer };
 
-//# debugId=4847DC8F7CFD610964756E2164756E21
-//# sourceMappingURL=index-sw194bbj.js.map
+//# debugId=5CD4CD088CC2988464756E2164756E21
+//# sourceMappingURL=index-grak7z0n.js.map