@opentui/core 0.1.37 → 0.1.39

package/index.js

@@ -136,7 +136,7 @@ import {
   white,
   wrapWithDelegates,
   yellow
-} from "./index-7bav3fax.js";
+} from "./index-d4f5t33k.js";
 // src/text-buffer-view.ts
 class TextBufferView {
   lib;
@@ -4111,7 +4111,10 @@ class ScrollBoxRenderable extends BoxRenderable {
   set scrollTop(value) {
     this.verticalScrollBar.scrollPosition = value;
     if (!this._isApplyingStickyScroll) {
-      this._hasManualScroll = true;
+      const maxScrollTop = Math.max(0, this.scrollHeight - this.viewport.height);
+      if (!this.isAtStickyPosition() && maxScrollTop > 1) {
+        this._hasManualScroll = true;
+      }
     }
     this.updateStickyState();
   }
@@ -4121,7 +4124,10 @@ class ScrollBoxRenderable extends BoxRenderable {
   set scrollLeft(value) {
     this.horizontalScrollBar.scrollPosition = value;
     if (!this._isApplyingStickyScroll) {
-      this._hasManualScroll = true;
+      const maxScrollLeft = Math.max(0, this.scrollWidth - this.viewport.width);
+      if (!this.isAtStickyPosition() && maxScrollLeft > 1) {
+        this._hasManualScroll = true;
+      }
     }
     this.updateStickyState();
   }
@@ -4136,9 +4142,6 @@ class ScrollBoxRenderable extends BoxRenderable {
       return;
     const maxScrollTop = Math.max(0, this.scrollHeight - this.viewport.height);
     const maxScrollLeft = Math.max(0, this.scrollWidth - this.viewport.width);
-    if (this._hasManualScroll && this._stickyStart) {
-      return;
-    }
     if (this.scrollTop <= 0) {
       this._stickyScrollTop = true;
       this._stickyScrollBottom = false;
@@ -4259,7 +4262,10 @@ class ScrollBoxRenderable extends BoxRenderable {
       onChange: (position) => {
         this.content.translateY = -position;
         if (!this._isApplyingStickyScroll) {
-          this._hasManualScroll = true;
+          const maxScrollTop = Math.max(0, this.scrollHeight - this.viewport.height);
+          if (!this.isAtStickyPosition() && maxScrollTop > 1) {
+            this._hasManualScroll = true;
+          }
         }
         this.updateStickyState();
       }
@@ -4277,7 +4283,10 @@ class ScrollBoxRenderable extends BoxRenderable {
       onChange: (position) => {
         this.content.translateX = -position;
         if (!this._isApplyingStickyScroll) {
-          this._hasManualScroll = true;
+          const maxScrollLeft = Math.max(0, this.scrollWidth - this.viewport.width);
+          if (!this.isAtStickyPosition() && maxScrollLeft > 1) {
+            this._hasManualScroll = true;
+          }
         }
         this.updateStickyState();
       }
@@ -4305,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") {
@@ -4315,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);
   }
@@ -4344,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);
@@ -6362,5 +6393,5 @@ export {
   ASCIIFont
 };
 
-//# debugId=1E654B6F0692B62564756E2164756E21
+//# debugId=5DEE20591CE7786764756E2164756E21
 //# sourceMappingURL=index.js.map