@opentui/core 0.4.2 → 0.4.3

package/{index-6xr3rbbe.js → index-xt9f071j.js}

@@ -2,6 +2,7 @@ import {
   Clipboard,
   InternalKeyHandler,
   KeyHandler,
+  NativeMeasureTargetKind,
   OptimizedBuffer,
   RGBA,
   Selection,
@@ -39,7 +40,7 @@ import {
   toArrayBuffer,
   treeSitterToTextChunks,
   yoga_default
-} from "./index-x7n320jr.js";
+} from "./index-d5xqskty.js";
 
 // src/Renderable.ts
 import { EventEmitter } from "events";
@@ -122,8 +123,6 @@ var BrandedRenderable = Symbol.for("@opentui/core/Renderable");
 var LayoutEvents;
 ((LayoutEvents2) => {
   LayoutEvents2["LAYOUT_CHANGED"] = "layout-changed";
-  LayoutEvents2["ADDED"] = "added";
-  LayoutEvents2["REMOVED"] = "removed";
   LayoutEvents2["RESIZED"] = "resized";
 })(LayoutEvents ||= {});
 var RenderableEvents;
@@ -226,7 +225,6 @@ class Renderable extends BaseRenderable {
   _position = {};
   _opacity = 1;
   _flexShrink = 1;
-  renderableMapById = new Map;
   _childrenInLayoutOrder = [];
   _childrenInZIndexOrder = [];
   needsZIndexSort = false;
@@ -267,16 +265,6 @@ class Renderable extends BaseRenderable {
       this.createFrameBuffer();
     }
   }
-  get id() {
-    return this._id;
-  }
-  set id(value) {
-    if (this.parent) {
-      this.parent.renderableMapById.delete(this.id);
-      this.parent.renderableMapById.set(value, this);
-    }
-    super.id = value;
-  }
   get focusable() {
     return this._focusable;
   }
@@ -982,7 +970,7 @@ class Renderable extends BaseRenderable {
   }
   replaceParent(obj) {
     if (obj.parent) {
-      obj.parent.remove(obj.id);
+      obj.parent.remove(obj);
     }
     obj.parent = this;
   }
