@opentui/core 0.0.0-20251106-788e97e4 → 0.0.0-20251108-0c7899b1

package/index.js

@@ -136,7 +136,7 @@ import {
   white,
   wrapWithDelegates,
   yellow
-} from "./index-pb1pm3hk.js";
+} from "./index-z5bb2h2z.js";
 // src/text-buffer-view.ts
 class TextBufferView {
   lib;
@@ -2661,9 +2661,8 @@ class CodeRenderable extends TextBufferRenderable {
   _syntaxStyle;
   _isHighlighting = false;
   _treeSitterClient;
-  _pendingRehighlight = false;
-  _pendingUpdate = false;
-  _currentHighlightId = 0;
+  _highlightsDirty = false;
+  _highlightSnapshotId = 0;
   _conceal;
   _drawUnstyledText;
   _shouldRenderTextBuffer = true;
@@ -2685,7 +2684,7 @@ class CodeRenderable extends TextBufferRenderable {
     this._conceal = options.conceal ?? this._contentDefaultOptions.conceal;
     this._drawUnstyledText = options.drawUnstyledText ?? this._contentDefaultOptions.drawUnstyledText;
     this._streaming = options.streaming ?? this._contentDefaultOptions.streaming;
-    this.updateContent(this._content);
+    this._highlightsDirty = this._content.length > 0;
   }
   get content() {
     return this._content;
@@ -2693,7 +2692,7 @@ class CodeRenderable extends TextBufferRenderable {
   set content(value) {
     if (this._content !== value) {
       this._content = value;
-      this.scheduleUpdate();
+      this._highlightsDirty = true;
     }
   }
   get filetype() {
@@ -2702,7 +2701,7 @@ class CodeRenderable extends TextBufferRenderable {
   set filetype(value) {
     if (this._filetype !== value) {
       this._filetype = value;
-      this.scheduleUpdate();
+      this._highlightsDirty = true;
     }
   }
   get syntaxStyle() {
@@ -2711,7 +2710,7 @@ class CodeRenderable extends TextBufferRenderable {
   set syntaxStyle(value) {
     if (this._syntaxStyle !== value) {
       this._syntaxStyle = value;
-      this.scheduleUpdate();
+      this._highlightsDirty = true;
     }
   }
   get conceal() {
@@ -2720,7 +2719,7 @@ class CodeRenderable extends TextBufferRenderable {
   set conceal(value) {
     if (this._conceal !== value) {
       this._conceal = value;
-      this.scheduleUpdate();
+      this._highlightsDirty = true;
     }
   }
   get drawUnstyledText() {
@@ -2729,7 +2728,7 @@ class CodeRenderable extends TextBufferRenderable {
   set drawUnstyledText(value) {
     if (this._drawUnstyledText !== value) {
       this._drawUnstyledText = value;
-      this.scheduleUpdate();
+      this._highlightsDirty = true;
     }
   }
   get streaming() {
@@ -2740,7 +2739,7 @@ class CodeRenderable extends TextBufferRenderable {
       this._streaming = value;
       this._hadInitialContent = false;
       this._lastHighlights = [];
-      this.scheduleUpdate();
+      this._highlightsDirty = true;
     }
   }
   get treeSitterClient() {
@@ -2749,53 +2748,66 @@ class CodeRenderable extends TextBufferRenderable {
   set treeSitterClient(value) {
     if (this._treeSitterClient !== value) {
       this._treeSitterClient = value;
-      this.scheduleUpdate();
+      this._highlightsDirty = true;
     }
   }
-  scheduleUpdate() {
-    if (this._pendingUpdate)
-      return;
-    this._pendingUpdate = true;
-    queueMicrotask(() => {
-      this._pendingUpdate = false;
-      this.updateContent(this._content);
-    });
-  }
-  async updateContent(content) {
-    if (content.length === 0)
-      return;
+  ensureVisibleTextBeforeHighlight() {
+    const content = this._content;
     if (!this._filetype) {
-      this.fallback(content);
+      if (this.isDestroyed)
+        return;
+      this.textBuffer.setText(content);
       this._shouldRenderTextBuffer = true;
+      this.updateTextInfo();
       return;
     }
-    this._currentHighlightId++;
-    const highlightId = this._currentHighlightId;
     const isInitialContent = this._streaming && !this._hadInitialContent;
-    if (isInitialContent) {
-      this._hadInitialContent = true;
-    }
     const shouldDrawUnstyledNow = this._streaming ? isInitialContent && this._drawUnstyledText : this._drawUnstyledText;
-    this.fallback(content);
-    if (!shouldDrawUnstyledNow) {
-      this._shouldRenderTextBuffer = false;
-    }
-    if (this._streaming && !isInitialContent && this._lastHighlights.length > 0) {
-      const chunks = treeSitterToTextChunks(content, this._lastHighlights, this._syntaxStyle, {
-        enabled: this._conceal
-      });
-      const partialStyledText = new StyledText(chunks);
+    if (this._streaming && !isInitialContent) {
+      if (this._lastHighlights.length > 0) {
+        const chunks = treeSitterToTextChunks(content, this._lastHighlights, this._syntaxStyle, {
+          enabled: this._conceal
+        });
+        const partialStyledText = new StyledText(chunks);
+        if (this.isDestroyed)
+          return;
+        this.textBuffer.setStyledText(partialStyledText);
+        this._shouldRenderTextBuffer = true;
+        this.updateTextInfo();
+      } else {
+        if (this.isDestroyed)
+          return;
+        this.textBuffer.setText(content);
+        this._shouldRenderTextBuffer = true;
+        this.updateTextInfo();
+      }
+    } else if (shouldDrawUnstyledNow) {
       if (this.isDestroyed)
         return;
-      this.textBuffer.setStyledText(partialStyledText);
+      this.textBuffer.setText(content);
       this._shouldRenderTextBuffer = true;
       this.updateTextInfo();
+    } else {
+      if (this.isDestroyed)
+        return;
+      this._shouldRenderTextBuffer = false;
+      this.updateTextInfo();
+    }
+  }
+  async startHighlight() {
+    const content = this._content;
+    const filetype = this._filetype;
+    const snapshotId = ++this._highlightSnapshotId;
+    if (!filetype)
+      return;
+    const isInitialContent = this._streaming && !this._hadInitialContent;
+    if (isInitialContent) {
+      this._hadInitialContent = true;
     }
     this._isHighlighting = true;
-    this._pendingRehighlight = false;
     try {
-      const result = await this._treeSitterClient.highlightOnce(content, this._filetype);
-      if (highlightId !== this._currentHighlightId) {
+      const result = await this._treeSitterClient.highlightOnce(content, filetype);
+      if (snapshotId !== this._highlightSnapshotId) {
         return;
       }
       if (this.isDestroyed)
@@ -2810,46 +2822,53 @@ class CodeRenderable extends TextBufferRenderable {
         const styledText = new StyledText(chunks);
         this.textBuffer.setStyledText(styledText);
       } else {
-        this.fallback(content);
+        this.textBuffer.setText(content);
       }
       this._shouldRenderTextBuffer = true;
       this.updateTextInfo();
+      this._isHighlighting = false;
+      this._highlightsDirty = false;
+      this.requestRender();
     } catch (error) {
-      if (highlightId !== this._currentHighlightId) {
+      if (snapshotId !== this._highlightSnapshotId) {
         return;
       }
       console.warn("Code highlighting failed, falling back to plain text:", error);
-      this.fallback(content);
+      if (this.isDestroyed)
+        return;
+      this.textBuffer.setText(content);
       this._shouldRenderTextBuffer = true;
-    } finally {
-      if (highlightId === this._currentHighlightId) {
-        this._isHighlighting = false;
-      }
+      this.updateTextInfo();
+      this._isHighlighting = false;
+      this._highlightsDirty = false;
+      this.requestRender();
     }
   }
-  fallback(content) {
-    const fallbackStyledText = this.createFallbackStyledText(content);
-    if (this.isDestroyed)
-      return;
-    this.textBuffer.setStyledText(fallbackStyledText);
-    this.updateTextInfo();
-  }
-  createFallbackStyledText(content) {
-    const chunks = [
-      {
-        __isChunk: true,
-        text: content,
-        fg: this._defaultFg,
-        bg: this._defaultBg,
-        attributes: this._defaultAttributes
-      }
-    ];
-    return new StyledText(chunks);
-  }
   getLineHighlights(lineIdx) {
     return this.textBuffer.getLineHighlights(lineIdx);
   }
   renderSelf(buffer) {
+    if (this._highlightsDirty) {
+      if (this._content.length === 0) {
+        if (this.isDestroyed)
+          return;
+        this.textBuffer.setText("");
+        this._shouldRenderTextBuffer = false;
+        this._highlightsDirty = false;
+        this.updateTextInfo();
+      } else if (!this._filetype) {
+        if (this.isDestroyed)
+          return;
+        this.textBuffer.setText(this._content);
+        this._shouldRenderTextBuffer = true;
+        this._highlightsDirty = false;
+        this.updateTextInfo();
+      } else {
+        this.ensureVisibleTextBeforeHighlight();
+        this._highlightsDirty = false;
+        this.startHighlight();
+      }
+    }
     if (!this._shouldRenderTextBuffer)
       return;
     super.renderSelf(buffer);
@@ -4046,11 +4065,11 @@ class ContentRenderable extends BoxRenderable {
   set viewportCulling(value) {
     this._viewportCulling = value;
   }
-  _getChildren() {
+  _getVisibleChildren() {
     if (this._viewportCulling) {
-      return getObjectsInViewport(this.viewport, this.getChildrenSortedByPrimaryAxis(), this.primaryAxis);
+      return getObjectsInViewport(this.viewport, this.getChildrenSortedByPrimaryAxis(), this.primaryAxis).map((child) => child.num);
     }
-    return this.getChildrenSortedByPrimaryAxis();
+    return this.getChildrenSortedByPrimaryAxis().map((child) => child.num);
   }
 }
 
@@ -4082,6 +4101,7 @@ class ScrollBoxRenderable extends BoxRenderable {
   _stickyScrollRight = false;
   _stickyStart;
   _hasManualScroll = false;
+  _isApplyingStickyScroll = false;
   scrollAccel;
   get stickyScroll() {
     return this._stickyScroll;
@@ -4102,7 +4122,12 @@ class ScrollBoxRenderable extends BoxRenderable {
   }
   set scrollTop(value) {
     this.verticalScrollBar.scrollPosition = value;
-    this._hasManualScroll = true;
+    if (!this._isApplyingStickyScroll) {
+      const maxScrollTop = Math.max(0, this.scrollHeight - this.viewport.height);
+      if (!this.isAtStickyPosition() && maxScrollTop > 1) {
+        this._hasManualScroll = true;
+      }
+    }
     this.updateStickyState();
   }
   get scrollLeft() {
@@ -4110,7 +4135,12 @@ class ScrollBoxRenderable extends BoxRenderable {
   }
   set scrollLeft(value) {
     this.horizontalScrollBar.scrollPosition = value;
-    this._hasManualScroll = true;
+    if (!this._isApplyingStickyScroll) {
+      const maxScrollLeft = Math.max(0, this.scrollWidth - this.viewport.width);
+      if (!this.isAtStickyPosition() && maxScrollLeft > 1) {
+        this._hasManualScroll = true;
+      }
+    }
     this.updateStickyState();
   }
   get scrollWidth() {
@@ -4146,6 +4176,7 @@ class ScrollBoxRenderable extends BoxRenderable {
     }
   }
   applyStickyStart(stickyStart) {
+    this._isApplyingStickyScroll = true;
     switch (stickyStart) {
       case "top":
         this._stickyScrollTop = true;
@@ -4168,6 +4199,7 @@ class ScrollBoxRenderable extends BoxRenderable {
         this.horizontalScrollBar.scrollPosition = Math.max(0, this.scrollWidth - this.viewport.width);
         break;
     }
+    this._isApplyingStickyScroll = false;
   }
   constructor(ctx, {
     wrapperOptions,
@@ -4241,7 +4273,12 @@ class ScrollBoxRenderable extends BoxRenderable {
       orientation: "vertical",
       onChange: (position) => {
         this.content.translateY = -position;
-        this._hasManualScroll = true;
+        if (!this._isApplyingStickyScroll) {
+          const maxScrollTop = Math.max(0, this.scrollHeight - this.viewport.height);
+          if (!this.isAtStickyPosition() && maxScrollTop > 1) {
+            this._hasManualScroll = true;
+          }
+        }
         this.updateStickyState();
       }
     });
@@ -4257,7 +4294,12 @@ class ScrollBoxRenderable extends BoxRenderable {
       orientation: "horizontal",
       onChange: (position) => {
         this.content.translateX = -position;
-        this._hasManualScroll = true;
+        if (!this._isApplyingStickyScroll) {
+          const maxScrollLeft = Math.max(0, this.scrollWidth - this.viewport.width);
+          if (!this.isAtStickyPosition() && maxScrollLeft > 1) {
+            this._hasManualScroll = true;
+          }
+        }
         this.updateStickyState();
       }
     });
@@ -4284,7 +4326,6 @@ class ScrollBoxRenderable extends BoxRenderable {
       this.verticalScrollBar.scrollBy(delta.y, unit);
       this.horizontalScrollBar.scrollBy(delta.x, unit);
     }
-    this._hasManualScroll = true;
   }
   scrollTo(position) {
     if (typeof position === "number") {
@@ -4294,6 +4335,25 @@ class ScrollBoxRenderable extends BoxRenderable {
       this.scrollLeft = position.x;
     }
   }
+  isAtStickyPosition() {
+    if (!this._stickyScroll || !this._stickyStart) {
+      return false;
+    }
+    const maxScrollTop = Math.max(0, this.scrollHeight - this.viewport.height);
+    const maxScrollLeft = Math.max(0, this.scrollWidth - this.viewport.width);
+    switch (this._stickyStart) {
+      case "top":
+        return this.scrollTop === 0;
+      case "bottom":
+        return this.scrollTop >= maxScrollTop;
+      case "left":
+        return this.scrollLeft === 0;
+      case "right":
+        return this.scrollLeft >= maxScrollLeft;
+      default:
+        return false;
+    }
+  }
   add(obj, index) {
     return this.content.add(obj, index);
   }
@@ -4323,7 +4383,11 @@ class ScrollBoxRenderable extends BoxRenderable {
       } else if (dir === "right") {
         this.scrollLeft += baseDelta * multiplier;
       }
-      this._hasManualScroll = true;
+      const maxScrollTop = Math.max(0, this.scrollHeight - this.viewport.height);
+      const maxScrollLeft = Math.max(0, this.scrollWidth - this.viewport.width);
+      if (maxScrollTop > 1 || maxScrollLeft > 1) {
+        this._hasManualScroll = true;
+      }
     }
     if (event.type === "drag" && event.isSelecting) {
       this.updateAutoScroll(event.x, event.y);
@@ -4451,6 +4515,8 @@ class ScrollBoxRenderable extends BoxRenderable {
     }
   }
   recalculateBarProps() {
+    const wasApplyingStickyScroll = this._isApplyingStickyScroll;
+    this._isApplyingStickyScroll = true;
     this.verticalScrollBar.scrollSize = this.content.height;
     this.verticalScrollBar.viewportSize = this.viewport.height;
     this.horizontalScrollBar.scrollSize = this.content.width;
@@ -4473,6 +4539,7 @@ class ScrollBoxRenderable extends BoxRenderable {
         }
       }
     }
+    this._isApplyingStickyScroll = wasApplyingStickyScroll;
     process.nextTick(() => {
       this.requestRender();
     });
@@ -6338,5 +6405,5 @@ export {
   ASCIIFont
 };
 
-//# debugId=027AE54A57A8DE7D64756E2164756E21
+//# debugId=33D29679C10495BA64756E2164756E21
 //# sourceMappingURL=index.js.map