@opentui/core 0.1.19 → 0.1.21

package/index.js

@@ -66,6 +66,7 @@ import {
   getBorderSides,
   getCharacterPositions,
   getKeyHandler,
+  getObjectsInViewport,
   green,
   h,
   hastToStyledText,
@@ -81,6 +82,7 @@ import {
   isPositionTypeType,
   isRenderable,
   isSizeType,
+  isStyledText,
   isVNode,
   isValidPercentage,
   italic,
@@ -118,7 +120,7 @@ import {
   white,
   wrapWithDelegates,
   yellow
-} from "./index-0h2r5adk.js";
+} from "./index-8sac0sgm.js";
 // src/post/filters.ts
 function applyScanlines(buffer, strength = 0.8, step = 2) {
   const width = buffer.width;
@@ -1449,6 +1451,17 @@ var BrandedTextNodeRenderable = Symbol.for("@opentui/core/TextNodeRenderable");
 function isTextNodeRenderable(obj) {
   return !!obj?.[BrandedTextNodeRenderable];
 }
+function styledTextToTextNodes(styledText) {
+  return styledText.chunks.map((chunk) => {
+    const node = new TextNodeRenderable({
+      fg: chunk.fg,
+      bg: chunk.bg,
+      attributes: chunk.attributes
+    });
+    node.add(chunk.text);
+    return node;
+  });
+}
 
 class TextNodeRenderable extends BaseRenderable {
   [BrandedTextNodeRenderable] = true;
@@ -1480,12 +1493,11 @@ class TextNodeRenderable extends BaseRenderable {
         this._children.splice(index, 0, obj);
         this.requestRender();
         return index;
-      } else {
-        const insertIndex = this._children.length;
-        this._children.push(obj);
-        this.requestRender();
-        return insertIndex;
       }
+      const insertIndex = this._children.length;
+      this._children.push(obj);
+      this.requestRender();
+      return insertIndex;
     }
     if (isTextNodeRenderable(obj)) {
       if (index !== undefined) {
@@ -1493,24 +1505,48 @@ class TextNodeRenderable extends BaseRenderable {
         obj.parent = this;
         this.requestRender();
         return index;
-      } else {
-        const insertIndex = this._children.length;
-        this._children.push(obj);
-        obj.parent = this;
+      }
+      const insertIndex = this._children.length;
+      this._children.push(obj);
+      obj.parent = this;
+      this.requestRender();
+      return insertIndex;
+    }
+    if (isStyledText(obj)) {
+      const textNodes = styledTextToTextNodes(obj);
+      if (index !== undefined) {
+        this._children.splice(index, 0, ...textNodes);
+        textNodes.forEach((node) => node.parent = this);
         this.requestRender();
-        return insertIndex;
+        return index;
       }
+      const insertIndex = this._children.length;
+      this._children.push(...textNodes);
+      textNodes.forEach((node) => node.parent = this);
+      this.requestRender();
+      return insertIndex;
     }
-    throw new Error("TextNodeRenderable only accepts strings or other TextNodeRenderable instances");
+    throw new Error("TextNodeRenderable only accepts strings, TextNodeRenderable instances, or StyledText instances");
   }
   insertBefore(child, anchorNode) {
+    if (!anchorNode || !isTextNodeRenderable(anchorNode)) {
+      throw new Error("Anchor must be a TextNodeRenderable");
+    }
     const anchorIndex = this._children.indexOf(anchorNode);
     if (anchorIndex === -1) {
       throw new Error("Anchor node not found in children");
     }
-    this._children.splice(anchorIndex, 0, child);
-    if (typeof child !== "string") {
+    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) {
+      const textNodes = styledTextToTextNodes(child);
+      this._children.splice(anchorIndex, 0, ...textNodes);
+      textNodes.forEach((node) => node.parent = this);
+    } else {
+      throw new Error("Child must be a string, TextNodeRenderable, or StyledText instance");
     }
     this.requestRender();
     return this;
@@ -1802,7 +1838,6 @@ class TextRenderable extends Renderable {
   }
   updateTextFromNodes() {
     if (this.rootTextNode.isDirty) {
-      const startTime = performance.now();
       const chunks = this.rootTextNode.gatherWithInheritedStyle({
         fg: this._defaultFg,
         bg: this._defaultBg,
@@ -1810,14 +1845,9 @@ class TextRenderable extends Renderable {
       });
       this.textBuffer.setStyledText(new StyledText(chunks));
       this.updateTextInfo();
-      const endTime = performance.now();
-      console.log(`updateTextFromNodes took ${endTime - startTime}ms`);
     }
   }
   add(obj, index) {
-    if (!isTextNodeRenderable(obj)) {
-      throw new Error("TextRenderable only accepts TextNodeRenderables. Use add() method.");
-    }
     return this.rootTextNode.add(obj, index);
   }
   remove(id) {
@@ -1827,12 +1857,6 @@ class TextRenderable extends Renderable {
     }
   }
   insertBefore(obj, anchor) {
-    if (!isTextNodeRenderable(obj)) {
-      throw new Error("TextRenderable insertBefore only accepts TextNodeRenderables");
-    }
-    if (!anchor || !isTextNodeRenderable(anchor)) {
-      throw new Error("Anchor must be a TextNodeRenderable");
-    }
     this.rootTextNode.insertBefore(obj, anchor);
     return this.rootTextNode.children.indexOf(obj);
   }
@@ -1870,12 +1894,12 @@ class TextRenderable extends Renderable {
   getSelection() {
     return this.textBuffer.getSelection();
   }
+  onUpdate(deltaTime) {
+    this.updateTextFromNodes();
+  }
   render(buffer, deltaTime) {
     if (!this.visible)
       return;
-    this.onUpdate(deltaTime);
-    this.updateFromLayout();
-    this.updateTextFromNodes();
     this.markClean();
     this._ctx.addToHitGrid(this.x, this.y, this.width, this.height, this.num);
     this.renderSelf(buffer);
@@ -3395,7 +3419,7 @@ class ContentRenderable extends BoxRenderable {
     this.viewport = viewport;
   }
   _getChildren() {
-    return this.getChildrenInViewport(this.viewport);
+    return getObjectsInViewport(this.viewport, this.getChildrenSortedByPrimaryAxis(), this.primaryAxis);
   }
 }
 
@@ -3845,6 +3869,7 @@ export {
   isValidPercentage,
   isVNode,
   isTextNodeRenderable,
+  isStyledText,
   isSizeType,
   isRenderable,
   isPositionTypeType,
@@ -3964,5 +3989,5 @@ export {
   ASCIIFont
 };
 
-//# debugId=AFF1AC494BCD215264756E2164756E21
+//# debugId=8F19C97D909538BC64756E2164756E21
 //# sourceMappingURL=index.js.map