@@ -1010,7 +998,6 @@ class Renderable extends BaseRenderable {
     } else {
       this.replaceParent(renderable);
       this.needsZIndexSort = true;
-      this.renderableMapById.set(renderable.id, renderable);
       this._childrenInZIndexOrder.push(renderable);
       if (typeof renderable.onLifecyclePass === "function") {
         this._ctx.registerLifecyclePass(renderable);
@@ -1055,13 +1042,13 @@ class Renderable extends BaseRenderable {
       }
       return -1;
     }
-    if (!this.renderableMapById.has(anchor.id)) {
+    if (this._childrenInLayoutOrder.indexOf(anchor) === -1) {
       if (true) {
         console.warn(`Anchor with id ${anchor.id} does not exist within the parent ${this.id}, skipping insertBefore`);
       }
       return -1;
     }
-    if (renderable === anchor || renderable.id === anchor.id) {
+    if (renderable === anchor) {
       if (true) {
         console.warn(`Anchor is the same as the node ${renderable.id} being inserted, skipping insertBefore`);
       }
@@ -1073,7 +1060,6 @@ class Renderable extends BaseRenderable {
     } else {
       this.replaceParent(renderable);
       this.needsZIndexSort = true;
-      this.renderableMapById.set(renderable.id, renderable);
       this._childrenInZIndexOrder.push(renderable);
       if (typeof renderable.onLifecyclePass === "function") {
         this._ctx.registerLifecyclePass(renderable);
@@ -1093,37 +1079,36 @@ class Renderable extends BaseRenderable {
     return insertedIndex;
   }
   getRenderable(id) {
-    return this.renderableMapById.get(id);
+    return this._childrenInLayoutOrder.find((child) => child.id === id);
   }
-  remove(id) {
-    if (!id) {
-      return;
+  remove(child) {
+    if (!(child instanceof BaseRenderable)) {
+      throw new Error("remove expects a renderable child object");
     }
-    if (this.renderableMapById.has(id)) {
-      const obj = this.renderableMapById.get(id);
-      if (obj) {
-        if (obj._liveCount > 0) {
-          this.propagateLiveCount(-obj._liveCount);
-        }
-        const childLayoutNode = obj.getLayoutNode();
-        this.yogaNode.removeChild(childLayoutNode);
-        this.requestRender();
-        obj.onRemove();
-        obj.parent = null;
-        this._ctx.unregisterLifecyclePass(obj);
-        this.renderableMapById.delete(id);
-        const index = this._childrenInLayoutOrder.findIndex((obj2) => obj2.id === id);
-        if (index !== -1) {
-          this._childrenInLayoutOrder.splice(index, 1);
-        }
-        const zIndexIndex = this._childrenInZIndexOrder.findIndex((obj2) => obj2.id === id);
-        if (zIndexIndex !== -1) {
-          this._childrenInZIndexOrder.splice(zIndexIndex, 1);
-        }
-        this.childrenPrimarySortDirty = true;
-        bumpRenderListRevision(this._ctx);
+    const index = this._childrenInLayoutOrder.indexOf(child);
+    if (index === -1) {
+      if (true) {
+        console.warn(`Renderable with id ${child.id} is not a child of ${this.id}, skipping remove`);
       }
+      return;
+    }
+    const renderable = this._childrenInLayoutOrder[index];
+    if (renderable._liveCount > 0) {
+      this.propagateLiveCount(-renderable._liveCount);
     }
+    this.yogaNode.removeChild(renderable.getLayoutNode());
+    this._childrenInLayoutOrder.splice(index, 1);
+    const zIndexIndex = this._childrenInZIndexOrder.indexOf(renderable);
+    if (zIndexIndex !== -1) {
+      this._childrenInZIndexOrder.splice(zIndexIndex, 1);
+    }
+    this._shouldUpdateBefore.delete(renderable);
+    this.requestRender();
+    renderable.onRemove();
+    renderable.parent = null;
+    this._ctx.unregisterLifecyclePass(renderable);
+    this.childrenPrimarySortDirty = true;
+    bumpRenderListRevision(this._ctx);
   }
   onRemove() {}
   getChildren() {
@@ -1242,17 +1227,18 @@ class Renderable extends BaseRenderable {
     this._isDestroyed = true;
     this.emit("destroyed" /* DESTROYED */);
     if (this.parent) {
-      this.parent.remove(this.id);
+      this.parent.remove(this);
     }
     if (this.frameBuffer) {
       this.frameBuffer.destroy();
       this.frameBuffer = null;
     }
-    for (const child of this._childrenInLayoutOrder) {
-      this.remove(child.id);
+    for (const child of [...this._childrenInLayoutOrder]) {
+      this.remove(child);
     }
     this._childrenInLayoutOrder = [];
-    this.renderableMapById.clear();
+    this._childrenInZIndexOrder = [];
+    this._shouldUpdateBefore.clear();
     Renderable.renderablesByNumber.delete(this.num);
     this.blur();
     this.removeAllListeners();
@@ -1403,7 +1389,9 @@ class RootRenderable extends Renderable {
     if (!this.visible)
       return;
     for (const renderable of this._ctx.getLifecyclePasses()) {
-      renderable.onLifecyclePass?.call(renderable);
+      if (!renderable.isDestroyed) {
+        renderable.onLifecyclePass?.call(renderable);
+      }
     }
     if (this.yogaNode.isDirty()) {
       this.calculateLayout();
@@ -1564,19 +1552,8 @@ function maybeMakeRenderable(ctx, node) {
 function wrapWithDelegates(instance, delegateMap) {
   if (!delegateMap || Object.keys(delegateMap).length === 0)
     return instance;
-  const descendantCache = new Map;
   const getDescendant = (id) => {
-    if (descendantCache.has(id)) {
-      const cached = descendantCache.get(id);
-      if (cached !== undefined) {
-        return cached;
-      }
-    }
-    const descendant = instance.findDescendantById(id);
-    if (descendant) {
-      descendantCache.set(id, descendant);
-    }
-    return descendant;
+    return instance.findDescendantById(id);
   };
   const proxy = new Proxy(instance, {
     get(target, prop, receiver) {
@@ -2769,6 +2746,7 @@ class TextBufferRenderable extends Renderable {
   textBuffer;
   textBufferView;
   _textBufferSyntaxStyle;
+  nativeRenderable = null;
   _defaultOptions = {
     fg: RGBA.fromValues(1, 1, 1, 1),
     bg: RGBA.fromValues(0, 0, 0, 0),
@@ -2800,7 +2778,7 @@ class TextBufferRenderable extends Renderable {
     this.textBuffer.setSyntaxStyle(this._textBufferSyntaxStyle);
     this.textBufferView.setWrapMode(this._wrapMode);
     this.textBufferView.setFirstLineOffset(this._firstLineOffset);
-    this.setupMeasureFunc();
+    this.setupNativeRenderable();
     this.textBuffer.setDefaultFg(this._defaultFg);
     this.textBuffer.setDefaultBg(this._defaultBg);
     this.textBuffer.setDefaultAttributes(this._defaultAttributes);
@@ -3034,30 +3012,18 @@ class TextBufferRenderable extends Renderable {
     this.requestRender();
     this.emit("line-info-change");
   }
-  setupMeasureFunc() {
-    const measureFunc = (width, widthMode, height, heightMode) => {
-      let effectiveWidth;
-      if (widthMode === 0 /* Undefined */ || isNaN(width)) {
-        effectiveWidth = 0;
-      } else {
-        effectiveWidth = width;
-      }
-      const effectiveHeight = isNaN(height) ? 1 : height;
-      const measureResult = this.textBufferView.measureForDimensions(Math.floor(effectiveWidth), Math.floor(effectiveHeight));
-      const measuredWidth = measureResult ? Math.max(1, measureResult.widthColsMax) : 1;
-      const measuredHeight = measureResult ? Math.max(1, measureResult.lineCount) : 1;
-      if (widthMode === 2 /* AtMost */ && this._positionType !== "absolute") {
-        return {
-          width: Math.min(effectiveWidth, measuredWidth),
-          height: Math.min(effectiveHeight, measuredHeight)
-        };
-      }
-      return {
-        width: measuredWidth,
-        height: measuredHeight
-      };
-    };
-    this.yogaNode.setMeasureFunc(measureFunc);
+  setupNativeRenderable() {
+    const lib = resolveRenderLib();
+    const nativeRenderable = lib.createNativeRenderable();
+    if (!lib.nativeRenderableAttachYogaNode(nativeRenderable, this.yogaNode.ptr)) {
+      lib.destroyNativeRenderable(nativeRenderable);
+      throw new Error("Failed to attach native renderable Yoga node");
+    }
+    if (!lib.nativeRenderableSetMeasureTarget(nativeRenderable, NativeMeasureTargetKind.TextBufferView, this.textBufferView.ptr)) {
+      lib.destroyNativeRenderable(nativeRenderable);
+      throw new Error("Failed to attach text buffer native measure target");
+    }
+    this.nativeRenderable = nativeRenderable;
   }
   shouldStartSelection(x, y) {
     if (!this.selectable)
@@ -3112,6 +3078,10 @@ class TextBufferRenderable extends Renderable {
   destroy() {
     if (this.isDestroyed)
       return;
+    if (this.nativeRenderable) {
+      resolveRenderLib().destroyNativeRenderable(this.nativeRenderable);
+      this.nativeRenderable = null;
+    }
     this.textBuffer.setSyntaxStyle(null);
     this._textBufferSyntaxStyle.destroy();
     this.textBufferView.destroy();
@@ -3592,6 +3562,19 @@ class TextNodeRenderable extends BaseRenderable {
     return this._children;
   }
   set children(children) {
+    for (const child of this._children) {
+      if (isTextNodeRenderable(child) && child.parent === this) {
+        child.parent = null;
+      }
+    }
+    for (const child of children) {
+      if (isTextNodeRenderable(child)) {
+        if (child.parent && child.parent !== this) {
+          child.parent.remove(child);
+        }
+        child.parent = this;
+      }
+    }
     this._children = children;
     this.requestRender();
   }
@@ -3612,14 +3595,8 @@ class TextNodeRenderable extends BaseRenderable {
       return insertIndex;
     }
     if (isTextNodeRenderable(obj)) {
-      if (index !== undefined) {
-        this._children.splice(index, 0, obj);
-        obj.parent = this;
-        this.requestRender();
-        return index;
-      }
-      const insertIndex = this._children.length;
-      this._children.push(obj);
+      const insertIndex = this.prepareChildInsert(obj, index);
+      this._children.splice(insertIndex, 0, obj);
       obj.parent = this;
       this.requestRender();
       return insertIndex;
@@ -3640,11 +3617,39 @@ class TextNodeRenderable extends BaseRenderable {
     }
     throw new Error("TextNodeRenderable only accepts strings, TextNodeRenderable instances, or StyledText instances");
   }
+  prepareChildInsert(child, index) {
+    let insertIndex = index ?? this._children.length;
+    if (child.parent && child.parent !== this) {
+      child.parent.remove(child);
+    } else if (child.parent === this) {
+      const currentIndex = this._children.indexOf(child);
+      if (currentIndex !== -1) {
+        this._children.splice(currentIndex, 1);
+        if (currentIndex < insertIndex)
+          insertIndex -= 1;
+      }
+    }
+    return Math.max(0, Math.min(insertIndex, this._children.length));
+  }
   replace(obj, index) {
-    this._children[index] = obj;
-    if (typeof obj !== "string") {
+    const existing = this._children[index];
+    if (isTextNodeRenderable(existing) && existing.parent === this) {
+      existing.parent = null;
+    }
+    if (isTextNodeRenderable(obj)) {
+      if (obj.parent && obj.parent !== this) {
+        obj.parent.remove(obj);
+      } else if (obj.parent === this) {
+        const currentIndex = this._children.indexOf(obj);
+        if (currentIndex !== -1 && currentIndex !== index) {
+          this._children.splice(currentIndex, 1);
+          if (currentIndex < index)
+            index -= 1;
+        }
+      }
       obj.parent = this;
     }
+    this._children[index] = obj;
     this.requestRender();
   }
   insertBefore(child, anchorNode) {
@@ -3655,12 +3660,16 @@ class TextNodeRenderable extends BaseRenderable {
     if (anchorIndex === -1) {
       throw new Error("Anchor node not found in children");
     }
+    if (child === anchorNode) {
+      return this;
+    }
+    if (isTextNodeRenderable(child)) {
+      this.add(child, anchorIndex);
+      return this;
+    }
     if (typeof child === "string") {
       this._children.splice(anchorIndex, 0, child);
-    } else if (isTextNodeRenderable(child)) {
-      this._children.splice(anchorIndex, 0, child);
-      child.parent = this;
-    } else if (child instanceof StyledText) {
+    } else if (isStyledText(child)) {
       const textNodes = styledTextToTextNodes(child);
       this._children.splice(anchorIndex, 0, ...textNodes);
       textNodes.forEach((node) => node.parent = this);
@@ -3670,18 +3679,27 @@ class TextNodeRenderable extends BaseRenderable {
     this.requestRender();
     return this;
   }
-  remove(id) {
-    const childIndex = this.getRenderableIndex(id);
+  remove(child) {
+    if (!isTextNodeRenderable(child)) {
+      throw new Error("remove expects a TextNodeRenderable child object");
+    }
+    const childIndex = this._children.indexOf(child);
     if (childIndex === -1) {
-      throw new Error("Child not found in children");
+      if (true) {
+        console.warn(`TextNodeRenderable with id ${child.id} is not a child of ${this.id}, skipping remove`);
+      }
+      return;
     }
-    const child = this._children[childIndex];
     this._children.splice(childIndex, 1);
     child.parent = null;
     this.requestRender();
-    return this;
   }
   clear() {
+    for (const child of this._children) {
+      if (isTextNodeRenderable(child) && child.parent === this) {
+        child.parent = null;
+      }
+    }
     this._children = [];
     this.requestRender();
   }
@@ -3867,8 +3885,8 @@ class TextRenderable extends TextBufferRenderable {
   add(obj, index) {
     return this.rootTextNode.add(obj, index);
   }
-  remove(id) {
-    this.rootTextNode.remove(id);
+  remove(child) {
+    this.rootTextNode.remove(child);
   }
   insertBefore(obj, anchor) {
     this.rootTextNode.insertBefore(obj, anchor);
@@ -5406,6 +5424,7 @@ class EditBufferRenderable extends Renderable {
   _keyboardSelectionActive = false;
   editBuffer;
   editorView;
+  nativeRenderable = null;
   _defaultOptions = {
     textColor: RGBA.fromValues(1, 1, 1, 1),
     backgroundColor: "transparent",
@@ -5457,7 +5476,7 @@ class EditBufferRenderable extends Renderable {
     if (this._tabIndicatorColor !== undefined) {
       this.editorView.setTabIndicatorColor(this._tabIndicatorColor);
     }
-    this.setupMeasureFunc();
+    this.setupNativeRenderable();
     this.setupEventListeners(options);
   }
   get lineInfo() {
@@ -6086,30 +6105,18 @@ class EditBufferRenderable extends Renderable {
     this.requestRender();
     return true;
   }
-  setupMeasureFunc() {
-    const measureFunc = (width, widthMode, height, heightMode) => {
-      let effectiveWidth;
-      if (widthMode === 0 /* Undefined */ || isNaN(width)) {
-        effectiveWidth = 0;
-      } else {
-        effectiveWidth = width;
-      }
-      const effectiveHeight = isNaN(height) ? 1 : height;
-      const measureResult = this.editorView.measureForDimensions(Math.floor(effectiveWidth), Math.floor(effectiveHeight));
-      const measuredWidth = measureResult ? Math.max(1, measureResult.widthColsMax) : 1;
-      const measuredHeight = measureResult ? Math.max(1, measureResult.lineCount) : 1;
-      if (widthMode === 2 /* AtMost */ && this._positionType !== "absolute") {
-        return {
-          width: Math.min(effectiveWidth, measuredWidth),
-          height: Math.min(effectiveHeight, measuredHeight)
-        };
-      }
-      return {
-        width: measuredWidth,
-        height: measuredHeight
-      };
-    };
-    this.yogaNode.setMeasureFunc(measureFunc);
+  setupNativeRenderable() {
+    const lib = resolveRenderLib();
+    const nativeRenderable = lib.createNativeRenderable();
+    if (!lib.nativeRenderableAttachYogaNode(nativeRenderable, this.yogaNode.ptr)) {
+      lib.destroyNativeRenderable(nativeRenderable);
+      throw new Error("Failed to attach native renderable Yoga node");
+    }
+    if (!lib.nativeRenderableSetMeasureTarget(nativeRenderable, NativeMeasureTargetKind.EditorView, this.editorView.ptr)) {
+      lib.destroyNativeRenderable(nativeRenderable);
+      throw new Error("Failed to attach editor native measure target");
+    }
+    this.nativeRenderable = nativeRenderable;
   }
   render(buffer, deltaTime) {
     if (!this.visible)
@@ -6160,6 +6167,10 @@ class EditBufferRenderable extends Renderable {
       this._ctx.setCursorPosition(0, 0, false);
       this.blur();
     }
+    if (this.nativeRenderable) {
+      resolveRenderLib().destroyNativeRenderable(this.nativeRenderable);
+      this.nativeRenderable = null;
+    }
     this.editorView.destroy();
     this.editBuffer.destroy();
     super.destroy();
@@ -10030,5 +10041,5 @@ Captured external output:
 
 export { h, isVNode, maybeMakeRenderable, wrapWithDelegates, instantiate, delegate, LayoutEvents, RenderableEvents, isRenderable, BaseRenderable, Renderable, RootRenderable, TextBufferView, EditBuffer, EditorView, convertThemeToStyles, SyntaxStyle, ANSI, BoxRenderable, TextBufferRenderable, CodeRenderable, isTextNodeRenderable, TextNodeRenderable, RootTextNodeRenderable, TextRenderable, NativeSpanFeed, defaultKeyAliases, mergeKeyAliases, mergeKeyBindings, getKeyBindingAction, buildKeyBindingsMap, capture, ConsolePosition, TerminalConsole, getObjectsInViewport, EditBufferRenderableEvents, isEditBufferRenderable, EditBufferRenderable, buildKittyKeyboardFlags, MouseEvent, MouseButton, createCliRenderer, CliRenderEvents, RendererControlState, CliRenderer };
 
-//# debugId=4FDEA314173926CA64756E2164756E21
-//# sourceMappingURL=index-6xr3rbbe.js.map
+//# debugId=9F3FCD78D0AED08D64756E2164756E21
+//# sourceMappingURL=index-xt9f071j.js.map