@inboxsdk/core 2.1.3 → 2.1.5

package/inboxsdk.js

@@ -832,7 +832,7 @@ function isElementVisible(el) {
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment -- SDK_VERSION is injected by webpack
 ///@ts-ignore
-const BUILD_VERSION = "2.1.3-1695642021797-32b1a1b147ce5783";
+const BUILD_VERSION = "2.1.5-1696881387401-5c0ff20cfc735daf";
 if (false) {}
 
 /***/ }),
@@ -1052,23 +1052,20 @@ const gotoView = ud__WEBPACK_IMPORTED_MODULE_2__.defn(module, async function got
 
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "Z": () => (/* binding */ isIntegratedViewGmail),
-/* harmony export */   "k": () => (/* binding */ isCollapsiblePanelHidden)
+/* harmony export */   "Jv": () => (/* binding */ isGoogleChatEnabled),
+/* harmony export */   "ZP": () => (/* binding */ isIntegratedViewGmail),
+/* harmony export */   "ky": () => (/* binding */ isCollapsiblePanelHidden)
 /* harmony export */ });
 /**
- * There's three cases this function should return true:
-    - The user is in a pre-Google-Chat Hangouts-only version of Gmail (the Gmail Settings ->
-    Chat and Meet -> Chat menu only has the options "Hangouts On" and "Hangouts Off").
-    - The user has "Classic Hangouts" picked in Gmail Settings -> Chat and Meet -> Chat.
-    - Integrated view gmail.
+ * As of writing, @returns true when either Google Chat or Google Meet or both are enabled.
  * @see https://support.google.com/mail/answer/11555490
  */
 function isIntegratedViewGmail() {
-  const nav = document.querySelector('div[role=navigation]');
-  return Boolean(nav?.firstElementChild?.classList.contains('Xa'));
+  const nav = document.querySelector('div[role=navigation] > :nth-child(1).Xa');
+  return nav != null;
 }
 
-/** @returns null if the app menu is configured off */
+/** @returns null if the app menu (left side menu containing Mail, Chat/Spaces, and Meet) is configured off */
 function isCollapsiblePanelHidden() {
   if (!isIntegratedViewGmail()) {
     return null;
@@ -1076,6 +1073,13 @@ function isCollapsiblePanelHidden() {
   return document.querySelector('div[role=navigation].aBA') != null;
 }
 
+/**
+ * @note only able to @return true when @see {isIntegratedViewGmail} returns true
+ */
+function isGoogleChatEnabled() {
+  return document.querySelector('div[role=navigation] > .ao4') != null;
+}
+
 /***/ }),
 
 /***/ 86844:
