@inboxsdk/core 2.2.22 → 2.2.23

package/inboxsdk.js

@@ -371,7 +371,7 @@ function isNotNil(value) {
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment -- SDK_VERSION is injected by webpack
 ///@ts-ignore
-const BUILD_VERSION = "2.2.22-1788490014289-746166a2740dd165";
+const BUILD_VERSION = "2.2.23-1788892817778-0b7ebbd328d16089";
 if (false) {}
 
 /***/ }),
@@ -2711,7 +2711,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.2.22-1788490014289-746166a2740dd165");
+              "2.2.23-1788892817778-0b7ebbd328d16089");
               document.head.append(htmlElement);
             };
 options.domAPI = (styleDomAPI_default());
@@ -10383,7 +10383,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.2.22-1788490014289-746166a2740dd165");
+              "2.2.23-1788892817778-0b7ebbd328d16089");
               document.head.append(htmlElement);
             };
 options.domAPI = (styleDomAPI_default());
@@ -15289,7 +15289,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.2.22-1788490014289-746166a2740dd165");
+              "2.2.23-1788892817778-0b7ebbd328d16089");
               document.head.append(htmlElement);
             };
 options.domAPI = (styleDomAPI_default());
@@ -15912,7 +15912,7 @@ var isNotNil = __webpack_require__(960);
 
 
 
-function makePageParser(element, logger) {
+function makePageParser(element, logger, selectors) {
   return new (page_parser_tree_js_default())(element, {
     logError(err, el) {
       const details = {
@@ -15926,18 +15926,21 @@ function makePageParser(element, logger) {
       sources: [null],
       tag: 'rowListElementContainer',
       selectors: [{
-        $map: () => document.querySelector('.bGI.nH')?.parentElement
+        $map: () => selectors.querySelectorByKey(document, 'routeView.rowListWrapper')?.parentElement
       }]
     }, {
       sources: ['rowListElementContainer'],
       tag: 'rowListElement',
-      selectors: [{
+      selectors: [
+      // `.bGI.nH` stays literal here: this is a descent path, and a
+      // registry key resolves a single element rather than a path step.
+      {
         $or: [[], ['.bGI.nH', '.bf5', '.bv9', '.bGC']]
       }, '.bGI[role=main]', '[gh=tl]']
     }],
     finders: {
       rowListElementContainer: {
-        fn: root => [root.querySelector('.bGI.nH')?.parentElement].filter(isNotNil/* default */.A)
+        fn: root => [selectors.querySelectorByKey(root, 'routeView.rowListWrapper')?.parentElement].filter(isNotNil/* default */.A)
       },
       rowListElement: {
         fn: root => root.querySelectorAll('[gh=tl]')
@@ -16036,7 +16039,7 @@ class GmailRouteView {
     this.#driver = driver;
     this._eventStream = kefir_bus_default()();
     this._hasAddedCollapsibleSection = false;
-    this.#page = makePageParser(document.body, driver.getLogger());
+    this.#page = makePageParser(document.body, driver.getLogger(), driver.selectors);
     if (this._type === 'CUSTOM') {
       this._setupCustomViewElement();
       driver.getStopper().takeUntilBy(this._stopper.delay(0)).onValue(() => {
@@ -16349,13 +16352,27 @@ class GmailRouteView {
       if (!sectionsContainer) {
         sectionsContainer = document.createElement('div');
         sectionsContainer.classList.add('inboxsdk__custom_sections');
-        main.insertBefore(sectionsContainer, main.firstChild);
+        this.#insertSectionsContainer(main, sectionsContainer);
       } else if (sectionsContainer.classList.contains('Wc') && !this._isSearchRoute()) {
         sectionsContainer.classList.remove('Wc');
       }
       return sectionsContainer;
     }).toProperty();
   }
+
+  /**
+   * Gmail nests the list toolbar inside the row list wrapper, so the top of
+   * the container is above it.
+   */
+  #insertSectionsContainer(main, sectionsContainer) {
+    const rowListWrapper = this.#driver.selectors.querySelectorByKey(main, 'routeView.rowListWrapper');
+    const listToolbar = rowListWrapper && this.#driver.selectors.querySelectorByKey(rowListWrapper, 'routeView.listToolbar');
+    if (listToolbar?.parentElement) {
+      listToolbar.parentElement.insertBefore(sectionsContainer, listToolbar.nextSibling);
+      return;
+    }
+    main.insertBefore(sectionsContainer, main.firstChild);
+  }
   _getCustomParams() {
     var params = Object.create(null);
     if (!this._customRouteID) throw new Error("Should not happen, can't get custom params for non-custom view");
@@ -20052,7 +20069,7 @@ mole_view_module_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.2.22-1788490014289-746166a2740dd165");
+              "2.2.23-1788892817778-0b7ebbd328d16089");
               document.head.append(htmlElement);
             };
 mole_view_module_options.domAPI = (styleDomAPI_default());
@@ -24500,7 +24517,17 @@ const GMAIL_SELECTORS = {
    * when it contains emoji images.
    * Root: thread element.
    */
-  'threadView.subject': ['.ha h2']
+  'threadView.subject': ['.ha h2'],
+  /**
+   * The element holding the list toolbar and the thread list.
+   * Root: the row list element container.
+   */
+  'routeView.rowListWrapper': ['.bGI.nH'],
+  /**
+   * The toolbar above the thread list.
+   * Root: `routeView.rowListWrapper`.
+   */
+  'routeView.listToolbar': ['[gh=tm]', '.G-atb']
 };
 
 /** Resolved candidates for every key. The merge builds new lists. */