From 724bbebc14d92ec4019bf0eeb7b8e85be08652b0 Mon Sep 17 00:00:00 2001
From: meganrogge <merogge@microsoft.com>
Date: Wed, 9 Mar 2022 08:46:09 -0600
Subject: [PATCH] assign element in render call

---
 src/browser/services/DecorationService.ts | 10 ++++++----
 typings/xterm.d.ts                        |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/browser/services/DecorationService.ts b/src/browser/services/DecorationService.ts
index 39d89294..ee1bc2e7 100644
--- a/src/browser/services/DecorationService.ts
+++ b/src/browser/services/DecorationService.ts
@@ -134,12 +134,12 @@ export class DecorationService extends Disposable implements IDecorationService
 
 export class ScrollbarDecoration extends Disposable implements IDecoration {
   private readonly _marker: IMarker;
-  private _canvas: HTMLCanvasElement | undefined;
+  private _element: HTMLCanvasElement | undefined;
   private _color: string | undefined;
 
   public isDisposed: boolean = false;
 
-  public get element(): HTMLCanvasElement { return this._canvas!; }
+  public get element(): HTMLCanvasElement { return this._element!; }
   public get marker(): IMarker { return this._marker; }
   public get color(): string { return this._color!; }
 
@@ -151,18 +151,20 @@ export class ScrollbarDecoration extends Disposable implements IDecoration {
 
   constructor(
     options: IDecorationOptions,
-    canvas: HTMLCanvasElement,
+    private readonly _canvas: HTMLCanvasElement,
     private readonly _ctx: CanvasRenderingContext2D,
     @IBufferService private readonly _bufferService: IBufferService
   ) {
     super();
     this._marker = options.marker;
-    this._canvas = canvas;
     this._color = options.scrollbarDecorationColor;
     this._marker.onDispose(() => this.dispose());
     this.render();
   }
   public render(): void {
+    if (!this._element) {
+      this._element = this._canvas;
+    }
     this._ctx.lineWidth = 1;
     this._ctx.strokeStyle = this.color;
     this._ctx.strokeRect(
diff --git a/typings/xterm.d.ts b/typings/xterm.d.ts
index eb31c4a0..510c099f 100644
--- a/typings/xterm.d.ts
+++ b/typings/xterm.d.ts
@@ -427,8 +427,8 @@ declare module 'xterm' {
     readonly onRender: IEvent<HTMLElement>;
 
     /**
-     * The HTMLElement that gets created after the 
-     * first _onRender call, or undefined if accessed before
+     * The HTMLElement that gets created or drawn to (for scrollbar decorations)
+     * after the first _onRender call, or undefined if accessed before
      * that.
      */
     readonly element: HTMLElement | undefined;