@@ -1536,7 +1540,7 @@ const GmailElementGetter = {
     return document.querySelector('.brC-aT5-aOt-Jw');
   },
   getComposeButton() {
-    if ((0,isIntegratedViewGmail/* default */.Z)()) {
+    if ((0,isIntegratedViewGmail/* default */.ZP)()) {
       return document.querySelector('.aIH .aic div[role=button].L3');
     }
     return document.querySelector('[gh=cm]');
@@ -1551,7 +1555,7 @@ const GmailElementGetter = {
     // finds something different than the old method, so that way we can
     // figure out if it's okay to swap over.
     const el = document.querySelector('div.nH.bkK > .nH');
-    if ((0,isIntegratedViewGmail/* default */.Z)()) {
+    if ((0,isIntegratedViewGmail/* default */.ZP)()) {
       return el;
     } else {
       const leftNavContainer = GmailElementGetter.getLeftNavContainerElement();
@@ -1605,7 +1609,7 @@ const GmailElementGetter = {
     if (this.getAppMenu()) {
       return this.getAppMenuContainer()?.querySelector('.aqn.aIH') ?? null;
     }
-    if ((0,isIntegratedViewGmail/* default */.Z)()) {
+    if ((0,isIntegratedViewGmail/* default */.ZP)()) {
       return document.querySelector('div[role=navigation] + div.aqn');
     }
     return document.querySelector('.aeN');
@@ -1634,7 +1638,7 @@ const GmailElementGetter = {
    * in their own sections at the bottom of the leftnav).
    */
   shouldAddNavItemsInline() {
-    if ((0,isIntegratedViewGmail/* default */.Z)()) {
+    if ((0,isIntegratedViewGmail/* default */.ZP)()) {
       return true;
     }
     const leftNavElement = document.querySelector('.aeN[role=navigation], .aeN [role=navigation]');
@@ -1689,7 +1693,7 @@ const GmailElementGetter = {
     return document.querySelector('.aeN');
   },
   getSameSectionNavItemMenuInjectionContainer() {
-    if ((0,isIntegratedViewGmail/* default */.Z)()) {
+    if ((0,isIntegratedViewGmail/* default */.ZP)()) {
       return document.querySelector('.yJ .wT > .n3');
     } else {
       return document.querySelector('.aeN .n3');
@@ -3108,35 +3112,42 @@ const sidebarWaitingPlatformClassName = classnames_default()(cssGlobal, "inboxsd
 
 
 const ACTIVE_ADD_ON_ICON_SELECTOR = '.aT5-aOt-I-KO';
-const COMPANION_SIDEBAR_CONTENT_CLOSED_SHADOW_CLASS = 'brC-brG-btc'; // Only one instance of this Primary is ever created within a page, even if
-// there are multiple InboxSDK instances and/or extensions. All other InboxSDK
-// instances (including from other extensions) communicate with this Primary
-// through DOM events.
+const COMPANION_SIDEBAR_CONTENT_CLOSED_SHADOW_CLASS = 'brC-brG-btc';
 
+/** Only one instance of this Primary is ever created within a page, even if
+ * there are multiple InboxSDK instances and/or extensions. All other InboxSDK
+ * instances (including from other extensions) communicate with this Primary
+ * through DOM events. */
 class GmailAppSidebarPrimary {
-  _stopper = kefir_stopper_js_default()();
-  // There could be multiple InboxSDK instances (and therefore GmailDrivers)
-  // talking to this Primary, so we shouldn't privilege the specific GmailDriver
-  // that happened to create the Primary. Only use this GmailDriver for
-  // logging-related functionality!
-
-  // This Primary has an identifier used by the DOM events to specify they're
-  // talking to this Primary. This leaves us some room for having multiple
-  // Primary instances (representing different visual locations in Gmail) or
-  // multiple classes that make use of the same DOM events, but we don't make
-  // use of that now. Mainly I didn't want to risk baking in the singleton
-  // nature too deeply; that always seems to bite me.
-  _instanceId = `${Date.now()}-${Math.random()}`;
-  _instanceIdsToDescriptors = new Map();
-  _threadSidebarComponent = null;
-  _threadIconArea = null;
-  _globalIconArea = null;
-  _globalButtonContainers = new Map();
-  _threadButtonContainers = new Map();
-  _contentContainers = new Map();
-  _threadSidebarContainerEl = null;
-  _currentIds = new Set();
-  _orderManager = new (order_manager_js_default())({
+  #stopper = kefir_stopper_js_default()();
+  /**
+   * There could be multiple InboxSDK instances (and therefore GmailDrivers)
+   * talking to this Primary, so we shouldn't privilege the specific GmailDriver
+   * that happened to create the Primary. Only use this GmailDriver for
+   * logging-related functionality!
+   */
+  #driver;
+  /**
+   * This Primary has an identifier used by the DOM events to specify they're
+   * talking to this Primary. This leaves us some room for having multiple
+   * Primary instances (representing different visual locations in Gmail) or
+   * multiple classes that make use of the same DOM events, but we don't make
+   * use of that now. Mainly I didn't want to risk baking in the singleton
+   * nature too deeply; that always seems to bite me.
+   */
+  #instanceId = `${Date.now()}-${Math.random()}`;
+  #companionSidebarContentContainerEl;
+  #instanceIdsToDescriptors = new Map();
+  #threadSidebarComponent = null;
+  #threadIconArea = null;
+  #globalIconArea = null;
+  #globalButtonContainers = new Map();
+  #threadButtonContainers = new Map();
+  #contentContainers = new Map();
+  #threadSidebarContainerEl = null;
+  #companionSidebarOuterWrapper;
+  #currentIds = new Set();
+  #orderManager = new (order_manager_js_default())({
     get() {
       try {
         return JSON.parse(__webpack_require__.g.localStorage.getItem('inboxsdk__sidebar_ordering') || 'null');
@@ -3152,53 +3163,58 @@ class GmailAppSidebarPrimary {
       }
     }
   });
-  _updateHighlightedAppThreadIconBus = kefir_bus_default()();
+  #containerProp;
+  #updateHighlightedAppThreadIconBus = kefir_bus_default()();
   constructor(driver, companionSidebarContentContainerElement) {
-    this._driver = driver;
-    this._companionSidebarContentContainerEl = companionSidebarContentContainerElement;
-    this._setupElement();
+    this.#driver = driver;
+    this.#companionSidebarContentContainerEl = companionSidebarContentContainerElement;
+    this.#setupElement();
   }
   getInstanceId() {
-    return this._instanceId;
+    return this.#instanceId;
   }
 
-  // Only use this if a different Primary needs to take over this one's elements.
-  // Currently this is only done when hot-reloading in dev. Don't use this when
-  // a threadview exits, the sdk.destroy() is called, etc.
+  /**
+   * Only use this if a different Primary needs to take over this one's elements.
+   * Currently this is only done when hot-reloading in dev. Don't use this when
+   * a threadview exits, the sdk.destroy() is called, etc.
+   */
   destroy() {
-    this._stopper.destroy();
+    this.#stopper.destroy();
   }
 
-  // This value controls whether the app sidebar should automatically open
-  // itself when available when the chat sidebar isn't present. It's only set
-  // if the user interacts with the app sidebar button.
-  _getShouldGlobalAppSidebarOpen() {
+  /**
+   * This value controls whether the app sidebar should automatically open
+   * itself when available when the chat sidebar isn't present. It's only set
+   * if the user interacts with the app sidebar button.
+   */
+  #getShouldGlobalAppSidebarOpen() {
     return __webpack_require__.g.localStorage.getItem('inboxsdk__global_app_sidebar_should_open') === 'true';
   }
-  _setShouldGlobalAppSidebarOpen(open) {
+  #setShouldGlobalAppSidebarOpen(open) {
     try {
       __webpack_require__.g.localStorage.setItem('inboxsdk__global_app_sidebar_should_open', String(open));
     } catch (err) {
       console.error('error saving', err);
     }
   }
-  _getShouldThreadAppSidebarOpen() {
+  #getShouldThreadAppSidebarOpen() {
     return __webpack_require__.g.localStorage.getItem('inboxsdk__thread_app_sidebar_should_open') !== 'false';
   }
-  _setShouldThreadAppSidebarOpen(open) {
+  #setShouldThreadAppSidebarOpen(open) {
     try {
       __webpack_require__.g.localStorage.setItem('inboxsdk__thread_app_sidebar_should_open', String(open));
     } catch (err) {
       console.error('error saving', err);
     }
   }
-  _createThreadSidebarIfNeeded() {
-    if (this._threadSidebarContainerEl) return this._threadSidebarContainerEl;
-    const threadSidebarContainerEl = this._threadSidebarContainerEl = document.createElement('div');
+  #createThreadSidebarIfNeeded() {
+    if (this.#threadSidebarContainerEl) return this.#threadSidebarContainerEl;
+    const threadSidebarContainerEl = this.#threadSidebarContainerEl = document.createElement('div');
     threadSidebarContainerEl.classList.add('thread_app_sidebar', (0,idMap/* default */.Z)('app_sidebar_container'), 'addon_sidebar');
-    this._companionSidebarContentContainerEl.insertBefore(threadSidebarContainerEl, this._companionSidebarContentContainerEl.firstElementChild);
-    this._containerProp = () => threadSidebarContainerEl;
-    this._updateHighlightedAppThreadIconBus.bufferWithTimeOrCount(150, 100).filter(events => events.length > 0).takeUntilBy(this._stopper).onValue(() => {
+    this.#companionSidebarContentContainerEl.insertBefore(threadSidebarContainerEl, this.#companionSidebarContentContainerEl.firstElementChild);
+    this.#containerProp = () => threadSidebarContainerEl;
+    this.#updateHighlightedAppThreadIconBus.bufferWithTimeOrCount(150, 100).filter(events => events.length > 0).takeUntilBy(this.#stopper).onValue(() => {
       // Before touching this code, make sure you understand the meaning of the clientRect
       // values and of scrollTop. In particular, make sure you understand the distinction of
       // absolute (the scroll[Top|Bottom|Height] values) vs relative (the BoundingRect top
@@ -3240,9 +3256,9 @@ class GmailAppSidebarPrimary {
         const instanceId = titleBar.getAttribute('data-instance-id');
         const appName = titleBar.getAttribute('data-app-name');
         if (!appName) return;
-        const appButton = this._threadButtonContainers.get(appName);
-        if (!appButton || !this._threadIconArea) return;
-        const activeButtonContainer = this._threadIconArea.querySelector('.sidebar_button_container_active');
+        const appButton = this.#threadButtonContainers.get(appName);
+        if (!appButton || !this.#threadIconArea) return;
+        const activeButtonContainer = this.#threadIconArea.querySelector('.sidebar_button_container_active');
         if (activeButtonContainer) {
           activeButtonContainer.classList.remove('sidebar_button_container_active');
         }
@@ -3251,61 +3267,61 @@ class GmailAppSidebarPrimary {
     });
 
     //listen for scroll and update active icon if needed
-    this._updateHighlightedAppThreadIconBus.plug(kefir_esm.fromEvents(threadSidebarContainerEl, 'scroll').map(() => null));
+    this.#updateHighlightedAppThreadIconBus.plug(kefir_esm.fromEvents(threadSidebarContainerEl, 'scroll').map(() => null));
 
     // handle rendering thread sidebar contents
-    this._renderThreadSidebar();
+    this.#renderThreadSidebar();
     return threadSidebarContainerEl;
   }
-  _renderThreadSidebarIfPresent() {
-    if (!this._threadSidebarContainerEl) {
+  #renderThreadSidebarIfPresent() {
+    if (!this.#threadSidebarContainerEl) {
       return;
     }
-    this._renderThreadSidebar();
+    this.#renderThreadSidebar();
   }
-  _appSidebarRefSetter = threadSidebarComponent => {
+  #appSidebarRefSetter = threadSidebarComponent => {
     if (threadSidebarComponent) {
-      this._threadSidebarComponent = threadSidebarComponent;
+      this.#threadSidebarComponent = threadSidebarComponent;
     }
   };
-  _renderThreadSidebar() {
-    const threadSidebarContainerEl = this._threadSidebarContainerEl;
+  #renderThreadSidebar() {
+    const threadSidebarContainerEl = this.#threadSidebarContainerEl;
     if (!threadSidebarContainerEl) {
       throw new Error('_renderThreadSidebar should not be called when _threadSidebarContainerEl is unset');
     }
     return new Promise(resolve => {
       react_dom.render( /*#__PURE__*/react.createElement(AppSidebar, {
-        ref: this._appSidebarRefSetter,
-        panels: this._orderManager.getOrderedItems().map(x => x.value),
+        ref: this.#appSidebarRefSetter,
+        panels: this.#orderManager.getOrderedItems().map(x => x.value),
         onMoveEnd: (newList, movedItem, oldIndex, newIndex) => {
-          this._orderManager.moveItem(oldIndex, newIndex);
-          this._renderThreadSidebar();
+          this.#orderManager.moveItem(oldIndex, newIndex);
+          this.#renderThreadSidebar();
         },
         onExpandedToggle: () => {
-          this._updateHighlightedAppThreadIconBus.emit(null);
+          this.#updateHighlightedAppThreadIconBus.emit(null);
         },
-        container: this._containerProp
+        container: this.#containerProp
       }), threadSidebarContainerEl, () => {
-        if (!this._threadSidebarComponent) {
+        if (!this.#threadSidebarComponent) {
           throw new Error('Should not happen');
         }
-        resolve(this._threadSidebarComponent);
-        this._updateHighlightedAppThreadIconBus.emit(null);
+        resolve(this.#threadSidebarComponent);
+        this.#updateHighlightedAppThreadIconBus.emit(null);
       });
     });
   }
-  _getActiveButtonContainer() {
+  #getActiveButtonContainer() {
     let activeButtonContainer;
-    if (this._globalIconArea) {
-      activeButtonContainer = this._globalIconArea.querySelector('.sidebar_button_container_active');
+    if (this.#globalIconArea) {
+      activeButtonContainer = this.#globalIconArea.querySelector('.sidebar_button_container_active');
     }
-    if (!activeButtonContainer && this._threadIconArea) {
-      activeButtonContainer = this._threadIconArea.querySelector('.sidebar_button_container_active');
+    if (!activeButtonContainer && this.#threadIconArea) {
+      activeButtonContainer = this.#threadIconArea.querySelector('.sidebar_button_container_active');
     }
     return activeButtonContainer;
   }
-  _closeButton = null;
-  _addButton(iconArea, event, isGlobal) {
+  #closeButton = null;
+  #addButton(iconArea, event, isGlobal) {
     var _this = this;
     // we put adding the content panel icon in the iconArea in an asap so that we
     // get consistent ordering. The ordering of the icons is based on the position of the FIRST
@@ -3319,7 +3335,7 @@ class GmailAppSidebarPrimary {
       const iconClass = event.detail.iconClass || '';
       // If there's an existing button for the app, then just increment its
       // data-count attribute instead of adding a new button.
-      const existingButtonContainer = isGlobal ? this._globalButtonContainers.get(appName) : this._threadButtonContainers.get(appName);
+      const existingButtonContainer = isGlobal ? this.#globalButtonContainers.get(appName) : this.#threadButtonContainers.get(appName);
       let buttonContainer;
       if (existingButtonContainer) {
         const currentCount = Number(existingButtonContainer.getAttribute('data-count')) || 1;
@@ -3339,28 +3355,28 @@ class GmailAppSidebarPrimary {
           (0,querySelectorOrFail/* default */.Z)(buttonContainer, '.inboxsdk__button_selectedIndicator').style.backgroundColor = event.detail.primaryColor;
         }
         if (isGlobal) {
-          this._globalButtonContainers.set(appName, buttonContainer);
+          this.#globalButtonContainers.set(appName, buttonContainer);
         } else {
-          this._threadButtonContainers.set(appName, buttonContainer);
+          this.#threadButtonContainers.set(appName, buttonContainer);
         }
         const activate = function () {
           let dontScrollIntoView = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-          const activeButtonContainer = _this._getActiveButtonContainer();
+          const activeButtonContainer = _this.#getActiveButtonContainer();
           if (activeButtonContainer === buttonContainer) {
             // button was clicked while its panel was open, so close it.
-            if (!_this._closeButton) throw new Error();
-            _this._closeButton(true);
+            if (!_this.#closeButton) throw new Error();
+            _this.#closeButton(true);
           } else {
             // button was clicked while its own panel wasn't open, so open it.
-            if (_this._closeButton) {
-              _this._closeButton(true);
+            if (_this.#closeButton) {
+              _this.#closeButton(true);
             }
-            if (isGlobal) _this._setShouldGlobalAppSidebarOpen(true);else _this._setShouldThreadAppSidebarOpen(true);
-            _this._openSidebarAndActivateButton(buttonContainer, isGlobal);
+            if (isGlobal) _this.#setShouldGlobalAppSidebarOpen(true);else _this.#setShouldThreadAppSidebarOpen(true);
+            _this.#openSidebarAndActivateButton(buttonContainer, isGlobal);
             if (isGlobal) {
-              const contentEl = _this._contentContainers.get(appName);
+              const contentEl = _this.#contentContainers.get(appName);
               if (contentEl) contentEl.style.display = '';
-              _this._companionSidebarContentContainerEl.classList.add('companion_global_app_sidebar_visible');
+              _this.#companionSidebarContentContainerEl.classList.add('companion_global_app_sidebar_visible');
 
               // let app listen for activate event
               document.body.dispatchEvent(new CustomEvent('inboxsdkSidebarPanelActivated', {
@@ -3371,7 +3387,7 @@ class GmailAppSidebarPrimary {
                 }
               }));
             } else {
-              const threadSidebarComponent = _this._threadSidebarComponent;
+              const threadSidebarComponent = _this.#threadSidebarComponent;
               if (!threadSidebarComponent) {
                 throw new Error('sidebar not mounted');
               }
@@ -3380,20 +3396,20 @@ class GmailAppSidebarPrimary {
                 threadSidebarComponent.scrollPanelIntoView(instanceId, true);
               }
             }
-            _this._closeButton = userClick => {
-              _this._closeButton = null;
-              const activeButtonContainer = _this._getActiveButtonContainer();
+            _this.#closeButton = userClick => {
+              _this.#closeButton = null;
+              const activeButtonContainer = _this.#getActiveButtonContainer();
               if (!activeButtonContainer) {
                 throw new Error('Expected activeButtonContainer');
               }
-              _this._closeSidebarAndDeactivateButton(activeButtonContainer);
+              _this.#closeSidebarAndDeactivateButton(activeButtonContainer);
               if (isGlobal) {
-                if (userClick) _this._setShouldGlobalAppSidebarOpen(false);
-                const contentEl = _this._contentContainers.get(appName);
+                if (userClick) _this.#setShouldGlobalAppSidebarOpen(false);
+                const contentEl = _this.#contentContainers.get(appName);
                 if (contentEl) {
                   contentEl.style.display = 'none';
                 } else {
-                  _this._driver.getLogger().error(new Error('Unexpected: contentEl not set'));
+                  _this.#driver.getLogger().error(new Error('Unexpected: contentEl not set'));
                 }
                 document.body.dispatchEvent(new CustomEvent('inboxsdkSidebarPanelDeactivated', {
                   bubbles: true,
@@ -3403,7 +3419,7 @@ class GmailAppSidebarPrimary {
                   }
                 }));
               } else {
-                if (userClick) _this._setShouldThreadAppSidebarOpen(false);
+                if (userClick) _this.#setShouldThreadAppSidebarOpen(false);
               }
 
               //fake a window resize after closing so gmail fixes any heights that are messed up
@@ -3419,23 +3435,23 @@ class GmailAppSidebarPrimary {
           activate();
         }, true);
         if (iconArea) {
-          (0,add_to_icon_area/* default */.Z)(this._orderManager, appName, buttonContainer, iconArea);
+          (0,add_to_icon_area/* default */.Z)(this.#orderManager, appName, buttonContainer, iconArea);
         }
 
         // if we last had an SDK sidebar open then bring up the SDK sidebar when the first
         // panel gets added
         {
-          const activeButtonContainer = this._getActiveButtonContainer();
+          const activeButtonContainer = this.#getActiveButtonContainer();
           if (isGlobal) {
-            if (this._getShouldGlobalAppSidebarOpen()) {
-              const activeButtonContainerPresentAndIsForGlobal = this._globalIconArea && activeButtonContainer && this._globalIconArea.contains(activeButtonContainer);
+            if (this.#getShouldGlobalAppSidebarOpen()) {
+              const activeButtonContainerPresentAndIsForGlobal = this.#globalIconArea && activeButtonContainer && this.#globalIconArea.contains(activeButtonContainer);
               if (!activeButtonContainerPresentAndIsForGlobal) {
                 activate(true);
               }
             }
           } else {
-            if (this._getShouldThreadAppSidebarOpen()) {
-              const activeButtonContainerPresentAndIsForThread = this._threadIconArea && activeButtonContainer && this._threadIconArea.contains(activeButtonContainer);
+            if (this.#getShouldThreadAppSidebarOpen()) {
+              const activeButtonContainerPresentAndIsForThread = this.#threadIconArea && activeButtonContainer && this.#threadIconArea.contains(activeButtonContainer);
               if (!activeButtonContainerPresentAndIsForThread) {
                 activate(true);
               }
@@ -3445,7 +3461,7 @@ class GmailAppSidebarPrimary {
       }
     });
   }
-  _removeButton(event, buttonContainers, iconArea) {
+  #removeButton(event, buttonContainers, iconArea) {
     const appName = event.detail.appName;
     const container = buttonContainers.get(appName);
     if (!iconArea || !container) {
@@ -3455,11 +3471,11 @@ class GmailAppSidebarPrimary {
     if (currentCount <= 1) {
       const activeButtonContainer = iconArea.querySelector('.sidebar_button_container_active');
       if (container === activeButtonContainer) {
-        if (!this._closeButton) throw new Error();
-        this._closeButton(false);
-        this._companionSidebarOuterWrapper.classList.remove('companion_app_sidebar_wrapper_visible');
-        this._companionSidebarContentContainerEl.classList.remove('companion_app_sidebar_visible');
-        const contentContainer = this._companionSidebarOuterWrapper.previousElementSibling;
+        if (!this.#closeButton) throw new Error();
+        this.#closeButton(false);
+        this.#companionSidebarOuterWrapper.classList.remove('companion_app_sidebar_wrapper_visible');
+        this.#companionSidebarContentContainerEl.classList.remove('companion_app_sidebar_visible');
+        const contentContainer = this.#companionSidebarOuterWrapper.previousElementSibling;
         if (contentContainer) contentContainer.classList.remove('companion_container_app_sidebar_visible');
       }
       container.remove();
@@ -3470,18 +3486,18 @@ class GmailAppSidebarPrimary {
       container.setAttribute('data-count', String(currentCount - 1));
     }
   }
-  _closeSidebarAndDeactivateButton(activeButtonContainer) {
+  #closeSidebarAndDeactivateButton(activeButtonContainer) {
     activeButtonContainer.classList.remove('sidebar_button_container_active');
-    this._companionSidebarOuterWrapper.classList.remove('companion_app_sidebar_wrapper_visible');
-    this._companionSidebarContentContainerEl.classList.add(COMPANION_SIDEBAR_CONTENT_CLOSED_SHADOW_CLASS);
-    this._companionSidebarContentContainerEl.classList.remove('companion_app_sidebar_visible', 'companion_global_app_sidebar_visible');
-    const contentContainer = this._companionSidebarOuterWrapper.previousElementSibling;
+    this.#companionSidebarOuterWrapper.classList.remove('companion_app_sidebar_wrapper_visible');
+    this.#companionSidebarContentContainerEl.classList.add(COMPANION_SIDEBAR_CONTENT_CLOSED_SHADOW_CLASS);
+    this.#companionSidebarContentContainerEl.classList.remove('companion_app_sidebar_visible', 'companion_global_app_sidebar_visible');
+    const contentContainer = this.#companionSidebarOuterWrapper.previousElementSibling;
     if (contentContainer) contentContainer.classList.remove('companion_container_app_sidebar_visible');
   }
-  _openSidebarAndActivateButton(buttonContainer, isGlobal) {
+  #openSidebarAndActivateButton(buttonContainer, isGlobal) {
     const companionSidebarIconContainerEl = gmail_element_getter/* default.getCompanionSidebarIconContainerElement */.Z.getCompanionSidebarIconContainerElement();
     if (!companionSidebarIconContainerEl) throw new Error('Could not find companion sidebar icon container element');
-    const activeButtonContainer = this._getActiveButtonContainer();
+    const activeButtonContainer = this.#getActiveButtonContainer();
     if (activeButtonContainer) {
       throw new Error('activeButtonContainer should not be true'); // this._closeSidebarAndDeactivateButton(activeButtonContainer);
     }
@@ -3494,29 +3510,29 @@ class GmailAppSidebarPrimary {
       }
     }
     buttonContainer.classList.add('sidebar_button_container_active');
-    this._companionSidebarOuterWrapper.classList.add('companion_app_sidebar_wrapper_visible');
-    this._companionSidebarContentContainerEl.classList.add('companion_app_sidebar_visible');
-    this._companionSidebarContentContainerEl.classList.remove(COMPANION_SIDEBAR_CONTENT_CLOSED_SHADOW_CLASS);
-    const contentContainer = this._companionSidebarOuterWrapper.previousElementSibling;
+    this.#companionSidebarOuterWrapper.classList.add('companion_app_sidebar_wrapper_visible');
+    this.#companionSidebarContentContainerEl.classList.add('companion_app_sidebar_visible');
+    this.#companionSidebarContentContainerEl.classList.remove(COMPANION_SIDEBAR_CONTENT_CLOSED_SHADOW_CLASS);
+    const contentContainer = this.#companionSidebarOuterWrapper.previousElementSibling;
     if (contentContainer) contentContainer.classList.add('companion_container_app_sidebar_visible');
-    if (isGlobal) this._companionSidebarContentContainerEl.classList.add('companion_global_app_sidebar_visible');
+    if (isGlobal) this.#companionSidebarContentContainerEl.classList.add('companion_global_app_sidebar_visible');
   }
-  _setupElement() {
+  #setupElement() {
     const companionSidebarIconContainerEl = gmail_element_getter/* default.getCompanionSidebarIconContainerElement */.Z.getCompanionSidebarIconContainerElement();
     if (!companionSidebarIconContainerEl) throw new Error('Could not find companion sidebar icon container element');
-    this._companionSidebarContentContainerEl.setAttribute('data-sdk-sidebar-instance-id', this._instanceId);
+    this.#companionSidebarContentContainerEl.setAttribute('data-sdk-sidebar-instance-id', this.#instanceId);
 
     // TODO: Once the changes to the GMail DOM have been entirely ramped, drop the ternary here and
     // always get the parentElement. (Jun 20, 2018)
-    this._companionSidebarOuterWrapper = this._companionSidebarContentContainerEl.classList.contains('bq9') ? this._companionSidebarContentContainerEl : this._companionSidebarContentContainerEl.parentElement;
-    if (!this._companionSidebarOuterWrapper) {
+    this.#companionSidebarOuterWrapper = this.#companionSidebarContentContainerEl.classList.contains('bq9') ? this.#companionSidebarContentContainerEl : this.#companionSidebarContentContainerEl.parentElement;
+    if (!this.#companionSidebarOuterWrapper) {
       throw new Error('should not happen: failed to find companionSidebarOuterWrapper');
     }
-    const contentContainer = this._companionSidebarOuterWrapper.previousElementSibling;
+    const contentContainer = this.#companionSidebarOuterWrapper.previousElementSibling;
     if (contentContainer) {
       contentContainer.classList.add((0,idMap/* default */.Z)('companion_container_app_sidebar_in_use'));
     }
-    this._companionSidebarContentContainerEl.classList.add((0,idMap/* default */.Z)('app_sidebar_in_use'));
+    this.#companionSidebarContentContainerEl.classList.add((0,idMap/* default */.Z)('app_sidebar_in_use'));
     if (!document.body.querySelector(sidebarWaitingPlatformSelector)) {
       const waitingPlatform = document.createElement('div');
       waitingPlatform.className = classnames_default()(sidebarWaitingPlatformClassName, (0,idMap/* default */.Z)('app_sidebar_waiting_platform'));
@@ -3525,19 +3541,19 @@ class GmailAppSidebarPrimary {
 
     // thread sidebar content panels
     {
-      kefir_esm.fromEvents(window, 'storage').filter(e => e.key === 'inboxsdk__sidebar_ordering').takeUntilBy(this._stopper).onValue(() => {
-        this._orderManager.reload();
-        this._renderThreadSidebarIfPresent();
+      kefir_esm.fromEvents(window, 'storage').filter(e => e.key === 'inboxsdk__sidebar_ordering').takeUntilBy(this.#stopper).onValue(() => {
+        this.#orderManager.reload();
+        this.#renderThreadSidebarIfPresent();
       });
-      kefir_esm.fromEvents(document.body, 'inboxsdkNewSidebarPanel').filter(e => e.detail.sidebarId === this._instanceId && !e.detail.isGlobal).takeUntilBy(this._stopper).onValue(event => {
-        this._createThreadSidebarIfNeeded();
+      kefir_esm.fromEvents(document.body, 'inboxsdkNewSidebarPanel').filter(e => e.detail.sidebarId === this.#instanceId && !e.detail.isGlobal).takeUntilBy(this.#stopper).onValue(event => {
+        this.#createThreadSidebarIfNeeded();
         let id = event.detail.id;
-        while (this._currentIds.has(id)) {
+        while (this.#currentIds.has(id)) {
           id = incrementName(id);
         }
-        this._currentIds.add(id);
+        this.#currentIds.add(id);
         const appName = event.detail.appName;
-        this._orderManager.addItem({
+        this.#orderManager.addItem({
           groupId: event.detail.appId,
           id,
           orderHint: event.detail.orderHint,
@@ -3553,21 +3569,21 @@ class GmailAppSidebarPrimary {
             el: event.target
           }
         });
-        this._renderThreadSidebar();
-        let threadIconArea = this._threadIconArea = companionSidebarIconContainerEl.querySelector('.sidebar_thread_iconArea');
+        this.#renderThreadSidebar();
+        let threadIconArea = this.#threadIconArea = companionSidebarIconContainerEl.querySelector('.sidebar_thread_iconArea');
         if (!threadIconArea) {
-          threadIconArea = this._threadIconArea = document.createElement('div');
+          threadIconArea = this.#threadIconArea = document.createElement('div');
           threadIconArea.className = (0,idMap/* default */.Z)('sidebar_iconArea');
           threadIconArea.classList.add('sidebar_thread_iconArea');
-          (0,add_companion_thread_icon_area/* default */.Z)(this._driver.getLogger(), threadIconArea, companionSidebarIconContainerEl);
+          (0,add_companion_thread_icon_area/* default */.Z)(this.#driver.getLogger(), threadIconArea, companionSidebarIconContainerEl);
         }
-        this._addButton(threadIconArea, event, false);
+        this.#addButton(threadIconArea, event, false);
       });
-      kefir_esm.fromEvents(document.body, 'inboxsdkUpdateSidebarPanel').filter(e => e.detail.sidebarId === this._instanceId && !e.detail.isGlobal).takeUntilBy(this._stopper).onValue(event => {
-        const orderedItems = this._orderManager.getOrderedItems();
+      kefir_esm.fromEvents(document.body, 'inboxsdkUpdateSidebarPanel').filter(e => e.detail.sidebarId === this.#instanceId && !e.detail.isGlobal).takeUntilBy(this.#stopper).onValue(event => {
+        const orderedItems = this.#orderManager.getOrderedItems();
         const index = findIndex_default()(orderedItems, x => x.value.instanceId === event.detail.instanceId);
         if (index === -1) throw new Error('should not happen: failed to find orderItem');
-        this._orderManager.updateItemValueByIndex(index, {
+        this.#orderManager.updateItemValueByIndex(index, {
           id: orderedItems[index].value.id,
           appId: event.detail.appId,
           appName: event.detail.appName || event.detail.title,
@@ -3578,33 +3594,33 @@ class GmailAppSidebarPrimary {
           hideTitleBar: event.detail.hideTitleBar,
           el: event.target
         });
-        this._renderThreadSidebar();
+        this.#renderThreadSidebar();
       });
-      kefir_esm.fromEvents(document.body, 'inboxsdkRemoveSidebarPanel').filter(e => e.detail.sidebarId === this._instanceId && !e.detail.isGlobal).takeUntilBy(this._stopper).onValue(event => {
-        const orderedItems = this._orderManager.getOrderedItems();
+      kefir_esm.fromEvents(document.body, 'inboxsdkRemoveSidebarPanel').filter(e => e.detail.sidebarId === this.#instanceId && !e.detail.isGlobal).takeUntilBy(this.#stopper).onValue(event => {
+        const orderedItems = this.#orderManager.getOrderedItems();
         const index = findIndex_default()(orderedItems, x => x.value.instanceId === event.detail.instanceId);
         if (index === -1) throw new Error('should not happen: failed to find orderItem');
-        this._currentIds.delete(orderedItems[index].id);
-        this._orderManager.removeItemByIndex(index);
-        this._renderThreadSidebar();
-        this._removeButton(event, this._threadButtonContainers, this._threadIconArea);
+        this.#currentIds.delete(orderedItems[index].id);
+        this.#orderManager.removeItemByIndex(index);
+        this.#renderThreadSidebar();
+        this.#removeButton(event, this.#threadButtonContainers, this.#threadIconArea);
       });
-      kefir_esm.fromEvents(document.body, 'inboxsdkSidebarPanelScrollIntoView').filter(e => e.detail.sidebarId === this._instanceId && !e.detail.isGlobal).takeUntilBy(this._stopper).onValue(event => {
-        if (this._threadSidebarComponent) this._threadSidebarComponent.scrollPanelIntoView(event.detail.instanceId);
+      kefir_esm.fromEvents(document.body, 'inboxsdkSidebarPanelScrollIntoView').filter(e => e.detail.sidebarId === this.#instanceId && !e.detail.isGlobal).takeUntilBy(this.#stopper).onValue(event => {
+        if (this.#threadSidebarComponent) this.#threadSidebarComponent.scrollPanelIntoView(event.detail.instanceId);
       });
-      kefir_esm.fromEvents(document.body, 'inboxsdkSidebarPanelClose').filter(e => e.detail.sidebarId === this._instanceId && !e.detail.isGlobal).takeUntilBy(this._stopper).onValue(event => {
-        if (this._threadSidebarComponent) this._threadSidebarComponent.closePanel(event.detail.instanceId);
+      kefir_esm.fromEvents(document.body, 'inboxsdkSidebarPanelClose').filter(e => e.detail.sidebarId === this.#instanceId && !e.detail.isGlobal).takeUntilBy(this.#stopper).onValue(event => {
+        if (this.#threadSidebarComponent) this.#threadSidebarComponent.closePanel(event.detail.instanceId);
       });
-      kefir_esm.fromEvents(document.body, 'inboxsdkSidebarPanelOpen').filter(e => e.detail.sidebarId === this._instanceId && !e.detail.isGlobal).takeUntilBy(this._stopper).onValue(e => {
+      kefir_esm.fromEvents(document.body, 'inboxsdkSidebarPanelOpen').filter(e => e.detail.sidebarId === this.#instanceId && !e.detail.isGlobal).takeUntilBy(this.#stopper).onValue(e => {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        this._renderThreadSidebar().then(threadSidebarComponent => {
-          const descriptor = this._instanceIdsToDescriptors.get(e.detail.instanceId);
+        this.#renderThreadSidebar().then(threadSidebarComponent => {
+          const descriptor = this.#instanceIdsToDescriptors.get(e.detail.instanceId);
           if (!descriptor) return;
-          const buttonContainer = this._threadButtonContainers.get(descriptor.appName);
+          const buttonContainer = this.#threadButtonContainers.get(descriptor.appName);
           if (!buttonContainer) {
             throw new Error('missing button container');
           }
-          const activeButtonContainer = this._getActiveButtonContainer();
+          const activeButtonContainer = this.#getActiveButtonContainer();
           if (activeButtonContainer !== buttonContainer) {
             (0,querySelectorOrFail/* default */.Z)(buttonContainer, 'button').click();
           }
@@ -3613,30 +3629,30 @@ class GmailAppSidebarPrimary {
     }
     // global sidebar content panels
     {
-      kefir_esm.fromEvents(document.body, 'inboxsdkNewSidebarPanel').filter(e => e.detail.sidebarId === this._instanceId && e.detail.isGlobal).takeUntilBy(this._stopper).onValue(event => {
+      kefir_esm.fromEvents(document.body, 'inboxsdkNewSidebarPanel').filter(e => e.detail.sidebarId === this.#instanceId && e.detail.isGlobal).takeUntilBy(this.#stopper).onValue(event => {
         let id = event.detail.id;
-        while (this._currentIds.has(id)) {
+        while (this.#currentIds.has(id)) {
           id = incrementName(id);
         }
-        this._currentIds.add(id);
+        this.#currentIds.add(id);
         const appName = event.detail.appName;
-        let globalIconArea = this._globalIconArea = companionSidebarIconContainerEl.querySelector('.sidebar_global_iconArea');
+        let globalIconArea = this.#globalIconArea = companionSidebarIconContainerEl.querySelector('.sidebar_global_iconArea');
         if (!globalIconArea) {
-          globalIconArea = this._globalIconArea = document.createElement('div');
+          globalIconArea = this.#globalIconArea = document.createElement('div');
           globalIconArea.className = (0,idMap/* default */.Z)('sidebar_iconArea');
           globalIconArea.classList.add('sidebar_global_iconArea');
-          (0,add_companion_global_icon_area/* default */.Z)(this._driver.getLogger(), globalIconArea, companionSidebarIconContainerEl);
+          (0,add_companion_global_icon_area/* default */.Z)(this.#driver.getLogger(), globalIconArea, companionSidebarIconContainerEl);
         }
         const sdkContentContainerEl = document.createElement('div');
         sdkContentContainerEl.classList.add('addon_sidebar', (0,idMap/* default */.Z)('app_sidebar_container'), 'global_app_sidebar');
-        this._companionSidebarContentContainerEl.insertAdjacentElement('afterbegin', sdkContentContainerEl);
-        this._contentContainers.set(appName, sdkContentContainerEl);
+        this.#companionSidebarContentContainerEl.insertAdjacentElement('afterbegin', sdkContentContainerEl);
+        this.#contentContainers.set(appName, sdkContentContainerEl);
         sdkContentContainerEl.appendChild(event.target);
         sdkContentContainerEl.style.display = 'none';
-        this._addButton(globalIconArea, event, true);
+        this.#addButton(globalIconArea, event, true);
       });
-      kefir_esm.fromEvents(document.body, 'inboxsdkUpdateSidebarPanel').filter(e => e.detail.sidebarId === this._instanceId && e.detail.isGlobal).takeUntilBy(this._stopper).onValue(event => {
-        const buttonContainer = this._globalButtonContainers.get(event.detail.appName);
+      kefir_esm.fromEvents(document.body, 'inboxsdkUpdateSidebarPanel').filter(e => e.detail.sidebarId === this.#instanceId && e.detail.isGlobal).takeUntilBy(this.#stopper).onValue(event => {
+        const buttonContainer = this.#globalButtonContainers.get(event.detail.appName);
         if (!buttonContainer) return;
         const iconClass = event.detail.iconClass || '';
         const iconUrl = event.detail.iconUrl || event.detail.appIconUrl;
@@ -3645,29 +3661,29 @@ class GmailAppSidebarPrimary {
         const button = (0,querySelectorOrFail/* default */.Z)(buttonContainer, 'button');
         button.setAttribute('class', `inboxsdk__button_icon ${iconClass}`);
       });
-      kefir_esm.fromEvents(document.body, 'inboxsdkRemoveSidebarPanel').filter(e => e.detail.sidebarId === this._instanceId && e.detail.isGlobal).takeUntilBy(this._stopper).onValue(event => {
-        this._currentIds.delete(event.detail.id);
-        this._removeButton(event, this._globalButtonContainers, this._globalIconArea);
+      kefir_esm.fromEvents(document.body, 'inboxsdkRemoveSidebarPanel').filter(e => e.detail.sidebarId === this.#instanceId && e.detail.isGlobal).takeUntilBy(this.#stopper).onValue(event => {
+        this.#currentIds.delete(event.detail.id);
+        this.#removeButton(event, this.#globalButtonContainers, this.#globalIconArea);
       });
-      kefir_esm.fromEvents(document.body, 'inboxsdkSidebarPanelClose').filter(e => e.detail.sidebarId === this._instanceId && e.detail.isGlobal).takeUntilBy(this._stopper).onValue(event => {
-        const descriptor = this._instanceIdsToDescriptors.get(event.detail.instanceId);
+      kefir_esm.fromEvents(document.body, 'inboxsdkSidebarPanelClose').filter(e => e.detail.sidebarId === this.#instanceId && e.detail.isGlobal).takeUntilBy(this.#stopper).onValue(event => {
+        const descriptor = this.#instanceIdsToDescriptors.get(event.detail.instanceId);
         if (!descriptor) return;
-        const buttonContainer = this._globalButtonContainers.get(descriptor.appName);
+        const buttonContainer = this.#globalButtonContainers.get(descriptor.appName);
         if (!buttonContainer) return;
-        const activeButtonContainer = this._getActiveButtonContainer();
+        const activeButtonContainer = this.#getActiveButtonContainer();
         if (activeButtonContainer === buttonContainer) {
-          if (!this._closeButton) {
+          if (!this.#closeButton) {
             throw new Error('Expected this._closeButton');
           }
-          this._closeButton(true);
+          this.#closeButton(true);
         }
       });
-      kefir_esm.fromEvents(document.body, 'inboxsdkSidebarPanelOpen').filter(e => e.detail.sidebarId === this._instanceId && e.detail.isGlobal).takeUntilBy(this._stopper).onValue(event => {
-        const descriptor = this._instanceIdsToDescriptors.get(event.detail.instanceId);
+      kefir_esm.fromEvents(document.body, 'inboxsdkSidebarPanelOpen').filter(e => e.detail.sidebarId === this.#instanceId && e.detail.isGlobal).takeUntilBy(this.#stopper).onValue(event => {
+        const descriptor = this.#instanceIdsToDescriptors.get(event.detail.instanceId);
         if (!descriptor) return;
-        const buttonContainer = this._globalButtonContainers.get(descriptor.appName);
+        const buttonContainer = this.#globalButtonContainers.get(descriptor.appName);
         if (!buttonContainer) return;
-        const activeButtonContainer = this._getActiveButtonContainer();
+        const activeButtonContainer = this.#getActiveButtonContainer();
         if (activeButtonContainer !== buttonContainer) {
           (0,querySelectorOrFail/* default */.Z)(buttonContainer, 'button').click();
         }
@@ -3675,14 +3691,14 @@ class GmailAppSidebarPrimary {
     }
     // instance id to descriptor management
     {
-      kefir_esm.fromEvents(document.body, 'inboxsdkNewSidebarPanel').filter(e => e.detail.sidebarId === this._instanceId).takeUntilBy(this._stopper).onValue(event => {
-        this._instanceIdsToDescriptors.set(event.detail.instanceId, event.detail);
+      kefir_esm.fromEvents(document.body, 'inboxsdkNewSidebarPanel').filter(e => e.detail.sidebarId === this.#instanceId).takeUntilBy(this.#stopper).onValue(event => {
+        this.#instanceIdsToDescriptors.set(event.detail.instanceId, event.detail);
       });
-      kefir_esm.fromEvents(document.body, 'inboxsdkRemoveSidebarPanel').filter(e => e.detail.sidebarId === this._instanceId).takeUntilBy(this._stopper).onValue(event => {
-        this._instanceIdsToDescriptors.delete(event.detail.instanceId);
+      kefir_esm.fromEvents(document.body, 'inboxsdkRemoveSidebarPanel').filter(e => e.detail.sidebarId === this.#instanceId).takeUntilBy(this.#stopper).onValue(event => {
+        this.#instanceIdsToDescriptors.delete(event.detail.instanceId);
       });
-      kefir_esm.fromEvents(document.body, 'inboxsdkUpdateSidebarPanel').filter(e => e.detail.sidebarId === this._instanceId).takeUntilBy(this._stopper).onValue(event => {
-        this._instanceIdsToDescriptors.set(event.detail.instanceId, event.detail);
+      kefir_esm.fromEvents(document.body, 'inboxsdkUpdateSidebarPanel').filter(e => e.detail.sidebarId === this.#instanceId).takeUntilBy(this.#stopper).onValue(event => {
+        this.#instanceIdsToDescriptors.set(event.detail.instanceId, event.detail);
       });
     }
     // at this point the companionSidebar has 2 children
@@ -3693,15 +3709,15 @@ class GmailAppSidebarPrimary {
     // or the thread add-on content element are visible
     // if they are both display: '' or display: none then the native sidebar
     // contents are not visible
-    const globalAddOnContentContainer = this._companionSidebarContentContainerEl.children[0];
-    const threadAddOnContentContainer = this._companionSidebarContentContainerEl.children[1];
+    const globalAddOnContentContainer = this.#companionSidebarContentContainerEl.children[0];
+    const threadAddOnContentContainer = this.#companionSidebarContentContainerEl.children[1];
     kefir_esm.merge([globalAddOnContentContainer, threadAddOnContentContainer].map(addonContentEl => (0,make_mutation_observer_chunked_stream/* default */.Z)(addonContentEl, {
       attributes: true,
       attributeFilter: ['style']
-    }))).filter(() => globalAddOnContentContainer.style.display !== threadAddOnContentContainer.style.display).takeUntilBy(this._stopper).onValue(() => {
+    }))).filter(() => globalAddOnContentContainer.style.display !== threadAddOnContentContainer.style.display).takeUntilBy(this.#stopper).onValue(() => {
       // TODO What is this block for? It closes the current section whenever
       // one of the Gmail addons bar elements changes?
-      const activeButtonContainer = this._getActiveButtonContainer();
+      const activeButtonContainer = this.#getActiveButtonContainer();
       if (activeButtonContainer) {
         (0,querySelectorOrFail/* default */.Z)(activeButtonContainer, 'button').click();
       }
@@ -3718,26 +3734,30 @@ var delay_asap = __webpack_require__(75610);
 
 
 class ContentPanelViewDriver {
-  _eventStream = kefir_bus_default()();
-  _isActive = false;
-  // This is not the `id` property passed by the application, but a random
-  // unique identifier used to manage a specific instance.
-  _instanceId = `${Date.now()}-${Math.random()}`;
+  #driver;
+  #stopper;
+  #eventStream = kefir_bus_default()();
+  #isActive = false;
+  /**
+   * This is not the `id` property passed by the application, but a random
+   * unique identifier used to manage a specific instance.
+   * */
+  #instanceId = `${Date.now()}-${Math.random()}`;
+  #sidebarId;
+  #isGlobal;
   constructor(driver, descriptor, sidebarId, isGlobal) {
-    this._driver = driver;
-    this._sidebarId = sidebarId;
-    this._isGlobal = Boolean(isGlobal);
-    this._stopper = this._eventStream.ignoreValues().beforeEnd(() => null).toProperty();
-    const document = __webpack_require__.g.document; //fix for unit test
-
-    this._eventStream.plug(kefir_esm.fromEvents(document.body, 'inboxsdkSidebarPanelActivated').filter(e => e.detail.instanceId === this._instanceId).map(() => {
-      this._isActive = true;
+    this.#driver = driver;
+    this.#sidebarId = sidebarId;
+    this.#isGlobal = Boolean(isGlobal);
+    this.#stopper = this.#eventStream.ignoreValues().beforeEnd(() => null).toProperty();
+    this.#eventStream.plug(kefir_esm.fromEvents(document.body, 'inboxsdkSidebarPanelActivated').filter(e => e.detail.instanceId === this.#instanceId).map(() => {
+      this.#isActive = true;
       return {
         eventName: 'activate'
       };
     }));
-    this._eventStream.plug(kefir_esm.fromEvents(document.body, 'inboxsdkSidebarPanelDeactivated').filter(e => e.detail.instanceId === this._instanceId).map(() => {
-      this._isActive = false;
+    this.#eventStream.plug(kefir_esm.fromEvents(document.body, 'inboxsdkSidebarPanelDeactivated').filter(e => e.detail.instanceId === this.#instanceId).map(() => {
+      this.#isActive = false;
       return {
         eventName: 'deactivate'
       };
@@ -3752,7 +3772,7 @@ class ContentPanelViewDriver {
     let hasPlacedAlready = false;
     let appName;
     const waitingPlatform = (0,querySelectorOrFail/* default */.Z)(document.body, sidebarWaitingPlatformSelector);
-    descriptor.flatMap(x => afterAsap.map(() => x)).takeUntilBy(this._stopper).onValue(descriptor => {
+    descriptor.flatMap(x => afterAsap.map(() => x)).takeUntilBy(this.#stopper).onValue(descriptor => {
       const {
         el,
         iconUrl,
@@ -3775,49 +3795,51 @@ class ContentPanelViewDriver {
         bubbles: true,
         cancelable: false,
         detail: {
-          appIconUrl: appIconUrl || this._driver.getOpts().appIconUrl || iconUrl,
-          appId: this._driver.getAppId(),
+          appIconUrl: appIconUrl || this.#driver.getOpts().appIconUrl || iconUrl,
+          appId: this.#driver.getAppId(),
           appName,
           hideTitleBar: Boolean(hideTitleBar),
           iconClass,
           iconUrl,
           id: String(id || title),
-          instanceId: this._instanceId,
+          instanceId: this.#instanceId,
           isGlobal,
           orderHint: typeof orderHint === 'number' ? orderHint : 0,
-          primaryColor: primaryColor || this._driver.getOpts().primaryColor,
-          secondaryColor: secondaryColor || this._driver.getOpts().secondaryColor,
-          sidebarId: this._sidebarId,
+          primaryColor: primaryColor || this.#driver.getOpts().primaryColor,
+          secondaryColor: secondaryColor || this.#driver.getOpts().secondaryColor,
+          sidebarId: this.#sidebarId,
           title
         }
       }));
     });
-    this._stopper.onValue(() => {
+    this.#stopper.onValue(() => {
       if (!hasPlacedAlready) return;
       document.body.dispatchEvent(new CustomEvent('inboxsdkRemoveSidebarPanel', {
         bubbles: true,
         cancelable: false,
         detail: {
           appName,
-          sidebarId: this._sidebarId,
-          instanceId: this._instanceId
+          sidebarId: this.#sidebarId,
+          instanceId: this.#instanceId
         }
       }));
     });
   }
   getStopper() {
-    return this._stopper;
+    return this.#stopper;
   }
   getEventStream() {
-    return this._eventStream;
+    return this.#eventStream;
   }
+
+  // TODO: is this used?
   scrollIntoView() {
     document.body.dispatchEvent(new CustomEvent('inboxsdkSidebarPanelScrollIntoView', {
       bubbles: true,
       cancelable: false,
       detail: {
-        instanceId: this._instanceId,
-        sidebarId: this._sidebarId
+        instanceId: this.#instanceId,
+        sidebarId: this.#sidebarId
       }
     }));
   }
@@ -3826,9 +3848,9 @@ class ContentPanelViewDriver {
       bubbles: true,
       cancelable: false,
       detail: {
-        instanceId: this._instanceId,
-        isGlobal: this._isGlobal,
-        sidebarId: this._sidebarId
+        instanceId: this.#instanceId,
+        isGlobal: this.#isGlobal,
+        sidebarId: this.#sidebarId
       }
     }));
   }
@@ -3837,17 +3859,17 @@ class ContentPanelViewDriver {
       bubbles: true,
       cancelable: false,
       detail: {
-        instanceId: this._instanceId,
-        isGlobal: this._isGlobal,
-        sidebarId: this._sidebarId
+        instanceId: this.#instanceId,
+        isGlobal: this.#isGlobal,
+        sidebarId: this.#sidebarId
       }
     }));
   }
   isActive() {
-    return this._isActive;
+    return this.#isActive;
   }
   remove() {
-    this._eventStream.end();
+    this.#eventStream.end();
   }
 }
 /* harmony default export */ const sidebar_ContentPanelViewDriver = (ContentPanelViewDriver);
@@ -3859,69 +3881,53 @@ class ContentPanelViewDriver {
 
 
 const updates = js_default()(module, null);
+
+/**
+ * @internal
+ */
 class GmailAppSidebarView {
-  _stopper = kefir_stopper_js_default()();
+  #stopper = kefir_stopper_js_default()();
+  #driver;
+  #instanceId;
   constructor(driver, companionSidebarContentContainerElement) {
-    this._driver = driver;
-    // We need to be able to cooperate with other apps/extensions that are
-    // sharing the app sidebar. We store some properties as attributes in the
-    // shared DOM instead of as class properties; class properties are mostly
-    // restricted to being used for references to DOM nodes. When
-    // GmailAppSidebarView is instantiated, we check the element for an
-    // attribute to see whether a previous extension's GmailAppSidebarView has
-    // already set up the sidebar or not.
+    this.#driver = driver;
+    /**
+     * We need to be able to cooperate with other apps/extensions that are
+     * sharing the app sidebar. We store some properties as attributes in the
+     * shared DOM instead of as class properties; class properties are mostly
+     * restricted to being used for references to DOM nodes. When
+     * GmailAppSidebarView is instantiated, we check the element for an
+     * attribute to see whether a previous extension's GmailAppSidebarView has
+     * already set up the sidebar or not.
+     */
     const instanceId = companionSidebarContentContainerElement.getAttribute('data-sdk-sidebar-instance-id');
     if (instanceId != null) {
-      this._instanceId = instanceId;
+      this.#instanceId = instanceId;
     } else {
       let primary = new gmail_app_sidebar_view_primary(driver, companionSidebarContentContainerElement);
-      this._instanceId = primary.getInstanceId();
+      this.#instanceId = primary.getInstanceId();
       // hot reloading support. Not perfect; this will break any existing panels.
       updates.changes().onValue(() => {
         primary.destroy();
         primary = new gmail_app_sidebar_view_primary(driver, companionSidebarContentContainerElement);
-        this._instanceId = primary.getInstanceId();
+        this.#instanceId = primary.getInstanceId();
       });
     }
   }
   destroy() {
-    this._stopper.destroy();
+    this.#stopper.destroy();
   }
   getStopper() {
-    return this._stopper;
-  }
-  _getShouldThreadAppSidebarOpen() {
-    return __webpack_require__.g.localStorage.getItem('inboxsdk__thread_app_sidebar_should_open') !== 'false';
-  }
-  _setShouldThreadAppSidebarOpen(open) {
-    try {
-      __webpack_require__.g.localStorage.setItem('inboxsdk__thread_app_sidebar_should_open', String(open));
-    } catch (err) {
-      console.error('error saving', err);
-    }
-  }
-
-  // This value controls whether the app sidebar should automatically open
-  // itself when available when the chat sidebar isn't present. It's only set
-  // if the user interacts with the app sidebar button.
-  _getShouldGlobalAppSidebarOpen() {
-    return __webpack_require__.g.localStorage.getItem('inboxsdk__global_app_sidebar_should_open') === 'true';
-  }
-  _setShouldGlobalAppSidebarOpen(open) {
-    try {
-      __webpack_require__.g.localStorage.setItem('inboxsdk__global_app_sidebar_should_open', String(open));
-    } catch (err) {
-      console.error('error saving', err);
-    }
+    return this.#stopper;
   }
   addThreadSidebarContentPanel(descriptor, threadView) {
-    const panel = new sidebar_ContentPanelViewDriver(this._driver, descriptor, this._instanceId);
-    kefir_esm.merge([threadView.getStopper(), this._stopper]).take(1).takeUntilBy(panel.getStopper()).onValue(() => panel.remove());
+    const panel = new sidebar_ContentPanelViewDriver(this.#driver, descriptor, this.#instanceId);
+    kefir_esm.merge([threadView.getStopper(), this.#stopper]).take(1).takeUntilBy(panel.getStopper()).onValue(() => panel.remove());
     return panel;
   }
   addGlobalSidebarContentPanel(descriptor) {
-    const panel = new sidebar_ContentPanelViewDriver(this._driver, descriptor, this._instanceId, true);
-    this._stopper.takeUntilBy(panel.getStopper()).onValue(() => panel.remove());
+    const panel = new sidebar_ContentPanelViewDriver(this.#driver, descriptor, this.#instanceId, true);
+    this.#stopper.takeUntilBy(panel.getStopper()).onValue(() => panel.remove());
     return panel;
   }
 }
@@ -10833,7 +10839,7 @@ options.insert = htmlElement => {
               htmlElement.setAttribute('data-inboxsdk-version',
               // eslint-disable-next-line @typescript-eslint/ban-ts-comment -- this is injected by webpack
               ///@ts-ignore
-              "2.1.3-1695642021797-32b1a1b147ce5783");
+              "2.1.5-1696881387401-5c0ff20cfc735daf");
               document.head.append(htmlElement);
             };
 options.domAPI = (styleDomAPI_default());
@@ -11388,10 +11394,12 @@ function getAllAppIds() {
 const _trackedEventsQueue = new PersistentQueue('events');
 const FIRST_LOADED_TIME = Date.now();
 class Logger {
+  #appId;
+  #isMaster;
   constructor(appId, opts, loaderVersion, implVersion) {
     _extensionLoggerSetup(appId, opts, loaderVersion, implVersion);
-    this._appId = appId;
-    this._isMaster = (() => {
+    this.#appId = appId;
+    this.#isMaster = (() => {
       if (!_extensionUseEventTracking || typeof document !== 'undefined' && document.documentElement.hasAttribute('data-inboxsdk-app-logger-master-chosen')) {
         return false;
       } else {
@@ -11399,7 +11407,7 @@ class Logger {
         return true;
       }
     })();
-    if (this._isMaster && typeof document !== 'undefined') {
+    if (this.#isMaster && typeof document !== 'undefined') {
       document.addEventListener('inboxSDKinjectedError', event => {
         if (!(event instanceof CustomEvent && event?.detail)) {
           this.error(new Error('Invalid inboxSDKinjectedError event'), event);
@@ -11445,51 +11453,54 @@ class Logger {
     _logError(err, details, undefined, false);
   }
   error(err, details) {
-    _logError(err, details, this._appId, false);
+    _logError(err, details, this.#appId, false);
   }
   errorApp(err, details) {
-    _logError(err, details, this._appId, true);
+    _logError(err, details, this.#appId, true);
   }
+
+  /** Only the first logger instance reports Site errors. */
   errorSite(err, details) {
-    // Only the first logger instance reports Site errors.
-    if (!this._isMaster) {
+    if (!this.#isMaster) {
       return;
     }
     this.error(err, details);
   }
 
-  // Should only be used by the InboxSDK users for their own app events.
+  /** Should only be used by the InboxSDK users for their own app events. */
   eventApp(name, details) {
-    _trackEvent(this._appId, 'app', name, details);
+    _trackEvent(this.#appId, 'app', name, details);
   }
 
-  // For tracking app events that are possibly triggered by the user. Extensions
-  // can opt out of this with a flag passed to InboxSDK.load().
+  /**
+   * For tracking app events that are possibly triggered by the user. Extensions
+   * can opt out of this with a flag passed to InboxSDK.load().
+   */
   eventSdkActive(name, details) {
     if (!_extensionUseEventTracking) {
       return;
     }
-    _trackEvent(this._appId, 'sdkActive', name, details);
+    _trackEvent(this.#appId, 'sdkActive', name, details);
   }
 
   // Track events unrelated to user activity about how the app uses the SDK.
   // Examples include the app being initialized, and calls to any of the
   // register___ViewHandler functions.
   eventSdkPassive(name, details, sensitive) {
-    if (sensitive && !(0,isStreakAppId/* default */.Z)(this._appId)) {
+    if (sensitive && !(0,isStreakAppId/* default */.Z)(this.#appId)) {
       // do not log events if they were marked as sensitive
       return;
     }
-    _trackEvent(this._appId, 'sdkPassive', name, details);
+    _trackEvent(this.#appId, 'sdkPassive', name, details);
   }
 
   // Track Site events.
   eventSite(name, details) {
     // Only the first logger instance reports Site events.
-    if (!this._isMaster) {
+    if (!this.#isMaster) {
       return;
     }
-    _trackEvent(this._appId, 'gmail', name, details);
+    _trackEvent(this.#appId, 'gmail', name, details);
   }
   deprecationWarning(name, suggestion) {
     console.warn(`InboxSDK: ${name} is deprecated.` + (suggestion ? ` Please use ${suggestion} instead.` : ''));
@@ -11506,7 +11517,7 @@ class Logger {
     };
   }
   trackFunctionPerformance(fn, sampleRate, details) {
-    if (Math.random() < sampleRate && document.visibilityState === 'visible' && this._isMaster) {
+    if (Math.random() < sampleRate && document.visibilityState === 'visible' && this.#isMaster) {
       const start = Date.now();
       fn();
       setTimeout(() => {
@@ -19331,7 +19342,7 @@ options.insert = htmlElement => {
               htmlElement.setAttribute('data-inboxsdk-version',
               // eslint-disable-next-line @typescript-eslint/ban-ts-comment -- this is injected by webpack
               ///@ts-ignore
-              "2.1.3-1695642021797-32b1a1b147ce5783");
+              "2.1.5-1696881387401-5c0ff20cfc735daf");
               document.head.append(htmlElement);
             };
 options.domAPI = (styleDomAPI_default());
@@ -19356,51 +19367,53 @@ var update = injectStylesIntoStyleTag_default()(mole_view_module/* default */.Z,
 
 
 class GmailMoleViewDriver {
-  _eventStream = kefir_bus_default()();
-  _stopper = js_default()();
+  #driver;
+  #eventStream = kefir_bus_default()();
+  #stopper = js_default()();
+  #element;
   constructor(driver, options) {
-    this._driver = driver;
-    this._element = Object.assign(document.createElement('div'), {
+    this.#driver = driver;
+    this.#element = Object.assign(document.createElement('div'), {
       className: 'inboxsdk__mole_view ' + (options.className || ''),
       innerHTML: getHTMLString(options)
     });
     if (options.chrome === false) {
-      this._element.classList.add('inboxsdk__mole_view_chromeless');
+      this.#element.classList.add('inboxsdk__mole_view_chromeless');
     } else {
-      (0,querySelectorOrFail/* default */.Z)(this._element, '.inboxsdk__mole_view_titlebar').addEventListener('click', e => {
+      (0,querySelectorOrFail/* default */.Z)(this.#element, '.inboxsdk__mole_view_titlebar').addEventListener('click', e => {
         this.setMinimized(!this.getMinimized());
         e.preventDefault();
         e.stopPropagation();
       });
-      const minimizeBtn = (0,querySelectorOrFail/* default */.Z)(this._element, '.Hl');
+      const minimizeBtn = (0,querySelectorOrFail/* default */.Z)(this.#element, '.Hl');
       minimizeBtn.addEventListener('click', e => {
         this.setMinimized(true);
         e.preventDefault();
         e.stopPropagation();
       });
-      const maximizeBtn = (0,querySelectorOrFail/* default */.Z)(this._element, '.Hk');
+      const maximizeBtn = (0,querySelectorOrFail/* default */.Z)(this.#element, '.Hk');
       maximizeBtn.addEventListener('click', e => {
         this.setMinimized(false);
         e.preventDefault();
         e.stopPropagation();
       });
-      const closeBtn = (0,querySelectorOrFail/* default */.Z)(this._element, '.Ha');
+      const closeBtn = (0,querySelectorOrFail/* default */.Z)(this.#element, '.Ha');
       closeBtn.addEventListener('click', e => {
         this.destroy();
         e.preventDefault();
         e.stopPropagation();
       });
       if (options.titleEl) {
-        this._setTitleEl(options.titleEl);
+        this.#setTitleEl(options.titleEl);
       } else {
         this.setTitle(options.title || '');
       }
       if (options.minimizedTitleEl) {
-        this._setMinimizedTitleEl(options.minimizedTitleEl);
+        this.#setMinimizedTitleEl(options.minimizedTitleEl);
       }
       const titleButtons = options.titleButtons;
       if (titleButtons) {
-        const titleButtonContainer = (0,querySelectorOrFail/* default */.Z)(this._element, '.inboxsdk__mole_title_buttons');
+        const titleButtonContainer = (0,querySelectorOrFail/* default */.Z)(this.#element, '.inboxsdk__mole_title_buttons');
         const lastChild = titleButtonContainer.lastElementChild;
         titleButtons.forEach(titleButton => {
           const img = document.createElement('img');
@@ -19418,11 +19431,11 @@ class GmailMoleViewDriver {
         });
       }
     }
-    (0,querySelectorOrFail/* default */.Z)(this._element, '.inboxsdk__mole_view_content').appendChild(options.el);
+    (0,querySelectorOrFail/* default */.Z)(this.#element, '.inboxsdk__mole_view_content').appendChild(options.el);
   }
   show() {
     const doShow = moleParent => {
-      moleParent.insertBefore(this._element, last_default()(moleParent.children));
+      moleParent.insertBefore(this.#element, last_default()(moleParent.children));
       const dw = findParent(moleParent, el => el.nodeName === 'DIV' && el.classList.contains('dw'));
       if (dw) {
         dw.classList.add('inboxsdk__moles_in_use', mole_view_module/* inboxsdkMolesInUse */.Y);
@@ -19432,7 +19445,7 @@ class GmailMoleViewDriver {
     if (moleParent) {
       doShow(moleParent);
     } else {
-      const moleParentReadyEvent = (0,stream_wait_for/* default */.Z)(() => gmail_element_getter/* default.getMoleParent */.Z.getMoleParent()).takeUntilBy(this._stopper).onValue(doShow);
+      const moleParentReadyEvent = (0,stream_wait_for/* default */.Z)(() => gmail_element_getter/* default.getMoleParent */.Z.getMoleParent()).takeUntilBy(this.#stopper).onValue(doShow);
       // For some users, the mole parent element seems to be lazily loaded by
       // Gmail only once the user has used a compose view or a thread view.
       // If the gmail mode has settled, we've been loaded for 10 seconds, and
@@ -19440,10 +19453,10 @@ class GmailMoleViewDriver {
       // by opening a compose view and then closing it.
       kefir_esm.fromPromise(gmail_element_getter/* default.waitForGmailModeToSettle */.Z.waitForGmailModeToSettle()).flatMap(() => {
         // delay until we've passed TimestampOnReady + 10 seconds
-        return this._driver.delayToTimeAfterReady(10 * 1000);
-      }).takeUntilBy(moleParentReadyEvent).takeUntilBy(this._stopper).onValue(() => {
-        this._driver.getLogger().eventSdkActive('mole parent force load');
-        this._driver.openNewComposeViewDriver().then(gmailComposeView => {
+        return this.#driver.delayToTimeAfterReady(10 * 1000);
+      }).takeUntilBy(moleParentReadyEvent).takeUntilBy(this.#stopper).onValue(() => {
+        this.#driver.getLogger().eventSdkActive('mole parent force load');
+        this.#driver.openNewComposeViewDriver().then(gmailComposeView => {
           gmailComposeView.close();
         });
       });
@@ -19451,55 +19464,55 @@ class GmailMoleViewDriver {
   }
   setMinimized(minimized) {
     if (minimized) {
-      this._element.classList.add('inboxsdk__minimized');
-      this._eventStream.emit({
+      this.#element.classList.add('inboxsdk__minimized');
+      this.#eventStream.emit({
         eventName: 'minimize'
       });
     } else {
-      this._element.classList.remove('inboxsdk__minimized');
+      this.#element.classList.remove('inboxsdk__minimized');
 
       // If the mole is off the left edge of the screen, then move it to the
       // right.
-      const moleParent = this._element.parentElement;
-      if (moleParent && this._element.getBoundingClientRect().left < 0) {
-        moleParent.insertBefore(this._element, last_default()(moleParent.children));
+      const moleParent = this.#element.parentElement;
+      if (moleParent && this.#element.getBoundingClientRect().left < 0) {
+        moleParent.insertBefore(this.#element, last_default()(moleParent.children));
       }
-      this._eventStream.emit({
+      this.#eventStream.emit({
         eventName: 'restore'
       });
     }
   }
   getMinimized() {
-    return this._element.classList.contains('inboxsdk__minimized');
+    return this.#element.classList.contains('inboxsdk__minimized');
   }
   setTitle(text) {
-    const titleElement = this._element.querySelector('.inboxsdk__mole_view_titlebar h2.inboxsdk__mole_default');
+    const titleElement = this.#element.querySelector('.inboxsdk__mole_view_titlebar h2.inboxsdk__mole_default');
     if (titleElement) {
       titleElement.textContent = text;
     }
   }
-  _setTitleEl(el) {
-    const container = this._element.querySelector('.inboxsdk__mole_view_titlebar h2.inboxsdk__mole_default');
+  #setTitleEl(el) {
+    const container = this.#element.querySelector('.inboxsdk__mole_view_titlebar h2.inboxsdk__mole_default');
     if (container) {
       container.textContent = '';
       container.appendChild(el);
     }
   }
-  _setMinimizedTitleEl(el) {
-    const container = this._element.querySelector('.inboxsdk__mole_view_titlebar h2.inboxsdk__mole_minimized');
+  #setMinimizedTitleEl(el) {
+    const container = this.#element.querySelector('.inboxsdk__mole_view_titlebar h2.inboxsdk__mole_minimized');
     if (container) {
-      this._element.classList.add('inboxsdk__mole_use_minimize_title');
+      this.#element.classList.add('inboxsdk__mole_use_minimize_title');
       container.textContent = '';
       container.appendChild(el);
     }
   }
   getEventStream() {
-    return this._eventStream;
+    return this.#eventStream;
   }
   destroy() {
-    this._element.remove();
-    this._eventStream.end();
-    this._stopper.destroy();
+    this.#element.remove();
+    this.#eventStream.end();
+    this.#stopper.destroy();
   }
 }
 /* harmony default export */ const gmail_mole_view_driver = (GmailMoleViewDriver);
@@ -22162,14 +22175,42 @@ var isIntegratedViewGmail = __webpack_require__(98884);
 
 
 
+
+async function isSidePanelCollapsed() {
+  const sidePanelSelector = '.brC-aT5-aOt-Jw[role=complementary]';
+  try {
+    await (0,wait_for/* default */.Z)(() => document.querySelector(sidePanelSelector), 10_000);
+    // Wait for the collapse button to appear too. Otherwise, the side panel will initially appear without a display style set for collapsed.
+    await (0,wait_for/* default */.Z)(() => document.querySelector('.aT5-aOt-I[role=button]'));
+  } catch (e) {
+    if (e instanceof wait_for/* WaitForError */.p) {
+      return null;
+    }
+    throw e;
+  }
+  const maybeCollapsedSidePanel = document.querySelector(`${sidePanelSelector}[style*="display: none;"]`);
+
+  // If the sidePanel is collapsed, it will have a style attribute with display: none
+  return maybeCollapsedSidePanel != null;
+}
 async function gmailLoadEvent(driver) {
   const pageCommunicator = driver.getPageCommunicator();
   const isConversationViewDisabled = await pageCommunicator.isConversationViewDisabled();
   await waitForMenuReady();
   const isUsingDarkTheme = await checkForDarkThemeSafe();
-  driver.getLogger().eventSite('gmailSettings', {
-    isGmailIntegratedView: (0,isIntegratedViewGmail/* default */.Z)(),
-    isCollapsiblePanelHidden: (0,isIntegratedViewGmail/* isCollapsiblePanelHidden */.k)(),
+  const sidePanelCollapsed = await isSidePanelCollapsed();
+  const timing = performance?.timing;
+  driver.logger.eventSite('gmailSettings', {
+    isGmailIntegratedView: (0,isIntegratedViewGmail/* default */.ZP)(),
+    /**
+     * This is the panel on the left side of the screen. If the top left burger of Gmail is collapsed, then this is true.
+     */
+    isCollapsiblePanelHidden: (0,isIntegratedViewGmail/* isCollapsiblePanelHidden */.ky)(),
+    isGoogleChatEnabled: (0,isIntegratedViewGmail/* isGoogleChatEnabled */.Jv)(),
+    /**
+     * This is the sidePanel on the right side of the screen. The collapse button is at the bottom right corner of the screen.
+     */
+    isSidePanelCollapsed: sidePanelCollapsed,
     isDarkTheme: isUsingDarkTheme,
     screenWidth: window.screen?.width,
     screenHeight: window.screen?.height,
@@ -22181,20 +22222,20 @@ async function gmailLoadEvent(driver) {
     isConversationViewDisabled,
     wasAccountSwitcherReadyAtStart: driver.getEnvData().wasAccountSwitcherReadyAtStart,
     timings: {
-      responseStart: __webpack_require__.g.performance?.timing.responseStart,
-      responseEnd: __webpack_require__.g.performance?.timing.responseEnd,
-      domLoading: __webpack_require__.g.performance?.timing.domLoading,
-      domInteractive: __webpack_require__.g.performance?.timing.domInteractive,
-      domComplete: __webpack_require__.g.performance?.timing.domComplete,
-      domContentLoadedEventStart: __webpack_require__.g.performance?.timing.domContentLoadedEventStart,
-      domContentLoadedEventEnd: __webpack_require__.g.performance?.timing.domContentLoadedEventEnd,
-      domainLookupEnd: __webpack_require__.g.performance?.timing.domainLookupEnd,
-      domainLookupStart: __webpack_require__.g.performance?.timing.domainLookupStart,
-      fetchStart: __webpack_require__.g.performance?.timing.fetchStart,
-      loadEventStart: __webpack_require__.g.performance?.timing.loadEventStart,
-      loadEventEnd: __webpack_require__.g.performance?.timing.loadEventEnd,
-      navigationStart: __webpack_require__.g.performance?.timing.navigationStart,
-      requestStart: __webpack_require__.g.performance?.timing.requestStart,
+      responseStart: timing?.responseStart,
+      responseEnd: timing?.responseEnd,
+      domLoading: timing?.domLoading,
+      domInteractive: timing?.domInteractive,
+      domComplete: timing?.domComplete,
+      domContentLoadedEventStart: timing?.domContentLoadedEventStart,
+      domContentLoadedEventEnd: timing?.domContentLoadedEventEnd,
+      domainLookupEnd: timing?.domainLookupEnd,
+      domainLookupStart: timing?.domainLookupStart,
+      fetchStart: timing?.fetchStart,
+      loadEventStart: timing?.loadEventStart,
+      loadEventEnd: timing?.loadEventEnd,
+      navigationStart: timing?.navigationStart,
+      requestStart: timing?.requestStart,
       ...driver.getTimings()
     }
   });
@@ -23288,22 +23329,51 @@ function parseListPeopleByKnownIdResponse(data) {
 
 
 
+/**
+ * @internal
+ */
 class GmailDriver {
-  _customRouteIDs = new Set();
-  _customListRouteIDs = new Map();
-  _customListSearchStringsToRouteIds = new Map();
-  _messageIDsToThreadIDs = new Map();
-  _stopper = js_default()();
-  _navMarkerHiddenChanged = kefir_bus_default()();
-  _addonSidebarHiddenChanged = kefir_bus_default()();
-  _appSidebarView = null;
+  #appId;
+  #logger;
+  #opts;
+  #envData;
+  #customRouteIDs = new Set();
+  #customListRouteIDs = new Map();
+  #customListSearchStringsToRouteIds = new Map();
+  #messageIDsToThreadIDs = new Map();
+  #threadRowIdentifier;
+  #gmailRouteProcessor;
+  #keyboardShortcutHelpModifier;
+  #page;
+  #pageCommunicator;
+  #pageCommunicatorPromise;
+  #butterBar;
+  #butterBarDriver;
+  #routeViewDriverStream;
+  #rowListViewDriverStream;
+  #threadRowViewDriverKefirStream;
+  #threadViewDriverLiveSet;
+  #toolbarViewDriverLiveSet;
+  #composeViewDriverStream;
+  #xhrInterceptorStream;
+  #messageViewDriverStream;
+  #stopper = js_default()();
+  #navMarkerHiddenChanged = kefir_bus_default()();
+  #addonSidebarHiddenChanged = kefir_bus_default()();
+  #userInfo;
+  #timestampAccountSwitcherReady;
+  #timestampGlobalsFound;
+  #timestampOnready;
+  #lastCustomThreadListActivity;
+  #currentRouteViewDriver;
+  #appSidebarView = null;
   constructor(appId, LOADER_VERSION, IMPL_VERSION, logger, opts, envData) {
-    this._appId = appId;
-    this._logger = logger;
-    this._opts = opts;
-    this._envData = envData;
-    this._page = (0,makePageParserTree/* default */.Z)(this, document);
-    this._stopper.onValue(() => this._page.dump());
+    this.#appId = appId;
+    this.#logger = logger;
+    this.#opts = opts;
+    this.#envData = envData;
+    this.#page = (0,makePageParserTree/* default */.Z)(this, document);
+    this.#stopper.onValue(() => this.#page.dump());
 
     // Manages the mapping between RFC Message Ids and Gmail Message Ids. Caches to
     // localStorage. Used for custom thread lists.
@@ -23364,85 +23434,88 @@ class GmailDriver {
       // sent. It doesn't really need to be cached so it's not here.
       this.getGmailMessageIdForSyncDraftId = syncDraftId => (0,getGmailMessageIdForSyncMessageId/* default */.Z)(this, syncDraftId);
     }
-    this._gmailRouteProcessor = new GmailRouteProcessor();
-    this._keyboardShortcutHelpModifier = new KeyboardShortcutHelpModifier();
-    this._butterBarDriver = new GmailButterBarDriver();
-    kefir_esm.later(45 * 1000, undefined).takeUntilBy((0,toItemWithLifetimeStream/* default */.Z)(this._page.tree.getAllByTag('supportMenu'))).onValue(() => {
-      this._logger.errorSite(new Error('Failed to find gmail supportMenu'));
+    this.#gmailRouteProcessor = new GmailRouteProcessor();
+    this.#keyboardShortcutHelpModifier = new KeyboardShortcutHelpModifier();
+    this.#butterBarDriver = new GmailButterBarDriver();
+    kefir_esm.later(45 * 1000, undefined).takeUntilBy((0,toItemWithLifetimeStream/* default */.Z)(this.#page.tree.getAllByTag('supportMenu'))).onValue(() => {
+      this.#logger.errorSite(new Error('Failed to find gmail supportMenu'));
     });
-    this._setupEventStreams();
+    this.#setupEventStreams();
     this.onready.then(() => {
       trackEvents(this);
       gmailLoadEvent(this);
-      (0,override_gmail_back_button/* default */.Z)(this, this._gmailRouteProcessor);
+      (0,override_gmail_back_button/* default */.Z)(this, this.#gmailRouteProcessor);
       trackGmailStyles();
       temporaryTrackDownloadUrlValidity(this);
       if (opts.suppressAddonTitle != null) {
         suppressAddon(this, opts.suppressAddonTitle);
       }
     }).catch(err => {
-      this._logger.error(err);
+      this.#logger.error(err);
     });
   }
   destroy() {
-    this._threadRowViewSelectionChanges.end();
-    this._keyboardShortcutHelpModifier.destroy();
-    this._stopper.destroy();
+    this.#threadRowViewSelectionChanges.end();
+    this.#keyboardShortcutHelpModifier.destroy();
+    this.#stopper.destroy();
     (0,gmail_thread_row_view/* removeAllThreadRowUnclaimedModifications */.c)();
   }
   getAppId() {
-    return this._appId;
+    return this.#appId;
   }
   getOpts() {
-    return this._opts;
+    return this.#opts;
   }
   getPageCommunicator() {
-    return this._pageCommunicator;
+    return this.#pageCommunicator;
   }
   getPageCommunicatorPromise() {
-    return this._pageCommunicatorPromise;
+    return this.#pageCommunicatorPromise;
+  }
+  get logger() {
+    return this.#logger;
   }
   getLogger() {
-    return this._logger;
+    return this.#logger;
   }
   getTagTree() {
-    return this._page.tree;
+    return this.#page.tree;
   }
   getCustomListSearchStringsToRouteIds() {
-    return this._customListSearchStringsToRouteIds;
+    return this.#customListSearchStringsToRouteIds;
   }
   getThreadRowIdentifier() {
-    return this._threadRowIdentifier;
+    return this.#threadRowIdentifier;
   }
   getButterBarDriver() {
-    return this._butterBarDriver;
+    return this.#butterBarDriver;
   }
   getButterBar() {
-    return this._butterBar;
+    return this.#butterBar;
   }
   setButterBar(bb) {
-    this._butterBar = bb;
+    this.#butterBar = bb;
   }
   getCustomRouteIDs() {
-    return this._customRouteIDs;
+    return this.#customRouteIDs;
   }
   getCustomListRouteIDs() {
-    return this._customListRouteIDs;
+    return this.#customListRouteIDs;
   }
   getKeyboardShortcutHelpModifier() {
-    return this._keyboardShortcutHelpModifier;
+    return this.#keyboardShortcutHelpModifier;
   }
   getRouteViewDriverStream() {
-    return this._routeViewDriverStream;
+    return this.#routeViewDriverStream;
   }
   getRowListViewDriverStream() {
-    return this._rowListViewDriverStream;
+    return this.#rowListViewDriverStream;
   }
   getThreadRowViewDriverStream() {
-    return this._threadRowViewDriverKefirStream;
+    return this.#threadRowViewDriverKefirStream;
   }
   getThreadViewDriverStream() {
-    return (0,toItemWithLifetimeStream/* default */.Z)(this._threadViewDriverLiveSet).map(_ref2 => {
+    return (0,toItemWithLifetimeStream/* default */.Z)(this.#threadViewDriverLiveSet).map(_ref2 => {
       let {
         el
       } = _ref2;
@@ -23450,29 +23523,29 @@ class GmailDriver {
     });
   }
   getAttachmentCardViewDriverStream() {
-    return this._messageViewDriverStream.flatMap(messageViewDriver => messageViewDriver.isLoaded() ? kefir_esm.constant(messageViewDriver) : messageViewDriver.getEventStream().filter(event => event.eventName === 'messageLoad').map(() => messageViewDriver).take(1)).map(messageView => messageView.getAttachmentCardViewDrivers()).flatten();
+    return this.#messageViewDriverStream.flatMap(messageViewDriver => messageViewDriver.isLoaded() ? kefir_esm.constant(messageViewDriver) : messageViewDriver.getEventStream().filter(event => event.eventName === 'messageLoad').map(() => messageViewDriver).take(1)).map(messageView => messageView.getAttachmentCardViewDrivers()).flatten();
   }
   getComposeViewDriverStream() {
-    return this._composeViewDriverStream;
+    return this.#composeViewDriverStream;
   }
   getXhrInterceptorStream() {
-    return this._xhrInterceptorStream;
+    return this.#xhrInterceptorStream;
   }
   getMessageViewDriverStream() {
-    return this._messageViewDriverStream;
+    return this.#messageViewDriverStream;
   }
   getStopper() {
-    return this._stopper;
+    return this.#stopper;
   }
   getEnvData() {
-    return this._envData;
+    return this.#envData;
   }
   getTimestampOnReady() {
-    if (this._timestampOnready == null) {
-      this._logger.error(new Error('getTimestampOnReady called before ready'));
+    if (this.#timestampOnready == null) {
+      this.#logger.error(new Error('getTimestampOnReady called before ready'));
       return Date.now();
     }
-    return this._timestampOnready;
+    return this.#timestampOnready;
   }
 
   // Returns a stream that emits an event once at least `time` milliseconds has
@@ -23484,11 +23557,11 @@ class GmailDriver {
   }
   getTimings() {
     return {
-      piMainStarted: this._envData.piMainStarted,
-      piLoadStarted: this._envData.piLoadStarted,
-      globalsFound: this._timestampGlobalsFound,
-      accountSwitcherReady: this._timestampAccountSwitcherReady,
-      onready: this._timestampOnready
+      piMainStarted: this.#envData.piMainStarted,
+      piLoadStarted: this.#envData.piLoadStarted,
+      globalsFound: this.#timestampGlobalsFound,
+      accountSwitcherReady: this.#timestampAccountSwitcherReady,
+      onready: this.#timestampOnready
     };
   }
   registerThreadButton(options) {
@@ -23498,7 +23571,7 @@ class GmailDriver {
         button.destroy();
       });
     };
-    const toolbarViewSub = toValueObservable_default()(this._toolbarViewDriverLiveSet).subscribe(_ref3 => {
+    const toolbarViewSub = toValueObservable_default()(this.#toolbarViewDriverLiveSet).subscribe(_ref3 => {
       let {
         value: gmailToolbarView
       } = _ref3;
@@ -23557,12 +23630,12 @@ class GmailDriver {
           }
         }).merge(unregister));
       };
-      if (this._currentRouteViewDriver) {
-        this._currentRouteViewDriver.getRowListViews().forEach(gmailRowListView => {
+      if (this.#currentRouteViewDriver) {
+        this.#currentRouteViewDriver.getRowListViews().forEach(gmailRowListView => {
           gmailRowListView.getThreadRowViewDrivers().forEach(perThreadRow);
         });
       }
-      const threadRowViewSub = this._threadRowViewDriverKefirStream.observe({
+      const threadRowViewSub = this.#threadRowViewDriverKefirStream.observe({
         value: perThreadRow
       });
       unregister.onValue(() => {
@@ -23585,21 +23658,21 @@ class GmailDriver {
     window.dispatchEvent(hce);
   }
   addCustomRouteID(routeID) {
-    this._customRouteIDs.add(routeID);
-    this._pageCommunicator.registerAllowedHashLinkStartTerm(routeID.split('/')[0]);
+    this.#customRouteIDs.add(routeID);
+    this.#pageCommunicator.registerAllowedHashLinkStartTerm(routeID.split('/')[0]);
     return () => {
-      this._customRouteIDs.delete(routeID);
+      this.#customRouteIDs.delete(routeID);
     };
   }
   addCustomListRouteID(routeID, handler) {
-    this._customListRouteIDs.set(routeID, handler);
-    this._pageCommunicator.registerAllowedHashLinkStartTerm(routeID.split('/')[0]);
+    this.#customListRouteIDs.set(routeID, handler);
+    this.#pageCommunicator.registerAllowedHashLinkStartTerm(routeID.split('/')[0]);
     return () => {
-      this._customListRouteIDs.delete(routeID);
+      this.#customListRouteIDs.delete(routeID);
     };
   }
   signalCustomThreadListActivity(customRouteID) {
-    this._lastCustomThreadListActivity = {
+    this.#lastCustomThreadListActivity = {
       customRouteID,
       timestamp: new Date()
     };
@@ -23608,7 +23681,7 @@ class GmailDriver {
   // Returns the last time a request for a custom thread list search has gone
   // out or we got a response, and the customRouteID for that.
   getLastCustomThreadListActivity() {
-    return this._lastCustomThreadListActivity;
+    return this.#lastCustomThreadListActivity;
   }
   showCustomThreadList(customRouteID, onActivate, params) {
     showCustomThreadList(this, customRouteID, onActivate, params);
@@ -23620,19 +23693,19 @@ class GmailDriver {
     showNativeRouteView(this);
   }
   createLink(routeID, params) {
-    return createLink(this._gmailRouteProcessor, routeID, params);
+    return createLink(this.#gmailRouteProcessor, routeID, params);
   }
   goto(routeID, params) {
     return (0,goto_view/* default */.Z)(this, routeID, params);
   }
   resolveUrlRedirects(url) {
-    return this._pageCommunicatorPromise.then(pageCommunicator => pageCommunicator.resolveUrlRedirects(url));
+    return this.#pageCommunicatorPromise.then(pageCommunicator => pageCommunicator.resolveUrlRedirects(url));
   }
   registerSearchSuggestionsProvider(handler) {
     registerSearchSuggestionsProvider(this, handler);
   }
   registerSearchQueryRewriter(obj) {
-    registerSearchQueryRewriter(this._pageCommunicator, obj);
+    registerSearchQueryRewriter(this.#pageCommunicator, obj);
   }
   addToolbarButtonForApp(buttonDescriptor) {
     return addToolbarButtonForApp(this, buttonDescriptor);
@@ -23644,13 +23717,13 @@ class GmailDriver {
       const composeViewDriver = await composeViewDriverPromise;
       return composeViewDriver;
     } catch (err) {
-      this._logger.error(err);
+      this.#logger.error(err);
       throw err;
     }
   }
   getNextComposeViewDriver() {
     let timeout = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 10 * 1000;
-    return this._composeViewDriverStream.merge(kefir_esm.later(timeout, new Error('Reached timeout while waiting for getNextComposeViewDriver'))).beforeEnd(() => new Error('Driver was shut down before a new compose was found')).flatMap(x => x instanceof Error ? kefir_esm.constantError(x) : kefir_esm.constant(x)).take(1).takeErrors(1).toPromise();
+    return this.#composeViewDriverStream.merge(kefir_esm.later(timeout, new Error('Reached timeout while waiting for getNextComposeViewDriver'))).beforeEnd(() => new Error('Driver was shut down before a new compose was found')).flatMap(x => x instanceof Error ? kefir_esm.constantError(x) : kefir_esm.constant(x)).take(1).takeErrors(1).toPromise();
   }
   openDraftByMessageID(messageID) {
     return openDraftByMessageID(this, messageID);
@@ -23678,25 +23751,25 @@ class GmailDriver {
   }
   getSentMailNativeNavItem() {
     const p = getNativeNavItem(this, 'sent');
-    p.catch(err => this._logger.error(err));
+    p.catch(err => this.#logger.error(err));
     return p;
   }
   setShowNativeNavMarker(isNative) {
-    this._navMarkerHiddenChanged.emit(null);
+    this.#navMarkerHiddenChanged.emit(null);
     const leftNavContainerElement = gmail_element_getter/* default.getLeftNavContainerElement */.Z.getLeftNavContainerElement();
     if (leftNavContainerElement) {
       if (isNative) {
         leftNavContainerElement.classList.remove('inboxsdk__hide_native_marker');
       } else {
         leftNavContainerElement.classList.add('inboxsdk__hide_native_marker');
-        this._stopper.takeUntilBy(this._navMarkerHiddenChanged).onValue(() => {
+        this.#stopper.takeUntilBy(this.#navMarkerHiddenChanged).onValue(() => {
           leftNavContainerElement.classList.remove('inboxsdk__hide_native_marker');
         });
       }
     }
   }
   setShowNativeAddonSidebar(isNative) {
-    this._addonSidebarHiddenChanged.emit(null);
+    this.#addonSidebarHiddenChanged.emit(null);
     const addonContainerElement = gmail_element_getter/* default.getAddonSidebarContainerElement */.Z.getAddonSidebarContainerElement();
     const mainContentBodyContainerElement = gmail_element_getter/* default.getMainContentBodyContainerElement */.Z.getMainContentBodyContainerElement();
     if (addonContainerElement && mainContentBodyContainerElement) {
@@ -23706,90 +23779,90 @@ class GmailDriver {
         parent.classList.remove('inboxsdk__hide_addon_container');
       } else {
         parent.classList.add('inboxsdk__hide_addon_container');
-        this._stopper.takeUntilBy(this._addonSidebarHiddenChanged).onValue(() => {
+        this.#stopper.takeUntilBy(this.#addonSidebarHiddenChanged).onValue(() => {
           parent.classList.remove('inboxsdk__hide_addon_container');
         });
       }
     }
   }
   async getGmailActionToken() {
-    return this._pageCommunicator.getActionTokenValue();
+    return this.#pageCommunicator.getActionTokenValue();
   }
   getUserEmailAddress() {
-    return this._pageCommunicator.getUserEmailAddress();
+    return this.#pageCommunicator.getUserEmailAddress();
   }
   isConversationViewDisabled() {
-    return this._pageCommunicator.isConversationViewDisabled();
+    return this.#pageCommunicator.isConversationViewDisabled();
   }
   getUserLanguage() {
-    return this._pageCommunicator.getUserLanguage();
+    return this.#pageCommunicator.getUserLanguage();
   }
   getUserContact() {
     return {
       emailAddress: this.getUserEmailAddress(),
-      name: this._userInfo.getUserName()
+      name: this.#userInfo.getUserName()
     };
   }
   getAccountSwitcherContactList() {
-    return this._userInfo.getAccountSwitcherContactList();
+    return this.#userInfo.getAccountSwitcherContactList();
   }
   activateShortcut(keyboardShortcutHandle, appName, appIconUrl) {
-    this.getKeyboardShortcutHelpModifier().set(keyboardShortcutHandle, this._appId, appName, appIconUrl);
+    this.getKeyboardShortcutHelpModifier().set(keyboardShortcutHandle, this.#appId, appName, appIconUrl);
     keyboardShortcutHandle.once('destroy', () => {
       this.getKeyboardShortcutHelpModifier().delete(keyboardShortcutHandle);
     });
   }
-  _setupEventStreams() {
+  #setupEventStreams() {
     var result = makeXhrInterceptor();
-    this._xhrInterceptorStream = result.xhrInterceptStream.takeUntilBy(this._stopper);
-    this._pageCommunicatorPromise = result.pageCommunicatorPromise;
-    this.onready = this._pageCommunicatorPromise.then(pageCommunicator => {
-      this._timestampGlobalsFound = Date.now();
-      this._pageCommunicator = pageCommunicator;
-      this._logger.setUserEmailAddress(this.getUserEmailAddress());
-      this._logger.setIsUsingSyncAPI(pageCommunicator.isUsingSyncAPI());
-      this._userInfo = new UserInfo(this);
-      this._timestampAccountSwitcherReady = Date.now();
-      this._routeViewDriverStream = setupRouteViewDriverStream(this._gmailRouteProcessor, this).takeUntilBy(this._stopper).toProperty();
-      this._routeViewDriverStream.onValue(gmailRouteView => {
-        this._currentRouteViewDriver = gmailRouteView;
+    this.#xhrInterceptorStream = result.xhrInterceptStream.takeUntilBy(this.#stopper);
+    this.#pageCommunicatorPromise = result.pageCommunicatorPromise;
+    this.onready = this.#pageCommunicatorPromise.then(pageCommunicator => {
+      this.#timestampGlobalsFound = Date.now();
+      this.#pageCommunicator = pageCommunicator;
+      this.#logger.setUserEmailAddress(this.getUserEmailAddress());
+      this.#logger.setIsUsingSyncAPI(pageCommunicator.isUsingSyncAPI());
+      this.#userInfo = new UserInfo(this);
+      this.#timestampAccountSwitcherReady = Date.now();
+      this.#routeViewDriverStream = setupRouteViewDriverStream(this.#gmailRouteProcessor, this).takeUntilBy(this.#stopper).toProperty();
+      this.#routeViewDriverStream.onValue(gmailRouteView => {
+        this.#currentRouteViewDriver = gmailRouteView;
       });
-      this._rowListViewDriverStream = this._setupRouteSubViewDriver('newGmailRowListView').takeUntilBy(this._stopper);
-      this._setupThreadRowViewDriverKefirStream();
-      this._threadViewDriverLiveSet = toLiveSet(this._setupRouteSubViewDriver('newGmailThreadView').takeUntilBy(this._stopper).flatMap(gmailThreadView => gmailThreadView.getReadyStream().map(() => gmailThreadView)).map(gmailThreadView => ({
+      this.#rowListViewDriverStream = this.#setupRouteSubViewDriver('newGmailRowListView').takeUntilBy(this.#stopper);
+      this.#setupThreadRowViewDriverKefirStream();
+      this.#threadViewDriverLiveSet = toLiveSet(this.#setupRouteSubViewDriver('newGmailThreadView').takeUntilBy(this.#stopper).flatMap(gmailThreadView => gmailThreadView.getReadyStream().map(() => gmailThreadView)).map(gmailThreadView => ({
         el: gmailThreadView,
         removalStream: gmailThreadView.getStopper()
       })));
-      this._setupToolbarViewDriverStream();
-      this._setupMessageViewDriverStream();
-      this._setupComposeViewDriverStream();
-      this._threadRowIdentifier = new thread_row_identifier(this);
-      this._timestampOnready = Date.now();
+      this.#setupToolbarViewDriverStream();
+      this.#setupMessageViewDriverStream();
+      this.#setupComposeViewDriverStream();
+      this.#threadRowIdentifier = new thread_row_identifier(this);
+      this.#timestampOnready = Date.now();
     });
   }
-  _setupComposeViewDriverStream() {
-    this._composeViewDriverStream = (0,setup_compose_view_driver_stream/* default */.Z)(this, this._messageViewDriverStream, this._xhrInterceptorStream).takeUntilBy(this._stopper);
+  #setupComposeViewDriverStream() {
+    this.#composeViewDriverStream = (0,setup_compose_view_driver_stream/* default */.Z)(this, this.#messageViewDriverStream, this.#xhrInterceptorStream).takeUntilBy(this.#stopper);
   }
-  _setupRouteSubViewDriver(viewName) {
-    return this._routeViewDriverStream.flatMap(gmailRouteView => {
+  #setupRouteSubViewDriver(viewName) {
+    return this.#routeViewDriverStream.flatMap(gmailRouteView => {
       return gmailRouteView.getEventStream().filter(event => event.eventName === viewName).map(event => event.view);
     });
   }
-  _setupThreadRowViewDriverKefirStream() {
-    this._threadRowViewDriverKefirStream = this._rowListViewDriverStream.flatMap(rowListViewDriver => rowListViewDriver.getRowViewDriverStream()).takeUntilBy(this._stopper);
+  #setupThreadRowViewDriverKefirStream() {
+    this.#threadRowViewDriverKefirStream = this.#rowListViewDriverStream.flatMap(rowListViewDriver => rowListViewDriver.getRowViewDriverStream()).takeUntilBy(this.#stopper);
   }
-  _setupToolbarViewDriverStream() {
-    this._toolbarViewDriverLiveSet = toLiveSet(kefir_esm.merge([this._rowListViewDriverStream.map(gmailRowListView => gmailRowListView.getToolbarView()), this.getThreadViewDriverStream().map(gmailThreadView => gmailThreadView.getToolbarView())]).filter(Boolean).flatMap(gmailToolbarView => gmailToolbarView.waitForReady()).map(gmailToolbarView => ({
+  #setupToolbarViewDriverStream() {
+    this.#toolbarViewDriverLiveSet = toLiveSet(kefir_esm.merge([this.#rowListViewDriverStream.map(gmailRowListView => gmailRowListView.getToolbarView()), this.getThreadViewDriverStream().map(gmailThreadView => gmailThreadView.getToolbarView())]).filter(Boolean).flatMap(gmailToolbarView => gmailToolbarView.waitForReady()).map(gmailToolbarView => ({
       el: gmailToolbarView,
       removalStream: gmailToolbarView.getStopper()
-    })).takeUntilBy(this._stopper));
-    this._toolbarViewDriverLiveSet.subscribe({});
+    })).takeUntilBy(this.#stopper));
+    this.#toolbarViewDriverLiveSet.subscribe({});
   }
-  _setupMessageViewDriverStream() {
-    this._messageViewDriverStream = this.getThreadViewDriverStream().flatMap(gmailThreadView => gmailThreadView.getMessageViewDriverStream()).takeUntilBy(this._stopper);
+  #setupMessageViewDriverStream() {
+    this.#messageViewDriverStream = this.getThreadViewDriverStream().flatMap(gmailThreadView => gmailThreadView.getMessageViewDriverStream()).takeUntilBy(this.#stopper);
   }
   async addGlobalSidebarContentPanel(descriptor) {
-    await this.waitForGlobalSidebarReady().merge(this._stopper.flatMap(() => kefir_esm.constantError(new Error('Driver instance was destroyed early')))).take(1).takeErrors(1).toPromise();
+    await this.waitForGlobalSidebarReady().merge(this.#stopper.flatMap(() => kefir_esm.constantError(new Error('Driver instance was destroyed early')))).take(1).takeErrors(1).toPromise();
     const appSidebar = this.getGlobalSidebar();
     return appSidebar.addGlobalSidebarContentPanel(descriptor);
   }
@@ -23801,11 +23874,11 @@ class GmailDriver {
     return (0,stream_wait_for/* default */.Z)(condition).map(() => undefined);
   }
   getGlobalSidebar() {
-    let appSidebarView = this._appSidebarView;
+    let appSidebarView = this.#appSidebarView;
     if (!appSidebarView) {
       const companionSidebarContentContainerEl = gmail_element_getter/* default.getCompanionSidebarContentContainerElement */.Z.getCompanionSidebarContentContainerElement();
       if (!companionSidebarContentContainerEl) throw new Error('did not find companionSidebarContentContainerEl');
-      appSidebarView = this._appSidebarView = new gmail_app_sidebar_view/* default */.Z(this, companionSidebarContentContainerEl);
+      appSidebarView = this.#appSidebarView = new gmail_app_sidebar_view/* default */.Z(this, companionSidebarContentContainerEl);
     }
     return appSidebarView;
   }
@@ -23813,7 +23886,7 @@ class GmailDriver {
     return !!(__webpack_require__.g.GLOBALS && __webpack_require__.g._GM_main);
   }
   isUsingSyncAPI() {
-    return this._pageCommunicator.isUsingSyncAPI();
+    return this.#pageCommunicator.isUsingSyncAPI();
   }
   showAppIdWarning() {
     showAppIdWarning(this);
@@ -23822,58 +23895,58 @@ class GmailDriver {
     return new GmailTopMessageBarDriver(optionStream);
   }
   associateThreadAndMessageIDs(threadID, messageID) {
-    this._messageIDsToThreadIDs.set(messageID, threadID);
+    this.#messageIDsToThreadIDs.set(messageID, threadID);
   }
   getThreadIDForMessageID(messageID) {
-    return (0,get_or_fail/* default */.Z)(this._messageIDsToThreadIDs, messageID);
+    return (0,get_or_fail/* default */.Z)(this.#messageIDsToThreadIDs, messageID);
   }
   getDraftIDForMessageID(messageID) {
     let skipCache = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     return (0,get_draft_id_for_message_id/* default */.Z)(this, messageID, skipCache);
   }
-  _recentSyncDraftIds = new Map();
+  #recentSyncDraftIds = new Map();
   reportRecentSyncDraftId(syncDraftId) {
-    const count = this._recentSyncDraftIds.get(syncDraftId);
+    const count = this.#recentSyncDraftIds.get(syncDraftId);
     const newCount = (count ?? 0) + 1;
-    this._recentSyncDraftIds.set(syncDraftId, newCount);
+    this.#recentSyncDraftIds.set(syncDraftId, newCount);
   }
   reportDraftClosed(syncDraftId) {
-    kefir_esm.later(30 * 1000, undefined).takeUntilBy(this._stopper).onValue(() => {
-      const count = this._recentSyncDraftIds.get(syncDraftId);
+    kefir_esm.later(30 * 1000, undefined).takeUntilBy(this.#stopper).onValue(() => {
+      const count = this.#recentSyncDraftIds.get(syncDraftId);
       let newCount;
       if (count == null || count < 1) {
         newCount = 0;
-        this._logger.error(new Error('_recentSyncDraftIds count had unexpected value'), {
+        this.#logger.error(new Error('_recentSyncDraftIds count had unexpected value'), {
           count
         });
       } else {
         newCount = count - 1;
       }
       if (newCount === 0) {
-        this._recentSyncDraftIds.delete(syncDraftId);
+        this.#recentSyncDraftIds.delete(syncDraftId);
       } else {
-        this._recentSyncDraftIds.set(syncDraftId, newCount);
+        this.#recentSyncDraftIds.set(syncDraftId, newCount);
       }
     });
   }
   isRecentSyncDraftId(syncMessageId) {
-    return this._recentSyncDraftIds.has(syncMessageId);
+    return this.#recentSyncDraftIds.has(syncMessageId);
   }
-  _selectedThreadRows = transducers_default().mapcat(gmailRowListView => gmailRowListView.getSelectedThreadRowViewDrivers());
+  #selectedThreadRows = transducers_default().mapcat(gmailRowListView => gmailRowListView.getSelectedThreadRowViewDrivers());
   getSelectedThreadRowViewDrivers() {
-    if (!this._currentRouteViewDriver) {
+    if (!this.#currentRouteViewDriver) {
       return [];
     }
-    return transducers_default().toArray(this._currentRouteViewDriver.getRowListViews(), this._selectedThreadRows);
+    return transducers_default().toArray(this.#currentRouteViewDriver.getRowListViews(), this.#selectedThreadRows);
   }
-  _threadRowViewSelectionChanges = kefir_bus_default()();
+  #threadRowViewSelectionChanges = kefir_bus_default()();
   signalThreadRowViewSelectionChange() {
-    this._threadRowViewSelectionChanges.value(undefined);
+    this.#threadRowViewSelectionChanges.value(undefined);
   }
   registerThreadRowViewSelectionHandler(handler) {
-    this._threadRowViewSelectionChanges.onValue(handler);
+    this.#threadRowViewSelectionChanges.onValue(handler);
     return () => {
-      this._threadRowViewSelectionChanges.offValue(handler);
+      this.#threadRowViewSelectionChanges.offValue(handler);
     };
   }
   getPersonDetails(emailAddress) {
@@ -24499,8 +24572,7 @@ class ComposeView extends safe_event_emitter/* default */.Z {
 /* harmony import */ var _common_get_or_fail__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(7791);
 
 
-const membersMap = new WeakMap(); // documented in src/docs/
-
+const membersMap = new WeakMap();
 class ContentPanelView extends _lib_safe_event_emitter__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z {
   destroyed = false;
   constructor(contentPanelViewImplementation) {
@@ -24509,7 +24581,7 @@ class ContentPanelView extends _lib_safe_event_emitter__WEBPACK_IMPORTED_MODULE_
       contentPanelViewImplementation
     };
     membersMap.set(this, members);
-    this._bindToStreamEvents();
+    this.#bindToStreamEvents();
   }
   remove() {
     (0,_common_get_or_fail__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(membersMap, this).contentPanelViewImplementation.remove();
@@ -24523,7 +24595,7 @@ class ContentPanelView extends _lib_safe_event_emitter__WEBPACK_IMPORTED_MODULE_
   isActive() {
     return (0,_common_get_or_fail__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(membersMap, this).contentPanelViewImplementation.isActive();
   }
-  _bindToStreamEvents() {
+  #bindToStreamEvents() {
     const stream = (0,_common_get_or_fail__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(membersMap, this).contentPanelViewImplementation.getEventStream();
     stream.onValue(_ref => {
       let {