From d96afa4499c744e2d10bc53d3819bed19a32469f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= <adomas.ven@gmail.com>
Date: Tue, 25 Jul 2023 14:22:57 +0300
Subject: [PATCH] Fix split-menu-button dropmarker triggering the button click
 event

Regression in fa31956d
---
 .../zotero/elements/splitMenuButton.js        | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/chrome/content/zotero/elements/splitMenuButton.js b/chrome/content/zotero/elements/splitMenuButton.js
index 6a26c46967..cea1fcdbd8 100644
--- a/chrome/content/zotero/elements/splitMenuButton.js
+++ b/chrome/content/zotero/elements/splitMenuButton.js
@@ -41,10 +41,8 @@
 			// Pointer events don't reach the button's children, so check mousedown positions manually and open
 			// the popup if over the end side of the button
 			this.addEventListener('mousedown', (event) => {
-				let rect = this.querySelector('[anonid="dropmarker-box"]').getBoundingClientRect();
-				if ((!Zotero.rtl && event.clientX >= rect.left || Zotero.rtl && event.clientX <= rect.right)
-						&& Zotero.Utilities.Internal.showNativeElementPopup(this)) {
-					event.preventDefault();
+				if (this._isEventInDropmarkerBox(event)) {
+					Zotero.Utilities.Internal.showNativeElementPopup(this);
 				}
 			});
 			
@@ -57,6 +55,20 @@
 
 		connectedCallback() {
 			this.append(this.constructor.contentFragment);
+			
+			// Prevent DOM-attached mouse handlers from running in the dropmarker area
+			for (const eventType of ['mousedown', 'mouseup', 'click']) {
+				const handler = this.getAttribute('on' + eventType);
+				if (!handler) {
+					continue;
+				}
+				this['on' + eventType] = null;
+				this.addEventListener(eventType, (event) => {
+					if (!this._isEventInDropmarkerBox(event)) {
+						eval(handler).bind(this);
+					}
+				});
+			}
 		}
 
 		get image() {
@@ -94,6 +106,11 @@
 			Object.defineProperty(this, "dropmarkerFragment", { value: frag });
 			return frag;
 		}
+		
+		_isEventInDropmarkerBox(event) {
+			let rect = this.querySelector('[anonid="dropmarker-box"]').getBoundingClientRect();
+			return !Zotero.rtl && event.clientX >= rect.left || Zotero.rtl && event.clientX <= rect.right
+		}
 	}
 
 	customElements.define("split-menu-button", SplitMenuButton, {