From 54382475be7f53434308218eb9c97a1a62794d4f Mon Sep 17 00:00:00 2001
From: windingwind <33902321+windingwind@users.noreply.github.com>
Date: Mon, 29 Apr 2024 11:45:09 +0800
Subject: [PATCH] Fix advanced search menu issues

Fix needsgutter padding of menupopup in menulist on MacOS
fix: #4052
Fix advanced search operator menu multi-select status
---
 .../content/zotero/elements/zoteroSearch.js   | 20 +++++++++++++------
 scss/mac/_menupopup.scss                      |  7 +++++++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/chrome/content/zotero/elements/zoteroSearch.js b/chrome/content/zotero/elements/zoteroSearch.js
index 0cdac238bf..12bbc9f628 100644
--- a/chrome/content/zotero/elements/zoteroSearch.js
+++ b/chrome/content/zotero/elements/zoteroSearch.js
@@ -50,8 +50,8 @@
 						<label value="&zotero.search.joinMode.prefix;"/>
 						<menulist id="joinModeMenu" oncommand="this.closest('zoterosearch').updateJoinMode();" native="true">
 							<menupopup>
-								<menuitem label="&zotero.search.joinMode.any;" value="any"/>
-								<menuitem label="&zotero.search.joinMode.all;" value="all" selected="true"/>
+								<menuitem label="&zotero.search.joinMode.any;" value="any" type="radio"/>
+								<menuitem label="&zotero.search.joinMode.all;" value="all" type="radio" selected="true"/>
 							</menupopup>
 						</menulist>
 						<label value="&zotero.search.joinMode.suffix;"/>
@@ -261,10 +261,11 @@
 			
 			// Build operator menu
 			for (let operator of operators) {
-				operatorsList.appendItem(
+				let menuitem = operatorsList.appendItem(
 					Zotero.getString('searchOperator.' + operator),
 					operator
 				);
+				menuitem.setAttribute('type', 'radio');
 			}
 			
 			// Build conditions menu
@@ -277,12 +278,14 @@
 					var menuitem = document.createXULElement('menuitem');
 					menuitem.setAttribute('label', condition.localized);
 					menuitem.setAttribute('value', condition.name);
+					menuitem.setAttribute('type', 'radio');
 					moreConditionsMenu.before(menuitem);
 				}
 				else {
 					var menuitem = moreConditionsMenu.appendItem(
 						condition.localized, condition.name
 					);
+					menuitem.setAttribute('type', 'radio');
 				}
 				
 				var baseFields = null;
@@ -412,6 +415,8 @@
 				}
 			}
 			operatorsList.selectedIndex = selectThis;
+			// Setting `selected` does not change `checked`. Should explicitly set it.
+			operatorsList.selectedItem.setAttribute('checked', true);
 			
 			// Generate drop-down menu instead of textbox for certain conditions
 			switch (conditionName) {
@@ -552,6 +557,7 @@
 				if (row.image) {
 					menuitem.className = 'menuitem-iconic';
 					menuitem.setAttribute('image', row.image);
+					menuitem.setAttribute('type', 'radio');
 				}
 			}
 			valueMenu.selectedIndex = 0;
@@ -909,9 +915,9 @@
 				<html:input class="input"/>
 				<menulist class="age-list" native="true">
 					<menupopup>
-						<menuitem label="&zotero.search.date.units.days;" value="days" selected="true"/>
-						<menuitem label="&zotero.search.date.units.months;" value="months"/>
-						<menuitem label="&zotero.search.date.units.years;" value="years"/>
+						<menuitem label="&zotero.search.date.units.days;" value="days" type="radio" selected="true"/>
+						<menuitem label="&zotero.search.date.units.months;" value="months" type="radio"/>
+						<menuitem label="&zotero.search.date.units.years;" value="years" type="radio"/>
 					</menupopup>
 				</menulist>
 			</html:div>
@@ -942,6 +948,8 @@
 				}
 			}
 			menulist.selectedIndex = selectThis;
+			// Setting `selected` does not change `checked`. Should explicitly set it.
+			menulist.selectedItem.setAttribute('checked', true);
 		}
 	}
 	customElements.define("zoterosearchagefield", ZoteroSearchAgeField);
diff --git a/scss/mac/_menupopup.scss b/scss/mac/_menupopup.scss
index 3fe9b2154b..33749f5c32 100644
--- a/scss/mac/_menupopup.scss
+++ b/scss/mac/_menupopup.scss
@@ -63,6 +63,13 @@ menupopup {
 	}
 }
 
+// Overwrite menulist rules
+menulist > menupopup > menuitem::after,
+menulist > menupopup > menuitem::before {
+	content: none;
+	padding-inline: 0;
+}
+
 // Modified based on rules from https://searchfox.org/mozilla-esr102/source/browser/base/content/browser.css
 
 /* On Mac, use the properties "-moz-window-transform" and "-moz-window-opacity"