@inboxsdk/core 2.1.12 → 2.1.14

package/inboxsdk.js

@@ -814,7 +814,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.12-1699623720812-466cb297eff34e1f";
+const BUILD_VERSION = "2.1.14-1700139139820-2df861d69ce2cd34";
 if (false) {}
 
 /***/ }),
@@ -4696,6 +4696,7 @@ function addButton(gmailComposeView, buttonDescriptorStream, groupOrderHint, ext
           });
         }
       } else {
+        // This
         buttonViewController.update(buttonOptions);
       }
     }).onEnd(() => {
@@ -5606,39 +5607,58 @@ function setFromEmail(driver, gmailComposeView, email) {
 
 let hasReportedMissingBody = false;
 class GmailComposeView {
-  // Set only after the message is sent.
-
-  _closedProgrammatically = false;
-  _destroyed = false;
-  _hasSetupLinkPopOvers = false;
+  #element;
+  #seenBodyElement;
+  #isInlineReplyForm;
+  #isFullscreen;
+  #isStandalone;
+  #driver;
+  #managedViewControllers;
+  #eventStream;
+  #isTriggeringADraftSavePending;
+  #buttonViewControllerTooltipMap;
+  #composeID;
+  #messageIDElement;
+  #messageId;
+  #initialMessageId;
+  #targetMessageID;
+  #draftIDpromise;
+  #threadID;
+  #stopper;
+  #lastSelectionRange;
+  #requestModifiers;
+  #isListeningToAjaxInterceptStream;
+  #formattingArea;
+  #closedProgrammatically = false;
+  #destroyed = false;
+  #removedFromDOMStopper;
+  #hasSetupLinkPopOvers = false;
+  #page;
   constructor(element, xhrInterceptorStream, driver, options) {
-    this;
-    this._element = element;
-    this._element.classList.add('inboxsdk__compose');
+    this.#element = element;
+    this.#element.classList.add('inboxsdk__compose');
     if (options.isInlineReplyForm) {
-      this._element.classList.add('inboxsdk__compose_inlineReply');
-    }
-    this._isInlineReplyForm = options.isInlineReplyForm;
-    this._isStandalone = options.isStandalone;
-    this._isFullscreen = false;
-    this._emailWasSent = false;
-    this._messageId = null;
-    this._finalMessageId = null;
-    this._draftSaving = false;
-    this._draftIDpromise = null;
-    this._driver = driver;
-    this._stopper = kefir_stopper_js_default()();
-    this._managedViewControllers = [];
-    this._requestModifiers = {};
-    this._isListeningToAjaxInterceptStream = false;
-    this._eventStream = kefir_bus_default()();
-    this._removedFromDOMStopper = kefir_stopper_js_default()();
-    this._isTriggeringADraftSavePending = false;
-    this._page = makePageParser(element, driver.getLogger());
-    this.tagTree = this._page.tree;
-    const saveAndSendStream = xhrInterceptorStream // we know _getDraftIDfromForm will work because by the time we're
+      this.#element.classList.add('inboxsdk__compose_inlineReply');
+    }
+    this.#isInlineReplyForm = options.isInlineReplyForm;
+    this.#isStandalone = options.isStandalone;
+    this.#isFullscreen = false;
+    this.#messageId = null;
+    this.#draftIDpromise = null;
+    this.#driver = driver;
+    this.#stopper = kefir_stopper_js_default()();
+    this.#managedViewControllers = [];
+    this.#requestModifiers = {};
+    this.#isListeningToAjaxInterceptStream = false;
+    this.#eventStream = kefir_bus_default()();
+    this.#removedFromDOMStopper = kefir_stopper_js_default()();
+    this.#isTriggeringADraftSavePending = false;
+    this.#page = makePageParser(element, driver.getLogger());
+    this.tagTree = this.#page.tree;
+    const saveAndSendStream = xhrInterceptorStream
+    // we know _getDraftIDfromForm will work because by the time we're
     // getting an ajax event Gmail's JS has generated an ID and added it to the DOM.
-    .filter(event => event.draftID === this._getDraftIDfromForm()).map(event => {
+    .filter(event => event.draftID === this.#getDraftIDfromForm()).map(event => {
       switch (event.type) {
         case 'emailSending':
           {
@@ -5650,8 +5670,8 @@ class GmailComposeView {
           {
             const syncThreadID = event.threadID;
             const syncMessageID = event.messageID;
-            if (event.oldMessageID) this._messageId = event.oldMessageID;
-            if (event.oldThreadID) this._threadID = event.oldThreadID;
+            if (event.oldMessageID) this.#messageId = event.oldMessageID;
+            if (event.oldThreadID) this.#threadID = event.oldThreadID;
             driver.removeCachedGmailMessageIdForSyncMessageId(syncMessageID);
             driver.removeCachedOldGmailThreadIdFromSyncThreadId(syncThreadID);
             return {
@@ -5680,8 +5700,8 @@ class GmailComposeView {
           }
         case 'emailDraftReceived':
           {
-            this._messageId = event.oldMessageID;
-            this._threadID = event.oldThreadID;
+            this.#messageId = event.oldMessageID;
+            this.#threadID = event.oldThreadID;
             return {
               eventName: 'draftSaved',
               data: {
@@ -5700,40 +5720,40 @@ class GmailComposeView {
           }
       }
     }).filter(Boolean);
-    this._eventStream.plug(kefir_esm.merge([saveAndSendStream, kefir_esm.fromEvents(this._element, 'buttonAdded').map(() => {
+    this.#eventStream.plug(kefir_esm.merge([saveAndSendStream, kefir_esm.fromEvents(this.#element, 'buttonAdded').map(() => {
       return {
         eventName: 'buttonAdded'
       };
-    }), kefir_esm.fromEvents(this._element, 'resize').map(() => ({
+    }), kefir_esm.fromEvents(this.#element, 'resize').map(() => ({
       eventName: 'resize'
-    })), kefir_esm.fromEvents(this._element, 'composeFullscreenStateChanged').map(() => {
-      this._updateComposeFullscreenState();
+    })), kefir_esm.fromEvents(this.#element, 'composeFullscreenStateChanged').map(() => {
+      this.#updateComposeFullscreenState();
       return {
         eventName: 'fullscreenChanged',
         data: {
-          fullscreen: this._isFullscreen
+          fullscreen: this.#isFullscreen
         }
       };
     })]));
-    kefir_esm.fromEvents(this._element, 'closedProgrammatically').takeUntilBy(this._stopper).onValue(() => {
-      this._closedProgrammatically = true;
+    kefir_esm.fromEvents(this.#element, 'closedProgrammatically').takeUntilBy(this.#stopper).onValue(() => {
+      this.#closedProgrammatically = true;
     });
-    this._buttonViewControllerTooltipMap = new WeakMap();
+    this.#buttonViewControllerTooltipMap = new WeakMap();
     const initialBodyElement = this.getMaybeBodyElement();
     this.ready = constant_default()((initialBodyElement ? kefir_esm.constant(initialBodyElement) : (0,stream_wait_for/* default */.Z)(() => this.getMaybeBodyElement(), 3 * 60 * 1000 //timeout
-    )).takeUntilBy(this._stopper).map(bodyElement => {
-      this._seenBodyElement = bodyElement;
-      this._composeID = this._element.querySelector('input[name="composeid"]').value;
-      this._messageIDElement = this._element.querySelector('input[name="draft"]');
-      if (!this._messageIDElement) {
+    )).takeUntilBy(this.#stopper).map(bodyElement => {
+      this.#seenBodyElement = bodyElement;
+      this.#composeID = this.#element.querySelector('input[name="composeid"]').value;
+      this.#messageIDElement = this.#element.querySelector('input[name="draft"]');
+      if (!this.#messageIDElement) {
         driver.getLogger().error(new Error('Could not find compose message id field'));
         // stub so other things don't fail
-        this._messageIDElement = document.createElement('input');
+        this.#messageIDElement = document.createElement('input');
       }
-      this._setupIDs();
-      this._setupStreams();
-      this._setupConsistencyCheckers();
-      this._updateComposeFullscreenState();
+      this.#setupIDs();
+      this.#setupStreams();
+      this.#setupConsistencyCheckers();
+      this.#updateComposeFullscreenState();
       {
         // try and handle the case where the user types in a bad email address
         // we get the presending event but then no other events will pass because
@@ -5743,14 +5763,14 @@ class GmailComposeView {
             eventName
           } = _ref;
           return eventName === 'presending';
-        }).takeUntilBy(this._stopper).onValue(() => {
+        }).takeUntilBy(this.#stopper).onValue(() => {
           (0,make_element_child_stream/* default */.Z)(document.body).map(event => event.el).filter(node => node.getAttribute && node.getAttribute('role') === 'alertdialog').takeUntilBy(kefir_esm.merge([this.getEventStream().filter(_ref2 => {
             let {
               eventName
             } = _ref2;
             return eventName === 'sendCanceled' || eventName === 'sending';
           }), kefir_esm.later(15, undefined)])).onValue(() => {
-            this._eventStream.emit({
+            this.#eventStream.emit({
               eventName: 'sendCanceled'
             });
           });
@@ -5768,7 +5788,7 @@ class GmailComposeView {
     // if we get a presending then we let the other stream wait for
     // sent. But if we get a sendCanceled, then a regular destroy can
     // pass through
-    this._removedFromDOMStopper.filterBy(this._eventStream.filter(_ref3 => {
+    this.#removedFromDOMStopper.filterBy(this.#eventStream.filter(_ref3 => {
       let {
         eventName
       } = _ref3;
@@ -5778,49 +5798,49 @@ class GmailComposeView {
         eventName
       } = _ref4;
       return eventName === 'sendCanceled';
-    }).toProperty(() => true)), kefir_esm.combine([this._removedFromDOMStopper, this._eventStream.filter(_ref5 => {
+    }).toProperty(() => true)), kefir_esm.combine([this.#removedFromDOMStopper, this.#eventStream.filter(_ref5 => {
       let {
         eventName
       } = _ref5;
       return eventName === 'sent';
     })])]).take(1) // we delay asap here so that the event stream is not destroyed before listeners here the sent event
-    .flatMap(() => (0,delay_asap/* default */.Z)(null)).onValue(() => this._destroy());
+    .flatMap(() => (0,delay_asap/* default */.Z)(null)).onValue(() => this.#destroy());
     detectClassicRecipientsArea();
   }
   destroy() {
     // this gets called when the element gets removed from the DOM
     // however we don't want to pass through that destroy event right away
-    this._removedFromDOMStopper.destroy();
-    this._page.dump();
+    this.#removedFromDOMStopper.destroy();
+    this.#page.dump();
   }
-  _destroy() {
-    this._eventStream.emit({
+  #destroy() {
+    this.#eventStream.emit({
       eventName: 'destroy',
       data: {
         messageID: this.getMessageID(),
-        closedByInboxSDK: this._closedProgrammatically
+        closedByInboxSDK: this.#closedProgrammatically
       }
     });
-    this._eventStream.end();
-    this._managedViewControllers.forEach(vc => {
+    this.#eventStream.end();
+    this.#managedViewControllers.forEach(vc => {
       vc.destroy();
     });
-    this._requestModifiers = {};
-    this._managedViewControllers.length = 0;
-    this._stopper.destroy();
-    this._destroyed = true;
+    this.#requestModifiers = {};
+    this.#managedViewControllers.length = 0;
+    this.#stopper.destroy();
+    this.#destroyed = true;
   }
   getStopper() {
-    return this._stopper;
+    return this.#stopper;
   }
   getEventStream() {
-    return this._eventStream;
+    return this.#eventStream;
   }
   getGmailDriver() {
-    return this._driver;
+    return this.#driver;
   }
   isDestroyed() {
-    return this._destroyed;
+    return this.#destroyed;
   }
   #getSubjectChangesStream() {
     const subjectElement = this.getSubjectInput();
@@ -5830,12 +5850,12 @@ class GmailComposeView {
       };
     });
   }
-  _setupStreams() {
-    this._eventStream.plug(getAddressChangesStream(this));
-    this._eventStream.plug(this.#getSubjectChangesStream());
-    this._eventStream.plug(get_body_changes_stream(this));
-    this._eventStream.plug(get_response_type_changes_stream(this));
-    this._eventStream.plug(getPresendingStream({
+  #setupStreams() {
+    this.#eventStream.plug(getAddressChangesStream(this));
+    this.#eventStream.plug(this.#getSubjectChangesStream());
+    this.#eventStream.plug(get_body_changes_stream(this));
+    this.#eventStream.plug(get_response_type_changes_stream(this));
+    this.#eventStream.plug(getPresendingStream({
       element: this.getElement(),
       sendButton: this.getSendButton(),
       sendAndArchive: this.getSendAndArchiveButton()
@@ -5845,71 +5865,71 @@ class GmailComposeView {
       discardButton = this.getDiscardButton();
     } catch (err) {
       // handle failures of this.getDiscardButton()
-      this._driver.getLogger().errorSite(new Error('Failed to find discard button'), {
-        html: (0,censorHTMLstring/* default */.Z)(this._element.outerHTML)
+      this.#driver.getLogger().errorSite(new Error('Failed to find discard button'), {
+        html: (0,censorHTMLstring/* default */.Z)(this.#element.outerHTML)
       });
     }
     if (discardButton) {
-      this._eventStream.plug(getDiscardStream({
+      this.#eventStream.plug(getDiscardStream({
         element: this.getElement(),
         discardButton
       }));
     }
-    this._eventStream.plug(kefir_esm.fromEvents(this.getElement(), 'inboxSDKsendCanceled').map(() => ({
+    this.#eventStream.plug(kefir_esm.fromEvents(this.getElement(), 'inboxSDKsendCanceled').map(() => ({
       eventName: 'sendCanceled'
     })));
-    this._eventStream.plug(kefir_esm.fromEvents(this.getElement(), 'inboxSDKdiscardCanceled').map(() => ({
+    this.#eventStream.plug(kefir_esm.fromEvents(this.getElement(), 'inboxSDKdiscardCanceled').map(() => ({
       eventName: 'discardCanceled'
     })));
-    this._eventStream.plug(kefir_esm.later(10, undefined).flatMap(() => (0,get_minimized_stream/* default */.Z)(this)).changes().map(minimized => ({
+    this.#eventStream.plug(kefir_esm.later(10, undefined).flatMap(() => (0,get_minimized_stream/* default */.Z)(this)).changes().map(minimized => ({
       eventName: minimized ? 'minimized' : 'restored'
     })));
   }
-  _setupConsistencyCheckers() {
+  #setupConsistencyCheckers() {
     try {
       (0,handle_compose_link_chips/* default */.Z)(this);
       monitor_selection_range(this);
       (0,manage_button_grouping/* default */.Z)(this);
-      sizeFixer(this._driver, this);
+      sizeFixer(this.#driver, this);
     } catch (err) {
-      this._driver.getLogger().error(err);
+      this.#driver.getLogger().error(err);
     }
   }
-  _setupIDs() {
-    const syncTargetMessageID = this._getTargetMessageID();
+  #setupIDs() {
+    const syncTargetMessageID = this.#getTargetMessageID();
     if (syncTargetMessageID) {
-      this._driver.getGmailMessageIdForSyncMessageId(syncTargetMessageID).then(gmailMessageId => this._targetMessageID = gmailMessageId);
+      this.#driver.getGmailMessageIdForSyncMessageId(syncTargetMessageID).then(gmailMessageId => this.#targetMessageID = gmailMessageId);
     }
-    const syncMessageId = this._getMessageIDfromForm();
+    const syncMessageId = this.#getMessageIDfromForm();
     if (syncMessageId) {
-      this._driver.getGmailMessageIdForSyncDraftId(syncMessageId).then(gmailMessageId => {
-        this._initialMessageId = gmailMessageId;
-        this._messageId = gmailMessageId;
+      this.#driver.getGmailMessageIdForSyncDraftId(syncMessageId).then(gmailMessageId => {
+        this.#initialMessageId = gmailMessageId;
+        this.#messageId = gmailMessageId;
       }).catch(() => {
         //do nothing because this means the message hasn't been saved yet
       });
-      this._driver.reportRecentSyncDraftId(syncMessageId);
-      this._stopper.onValue(() => {
-        this._driver.reportDraftClosed(syncMessageId);
+      this.#driver.reportRecentSyncDraftId(syncMessageId);
+      this.#stopper.onValue(() => {
+        this.#driver.reportDraftClosed(syncMessageId);
       });
     } else {
-      this._driver.getLogger().error(new Error('Draft is missing sync draft id'));
+      this.#driver.getLogger().error(new Error('Draft is missing sync draft id'));
     }
-    const legacyThreadIdElement = this._element.querySelector('input[name="lts"]');
-    if (legacyThreadIdElement && typeof legacyThreadIdElement.value === 'string') this._threadID = legacyThreadIdElement.value;
+    const legacyThreadIdElement = this.#element.querySelector('input[name="lts"]');
+    if (legacyThreadIdElement && typeof legacyThreadIdElement.value === 'string') this.#threadID = legacyThreadIdElement.value;
   }
-  _updateComposeFullscreenState() {
-    if (this._isInlineReplyForm) {
-      this._isFullscreen = false;
+  #updateComposeFullscreenState() {
+    if (this.#isInlineReplyForm) {
+      this.#isFullscreen = false;
     } else {
-      if (this._isStandalone) {
-        this._isFullscreen = true;
+      if (this.#isStandalone) {
+        this.#isFullscreen = true;
       } else {
         const fullScreenContainer = gmail_element_getter/* default.getFullscreenComposeWindowContainer */.Z.getFullscreenComposeWindowContainer();
         if (!fullScreenContainer) {
-          this._isFullscreen = false;
+          this.#isFullscreen = false;
         } else {
-          this._isFullscreen = fullScreenContainer.contains(this._element);
+          this.#isFullscreen = fullScreenContainer.contains(this.#element);
         }
       }
     }
@@ -5922,7 +5942,7 @@ class GmailComposeView {
   }
   insertBodyHTMLAtCursor(html) {
     var retVal = (0,insert_html_at_cursor/* default */.Z)(this.getBodyElement(), html, this.getLastSelectionRange());
-    this._triggerDraftSave();
+    this.#triggerDraftSave();
 
     // sometimes the html inserted can be quite large, so we need ot make sure that GMail resizes the compose window
     // triggering an enter press forces Gmail to resize compose
@@ -5931,49 +5951,49 @@ class GmailComposeView {
   }
   insertLinkIntoBody(text, href) {
     var retVal = insertLinkIntoBody(this, text, href);
-    this._triggerDraftSave();
+    this.#triggerDraftSave();
     return retVal;
   }
   insertLinkChipIntoBody(options) {
     var retVal = (0,insert_link_chip_into_body/* default */.Z)(this, options);
-    this._triggerDraftSave();
+    this.#triggerDraftSave();
     return retVal;
   }
   setSubject(text) {
-    this._element.querySelector('input[name=subjectbox]').value = text;
-    this._triggerDraftSave();
+    this.#element.querySelector('input[name=subjectbox]').value = text;
+    this.#triggerDraftSave();
   }
   setBodyHTML(html) {
     this.getBodyElement().innerHTML = html;
-    this._triggerDraftSave();
+    this.#triggerDraftSave();
   }
   setBodyText(text) {
     this.getBodyElement().textContent = text;
-    this._triggerDraftSave();
+    this.#triggerDraftSave();
   }
   setToRecipients(emails) {
     setRecipients(this, 'to', emails);
-    this._triggerDraftSave();
+    this.#triggerDraftSave();
   }
   setCcRecipients(emails) {
     setRecipients(this, 'cc', emails);
-    this._triggerDraftSave();
+    this.#triggerDraftSave();
   }
   setBccRecipients(emails) {
     setRecipients(this, 'bcc', emails);
-    this._triggerDraftSave();
+    this.#triggerDraftSave();
   }
   addRecipientRow(options) {
     return addRecipientRow(this, options);
   }
   forceRecipientRowsOpen() {
-    this._element.classList.add('inboxsdk__compose_forceRecipientsOpen');
+    this.#element.classList.add('inboxsdk__compose_forceRecipientsOpen');
     return () => {
-      this._element.classList.remove('inboxsdk__compose_forceRecipientsOpen');
+      this.#element.classList.remove('inboxsdk__compose_forceRecipientsOpen');
     };
   }
   hideNativeRecipientRows() {
-    const nativeRecipientRows = getRecipientRowElements(this._element);
+    const nativeRecipientRows = getRecipientRowElements(this.#element);
     nativeRecipientRows.forEach(row => {
       row.classList.add('inboxsdk__compose_forceRecipientRowHidden');
     });
@@ -5984,47 +6004,47 @@ class GmailComposeView {
     };
   }
   hideRecipientArea() {
-    this._element.classList.add('inboxsdk__compose_hideRecipientArea');
+    this.#element.classList.add('inboxsdk__compose_hideRecipientArea');
     return () => {
-      this._element.classList.remove('inboxsdk__compose_hideRecipientArea');
+      this.#element.classList.remove('inboxsdk__compose_hideRecipientArea');
     };
   }
   getFromContact() {
-    return getFromContact(this._driver, this);
+    return getFromContact(this.#driver, this);
   }
   getFromContactChoices() {
-    return getFromContactChoices(this._driver, this);
+    return getFromContactChoices(this.#driver, this);
   }
   setFromEmail(email) {
-    setFromEmail(this._driver, this, email);
+    setFromEmail(this.#driver, this, email);
   }
   addButton(buttonDescriptor, groupOrderHint, extraOnClickOptions) {
     return addButton(this, buttonDescriptor, groupOrderHint, extraOnClickOptions);
   }
   addTooltipToButton(buttonViewController, buttonDescriptor, tooltipDescriptor) {
     var tooltip = addTooltipToButton(this, buttonViewController, buttonDescriptor, tooltipDescriptor);
-    this._buttonViewControllerTooltipMap.set(buttonViewController, tooltip);
+    this.#buttonViewControllerTooltipMap.set(buttonViewController, tooltip);
   }
   closeButtonTooltip(buttonViewController) {
-    if (!this._buttonViewControllerTooltipMap) {
+    if (!this.#buttonViewControllerTooltipMap) {
       return;
     }
-    var tooltip = this._buttonViewControllerTooltipMap.get(buttonViewController);
+    var tooltip = this.#buttonViewControllerTooltipMap.get(buttonViewController);
     if (tooltip) {
       tooltip.destroy();
-      this._buttonViewControllerTooltipMap.delete(buttonViewController);
+      this.#buttonViewControllerTooltipMap.delete(buttonViewController);
     }
   }
   addComposeNotice() {
     let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     const composeNotice = addComposeNotice(this, options);
-    this._element.dispatchEvent(new CustomEvent('resize', {
+    this.#element.dispatchEvent(new CustomEvent('resize', {
       bubbles: false,
       cancelable: false,
       detail: null
     }));
-    kefir_esm.fromEvents(composeNotice, 'destroy').flatMap(delay_asap/* default */.Z).takeUntilBy(this._stopper).onValue(() => {
-      this._element.dispatchEvent(new CustomEvent('resize', {
+    kefir_esm.fromEvents(composeNotice, 'destroy').flatMap(delay_asap/* default */.Z).takeUntilBy(this.#stopper).onValue(() => {
+      this.#element.dispatchEvent(new CustomEvent('resize', {
         bubbles: false,
         cancelable: false,
         detail: null
@@ -6035,13 +6055,13 @@ class GmailComposeView {
   addStatusBar() {
     let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     const statusBar = (0,add_status_bar/* default */.Z)(this, options);
-    this._element.dispatchEvent(new CustomEvent('resize', {
+    this.#element.dispatchEvent(new CustomEvent('resize', {
       bubbles: false,
       cancelable: false,
       detail: null
     }));
-    kefir_esm.fromEvents(statusBar, 'destroy').flatMap(delay_asap/* default */.Z).takeUntilBy(this._stopper).onValue(() => {
-      this._element.dispatchEvent(new CustomEvent('resize', {
+    kefir_esm.fromEvents(statusBar, 'destroy').flatMap(delay_asap/* default */.Z).takeUntilBy(this.#stopper).onValue(() => {
+      this.#element.dispatchEvent(new CustomEvent('resize', {
         bubbles: false,
         cancelable: false,
         detail: null
@@ -6077,9 +6097,9 @@ class GmailComposeView {
     container.classList.add('inboxsdk__compose_customSendContainer');
     container.appendChild(el);
     sendButton.insertAdjacentElement('afterend', container);
-    this._element.setAttribute('data-inboxsdk-send-replaced', '');
+    this.#element.setAttribute('data-inboxsdk-send-replaced', '');
     const removalStopper = kefir_stopper_js_default()();
-    kefir_esm.fromEvents(this.getBodyElement(), 'keydown').takeUntilBy(this._stopper).takeUntilBy(removalStopper).filter(domEvent => (domEvent.which === 9 || domEvent.keyCode === 9) && !domEvent.shiftKey).onValue(domEvent => {
+    kefir_esm.fromEvents(this.getBodyElement(), 'keydown').takeUntilBy(this.#stopper).takeUntilBy(removalStopper).filter(domEvent => (domEvent.which === 9 || domEvent.keyCode === 9) && !domEvent.shiftKey).onValue(domEvent => {
       // Because of the way the compose DOM is structured, the natural
       // tab order does not flow from the compose body to the status bar.
       // Gmail modifies this flow programatically by focusing the send button,
@@ -6098,7 +6118,7 @@ class GmailComposeView {
     return () => {
       removalStopper.destroy();
       container.remove();
-      this._element.removeAttribute('data-inboxsdk-send-replaced');
+      this.#element.removeAttribute('data-inboxsdk-send-replaced');
       sendButton.style.display = '';
       if (sendAndArchiveParent instanceof HTMLElement) {
         sendAndArchiveParent.style.display = '';
@@ -6124,13 +6144,13 @@ class GmailComposeView {
       console.warn("Trying to close an inline reply which doesn't work.");
       return;
     }
-    this._element.dispatchEvent(new CustomEvent('closedProgrammatically', {
+    this.#element.dispatchEvent(new CustomEvent('closedProgrammatically', {
       bubbles: false,
       cancelable: false,
       detail: null
     }));
-    if (this._isFullscreen) {
-      this._eventStream.filter(_ref6 => {
+    if (this.#isFullscreen) {
+      this.#eventStream.filter(_ref6 => {
         let {
           eventName
         } = _ref6;
@@ -6163,25 +6183,25 @@ class GmailComposeView {
     if (!this.isInlineReplyForm()) {
       throw new Error('Can only pop out inline reply compose views');
     }
-    const popOutBtn = (0,querySelectorOrFail/* default */.Z)(this._element, '.M9 > [role=menu]:first-child > .SK > [role=menuitem]:last-child');
+    const popOutBtn = (0,querySelectorOrFail/* default */.Z)(this.#element, '.M9 > [role=menu]:first-child > .SK > [role=menuitem]:last-child');
     (0,simulate_mouse_event/* simulateClick */.HX)(popOutBtn);
   }
   overrideEditSubject() {
-    overrideEditSubject(this._driver, this);
+    overrideEditSubject(this.#driver, this);
   }
-  _hideDropzones() {
+  #hideDropzones() {
     setCss('compose dropzone hider', 'body > .aC7 .aC9 {visibility: hidden;}');
   }
-  _reenableDropzones() {
+  #reenableDropzones() {
     setCss('compose dropzone hider', null);
   }
-  _dropzonesVisible() {
+  #dropzonesVisible() {
     return find_default()(document.querySelectorAll('body > .aC7:not(.aWP)'), isElementVisible/* default */.Z) != null;
   }
-  _findDropzoneForThisCompose(inline) {
+  #findDropzoneForThisCompose(inline) {
     // Iterate through all the dropzones and find the one visually contained by
     // this compose.
-    const rect = this._element.getBoundingClientRect();
+    const rect = this.#element.getBoundingClientRect();
     const dropzoneSelector = inline ? 'body > .aC7:not(.aWP)' : 'body > .aC7.aWP';
     const el = [...document.querySelectorAll(dropzoneSelector)].find(dropzone => {
       if (!(0,isElementVisible/* default */.Z)(dropzone)) {
@@ -6201,9 +6221,9 @@ class GmailComposeView {
     }
     return el;
   }
-  async _attachFiles(files, inline) {
-    this._hideDropzones();
-    const endDrag = once_default()(() => simulateDragEnd(this._element, files));
+  async #attachFiles(files, inline) {
+    this.#hideDropzones();
+    const endDrag = once_default()(() => simulateDragEnd(this.#element, files));
     try {
       let firstLoop = true;
       for (const partitionedFiles of transducers_default().partition(files, 3)) {
@@ -6212,34 +6232,34 @@ class GmailComposeView {
         } else {
           await (0,pdelay_js/* default */.Z)(500);
         }
-        simulateDragOver(this._element, partitionedFiles);
-        await (0,wait_for/* default */.Z)(() => this._dropzonesVisible(), 20 * 1000);
-        const dropzone = this._findDropzoneForThisCompose(inline);
+        simulateDragOver(this.#element, partitionedFiles);
+        await (0,wait_for/* default */.Z)(() => this.#dropzonesVisible(), 20 * 1000);
+        const dropzone = this.#findDropzoneForThisCompose(inline);
         simulateDrop(dropzone, partitionedFiles);
         endDrag();
-        await (0,wait_for/* default */.Z)(() => !this._dropzonesVisible(), 20 * 1000);
+        await (0,wait_for/* default */.Z)(() => !this.#dropzonesVisible(), 20 * 1000);
       }
     } catch (err) {
-      this._driver.getLogger().error(err);
+      this.#driver.getLogger().error(err);
     } finally {
       endDrag();
-      this._reenableDropzones();
+      this.#reenableDropzones();
     }
   }
   attachFiles(files) {
-    return this._attachFiles(files, false);
+    return this.#attachFiles(files, false);
   }
   attachInlineFiles(files) {
-    return this._attachFiles(files, true);
+    return this.#attachFiles(files, true);
   }
   isForward() {
-    return Boolean(this._element.querySelector('.Un.J-JN-M-I .mI'));
+    return Boolean(this.#element.querySelector('.Un.J-JN-M-I .mI'));
   }
   isReply() {
-    return this._isInlineReplyForm || !!this._element.querySelector('.HQ');
+    return this.#isInlineReplyForm || !!this.#element.querySelector('.HQ');
   }
   isInlineReplyForm() {
-    return this._isInlineReplyForm;
+    return this.#isInlineReplyForm;
   }
   getBodyElement() {
     const el = this.getMaybeBodyElement();
@@ -6247,10 +6267,10 @@ class GmailComposeView {
     return el;
   }
   getMaybeBodyElement() {
-    return this._element.querySelector('.Ap [g_editable=true]');
+    return this.#element.querySelector('.Ap [g_editable=true]');
   }
   getTopFormElement() {
-    return (0,querySelectorOrFail/* default */.Z)(this._element, 'td > form');
+    return (0,querySelectorOrFail/* default */.Z)(this.#element, 'td > form');
   }
   getHTMLContent() {
     return this.getBodyElement().innerHTML;
@@ -6268,7 +6288,7 @@ class GmailComposeView {
     return this.getSubjectInput().value;
   }
   getSubjectInput() {
-    return this._element.querySelector('input[name=subjectbox]');
+    return this.#element.querySelector('input[name=subjectbox]');
   }
   getMetadataFormElement() {
     const container = this.getBodyElement().closest('.aoP');
@@ -6292,18 +6312,20 @@ class GmailComposeView {
   updateInsertMoreAreaLeft(oldFormattingAreaOffsetLeft) {
     updateInsertMoreAreaLeft(this, oldFormattingAreaOffsetLeft);
   }
+
+  /** @internal non-public method used outside this class */
   _getFormattingAreaOffsetLeft() {
     return getFormattingAreaOffsetLeft(this);
   }
   getFormattingArea() {
-    let formattingArea = this._formattingArea;
+    let formattingArea = this.#formattingArea;
     if (!formattingArea) {
-      formattingArea = this._formattingArea = this._element.querySelector('.oc');
+      formattingArea = this.#formattingArea = this.#element.querySelector('.oc');
     }
     return formattingArea;
   }
   getFormattingToolbar() {
-    return this._element.querySelector('.aX');
+    return this.#element.querySelector('.aX');
   }
   getFormattingToolbarArrow() {
     const el = this.getFormattingToolbar();
@@ -6311,39 +6333,39 @@ class GmailComposeView {
     return (0,querySelectorOrFail/* default */.Z)(el, '.aA4');
   }
   getFormattingToolbarToggleButton() {
-    const innerElement = (0,querySelectorOrFail/* default */.Z)(this._element, '[role=button] .dv');
+    const innerElement = (0,querySelectorOrFail/* default */.Z)(this.#element, '[role=button] .dv');
     const btn = closest_ng_js_default()(innerElement, '[role=button]');
     if (!btn) throw new Error('failed to find button');
     return btn;
   }
   getStatusBarPrependContainer() {
-    return this._element.querySelector('.inboxsdk__compose_statusBarPrependContainer');
+    return this.#element.querySelector('.inboxsdk__compose_statusBarPrependContainer');
   }
   getScrollBody() {
-    var scrollBody = this._element.querySelector('table .GP');
+    var scrollBody = this.#element.querySelector('table .GP');
     if (!scrollBody) {
       throw new Error('Failed to find scroll body');
     }
     return scrollBody;
   }
   getStatusArea() {
-    const statusArea = this._element.querySelector('.aDg .aDj > .aDh');
+    const statusArea = this.#element.querySelector('.aDg .aDj > .aDh');
     if (!statusArea) throw new Error('Failed to find status area');
     return statusArea;
   }
   getInsertMoreArea() {
-    return (0,querySelectorOrFail/* default */.Z)(this._element, '.eq');
+    return (0,querySelectorOrFail/* default */.Z)(this.#element, '.eq');
   }
   getInsertLinkButton() {
-    return (0,querySelectorOrFail/* default */.Z)(this._element, '.e5.aaA.aMZ');
+    return (0,querySelectorOrFail/* default */.Z)(this.#element, '.e5.aaA.aMZ');
   }
   getSendButton() {
-    return (0,querySelectorOrFail/* default */.Z)(this._element, '.IZ .Up div > div[role=button]:not(.Uo):not([aria-haspopup=true]):not([class^=inboxsdk_])');
+    return (0,querySelectorOrFail/* default */.Z)(this.#element, '.IZ .Up div > div[role=button]:not(.Uo):not([aria-haspopup=true]):not([class^=inboxsdk_])');
   }
 
   // When schedule send is available, this returns the element that contains both buttons.
   getSendButtonGroup() {
-    const scheduleSend = this._element.querySelector('.IZ .Up div > [role=button][aria-haspopup=true]:not([class^=inboxsdk_])');
+    const scheduleSend = this.#element.querySelector('.IZ .Up div > [role=button][aria-haspopup=true]:not([class^=inboxsdk_])');
     if (scheduleSend) {
       return scheduleSend.parentElement;
     }
@@ -6353,7 +6375,7 @@ class GmailComposeView {
     if (!this.isReply()) {
       return null;
     }
-    const sendAndArchiveButton = this._element.querySelector('.IZ .Up div > div[role=button].Uo:not([aria-haspopup=true]):not([class^=inboxsdk_])');
+    const sendAndArchiveButton = this.#element.querySelector('.IZ .Up div > div[role=button].Uo:not([aria-haspopup=true]):not([class^=inboxsdk_])');
     if (sendAndArchiveButton) {
       return sendAndArchiveButton;
     }
@@ -6363,38 +6385,38 @@ class GmailComposeView {
     const parent = sendButton.parentElement;
     if (!(parent instanceof HTMLElement)) throw new Error('should not happen');
     if (parent.childElementCount <= 1) {
-      this._driver.getLogger().eventSdkPassive('getSendAndArchiveButton - old method - failed to find, childElementCount <= 1');
+      this.#driver.getLogger().eventSdkPassive('getSendAndArchiveButton - old method - failed to find, childElementCount <= 1');
       return null;
     }
     const firstNotSendElement = parent.children[0] !== sendButton ? parent.children[0] : parent.children[1];
     const result = !firstNotSendElement ? null : firstNotSendElement.querySelector('[role=button]');
     if (result) {
-      this._driver.getLogger().eventSdkPassive('getSendAndArchiveButton - old method - found');
+      this.#driver.getLogger().eventSdkPassive('getSendAndArchiveButton - old method - found');
     } else {
-      this._driver.getLogger().eventSdkPassive('getSendAndArchiveButton - old method - failed to find');
+      this.#driver.getLogger().eventSdkPassive('getSendAndArchiveButton - old method - failed to find');
     }
     return result;
   }
   getCloseButton() {
-    return this._element.querySelectorAll('.Hm > img')[2];
+    return this.#element.querySelectorAll('.Hm > img')[2];
   }
   getMoleSwitchButton() {
-    return this._element.querySelectorAll('.Hm > img')[1];
+    return this.#element.querySelectorAll('.Hm > img')[1];
   }
   getBottomBarTable() {
-    return (0,querySelectorOrFail/* default */.Z)(this._element, '.aoP .aDh > table');
+    return (0,querySelectorOrFail/* default */.Z)(this.#element, '.aoP .aDh > table');
   }
   getBottomToolbarContainer() {
-    return (0,querySelectorOrFail/* default */.Z)(this._element, '.aoP .aDj');
+    return (0,querySelectorOrFail/* default */.Z)(this.#element, '.aoP .aDj');
   }
   getDiscardButton() {
-    return (0,querySelectorOrFail/* default */.Z)(this._element, '.gU .oh');
+    return (0,querySelectorOrFail/* default */.Z)(this.#element, '.gU .oh');
   }
   getComposeID() {
-    return this._composeID;
+    return this.#composeID;
   }
   getInitialMessageID() {
-    return this._initialMessageId;
+    return this.#initialMessageId;
   }
 
   /**
@@ -6402,15 +6424,15 @@ class GmailComposeView {
    * from the input that used to hold the hex message ID. Still does not
    * populate until first save.
    */
-  _getDraftIDfromForm() {
-    const value = this._messageIDElement && this._messageIDElement.value || null;
+  #getDraftIDfromForm() {
+    const value = this.#messageIDElement && this.#messageIDElement.value || null;
     if (typeof value === 'string' && value !== 'undefined' && value !== 'null') {
       return value.replace('#', '').replace('msg-a:', '');
     }
     return null;
   }
-  _getMessageIDfromForm() {
-    const value = this._messageIDElement && this._messageIDElement.value || null;
+  #getMessageIDfromForm() {
+    const value = this.#messageIDElement && this.#messageIDElement.value || null;
     if (typeof value === 'string' && value !== 'undefined' && value !== 'null') {
       return value.replace('#', ''); //annoyingly the hash is included
     }
@@ -6418,27 +6440,27 @@ class GmailComposeView {
     return null;
   }
   getMessageID() {
-    return this._messageId;
+    return this.#messageId;
   }
   getTargetMessageID() {
-    return this._targetMessageID;
+    return this.#targetMessageID;
   }
   getThreadID() {
-    return this._threadID;
+    return this.#threadID;
   }
   async getCurrentDraftID() {
     // This function is mostly a mirror of _getDraftIDimplementation, but
     // instead of waiting when finding out it's not saved, just returns null.
-    const draftID = this._getDraftIDfromForm();
-    if (this._messageId) {
+    const draftID = this.#getDraftIDfromForm();
+    if (this.#messageId) {
       return draftID;
     } else {
-      const syncMessageId = this._getMessageIDfromForm();
+      const syncMessageId = this.#getMessageIDfromForm();
       if (syncMessageId) {
         try {
           // If this succeeds, then the draft must exist on the server and we
           // can safely return the draft id we know.
-          await this._driver.getGmailMessageIdForSyncDraftId(syncMessageId);
+          await this.#driver.getGmailMessageIdForSyncDraftId(syncMessageId);
         } catch (e) {
           // ignore error, it's probably that the draft isn't saved yet.
           return null;
@@ -6448,50 +6470,50 @@ class GmailComposeView {
     }
   }
   getDraftID() {
-    let draftIDpromise = this._draftIDpromise;
+    let draftIDpromise = this.#draftIDpromise;
     if (!draftIDpromise) {
-      draftIDpromise = this._draftIDpromise = this._getDraftIDimplementation();
+      draftIDpromise = this.#draftIDpromise = this.#getDraftIDimplementation();
     }
     return draftIDpromise;
   }
-  async _getDraftIDimplementation() {
-    const draftID = this._getDraftIDfromForm();
+  async #getDraftIDimplementation() {
+    const draftID = this.#getDraftIDfromForm();
 
     // we want to keep the semantics that getDraftID doesn't return until
     // the draft is actually saved on Gmail's servers
-    if (this._messageId) {
+    if (this.#messageId) {
       // if we have a messageId that means there is a draft on the server
       return draftID;
     } else {
       // there may be a draft on the server, so let's find out
-      const syncMessageId = this._getMessageIDfromForm();
+      const syncMessageId = this.#getMessageIDfromForm();
       if (syncMessageId) {
         try {
           // If this succeeds, then the draft must exist on the server and we
           // can safely return the draft id we know.
           // eslint-disable-next-line @typescript-eslint/no-unused-vars
-          const gmailMessageId = await this._driver.getGmailMessageIdForSyncDraftId(syncMessageId);
+          const gmailMessageId = await this.#driver.getGmailMessageIdForSyncDraftId(syncMessageId);
         } catch (e) {
           // draft doesn't exist so we wait until it does
-          await this._eventStream.filter(_ref8 => {
+          await this.#eventStream.filter(_ref8 => {
             let {
               eventName
             } = _ref8;
             return eventName === 'draftSaved';
-          }).beforeEnd(() => null).map(() => this._getDraftIDfromForm()).take(1).toPromise();
+          }).beforeEnd(() => null).map(() => this.#getDraftIDfromForm()).take(1).toPromise();
         }
         return draftID;
       }
     }
   }
   addManagedViewController(viewController) {
-    this._managedViewControllers.push(viewController);
+    this.#managedViewControllers.push(viewController);
   }
   ensureGroupingIsOpen(type) {
-    ensureGroupingIsOpen(this._element, type);
+    ensureGroupingIsOpen(this.#element, type);
   }
   ensureAppButtonToolbarsAreClosed() {
-    ensureAppButtonToolbarsAreClosed(this._element);
+    ensureAppButtonToolbarsAreClosed(this.#element);
   }
   isMinimized() {
     const element = this.getElement();
@@ -6500,12 +6522,12 @@ class GmailComposeView {
     if (!bodyContainer) {
       if (!hasReportedMissingBody) {
         hasReportedMissingBody = true;
-        this._driver.getLogger().error(new Error('isMinimized failed to find bodyContainer'), {
+        this.#driver.getLogger().error(new Error('isMinimized failed to find bodyContainer'), {
           bodyElement: !!bodyElement,
-          hasMessageIDElement: !!this._messageIDElement,
-          ended: this._eventStream.ended,
-          bodyElStillInCompose: this._element.contains(this._seenBodyElement),
-          seenBodyElHtml: (0,censorHTMLstring/* default */.Z)(this._seenBodyElement.outerHTML),
+          hasMessageIDElement: !!this.#messageIDElement,
+          ended: this.#eventStream.ended,
+          bodyElStillInCompose: this.#element.contains(this.#seenBodyElement),
+          seenBodyElHtml: (0,censorHTMLstring/* default */.Z)(this.#seenBodyElement.outerHTML),
           composeHtml: (0,censorHTMLstring/* default */.Z)(element.outerHTML)
         });
       }
@@ -6515,21 +6537,21 @@ class GmailComposeView {
   }
   setMinimized(minimized) {
     if (minimized !== this.isMinimized()) {
-      if (this._isInlineReplyForm) throw new Error('Not implemented for inline compose views');
-      const minimizeButton = (0,querySelectorOrFail/* default */.Z)(this._element, '.Hm > img');
+      if (this.#isInlineReplyForm) throw new Error('Not implemented for inline compose views');
+      const minimizeButton = (0,querySelectorOrFail/* default */.Z)(this.#element, '.Hm > img');
       (0,simulate_mouse_event/* simulateClick */.HX)(minimizeButton);
     }
   }
   setFullscreen(fullscreen) {
     if (fullscreen !== this.isFullscreen()) {
-      if (this._isInlineReplyForm) throw new Error('Not implemented for inline compose views');
-      const fullscreenButton = (0,querySelectorOrFail/* default */.Z)(this._element, '.Hm > img:nth-of-type(2)');
+      if (this.#isInlineReplyForm) throw new Error('Not implemented for inline compose views');
+      const fullscreenButton = (0,querySelectorOrFail/* default */.Z)(this.#element, '.Hm > img:nth-of-type(2)');
       (0,simulate_mouse_event/* simulateClick */.HX)(fullscreenButton);
     }
   }
   setTitleBarColor(color) {
-    const buttonParent = (0,querySelectorOrFail/* default */.Z)(this._element, '.nH.Hy.aXJ table.cf.Ht td.Hm');
-    const elementsToModify = [(0,querySelectorOrFail/* default */.Z)(this._element, '.nH.Hy.aXJ .pi > .l.o'), (0,querySelectorOrFail/* default */.Z)(this._element, '.nH.Hy.aXJ .l.m'), (0,querySelectorOrFail/* default */.Z)(this._element, '.nH.Hy.aXJ .l.m > .l.n')];
+    const buttonParent = (0,querySelectorOrFail/* default */.Z)(this.#element, '.nH.Hy.aXJ table.cf.Ht td.Hm');
+    const elementsToModify = [(0,querySelectorOrFail/* default */.Z)(this.#element, '.nH.Hy.aXJ .pi > .l.o'), (0,querySelectorOrFail/* default */.Z)(this.#element, '.nH.Hy.aXJ .l.m'), (0,querySelectorOrFail/* default */.Z)(this.#element, '.nH.Hy.aXJ .l.m > .l.n')];
     buttonParent.classList.add('inboxsdk__compose_customTitleBarColor');
     elementsToModify.forEach(el => {
       el.style.backgroundColor = color;
@@ -6545,7 +6567,7 @@ class GmailComposeView {
     if (this.isInlineReplyForm()) {
       throw new Error('setTitleBarText() is not supported on inline compose views');
     }
-    const titleBarTable = (0,querySelectorOrFail/* default */.Z)(this._element, '.nH.Hy.aXJ table.cf.Ht');
+    const titleBarTable = (0,querySelectorOrFail/* default */.Z)(this.#element, '.nH.Hy.aXJ table.cf.Ht');
     if (titleBarTable.classList.contains('inboxsdk__compose_hasCustomTitleBarText')) {
       throw new Error('Custom title bar text is already registered for this compose view');
     }
@@ -6571,19 +6593,19 @@ class GmailComposeView {
       titleTextParent.classList.remove('inboxsdk__compose_nativeTitleBarText');
     };
   }
-  _triggerDraftSave() {
-    if (this._isTriggeringADraftSavePending) {
+  #triggerDraftSave() {
+    if (this.#isTriggeringADraftSavePending) {
       return;
     } else {
-      this._isTriggeringADraftSavePending = true;
+      this.#isTriggeringADraftSavePending = true;
       // Done asynchronously with setTimeout because if it's done synchronously
       // or after an asap step after an inline compose view's creation, Gmail
       // interprets the fake keypress and decides to add a '¾' character.
-      kefir_esm.later(0, undefined).takeUntilBy(this._stopper).onValue(() => {
-        this._isTriggeringADraftSavePending = false;
+      kefir_esm.later(0, undefined).takeUntilBy(this.#stopper).onValue(() => {
+        this.#isTriggeringADraftSavePending = false;
         const body = this.getMaybeBodyElement();
         if (body) {
-          const unsilence = this._driver.getPageCommunicator().silenceGmailErrorsForAMoment();
+          const unsilence = this.#driver.getPageCommunicator().silenceGmailErrorsForAMoment();
           try {
             simulateKey(body, 190, 0);
           } finally {
@@ -6596,87 +6618,78 @@ class GmailComposeView {
 
   // If this compose is a reply, then this gets the message ID of the message
   // we're replying to.
-  _getTargetMessageID() {
-    const input = this._element.querySelector('input[name="rm"]');
+  #getTargetMessageID() {
+    const input = this.#element.querySelector('input[name="rm"]');
     return input && typeof input.value === 'string' && input.value != 'undefined' ? input.value.replace('#', '') : null;
   }
-  _getThreadID() {
-    const targetID = this.getTargetMessageID();
-    try {
-      return targetID ? this._driver.getThreadIDForMessageID(targetID) : null;
-    } catch (err) {
-      this._driver.getLogger().error(err);
-      return null;
-    }
-  }
   getElement() {
-    return this._element;
+    return this.#element;
   }
   isFullscreen() {
-    return this._isFullscreen;
+    return this.#isFullscreen;
   }
   getLastSelectionRange() {
     // The selection range can become invalid if the compose view has become expanded or
     // minimized since the range was set.
-    const range = this._lastSelectionRange;
+    const range = this.#lastSelectionRange;
     if (range && !this.getBodyElement().contains(range.commonAncestorContainer)) {
-      this._lastSelectionRange = undefined;
+      this.#lastSelectionRange = undefined;
     }
-    return this._lastSelectionRange;
+    return this.#lastSelectionRange;
   }
   setLastSelectionRange(lastSelectionRange) {
-    this._lastSelectionRange = lastSelectionRange;
+    this.#lastSelectionRange = lastSelectionRange;
   }
   registerRequestModifier(modifier) {
-    const keyId = this._getDraftIDfromForm();
+    const keyId = this.#getDraftIDfromForm();
     if (!keyId) throw new Error('keyId should be set here');
-    const modifierId = this._driver.getPageCommunicator().registerComposeRequestModifier(keyId, this._driver.getAppId());
-    this._requestModifiers[modifierId] = modifier;
-    this._startListeningForModificationRequests();
-    this._stopper.onValue(() => {
-      this._driver.getPageCommunicator().unregisterComposeRequestModifier(keyId, modifierId);
+    const modifierId = this.#driver.getPageCommunicator().registerComposeRequestModifier(keyId, this.#driver.getAppId());
+    this.#requestModifiers[modifierId] = modifier;
+    this.#startListeningForModificationRequests();
+    this.#stopper.onValue(() => {
+      this.#driver.getPageCommunicator().unregisterComposeRequestModifier(keyId, modifierId);
     });
   }
-  _startListeningForModificationRequests() {
-    if (this._isListeningToAjaxInterceptStream) {
+  #startListeningForModificationRequests() {
+    if (this.#isListeningToAjaxInterceptStream) {
       return;
     }
-    const keyId = this._getDraftIDfromForm();
+    const keyId = this.#getDraftIDfromForm();
     if (!keyId) throw new Error('keyId should be set here');
-    this._driver.getPageCommunicator().ajaxInterceptStream.filter(_ref9 => {
+    this.#driver.getPageCommunicator().ajaxInterceptStream.filter(_ref9 => {
       let {
         type,
         composeid,
         draftID,
         modifierId
       } = _ref9;
-      return type === 'inboxSDKmodifyComposeRequest' && (composeid === keyId || keyId === draftID) && Boolean(this._requestModifiers[modifierId]);
-    }).takeUntilBy(this._stopper).onValue(_ref10 => {
+      return type === 'inboxSDKmodifyComposeRequest' && (composeid === keyId || keyId === draftID) && Boolean(this.#requestModifiers[modifierId]);
+    }).takeUntilBy(this.#stopper).onValue(_ref10 => {
       let {
         modifierId,
         composeParams
       } = _ref10;
-      if (this._driver.getLogger().shouldTrackEverything()) {
-        this._driver.getLogger().eventSite('inboxSDKmodifyComposeRequest');
+      if (this.#driver.getLogger().shouldTrackEverything()) {
+        this.#driver.getLogger().eventSite('inboxSDKmodifyComposeRequest');
       }
-      const modifier = this._requestModifiers[modifierId];
+      const modifier = this.#requestModifiers[modifierId];
       const result = new Promise(resolve => resolve(modifier(composeParams)));
-      result.then(newComposeParams => this._driver.getPageCommunicator().modifyComposeRequest(keyId, modifierId, newComposeParams || composeParams)).then(x => {
-        if (this._driver.getLogger().shouldTrackEverything()) {
-          this._driver.getLogger().eventSite('composeRequestModified');
+      result.then(newComposeParams => this.#driver.getPageCommunicator().modifyComposeRequest(keyId, modifierId, newComposeParams || composeParams)).then(x => {
+        if (this.#driver.getLogger().shouldTrackEverything()) {
+          this.#driver.getLogger().eventSite('composeRequestModified');
         }
         return x;
       }).catch(err => {
-        this._driver.getPageCommunicator().modifyComposeRequest(keyId, modifierId, composeParams);
-        this._driver.getLogger().error(err);
+        this.#driver.getPageCommunicator().modifyComposeRequest(keyId, modifierId, composeParams);
+        this.#driver.getLogger().error(err);
       });
     });
-    this._isListeningToAjaxInterceptStream = true;
+    this.#isListeningToAjaxInterceptStream = true;
   }
   setupLinkPopOvers() {
-    if (!this._hasSetupLinkPopOvers) {
-      this._hasSetupLinkPopOvers = true;
-      this._eventStream.plug(setupLinkPopOvers(this));
+    if (!this.#hasSetupLinkPopOvers) {
+      this.#hasSetupLinkPopOvers = true;
+      this.#eventStream.plug(setupLinkPopOvers(this));
     }
   }
 }
@@ -10478,7 +10491,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.12-1699623720812-466cb297eff34e1f");
+              "2.1.14-1700139139820-2df861d69ce2cd34");
               document.head.append(htmlElement);
             };
 options.domAPI = (styleDomAPI_default());
@@ -12991,27 +13004,37 @@ function reemitClickEvent(event) {
 
 let hasSeenOldElement = false;
 class GmailMessageView {
-  _eventStream = kefir_bus_default()();
-  _stopper = js_default()();
-  _messageLoaded = false;
-  _sender = null;
-  _recipients = null;
-  _recipientEmailAddresses = null;
-  _recipientsFull = null;
+  #element;
+  #driver;
+  #eventStream = kefir_bus_default()();
+  #stopper = js_default()();
+  #threadViewDriver;
+  #moreMenuItemDescriptors;
+  #moreMenuAddedElements;
+  #replyElementStream;
+  #readyStream;
+  #replyElement;
+  #gmailAttachmentAreaView;
+  #messageLoaded = false;
+  #openMoreMenu;
+  #sender = null;
+  #recipients = null;
+  #recipientEmailAddresses = null;
+  #recipientsFull = null;
   constructor(element, gmailThreadView, driver) {
-    this._element = element;
-    this._threadViewDriver = gmailThreadView;
-    this._driver = driver;
-    this._moreMenuItemDescriptors = [];
-    this._moreMenuAddedElements = [];
-    this._replyElement = null;
+    this.#element = element;
+    this.#threadViewDriver = gmailThreadView;
+    this.#driver = driver;
+    this.#moreMenuItemDescriptors = [];
+    this.#moreMenuAddedElements = [];
+    this.#replyElement = null;
     // Outputs the same type of stream as makeElementChildStream does.
-    this._replyElementStream = this._eventStream.filter(function (event) {
+    this.#replyElementStream = this.#eventStream.filter(function (event) {
       return event.eventName === 'replyElement';
     }).map(event => event.change);
-    this._setupMessageStateStream();
-    this._monitorEmailAddressHovering();
-    this._setupMoreMenuWatching();
+    this.#setupMessageStateStream();
+    this.#monitorEmailAddressHovering();
+    this.#setupMoreMenuWatching();
     let partialReadyStream;
 
     // handle the case that the data-message-id is available, but the data-legacy-message-id is not
@@ -13019,7 +13042,7 @@ class GmailMessageView {
     // client side, so the new message added (from your reply) shows up in the UI right away and has a data-message-id but
     // because it hasn't been synced to the server it does not have a data-legacy-messag-id
     // so we wait until the message has been synced to the server before saying this is ready
-    const messageIdElement = this._element.querySelector('[data-message-id]');
+    const messageIdElement = this.#element.querySelector('[data-message-id]');
     if (messageIdElement) {
       const syncMessageId = messageIdElement.getAttribute('data-message-id');
       if (!syncMessageId) throw new Error('data-message-id attribute has no value');
@@ -13027,14 +13050,14 @@ class GmailMessageView {
       // Only respect data-legacy-message-id if data-message-id is not the id
       // of a draft we've seen recently, in order to work around a Gmail bug.
       // https://github.com/StreakYC/GmailSDK/issues/515#issuecomment-457420619
-      if (messageIdElement.hasAttribute('data-legacy-message-id') && !this._driver.isRecentSyncDraftId(syncMessageId.replace('#', ''))) {
+      if (messageIdElement.hasAttribute('data-legacy-message-id') && !this.#driver.isRecentSyncDraftId(syncMessageId.replace('#', ''))) {
         partialReadyStream = kefir_esm.constant(null);
       } else {
         // we have a data message id, but not the legacy message id. So now we have to poll for the gmail message id
         partialReadyStream = kefir_esm.fromPromise((async () => {
           for (let ii = 0; ii < 10; ii++) {
             try {
-              const gmailMessageId = await this._driver.getGmailMessageIdForSyncMessageId(syncMessageId.replace('#', ''));
+              const gmailMessageId = await this.#driver.getGmailMessageIdForSyncMessageId(syncMessageId.replace('#', ''));
               // set the legacy message id attribute so subsequent calls to getMessageId find the legacy message id in the dom
               messageIdElement.setAttribute('data-legacy-message-id', gmailMessageId);
               return null;
@@ -13048,64 +13071,64 @@ class GmailMessageView {
     } else {
       partialReadyStream = kefir_esm.constant(null);
     }
-    this._readyStream = partialReadyStream.takeUntilBy(this._stopper).onValue(() => this._processInitialState());
+    this.#readyStream = partialReadyStream.takeUntilBy(this.#stopper).onValue(() => this.#processInitialState());
   }
   destroy() {
-    this._stopper.destroy();
-    this._eventStream.end();
-    if (this._gmailAttachmentAreaView) this._gmailAttachmentAreaView.destroy();
-    this._moreMenuAddedElements.forEach(el => {
+    this.#stopper.destroy();
+    this.#eventStream.end();
+    if (this.#gmailAttachmentAreaView) this.#gmailAttachmentAreaView.destroy();
+    this.#moreMenuAddedElements.forEach(el => {
       el.remove();
     });
   }
   getEventStream() {
-    return this._eventStream;
+    return this.#eventStream;
   }
   getReplyElementStream() {
-    return this._replyElementStream;
+    return this.#replyElementStream;
   }
   getElement() {
-    return this._element;
+    return this.#element;
   }
   getThreadViewDriver() {
-    return this._threadViewDriver;
+    return this.#threadViewDriver;
   }
   isLoaded() {
-    return this._messageLoaded;
+    return this.#messageLoaded;
   }
   getContentsElement() {
-    if (!this._messageLoaded) {
+    if (!this.#messageLoaded) {
       throw new Error('tried to get message contents before message is loaded');
     }
     try {
-      return (0,querySelectorOrFail/* default */.Z)(this._element, 'div.ii.gt');
+      return (0,querySelectorOrFail/* default */.Z)(this.#element, 'div.ii.gt');
     } catch (err) {
       // Keep old fallback selector until we're confident of the new one.
-      this._driver.getLogger().error(err);
-      return (0,querySelectorOrFail/* default */.Z)(this._element, '.adP');
+      this.#driver.getLogger().error(err);
+      return (0,querySelectorOrFail/* default */.Z)(this.#element, '.adP');
     }
   }
   isElementInQuotedArea(element) {
     return findParent(element, el => el.nodeName === 'BLOCKQUOTE') != null;
   }
   getSender() {
-    let sender = this._sender;
+    let sender = this.#sender;
     if (sender) return sender;
-    const senderSpan = (0,querySelectorOrFail/* default */.Z)(this._element, 'td.gF span[email]');
+    const senderSpan = (0,querySelectorOrFail/* default */.Z)(this.#element, 'td.gF span[email]');
     const emailAddress = senderSpan.getAttribute('email');
     if (!emailAddress) throw new Error('Could not find email address');
-    sender = this._sender = {
+    sender = this.#sender = {
       name: senderSpan.getAttribute('name'),
       emailAddress
     };
     return sender;
   }
   getRecipients() {
-    let recipients = this._recipients;
+    let recipients = this.#recipients;
     if (recipients) return recipients;
-    const receipientSpans = Array.from(this._element.querySelectorAll('.hb span[email]'));
-    recipients = this._recipients = receipientSpans.map(span => {
-      return this._getUpdatedContact({
+    const receipientSpans = Array.from(this.#element.querySelectorAll('.hb span[email]'));
+    recipients = this.#recipients = receipientSpans.map(span => {
+      return this.#getUpdatedContact({
         name: span.getAttribute('name'),
         emailAddress: span.getAttribute('email') || ''
       });
@@ -13113,101 +13136,101 @@ class GmailMessageView {
     return recipients;
   }
   getRecipientEmailAddresses() {
-    let recipients = this._recipientEmailAddresses;
+    let recipients = this.#recipientEmailAddresses;
     if (recipients) return recipients;
-    const receipientSpans = Array.from(this._element.querySelectorAll('.hb span[email]'));
-    recipients = this._recipientEmailAddresses = receipientSpans.map(span => span.getAttribute('email') || '');
+    const receipientSpans = Array.from(this.#element.querySelectorAll('.hb span[email]'));
+    recipients = this.#recipientEmailAddresses = receipientSpans.map(span => span.getAttribute('email') || '');
     return recipients;
   }
   async getRecipientsFull() {
-    let recipients = this._recipientsFull;
+    let recipients = this.#recipientsFull;
     if (recipients) return recipients;
-    const threadID = this._threadViewDriver.getInternalID();
-    recipients = this._recipientsFull = await this._driver.getPageCommunicator().getMessageRecipients(threadID, this._element);
+    const threadID = this.#threadViewDriver.getInternalID();
+    recipients = this.#recipientsFull = await this.#driver.getPageCommunicator().getMessageRecipients(threadID, this.#element);
     if (!recipients) {
-      this._driver.getLogger().error(new Error('Failed to find message recipients from response'), {
+      this.#driver.getLogger().error(new Error('Failed to find message recipients from response'), {
         threadID
       });
-      recipients = this._recipientsFull = this.getRecipients();
+      recipients = this.#recipientsFull = this.getRecipients();
     }
     return recipients;
   }
   getDateString() {
-    return (0,querySelectorOrFail/* default */.Z)(this._element, '.ads .gK .g3').title;
+    return (0,querySelectorOrFail/* default */.Z)(this.#element, '.ads .gK .g3').title;
   }
   async getDate() {
-    const threadID = this._threadViewDriver.getInternalID();
-    return await this._driver.getPageCommunicator().getMessageDate(threadID, this._element);
+    const threadID = this.#threadViewDriver.getInternalID();
+    return await this.#driver.getPageCommunicator().getMessageDate(threadID, this.#element);
   }
   getAttachmentCardViewDrivers() {
-    if (!this._gmailAttachmentAreaView) {
+    if (!this.#gmailAttachmentAreaView) {
       return [];
     }
-    return this._gmailAttachmentAreaView.getAttachmentCardViews();
+    return this.#gmailAttachmentAreaView.getAttachmentCardViews();
   }
   addButtonToDownloadAllArea(options) {
-    var gmailAttachmentAreaView = this._getAttachmentArea();
+    var gmailAttachmentAreaView = this.#getAttachmentArea();
     if (!gmailAttachmentAreaView) {
       return;
     }
     gmailAttachmentAreaView.addButtonToDownloadAllArea(options);
   }
   addMoreMenuItem(options) {
-    this._moreMenuItemDescriptors = sortBy_default()(this._moreMenuItemDescriptors.concat([options]), o => o.orderHint);
-    this._updateMoreMenu();
+    this.#moreMenuItemDescriptors = sortBy_default()(this.#moreMenuItemDescriptors.concat([options]), o => o.orderHint);
+    this.#updateMoreMenu();
   }
-  _setupMoreMenuWatching() {
+  #setupMoreMenuWatching() {
     // At the start, and whenever the view state changes, watch the
     // 'aria-expanded' property of the more button, and when that changes,
     // update the _openMoreMenu property.
-    this._openMoreMenu = null;
-    this._eventStream.filter(e => e.eventName === 'viewStateChange').toProperty(() => null).flatMapLatest(() => {
-      const moreButton = this._getMoreButton();
+    this.#openMoreMenu = null;
+    this.#eventStream.filter(e => e.eventName === 'viewStateChange').toProperty(() => null).flatMapLatest(() => {
+      const moreButton = this.#getMoreButton();
       if (!moreButton) {
         return kefir_esm.constant(null);
       }
       return (0,make_mutation_observer_chunked_stream/* default */.Z)(moreButton, {
         attributes: true,
         attributeFilter: ['aria-expanded']
-      }).map(() => moreButton.getAttribute('aria-expanded') === 'true' ? this._getOpenMoreMenu() : null);
-    }).takeUntilBy(this._stopper).onValue(openMoreMenu => {
-      this._openMoreMenu = openMoreMenu;
-      this._updateMoreMenu();
+      }).map(() => moreButton.getAttribute('aria-expanded') === 'true' ? this.#getOpenMoreMenu() : null);
+    }).takeUntilBy(this.#stopper).onValue(openMoreMenu => {
+      this.#openMoreMenu = openMoreMenu;
+      this.#updateMoreMenu();
     });
   }
-  _getMoreButton() {
+  #getMoreButton() {
     if (this.getViewState() !== 'EXPANDED') {
       return null;
     }
-    return this._element.querySelector('tr.acZ div.T-I.J-J5-Ji.aap.L3[role=button][aria-haspopup]');
+    return this.#element.querySelector('tr.acZ div.T-I.J-J5-Ji.aap.L3[role=button][aria-haspopup]');
   }
-  _getOpenMoreMenu() {
-    const selector_2022_11_23 = 'td > div.nH.a98.iY > div.nH.aHU .b7.J-M[aria-haspopup=true]';
+  #getOpenMoreMenu() {
+    const selector_2022_11_23 = 'td > div.nH.a98.iY > div.nH .aHU .b7.J-M[aria-haspopup=true]';
     const maybeMoreMenu = document.body.querySelector(selector_2022_11_23);
     // This will find any message's open more menu! The caller needs to make
     // sure it belongs to this message!
     return maybeMoreMenu || document.body.querySelector('td > div.nH.if > div.nH.aHU div.b7.J-M[aria-haspopup=true]');
   }
-  _closeActiveEmailMenu() {
-    const moreButton = this._getMoreButton();
+  #closeActiveEmailMenu() {
+    const moreButton = this.#getMoreButton();
     if (moreButton) {
       (0,simulate_mouse_event/* simulateClick */.HX)(moreButton);
     }
   }
-  _updateMoreMenu() {
-    this._moreMenuAddedElements.forEach(el => {
+  #updateMoreMenu() {
+    this.#moreMenuAddedElements.forEach(el => {
       el.remove();
     });
-    this._moreMenuAddedElements.length = 0;
-    const openMoreMenu = this._openMoreMenu;
-    if (openMoreMenu && this._moreMenuItemDescriptors.length) {
+    this.#moreMenuAddedElements.length = 0;
+    const openMoreMenu = this.#openMoreMenu;
+    if (openMoreMenu && this.#moreMenuItemDescriptors.length) {
       const originalHeight = openMoreMenu.offsetHeight;
       const originalWidth = openMoreMenu.offsetWidth;
       const dividerEl = document.createElement('div');
       dividerEl.className = 'J-Kh';
-      this._moreMenuAddedElements.push(dividerEl);
+      this.#moreMenuAddedElements.push(dividerEl);
       openMoreMenu.appendChild(dividerEl);
-      this._moreMenuItemDescriptors.forEach(options => {
+      this.#moreMenuItemDescriptors.forEach(options => {
         const itemEl = document.createElement('div');
         itemEl.className = 'J-N';
         itemEl.setAttribute('role', 'menuitem');
@@ -13215,7 +13238,7 @@ class GmailMessageView {
         itemEl.addEventListener('mouseenter', () => itemEl.classList.add('J-N-JT'));
         itemEl.addEventListener('mouseleave', () => itemEl.classList.remove('J-N-JT'));
         itemEl.addEventListener('click', () => {
-          this._closeActiveEmailMenu();
+          this.#closeActiveEmailMenu();
           options.onClick();
         });
         if (options.iconUrl || options.iconClass) {
@@ -13225,7 +13248,7 @@ class GmailMessageView {
           const insertionPoint = itemEl.firstElementChild;
           if (insertionPoint) insertionPoint.appendChild(iconEl);
         }
-        this._moreMenuAddedElements.push(itemEl);
+        this.#moreMenuAddedElements.push(itemEl);
         openMoreMenu.appendChild(itemEl);
       });
       const menuRect = openMoreMenu.getBoundingClientRect();
@@ -13233,7 +13256,7 @@ class GmailMessageView {
       if (addedWidth > 0) {
         openMoreMenu.style.left = Math.max(0, parseInt(openMoreMenu.style.left) - addedWidth) + 'px';
       }
-      const moreButton = this._getMoreButton();
+      const moreButton = this.#getMoreButton();
       if (moreButton) {
         const moreButtonRect = moreButton.getBoundingClientRect();
 
@@ -13248,20 +13271,20 @@ class GmailMessageView {
   }
   getMessageID() {
     let ignoreLoadStatus = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-    if (!ignoreLoadStatus && !this._messageLoaded) {
+    if (!ignoreLoadStatus && !this.#messageLoaded) {
       throw new Error('tried to get message id before message is loaded');
     }
-    const messageIdElement = this._element.querySelector('[data-legacy-message-id]');
+    const messageIdElement = this.#element.querySelector('[data-legacy-message-id]');
     if (messageIdElement) {
       const messageId = messageIdElement.getAttribute('data-legacy-message-id');
       if (!messageId) throw new Error('message id attribute with no value, wtf?');
       return messageId;
     }
-    const messageEl = this._element.querySelector('div.ii.gt');
+    const messageEl = this.#element.querySelector('div.ii.gt');
     if (!messageEl) {
       const err = new Error('Could not find message id element');
-      this._driver.getLogger().error(err, {
-        elementHtml: (0,censorHTMLtree/* default */.Z)(this._element)
+      this.#driver.getLogger().error(err, {
+        elementHtml: (0,censorHTMLtree/* default */.Z)(this.#element)
       });
       throw err;
     }
@@ -13269,14 +13292,14 @@ class GmailMessageView {
     if (m) {
       if (!hasSeenOldElement) {
         hasSeenOldElement = true;
-        this._driver.getLogger().eventSite('old messageid location');
+        this.#driver.getLogger().eventSite('old messageid location');
       }
       return m[1];
     } else {
       const messageElChild = messageEl.firstElementChild;
       if (!messageElChild) {
         const err = new Error('Could not find message id value');
-        this._driver.getLogger().error(err, {
+        this.#driver.getLogger().error(err, {
           reason: 'Could not find element',
           messageHtml: (0,censorHTMLtree/* default */.Z)(messageEl)
         });
@@ -13285,7 +13308,7 @@ class GmailMessageView {
       const m = messageElChild.className.match(/\bm([0-9a-f]+)\b/);
       if (!m) {
         const err = new Error('Could not find message id value');
-        this._driver.getLogger().error(err, {
+        this.#driver.getLogger().error(err, {
           reason: 'Element was missing message className',
           messageHtml: (0,censorHTMLtree/* default */.Z)(messageEl)
         });
@@ -13299,11 +13322,11 @@ class GmailMessageView {
   }
   addAttachmentIcon(iconDescriptor) {
     const attachmentIcon = new attachment_icon();
-    if (!this._element) {
+    if (!this.#element) {
       console.warn('addDateIcon called on destroyed message');
       return attachmentIcon;
     }
-    this._element.setAttribute('inboxsdk__message_added_attachment_icon', 'true');
+    this.#element.setAttribute('inboxsdk__message_added_attachment_icon', 'true');
     const getImgElement = once_default()(() => {
       const img = document.createElement('img');
       img.src = 'images/cleardot.gif';
@@ -13319,7 +13342,7 @@ class GmailMessageView {
     });
     let added = false;
     let currentIconUrl = null;
-    this._stopper.onValue(() => {
+    this.#stopper.onValue(() => {
       if (added) {
         getCustomIconWrapper().remove();
         getTooltipNodeWrapper().remove();
@@ -13327,7 +13350,7 @@ class GmailMessageView {
         added = false;
       }
     });
-    kefir_cast_default()(kefir_esm, iconDescriptor).combine(this._eventStream.filter(event => event.eventName === 'viewStateChange').toProperty(() => null), opts => opts).takeUntilBy(this._stopper).onValue(opts => {
+    kefir_cast_default()(kefir_esm, iconDescriptor).combine(this.#eventStream.filter(event => event.eventName === 'viewStateChange').toProperty(() => null), opts => opts).takeUntilBy(this.#stopper).onValue(opts => {
       if (!opts) {
         if (added) {
           getCustomIconWrapper().remove();
@@ -13338,9 +13361,9 @@ class GmailMessageView {
       } else {
         let attachmentDiv;
         if (this.getViewState() === 'COLLAPSED') {
-          attachmentDiv = (0,querySelectorOrFail/* default */.Z)(this._element, '.adf.ads td.gH span');
+          attachmentDiv = (0,querySelectorOrFail/* default */.Z)(this.#element, '.adf.ads td.gH span');
         } else {
-          attachmentDiv = (0,querySelectorOrFail/* default */.Z)(this._element, 'td.gH div.gK span');
+          attachmentDiv = (0,querySelectorOrFail/* default */.Z)(this.#element, 'td.gH div.gK span');
         }
         const img = opts.iconHtml != null ? getCustomIconWrapper() : getImgElement();
         const onClick = opts.onClick;
@@ -13403,35 +13426,35 @@ class GmailMessageView {
     return attachmentIcon;
   }
   getViewState() {
-    if (this._element.classList.contains('kQ') || this._element.classList.contains('kx')) {
+    if (this.#element.classList.contains('kQ') || this.#element.classList.contains('kx')) {
       return 'HIDDEN';
-    } else if (this._element.classList.contains('kv')) {
+    } else if (this.#element.classList.contains('kv')) {
       return 'COLLAPSED';
     } else {
       return 'EXPANDED';
     }
   }
   hasOpenReply() {
-    return Boolean(this._replyElement);
+    return Boolean(this.#replyElement);
   }
   addAttachmentCard(options) {
-    var gmailAttachmentCardView = new gmail_attachment_card_view(options, this._driver, this);
-    if (!this._gmailAttachmentAreaView) {
-      this._gmailAttachmentAreaView = this._getAttachmentArea();
+    var gmailAttachmentCardView = new gmail_attachment_card_view(options, this.#driver, this);
+    if (!this.#gmailAttachmentAreaView) {
+      this.#gmailAttachmentAreaView = this.#getAttachmentArea();
     }
-    if (!this._gmailAttachmentAreaView) {
-      this._gmailAttachmentAreaView = this._createAttachmentArea();
+    if (!this.#gmailAttachmentAreaView) {
+      this.#gmailAttachmentAreaView = this.#createAttachmentArea();
     }
-    this._gmailAttachmentAreaView.addGmailAttachmentCardView(gmailAttachmentCardView);
+    this.#gmailAttachmentAreaView.addGmailAttachmentCardView(gmailAttachmentCardView);
     return gmailAttachmentCardView;
   }
-  _setupMessageStateStream() {
+  #setupMessageStateStream() {
     var self = this;
-    this._eventStream.plug((0,make_mutation_observer_stream/* default */.Z)(this._element, {
+    this.#eventStream.plug((0,make_mutation_observer_stream/* default */.Z)(this.#element, {
       attributes: true,
       attributeFilter: ['class'],
       attributeOldValue: true
-    }).takeUntilBy(this._stopper).map(function (mutation) {
+    }).takeUntilBy(this.#stopper).map(function (mutation) {
       const currentClassList = mutation.target.classList;
       const mutationOldValue = mutation.oldValue;
       let oldValue;
@@ -13457,7 +13480,7 @@ class GmailMessageView {
       };
     }).map(function (event) {
       if (event.newValue === 'EXPANDED' && event.oldValue !== 'EXPANDED') {
-        self._checkMessageOpenState(event.currentClassList);
+        self.#checkMessageOpenState(event.currentClassList);
       }
       return event;
     }).filter(function (event) {
@@ -13470,38 +13493,38 @@ class GmailMessageView {
       };
     }));
   }
-  _processInitialState() {
-    this._checkMessageOpenState(this._element.classList);
+  #processInitialState() {
+    this.#checkMessageOpenState(this.#element.classList);
   }
-  _checkMessageOpenState(classList) {
+  #checkMessageOpenState(classList) {
     if (!classList.contains('h7')) {
       return;
     }
-    if (this._messageLoaded) {
+    if (this.#messageLoaded) {
       return;
     }
     let messageId;
     try {
       messageId = this.getMessageID(true);
     } catch (err) {
-      this._driver.getLogger().error(err);
+      this.#driver.getLogger().error(err);
       return;
     }
-    this._messageLoaded = true;
+    this.#messageLoaded = true;
     try {
-      this._driver.associateThreadAndMessageIDs(this._threadViewDriver.getThreadID(), messageId);
+      this.#driver.associateThreadAndMessageIDs(this.#threadViewDriver.getThreadID(), messageId);
     } catch (err) {
-      this._driver.getLogger().error(err);
+      this.#driver.getLogger().error(err);
     }
-    this._gmailAttachmentAreaView = this._getAttachmentArea();
-    this._eventStream.emit({
+    this.#gmailAttachmentAreaView = this.#getAttachmentArea();
+    this.#eventStream.emit({
       type: 'internal',
       eventName: 'messageLoad'
     });
-    this._setupReplyStream();
+    this.#setupReplyStream();
   }
-  _setupReplyStream() {
-    const replyContainer = this._element.querySelector('.ip');
+  #setupReplyStream() {
+    const replyContainer = this.#element.querySelector('.ip');
     if (!replyContainer) {
       return;
     }
@@ -13512,14 +13535,14 @@ class GmailMessageView {
     kefir_esm.combine([(0,make_mutation_observer_chunked_stream/* default */.Z)(replyContainer, {
       attributes: true,
       attributeFilter: ['class']
-    }), kefir_esm.later(1, null)]).merge(kefir_esm.later(1, undefined)).takeUntilBy(this._stopper).beforeEnd(() => 'END').onValue(mutation => {
+    }), kefir_esm.later(1, null)]).merge(kefir_esm.later(1, undefined)).takeUntilBy(this.#stopper).beforeEnd(() => 'END').onValue(mutation => {
       if (mutation !== 'END' && replyContainer.classList.contains('adB')) {
         if (!currentReplyElementRemovalStream) {
           const replyElement = replyContainer.firstElementChild;
-          self._replyElement = replyElement;
+          self.#replyElement = replyElement;
           if (replyElement) {
             currentReplyElementRemovalStream = kefir_bus_default()();
-            self._eventStream.emit({
+            self.#eventStream.emit({
               type: 'internal',
               eventName: 'replyElement',
               change: {
@@ -13540,21 +13563,21 @@ class GmailMessageView {
           currentReplyElementRemovalStream = null;
           temp.emit(null);
           temp.end();
-          self._replyElement = null;
+          self.#replyElement = null;
         }
       }
     });
   }
-  _monitorEmailAddressHovering() {
+  #monitorEmailAddressHovering() {
     var self = this;
-    this._eventStream.plug(kefir_esm.fromEvents(this._element, 'mouseover').map(e => e.target).filter(function (element) {
+    this.#eventStream.plug(kefir_esm.fromEvents(this.#element, 'mouseover').map(e => e.target).filter(function (element) {
       return element && element.getAttribute('email');
     }).map(function (element) {
       let contactType = null;
-      if (!self._element.classList.contains('h7')) {
+      if (!self.#element.classList.contains('h7')) {
         contactType = 'sender';
       } else {
-        if (self._element.querySelector('h3.iw').contains(element)) {
+        if (self.#element.querySelector('h3.iw').contains(element)) {
           contactType = 'sender';
         } else {
           contactType = 'recipient';
@@ -13562,7 +13585,7 @@ class GmailMessageView {
       }
       return {
         get contact() {
-          return self._getUpdatedContact(_extractContactInformation(element));
+          return self.#getUpdatedContact(_extractContactInformation(element));
         },
         contactType: contactType,
         eventName: 'contactHover',
@@ -13570,25 +13593,27 @@ class GmailMessageView {
       };
     }));
   }
-  _getAttachmentArea() {
-    if (this._element.querySelector('.hq')) {
-      return new gmail_attachment_area_view(this._element.querySelector('.hq'), this._driver, this);
+  #getAttachmentArea() {
+    if (this.#element.querySelector('.hq')) {
+      return new gmail_attachment_area_view(this.#element.querySelector('.hq'), this.#driver, this);
     }
     return null;
   }
-  _createAttachmentArea() {
-    const gmailAttachmentAreaView = new gmail_attachment_area_view(null, this._driver, this);
-    const beforeElement = (0,querySelectorOrFail/* default */.Z)(this._element, '.hi');
+  #createAttachmentArea() {
+    const gmailAttachmentAreaView = new gmail_attachment_area_view(null, this.#driver, this);
+    const beforeElement = (0,querySelectorOrFail/* default */.Z)(this.#element, '.hi');
     const parentNode = beforeElement.parentNode;
     if (!parentNode) throw new Error('parentNode not found');
     parentNode.insertBefore(gmailAttachmentAreaView.getElement(), beforeElement);
     return gmailAttachmentAreaView;
   }
-  _getUpdatedContact(inContact) {
-    return getUpdatedContact(inContact, this._element);
+  #getUpdatedContact(inContact) {
+    return getUpdatedContact(inContact, this.#element);
   }
+
+  // Is this used?
   getReadyStream() {
-    return this._readyStream;
+    return this.#readyStream;
   }
 }
 function _extractContactInformation(span) {
@@ -14357,6 +14382,10 @@ class WidthManager {
     if (noIconsVisible) this._contentContainerEl.classList.add((0,idMap/* default */.Z)('container_app_sidebar_no_icons'));else this._contentContainerEl.classList.remove((0,idMap/* default */.Z)('container_app_sidebar_no_icons'));
   }
 }
+// EXTERNAL MODULE: ./src/platform-implementation-js/lib/isStreakAppId.ts
+var isStreakAppId = __webpack_require__(3045);
+// EXTERNAL MODULE: ./src/common/censorHTMLstring.ts
+var censorHTMLstring = __webpack_require__(6272);
 ;// CONCATENATED MODULE: ./src/platform-implementation-js/dom-driver/gmail/views/gmail-thread-view.ts
 
 
@@ -14372,6 +14401,8 @@ class WidthManager {
 
 
 
+
+
 let hasLoggedAddonInfo = false;
 class GmailThreadView {
   _stopper = js_default()();
@@ -14701,7 +14732,30 @@ class GmailThreadView {
   }
   _setupToolbarView() {
     const toolbarElement = this._findToolbarElement();
-    if (!toolbarElement) throw new Error('No toolbar element found');
+    if (!toolbarElement) {
+      if ((0,isStreakAppId/* default */.Z)(this._driver.getAppId())) {
+        const threadViewEl = document.querySelector('.nH.bkK');
+        if (threadViewEl instanceof HTMLElement) {
+          this._driver.getLogger().error(new Error('Thread view toolbar cannot be found'), {
+            threadViewHtml: (0,censorHTMLstring/* default */.Z)(threadViewEl.innerHTML)
+          });
+        } else {
+          const pageHtml = document.querySelector('.nH');
+          if (pageHtml instanceof HTMLElement) {
+            this._driver.getLogger().error(new Error('Thread view toolbar cannot be found'), {
+              threadViewHtml: '.nH.bkK cannot be found',
+              pageHtml: (0,censorHTMLstring/* default */.Z)(pageHtml.innerHTML)
+            });
+          } else {
+            this._driver.getLogger().error(new Error('Thread view toolbar cannot be found'), {
+              threadViewHtml: '.nH.bkK cannot be found',
+              pageHtml: '.nH cannot be found'
+            });
+          }
+        }
+      }
+      throw new Error('No toolbar element found');
+    }
     const toolbarParent = toolbarElement.parentElement;
     if (toolbarParent) toolbarParent.classList.add('inboxsdk__thread_toolbar_parent');
     this._toolbarView = new gmail_toolbar_view(toolbarElement, this._driver, this._routeViewDriver, this);
@@ -17872,23 +17926,16 @@ class AppMenu {
 // EXTERNAL MODULE: ./src/platform-implementation-js/namespaces/router.ts + 3 modules
 var router = __webpack_require__(9154);
 ;// CONCATENATED MODULE: ./src/platform-implementation-js/namespaces/search.ts
-
-const search_memberMap = new WeakMap(); // documented in src/docs/
-
 class Search {
+  #driver;
   constructor(appId, driver) {
-    const members = {
-      appId,
-      driver
-    };
-    search_memberMap.set(this, members);
+    this.#driver = driver;
   }
   registerSearchSuggestionsProvider(handler) {
     if (typeof handler != 'function') {
       throw new Error('Incorrect arguments');
     }
-    const members = (0,get_or_fail/* default */.Z)(search_memberMap, this);
-    members.driver.registerSearchSuggestionsProvider(handler);
+    this.#driver.registerSearchSuggestionsProvider(handler);
   }
   registerSearchQueryRewriter(rewriter) {
     if (typeof rewriter.termReplacer != 'function' || typeof rewriter.term != 'string') {
@@ -17897,8 +17944,7 @@ class Search {
     if (!rewriter.term.match(/^(app|has):/)) {
       throw new Error("Custom search term must begin with 'app:'");
     }
-    const members = (0,get_or_fail/* default */.Z)(search_memberMap, this);
-    members.driver.registerSearchQueryRewriter(rewriter);
+    this.#driver.registerSearchQueryRewriter(rewriter);
   }
 }
 ;// CONCATENATED MODULE: ./src/platform-implementation-js/views/app-toolbar-button-view.ts
@@ -18994,7 +19040,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.12-1699623720812-466cb297eff34e1f");
+              "2.1.14-1700139139820-2df861d69ce2cd34");
               document.head.append(htmlElement);
             };
 options.domAPI = (styleDomAPI_default());
@@ -21294,8 +21340,6 @@ function addSupportItem(driver, supportItemDescriptor) {
 var goto_view = __webpack_require__(5354);
 // EXTERNAL MODULE: ./src/platform-implementation-js/dom-driver/gmail/gmail-sync-response-processor.ts
 var gmail_sync_response_processor = __webpack_require__(5521);
-// EXTERNAL MODULE: ./src/platform-implementation-js/lib/isStreakAppId.ts
-var isStreakAppId = __webpack_require__(3045);
 // EXTERNAL MODULE: ./node_modules/immutability-helper/index.js
 var immutability_helper = __webpack_require__(7145);
 var immutability_helper_default = /*#__PURE__*/__webpack_require__.n(immutability_helper);
@@ -24019,18 +24063,6 @@ class ComposeView extends safe_event_emitter/* default */.Z {
     });
     return new ComposeButtonView(optionsPromise, members.composeViewImplementation, members.driver);
   }
-
-  /*
-  // Incomplete
-  addInnerSidebar(options){
-  get(memberMap, this).composeViewImplementation.addInnerSidebar(options);
-  }
-  // Incomplete
-  addOuterSidebar(options){
-  get(memberMap, this).composeViewImplementation.addOuterSidebar(options);
-  }
-  */
-
   addComposeNotice(composeNoticeDescriptor) {
     return (0,get_or_fail/* default */.Z)(compose_view_memberMap, this).composeViewImplementation.addComposeNotice(composeNoticeDescriptor);
   }