@opentui/core 0.1.36 → 0.1.38

package/index.js

@@ -33,6 +33,7 @@ import {
   StdinBuffer,
   StyledText,
   TerminalConsole,
+  TerminalPalette,
   TextAttributes,
   TextBuffer,
   TreeSitterClient,
@@ -65,6 +66,7 @@ import {
   coordinateToCharacterIndex,
   createCliRenderer,
   createExtmarksController,
+  createTerminalPalette,
   createTextAttributes,
   cyan,
   delegate,
@@ -134,7 +136,7 @@ import {
   white,
   wrapWithDelegates,
   yellow
-} from "./index-n8nbvvhk.js";
+} from "./index-7bav3fax.js";
 // src/text-buffer-view.ts
 class TextBufferView {
   lib;
@@ -2774,20 +2776,27 @@ class CodeRenderable extends TextBufferRenderable {
       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.isDestroyed)
-        return;
-      this.textBuffer.setStyledText(partialStyledText);
+    } else {
       this._shouldRenderTextBuffer = true;
-      this.updateTextInfo();
+      this.fallback(content);
+    }
+    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 {
+        this.fallback(content);
+        this._shouldRenderTextBuffer = true;
+      }
     }
     this._isHighlighting = true;
     this._pendingRehighlight = false;
@@ -4044,11 +4053,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);
   }
 }
 
@@ -4080,6 +4089,7 @@ class ScrollBoxRenderable extends BoxRenderable {
   _stickyScrollRight = false;
   _stickyStart;
   _hasManualScroll = false;
+  _isApplyingStickyScroll = false;
   scrollAccel;
   get stickyScroll() {
     return this._stickyScroll;
@@ -4100,7 +4110,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() {
@@ -4108,7 +4123,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() {
@@ -4144,6 +4164,7 @@ class ScrollBoxRenderable extends BoxRenderable {
     }
   }
   applyStickyStart(stickyStart) {
+    this._isApplyingStickyScroll = true;
     switch (stickyStart) {
       case "top":
         this._stickyScrollTop = true;
@@ -4166,6 +4187,7 @@ class ScrollBoxRenderable extends BoxRenderable {
         this.horizontalScrollBar.scrollPosition = Math.max(0, this.scrollWidth - this.viewport.width);
         break;
     }
+    this._isApplyingStickyScroll = false;
   }
   constructor(ctx, {
     wrapperOptions,
@@ -4239,7 +4261,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();
       }
     });
@@ -4255,7 +4282,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();
       }
     });
@@ -4282,7 +4314,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") {
@@ -4292,6 +4323,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);
   }
@@ -4321,7 +4371,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);
@@ -4449,6 +4503,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;
@@ -4471,6 +4527,7 @@ class ScrollBoxRenderable extends BoxRenderable {
         }
       }
     }
+    this._isApplyingStickyScroll = wasApplyingStickyScroll;
     process.nextTick(() => {
       this.requestRender();
     });
@@ -6222,6 +6279,7 @@ export {
   cyan,
   createTimeline,
   createTextAttributes,
+  createTerminalPalette,
   createExtmarksController,
   createCliRenderer,
   coordinateToCharacterIndex,
@@ -6272,6 +6330,7 @@ export {
   TextBuffer,
   TextAttributes,
   Text,
+  TerminalPalette,
   TerminalConsole,
   TabSelectRenderableEvents,
   TabSelectRenderable,
@@ -6334,5 +6393,5 @@ export {
   ASCIIFont
 };
 
-//# debugId=44707EEC392262B964756E2164756E21
+//# debugId=5DEE20591CE7786764756E2164756E21
 //# sourceMappingURL=index.js.map