@inboxsdk/core 2.2.6 → 2.2.7

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.6-1752599126954-7ed0da58f090270c";
+const BUILD_VERSION = "2.2.7-1753737313283-f941d482eba8eb97";
 if (false) {}
 
 /***/ }),
@@ -2646,7 +2646,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.6-1752599126954-7ed0da58f090270c");
+              "2.2.7-1753737313283-f941d482eba8eb97");
               document.head.append(htmlElement);
             };
 options.domAPI = (styleDomAPI_default());
@@ -7425,20 +7425,20 @@ var assert = __webpack_require__(1602);
 
 
 const cachedModificationsByRow = (0,js.defonce)(module, () => new WeakMap());
+const BUTTON_CLASS = 'inboxsdk__thread_row_button';
 function focusAndNoPropagation(event) {
   this.focus();
   event.stopImmediatePropagation();
 }
-function starGroupEventInterceptor(event) {
-  const isOnStar = this.firstElementChild.contains(event.target);
-  const isOnSDKButton = !isOnStar && this !== event.target;
-  if (!isOnStar) {
+
+/**
+ *  Click handler for starGroup - will stop immediate propagation if the target is one of our buttons.
+ *  If we don't do this, clicking our button here would open the thread.
+ */
+function onClickStarGroup(event) {
+  const isOnSdkButton = !!event.target?.closest(`.${BUTTON_CLASS}`);
+  if (isOnSdkButton) {
     event.stopImmediatePropagation();
-    if (!isOnSDKButton || event.type == 'mouseover') {
-      const newEvent = document.createEvent('MouseEvents');
-      newEvent.initMouseEvent(event.type, event.bubbles, event.cancelable, event.view, event.detail, event.screenX, event.screenY, event.clientX, event.clientY, event.ctrlKey, event.altKey, event.shiftKey, event.metaKey, event.button, event.relatedTarget);
-      this.parentElement.dispatchEvent(newEvent);
-    }
   }
 }
 class GmailThreadRowView {
@@ -7528,6 +7528,14 @@ class GmailThreadRowView {
   getElement() {
     return this._elements[0];
   }
+
+  /**
+   *  Provides the button toolbar element.
+   *  Will be null when the element is not present - this happens when the "Hover actions" setting is disabled.
+   */
+  #getButtonToolbar() {
+    return this._elements[0]?.querySelector('ul[role=toolbar]') || null;
+  }
   _removeUnclaimedModifications() {
     _removeThreadRowUnclaimedModifications(this._modifications); // TODO fix column width to deal with removed buttons
   }
@@ -7733,8 +7741,8 @@ class GmailThreadRowView {
       }
     });
     this._stopper.onValue(() => {
-      if (buttonMod && buttonMod.buttonSpan) {
-        buttonMod.buttonSpan.onclick = null;
+      if (buttonMod && buttonMod.buttonEl) {
+        buttonMod.buttonEl.onclick = null;
       }
     });
     prop.combine(this._getRefresher(), (value, _ignored) => value).onValue(_buttonDescriptor => {
@@ -7751,34 +7759,28 @@ class GmailThreadRowView {
           buttonDescriptor.iconClass = buttonDescriptor.className;
           delete buttonDescriptor.className;
         }
-        let buttonSpan, iconSettings;
-        const buttonToolbar = this._elements[0].querySelector('ul[role=toolbar]');
+        const buttonToolbar = this.#getButtonToolbar();
+        let buttonEl, iconSettings;
         if (!buttonMod) {
           buttonMod = this._modifications.button.unclaimed.shift();
           if (!buttonMod) {
             if (buttonToolbar) {
-              buttonSpan = document.createElement('li');
-              buttonSpan.classList.add('bqX');
+              buttonEl = document.createElement('li');
+              buttonEl.classList.add('bqX');
             } else {
-              buttonSpan = document.createElement('span');
+              buttonEl = document.createElement('span');
               // T-KT is one of the class names on the star button.
-              buttonSpan.classList.add('T-KT');
-            }
-            buttonSpan.classList.add('inboxsdk__thread_row_button');
-            if (buttonDescriptor.title) {
-              buttonSpan.setAttribute('title', buttonDescriptor.title);
-              buttonSpan.setAttribute('data-tooltip', buttonDescriptor.title);
-            } else {
-              buttonSpan.removeAttribute('title');
+              buttonEl.classList.add('T-KT');
             }
-            buttonSpan.setAttribute('tabindex', '-1');
-            buttonSpan.setAttribute('data-order-hint', String(buttonDescriptor.orderHint || 0));
-            buttonSpan.addEventListener('onmousedown', focusAndNoPropagation);
+            buttonEl.classList.add(BUTTON_CLASS);
+            buttonEl.setAttribute('tabindex', '-1');
+            buttonEl.setAttribute('data-order-hint', String(buttonDescriptor.orderHint || 0));
+            buttonEl.addEventListener('onmousedown', focusAndNoPropagation);
             iconSettings = {};
             buttonMod = {
-              buttonSpan,
+              buttonEl,
               iconSettings,
-              remove: buttonSpan.remove.bind(buttonSpan)
+              remove: buttonEl.remove.bind(buttonEl)
             };
           }
           this._modifications.button.claimed.push(buttonMod);
@@ -7786,11 +7788,20 @@ class GmailThreadRowView {
 
         // could also be trash icon
         const starGroup = buttonToolbar ? null : (0,querySelectorOrFail/* default */.A)(this._elements[0], 'td.apU.xY, td.aqM.xY');
-        buttonSpan = buttonMod.buttonSpan;
+        buttonEl = buttonMod.buttonEl;
         iconSettings = buttonMod.iconSettings;
+
+        // update title
+        if (buttonDescriptor.title) {
+          buttonEl.setAttribute('aria-label', buttonDescriptor.title);
+          buttonEl.setAttribute('data-tooltip', buttonDescriptor.title);
+        } else {
+          buttonEl.removeAttribute('aria-label');
+          buttonEl.removeAttribute('data-tooltip');
+        }
         if (buttonDescriptor.onClick) {
           // eslint-disable-next-line @typescript-eslint/no-unused-vars
-          buttonSpan.onclick = event => {
+          buttonEl.onclick = event => {
             const appEvent = {
               dropdown: null,
               threadRowView: this._userView
@@ -7807,7 +7818,7 @@ class GmailThreadRowView {
                 this._elements[0].classList.add('inboxsdk__dropdown_active');
                 this._elements[0].classList.add('buL'); // gmail class to force row button toolbar to be visible
 
-                appEvent.dropdown = activeDropdown = new dropdown_view/* default */.A(new gmail_dropdown_view/* default */.A(), buttonSpan, null);
+                appEvent.dropdown = activeDropdown = new dropdown_view/* default */.A(new gmail_dropdown_view/* default */.A(), buttonEl, null);
                 activeDropdown.setPlacementOptions({
                   position: 'bottom',
                   hAlign: 'left',
@@ -7829,22 +7840,13 @@ class GmailThreadRowView {
             buttonDescriptor.onClick.call(null, appEvent);
           };
         }
-        (0,update_icon/* default */.A)(iconSettings, buttonSpan, false, buttonDescriptor.iconClass, buttonDescriptor.iconUrl);
-        if (buttonToolbar && buttonSpan.parentElement !== buttonToolbar) {
-          (0,insert_element_in_order/* default */.A)(buttonToolbar, buttonSpan, undefined, true);
-        } else if (starGroup && buttonSpan.parentElement !== starGroup) {
-          (0,insert_element_in_order/* default */.A)(starGroup, buttonSpan);
+        (0,update_icon/* default */.A)(iconSettings, buttonEl, false, buttonDescriptor.iconClass, buttonDescriptor.iconUrl);
+        if (buttonToolbar && buttonEl.parentElement !== buttonToolbar) {
+          (0,insert_element_in_order/* default */.A)(buttonToolbar, buttonEl, undefined, true);
+        } else if (starGroup && buttonEl.parentElement !== starGroup) {
+          (0,insert_element_in_order/* default */.A)(starGroup, buttonEl);
           this._expandColumn('col.y5', 26 * starGroup.children.length);
-
-          // Don't let the whole column count as the star for click and mouse over purposes.
-          // Click events that aren't directly on the star should be stopped.
-          // Mouseover events that aren't directly on the star should be stopped and
-          // re-emitted from the thread row, so the thread row still has the mouseover
-          // appearance.
-          // Click events that are on one of our buttons should be stopped. Click events
-          // that aren't on the star button or our buttons should be re-emitted from the
-          // thread row so it counts as clicking on the thread.
-          starGroup.onmouseover = starGroup.onclick = starGroupEventInterceptor;
+          starGroup.onclick = onClickStarGroup;
         }
       }
     });
@@ -10292,7 +10294,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.6-1752599126954-7ed0da58f090270c");
+              "2.2.7-1753737313283-f941d482eba8eb97");
               document.head.append(htmlElement);
             };
 options.domAPI = (styleDomAPI_default());
@@ -15042,7 +15044,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.6-1752599126954-7ed0da58f090270c");
+              "2.2.7-1753737313283-f941d482eba8eb97");
               document.head.append(htmlElement);
             };
 options.domAPI = (styleDomAPI_default());
@@ -19802,7 +19804,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.6-1752599126954-7ed0da58f090270c");
+              "2.2.7-1753737313283-f941d482eba8eb97");
               document.head.append(htmlElement);
             };
 mole_view_module_options.domAPI = (styleDomAPI_default());