From cbece42fb94e94b7f6fdb1f03428e0ebb1769a8b Mon Sep 17 00:00:00 2001
From: Abe Jellinek <jellinek@berkeley.edu>
Date: Fri, 28 Jul 2023 15:05:34 -0400
Subject: [PATCH] Fix merge pane overflow behavior

The item box CE can't be the scroll container, so it needs a wrapper element.

Fixes #3233
---
 chrome/content/zotero/zoteroPane.xhtml  | 6 ++++--
 chrome/skin/default/zotero/itemPane.css | 7 +------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/chrome/content/zotero/zoteroPane.xhtml b/chrome/content/zotero/zoteroPane.xhtml
index a8ed53b46d..943f5f3a49 100644
--- a/chrome/content/zotero/zoteroPane.xhtml
+++ b/chrome/content/zotero/zoteroPane.xhtml
@@ -1114,7 +1114,7 @@
 											</groupbox>
 											
 											<!-- Duplicate merging -->
-											<vbox id="zotero-duplicates-merge-pane" flex="1">
+											<vbox id="zotero-duplicates-merge-pane">
 												<groupbox>
 													<button id="zotero-duplicates-merge-button" oncommand="Zotero_Duplicates_Pane.merge()"/>
 												</groupbox>
@@ -1128,7 +1128,9 @@
 												
 												<groupbox flex="1">
 													<description id="zotero-duplicates-merge-field-select">&zotero.duplicatesMerge.fieldSelect;</description>
-													<item-box id="zotero-duplicates-merge-item-box" flex="1"/>
+													<vbox id="zotero-duplicates-merge-item-box-container" flex="1">
+														<item-box id="zotero-duplicates-merge-item-box" flex="1"/>
+													</vbox>
 												</groupbox>
 											</vbox>
 										</deck>
diff --git a/chrome/skin/default/zotero/itemPane.css b/chrome/skin/default/zotero/itemPane.css
index 08a3f31fd9..02b31a87da 100644
--- a/chrome/skin/default/zotero/itemPane.css
+++ b/chrome/skin/default/zotero/itemPane.css
@@ -76,15 +76,10 @@
 	margin: 8px 0 0 0;
 }
 
-#zotero-duplicates-merge-item-box {
+#zotero-duplicates-merge-item-box-container {
 	overflow-y: scroll;
 }
 
-#zotero-duplicates-merge-item-box row
-{
-	min-height: 20px;
-}
-
 #zotero-feed-item-toggleRead-button {
 	overflow: hidden;
 	white-space: nowrap;