commit 146213284df9e1f3d6dfdca0805f46aea348f39e
author Christophe Poucet <poucet@google.com> Wed Oct 13 16:01:25 2021 +0000
committer Christophe Poucet <poucet@google.com> Wed Oct 13 16:01:25 2021 +0000
tree b6de23a163a84c092e4452c105969a4e9882a64e
parent b9bab3a0c4c36de55824c8544baad33e5c5c324c

Revert "Get rid of usage of private _getElement from automerger."

This reverts commit b9bab3a0c4c36de55824c8544baad33e5c5c324c.

Reason for revert: Doesn't compile correctly

Change-Id: I60d4ab08baa7cad7e61d02d6725503a05bb4cb37

web/automerger.ts

diff --git a/web/automerger.ts b/web/automerger.ts
index cb0f499..96bcab5 100644
--- a/web/automerger.ts
+++ b/web/automerger.ts
@@ -32,6 +32,11 @@
   __url?: string;
 }
 
+export interface PopupPluginApiExtended extends PopupPluginApi {
+  // TODO: Remove this reference to a private method. This can break any time.
+  _getElement: () => HTMLElement;
+}
+
 export class Automerger {
   private change?: ChangeInfo;
 
@@ -89,7 +94,9 @@
     popupContent.appendChild(this.createMergeButton(branchToCheckbox));
 
     this.plugin.popup().then((popApi: PopupPluginApi) => {
-      popup.appendContent(popupContent);
+      const popupEl = (popApi as PopupPluginApiExtended)._getElement();
+      if (!popupEl) throw new Error('Popup element not found');
+      popupEl.appendChild(popupContent);
     });
   }