Merge remote-tracking branch 'upstream/master' into tyriar/lifecycle

2024-07-15 09:52:09 -07:00
parent 8a2a7ac6db b192ba2304
commit 2a6cd8230c
9 changed files with 50 additions and 21 deletions
@@ -67,7 +67,7 @@ export class FitAddon implements ITerminalAddon , IFitApi {

    const scrollbarWidth = (this._terminal.options.scrollback === 0
      ? 0
-      : (this._terminal.options.overviewRulerWidth || ViewportConstants.DEFAULT_SCROLL_BAR_WIDTH));
+      : (this._terminal.options.overviewRuler?.width || ViewportConstants.DEFAULT_SCROLL_BAR_WIDTH));

    const parentElementStyle = window.getComputedStyle(this._terminal.element.parentElement);
    const parentElementHeight = parseInt(parentElementStyle.getPropertyValue('height'));