@inboxsdk/core 2.2.10 → 2.2.12

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.10-1763685333177-98e6efede22d933e";
+const BUILD_VERSION = "2.2.12-1777580345308-37be721fe51fe009";
 if (false) {}
 
 /***/ }),
@@ -2665,7 +2665,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.10-1763685333177-98e6efede22d933e");
+              "2.2.12-1777580345308-37be721fe51fe009");
               document.head.append(htmlElement);
             };
 options.domAPI = (styleDomAPI_default());
@@ -10313,7 +10313,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.10-1763685333177-98e6efede22d933e");
+              "2.2.12-1777580345308-37be721fe51fe009");
               document.head.append(htmlElement);
             };
 options.domAPI = (styleDomAPI_default());
@@ -11558,10 +11558,11 @@ var safe_event_emitter = __webpack_require__(2788);
 ;// CONCATENATED MODULE: ./src/platform-implementation-js/views/keyboard-shortcut-handle.ts
 
 class KeyboardShortcutHandle extends safe_event_emitter/* default */.A {
-  constructor(chord, description) {
+  constructor(chord, description, orderHint) {
     super();
     this.chord = chord;
     this.description = description;
+    this.orderHint = orderHint;
   }
   remove() {
     this.emit('destroy');
@@ -11588,14 +11589,15 @@ class Keyboard {
     // eslint-disable-next-line prefer-const
     let {
       chord,
-      description
+      description,
+      orderHint
     } = shortcutDescriptor;
     if (!chord) throw new Error('Keyboard.createShortcutHandle chord missing');
     if (description == null) {
       console.error('Keyboard.createShortcutHandle chord missing');
       description = '';
     }
-    const keyboardShortcutHandle = new KeyboardShortcutHandle(chord, description);
+    const keyboardShortcutHandle = new KeyboardShortcutHandle(chord, description, orderHint);
     members.driver.activateShortcut(keyboardShortcutHandle, members.appName, members.appIconUrl);
     return keyboardShortcutHandle;
   }
@@ -14409,14 +14411,15 @@ class GmailThreadView {
   // Follows a similar structure to getThreadIDAsync, but gives up if async work is needed
   getThreadID() {
     if (this.#threadID) return this.#threadID;
-    let threadID;
-    const idElement = this.#element.querySelector('[data-thread-perm-id]');
+    const idElement = this.#element.querySelector('[data-legacy-thread-id]');
     if (!idElement) throw new Error('threadID element not found');
 
     // the string value can be 'undefined'
-    const attributeValue = idElement.getAttribute('data-thread-perm-id');
-    this.#syncThreadID = typeof attributeValue === 'string' && attributeValue !== 'undefined' ? attributeValue : null;
-    threadID = idElement.getAttribute('data-legacy-thread-id');
+    const syncAttributeValue = idElement.getAttribute('data-thread-perm-id');
+    if (!this.#syncThreadID && syncAttributeValue && syncAttributeValue !== 'undefined') {
+      this.#syncThreadID = syncAttributeValue;
+    }
+    let threadID = idElement.getAttribute('data-legacy-thread-id');
     if (!threadID) {
       const err = new Error('Failed to get id for thread: data-legacy-thread-id attribute missing');
       this.#driver.getLogger().error(err); // throw err;
@@ -14430,7 +14433,7 @@ class GmailThreadView {
         threadID = this.#driver.getPageCommunicator().getCurrentThreadID(this.#element, true);
       } else {
         const params = this.#routeViewDriver ? this.#routeViewDriver.getParams() : null;
-        if (params && params.threadID) {
+        if (params && typeof params.threadID === 'string') {
           threadID = params.threadID;
         } else {
           const err = new Error('Failed to get id for thread');
@@ -14443,16 +14446,18 @@ class GmailThreadView {
     return threadID;
   }
   async getThreadIDAsync() {
-    let threadID;
-    const idElement = this.#element.querySelector('[data-thread-perm-id]');
+    if (this.#threadID) return this.#threadID;
+    const idElement = this.#element.querySelector('[data-legacy-thread-id]');
     if (!idElement) throw new Error('threadID element not found');
 
     // the string value can be 'undefined'
-    const attributeValue = idElement.getAttribute('data-thread-perm-id');
-    const syncThreadID = this.#syncThreadID = typeof attributeValue === 'string' && attributeValue !== 'undefined' ? attributeValue : null;
-    this.#threadID = threadID = idElement.getAttribute('data-legacy-thread-id');
-    if (!threadID && syncThreadID) {
-      this.#threadID = threadID = await this.#driver.getOldGmailThreadIdFromSyncThreadId(syncThreadID);
+    const syncAttributeValue = idElement.getAttribute('data-thread-perm-id');
+    if (!this.#syncThreadID && syncAttributeValue && syncAttributeValue !== 'undefined') {
+      this.#syncThreadID = syncAttributeValue;
+    }
+    this.#threadID = idElement.getAttribute('data-legacy-thread-id');
+    if (!this.#threadID && this.#syncThreadID) {
+      this.#threadID = await this.#driver.getOldGmailThreadIdFromSyncThreadId(this.#syncThreadID);
     }
     if (this.#threadID) return this.#threadID;else throw new Error('Failed to get id for thread');
   }
@@ -15070,7 +15075,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.10-1763685333177-98e6efede22d933e");
+              "2.2.12-1777580345308-37be721fe51fe009");
               document.head.append(htmlElement);
             };
 options.domAPI = (styleDomAPI_default());
@@ -16513,12 +16518,14 @@ class ModalView extends safe_event_emitter/* default */.A {
     const hideAndDestroyStream = kefir_esm["default"].merge([kefir_esm["default"].fromEvents(this, 'destroy'), hideStream.filter(modalView => modalView === this)]);
     document.body.appendChild(modalViewDriver.getModalContainerElement());
     modalViewDriver.getModalContainerElement().focus();
-    kefir_esm["default"].fromEvents(document.body, 'keydown').filter(domEvent => domEvent.keyCode === 27).takeUntilBy(hideAndDestroyStream).onValue(domEvent => {
-      domEvent.stopImmediatePropagation();
-      domEvent.stopPropagation();
-      domEvent.preventDefault();
-      this.close();
-    });
+    if (modalViewDriver.getCloseOnEscape()) {
+      kefir_esm["default"].fromEvents(document.body, 'keydown').filter(domEvent => domEvent.key === 'Escape').takeUntilBy(hideAndDestroyStream).onValue(domEvent => {
+        domEvent.stopImmediatePropagation();
+        domEvent.stopPropagation();
+        domEvent.preventDefault();
+        this.close();
+      });
+    }
     _replaceCurrentlyShowingModal(this, modalViewDriver);
   }
   setTitle(title) {
@@ -19702,6 +19709,7 @@ class GmailModalViewDriver {
   constructor(options) {
     this._setupModalContainerElement(options);
     this._processOptions(options);
+    this._closeOnEscape = options.closeOnEscape ?? true;
     this._eventStream = kefir_bus_default()();
     this._setupEventStream();
   }
@@ -19715,6 +19723,9 @@ class GmailModalViewDriver {
   getEventStream() {
     return this._eventStream;
   }
+  getCloseOnEscape() {
+    return this._closeOnEscape;
+  }
   _processOptions(options) {
     this.setTitle(options.title);
     this.setContentElement(options.el);
@@ -19830,7 +19841,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.10-1763685333177-98e6efede22d933e");
+              "2.2.12-1777580345308-37be721fe51fe009");
               document.head.append(htmlElement);
             };
 mole_view_module_options.domAPI = (styleDomAPI_default());
@@ -20602,14 +20613,12 @@ class KeyboardShortcutHelpModifier {
     if (this._shortcuts.size === 0) {
       return;
     }
-    this._shortcuts.keys();
+    const sortedShortcuts = Array.from(this._shortcuts).sort(sortByOrderHintAsc);
     var header = this._renderHeader();
     var table = this._renderTable();
     var bodies = table.querySelectorAll('tbody tbody');
-    var index = 0;
-    this._shortcuts.forEach(keyboardShortcutHandle => {
+    sortedShortcuts.forEach((keyboardShortcutHandle, index) => {
       this._renderShortcut(bodies[index % 2], keyboardShortcutHandle);
-      index++;
     });
     const firstHeader = (0,querySelectorOrFail/* default */.A)(node, '.aov');
     const parent = firstHeader.parentElement;
@@ -20687,6 +20696,20 @@ function _getSeparatorHTML(separator) {
       return '';
   }
 }
+
+// Sort: items with orderHint first (ascending), then items without
+function sortByOrderHintAsc(a, b) {
+  if (a.orderHint == null && b.orderHint == null) {
+    return 0;
+  }
+  if (a.orderHint == null) {
+    return 1;
+  }
+  if (b.orderHint == null) {
+    return -1;
+  }
+  return a.orderHint - b.orderHint;
+}
 // EXTERNAL MODULE: ./src/platform-implementation-js/driver-common/getSyncThreadsForSearch.ts
 var getSyncThreadsForSearch = __webpack_require__(6743);
 // EXTERNAL MODULE: ./node_modules/@macil/simple-base-converter/dist/index.js