@opentui/core 0.1.52 → 0.1.54

package/index.js

@@ -137,7 +137,7 @@ import {
   white,
   wrapWithDelegates,
   yellow
-} from "./index-vhxgbbed.js";
+} from "./index-aedd54rx.js";
 // src/text-buffer-view.ts
 class TextBufferView {
   lib;
@@ -243,6 +243,10 @@ class TextBufferView {
     this.guard();
     return this.lib.textBufferViewMeasureForDimensions(this.viewPtr, width, height);
   }
+  getVirtualLineCount() {
+    this.guard();
+    return this.lib.textBufferViewGetVirtualLineCount(this.viewPtr);
+  }
   destroy() {
     if (this._destroyed)
       return;
@@ -2501,6 +2505,9 @@ class TextBufferRenderable extends Renderable {
   get lineCount() {
     return this.textBuffer.getLineCount();
   }
+  get virtualLineCount() {
+    return this.textBufferView.getVirtualLineCount();
+  }
   get scrollY() {
     return this._scrollY;
   }
@@ -2650,6 +2657,7 @@ class TextBufferRenderable extends Renderable {
   }
   onResize(width, height) {
     this.textBufferView.setViewport(this._scrollX, this._scrollY, width, height);
+    this.updateTextInfo();
     if (this.lastLocalSelection) {
       const changed = this.updateLocalSelection(this.lastLocalSelection);
       if (changed) {
@@ -3318,12 +3326,12 @@ class GutterRenderable extends Renderable {
     this._lineNumberOffset = options.lineNumberOffset;
     this._hideLineNumbers = options.hideLineNumbers;
     this._lineNumbers = options.lineNumbers ?? new Map;
-    this._lastKnownLineCount = this.target.lineCount;
+    this._lastKnownLineCount = this.target.virtualLineCount;
     this._lastKnownScrollY = this.target.scrollY;
     this.calculateSignWidths();
     this.setupMeasureFunc();
     this.onLifecyclePass = () => {
-      const currentLineCount = this.target.lineCount;
+      const currentLineCount = this.target.virtualLineCount;
       if (currentLineCount !== this._lastKnownLineCount) {
         this._lastKnownLineCount = currentLineCount;
         this.yogaNode.markDirty();
@@ -3334,7 +3342,7 @@ class GutterRenderable extends Renderable {
   setupMeasureFunc() {
     const measureFunc = (width, widthMode, height, heightMode) => {
       const gutterWidth = this.calculateWidth();
-      const gutterHeight = this.target.lineCount;
+      const gutterHeight = this.target.virtualLineCount;
       return {
         width: gutterWidth,
         height: gutterHeight
@@ -3345,6 +3353,23 @@ class GutterRenderable extends Renderable {
   remeasure() {
     this.yogaNode.markDirty();
   }
+  setLineNumberOffset(offset) {
+    if (this._lineNumberOffset !== offset) {
+      this._lineNumberOffset = offset;
+      this.yogaNode.markDirty();
+      this.requestRender();
+    }
+  }
+  setHideLineNumbers(hideLineNumbers) {
+    this._hideLineNumbers = hideLineNumbers;
+    this.yogaNode.markDirty();
+    this.requestRender();
+  }
+  setLineNumbers(lineNumbers) {
+    this._lineNumbers = lineNumbers;
+    this.yogaNode.markDirty();
+    this.requestRender();
+  }
   calculateSignWidths() {
     this._maxBeforeWidth = 0;
     this._maxAfterWidth = 0;
@@ -3360,7 +3385,7 @@ class GutterRenderable extends Renderable {
     }
   }
   calculateWidth() {
-    const totalLines = this.target.lineCount;
+    const totalLines = this.target.virtualLineCount;
     let maxLineNumber = totalLines + this._lineNumberOffset;
     if (this._lineNumbers.size > 0) {
       for (const customLineNum of this._lineNumbers.values()) {
@@ -3564,7 +3589,7 @@ class LineNumberRenderable extends Renderable {
     super.add(this.target);
   }
   add(child) {
-    if (!this.target && "lineInfo" in child && "lineCount" in child && "scrollY" in child) {
+    if (!this.target && "lineInfo" in child && "lineCount" in child && "virtualLineCount" in child && "scrollY" in child) {
       this.setTarget(child);
       return this.getChildrenCount() - 1;
     }
@@ -3703,13 +3728,8 @@ class LineNumberRenderable extends Renderable {
   set lineNumberOffset(value) {
     if (this._lineNumberOffset !== value) {
       this._lineNumberOffset = value;
-      if (this.gutter && this.target) {
-        const target = this.target;
-        super.remove(this.gutter.id);
-        super.remove(this.target.id);
-        this.gutter = null;
-        this.target = null;
-        this.setTarget(target);
+      if (this.gutter) {
+        this.gutter.setLineNumberOffset(value);
       }
     }
   }
@@ -3718,13 +3738,8 @@ class LineNumberRenderable extends Renderable {
   }
   setHideLineNumbers(hideLineNumbers) {
     this._hideLineNumbers = hideLineNumbers;
-    if (this.gutter && this.target) {
-      const target = this.target;
-      super.remove(this.gutter.id);
-      super.remove(this.target.id);
-      this.gutter = null;
-      this.target = null;
-      this.setTarget(target);
+    if (this.gutter) {
+      this.gutter.setHideLineNumbers(hideLineNumbers);
     }
   }
   getHideLineNumbers() {
@@ -3732,13 +3747,8 @@ class LineNumberRenderable extends Renderable {
   }
   setLineNumbers(lineNumbers) {
     this._lineNumbers = lineNumbers;
-    if (this.gutter && this.target) {
-      const target = this.target;
-      super.remove(this.gutter.id);
-      super.remove(this.target.id);
-      this.gutter = null;
-      this.target = null;
-      this.setTarget(target);
+    if (this.gutter) {
+      this.gutter.setLineNumbers(lineNumbers);
     }
   }
   getLineNumbers() {
@@ -4569,6 +4579,7 @@ class DiffRenderable extends Renderable {
   _conceal;
   _selectionBg;
   _selectionFg;
+  _treeSitterClient;
   _showLineNumbers;
   _lineNumberFg;
   _lineNumberBg;
@@ -4589,6 +4600,7 @@ class DiffRenderable extends Renderable {
   leftCodeRenderable = null;
   rightCodeRenderable = null;
   pendingRebuild = false;
+  _lastWidth = 0;
   errorTextRenderable = null;
   errorCodeRenderable = null;
   constructor(ctx, options) {
@@ -4601,9 +4613,10 @@ class DiffRenderable extends Renderable {
     this._filetype = options.filetype;
     this._syntaxStyle = options.syntaxStyle;
     this._wrapMode = options.wrapMode;
-    this._conceal = options.conceal ?? true;
+    this._conceal = options.conceal ?? false;
     this._selectionBg = options.selectionBg ? parseColor(options.selectionBg) : undefined;
     this._selectionFg = options.selectionFg ? parseColor(options.selectionFg) : undefined;
+    this._treeSitterClient = options.treeSitterClient;
     this._showLineNumbers = options.showLineNumbers ?? true;
     this._lineNumberFg = parseColor(options.lineNumberFg ?? "#888888");
     this._lineNumberBg = parseColor(options.lineNumberBg ?? "transparent");
@@ -4659,7 +4672,10 @@ class DiffRenderable extends Renderable {
   onResize(width, height) {
     super.onResize(width, height);
     if (this._view === "split" && this._wrapMode !== "none" && this._wrapMode !== undefined) {
-      this.requestRebuild();
+      if (this._lastWidth !== width) {
+        this._lastWidth = width;
+        this.requestRebuild();
+      }
     }
   }
   requestRebuild() {
@@ -4726,7 +4742,8 @@ class DiffRenderable extends Renderable {
         conceal: this._conceal,
         width: "100%",
         flexGrow: 1,
-        flexShrink: 1
+        flexShrink: 1,
+        ...this._treeSitterClient !== undefined && { treeSitterClient: this._treeSitterClient }
       });
       super.add(this.errorCodeRenderable);
     } else {
@@ -4755,7 +4772,8 @@ class DiffRenderable extends Renderable {
         height: "100%",
         ...drawUnstyledText !== undefined && { drawUnstyledText },
         ...this._selectionBg !== undefined && { selectionBg: this._selectionBg },
-        ...this._selectionFg !== undefined && { selectionFg: this._selectionFg }
+        ...this._selectionFg !== undefined && { selectionFg: this._selectionFg },
+        ...this._treeSitterClient !== undefined && { treeSitterClient: this._treeSitterClient }
       };
       const newRenderable = new CodeRenderable(this.ctx, codeOptions);
       if (side === "left") {
@@ -4767,6 +4785,7 @@ class DiffRenderable extends Renderable {
     } else {
       existingRenderable.content = content;
       existingRenderable.wrapMode = wrapMode ?? "none";
+      existingRenderable.conceal = this._conceal;
       if (drawUnstyledText !== undefined) {
         existingRenderable.drawUnstyledText = drawUnstyledText;
       }
@@ -5027,9 +5046,10 @@ class DiffRenderable extends Renderable {
 `);
     const preRightContent = rightLogicalLines.map((l) => l.content).join(`
 `);
-    const effectiveWrapMode = canDoWrapAlignment ? this._wrapMode : "none";
-    const leftCodeRenderable = this.createOrUpdateCodeRenderable("left", preLeftContent, effectiveWrapMode, true);
-    const rightCodeRenderable = this.createOrUpdateCodeRenderable("right", preRightContent, effectiveWrapMode, true);
+    const needsConsistentConcealing = (this._wrapMode === "word" || this._wrapMode === "char") && this._conceal && this._filetype;
+    const drawUnstyledText = !needsConsistentConcealing;
+    const leftCodeRenderable = this.createOrUpdateCodeRenderable("left", preLeftContent, this._wrapMode, drawUnstyledText);
+    const rightCodeRenderable = this.createOrUpdateCodeRenderable("right", preRightContent, this._wrapMode, drawUnstyledText);
     let finalLeftLines;
     let finalRightLines;
     if (canDoWrapAlignment) {
@@ -5383,6 +5403,15 @@ class DiffRenderable extends Renderable {
       }
     }
   }
+  get conceal() {
+    return this._conceal;
+  }
+  set conceal(value) {
+    if (this._conceal !== value) {
+      this._conceal = value;
+      this.rebuildView();
+    }
+  }
 }
 // src/renderables/Input.ts
 var InputRenderableEvents;
@@ -7229,10 +7258,12 @@ class TabSelectRenderable extends Renderable {
     }
   }
   refreshFrameBuffer() {
-    if (!this.frameBuffer || this._options.length === 0)
+    if (!this.frameBuffer)
       return;
     const bgColor = this._focused ? this._focusedBackgroundColor : this._backgroundColor;
     this.frameBuffer.clear(bgColor);
+    if (this._options.length === 0)
+      return;
     const contentX = 0;
     const contentY = 0;
     const contentWidth = this.width;
@@ -7568,6 +7599,9 @@ class EditBufferRenderable extends Renderable {
   get lineCount() {
     return this.editBuffer.getLineCount();
   }
+  get virtualLineCount() {
+    return this.editorView.getVirtualLineCount();
+  }
   get scrollY() {
     return this.editorView.getViewport().offsetY;
   }
@@ -7826,12 +7860,15 @@ class EditBufferRenderable extends Renderable {
     }
   }
   destroy() {
+    if (this.isDestroyed)
+      return;
     if (this._focused) {
       this._ctx.setCursorPosition(0, 0, false);
+      this.blur();
     }
-    super.destroy();
     this.editorView.destroy();
     this.editBuffer.destroy();
+    super.destroy();
   }
   set onCursorChange(handler) {
     this._cursorChangeListener = handler;
@@ -8358,7 +8395,9 @@ class TextareaRenderable extends EditBufferRenderable {
   }
   blur() {
     super.blur();
-    this.updateColors();
+    if (!this.isDestroyed) {
+      this.updateColors();
+    }
   }
   get placeholder() {
     return this._placeholder;
@@ -8617,5 +8656,5 @@ export {
   ASCIIFont
 };
 
-//# debugId=61DC3DAACFF9549264756E2164756E21
+//# debugId=04B0510AE1DAC91C64756E2164756E21
 //# sourceMappingURL=index.js.map