From cef5b46f930699147400750ce7d80981b5bc557a Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 25 Sep 2024 14:04:42 +1000
Subject: [PATCH] Fix merge dialog select boxes display issue (#5299)

---
 ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx        | 2 ++
 ui/v2.5/src/components/Tags/TagDetails/TagMergeDialog.tsx | 2 ++
 ui/v2.5/src/docs/en/Changelog/v0270.md                    | 1 +
 3 files changed, 5 insertions(+)

diff --git a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
index c019abcea..6fab0a150 100644
--- a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
@@ -771,6 +771,7 @@ export const SceneMergeModal: React.FC<ISceneMergeModalProps> = ({
                 isMulti
                 onSelect={(items) => setSourceScenes(items)}
                 values={sourceScenes}
+                menuPortalTarget={document.body}
               />
             </Col>
           </Form.Group>
@@ -803,6 +804,7 @@ export const SceneMergeModal: React.FC<ISceneMergeModalProps> = ({
               <SceneSelect
                 onSelect={(items) => setDestScene(items)}
                 values={destScene}
+                menuPortalTarget={document.body}
               />
             </Col>
           </Form.Group>
diff --git a/ui/v2.5/src/components/Tags/TagDetails/TagMergeDialog.tsx b/ui/v2.5/src/components/Tags/TagDetails/TagMergeDialog.tsx
index cc4051c5a..5d0bf80b8 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/TagMergeDialog.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/TagMergeDialog.tsx
@@ -106,6 +106,7 @@ export const TagMergeModal: React.FC<ITagMergeModalProps> = ({
                   onSelect={(items) => setSrc(items)}
                   values={src}
                   excludeIds={tag?.id ? [tag.id] : []}
+                  menuPortalTarget={document.body}
                 />
               </Col>
             </Form.Group>
@@ -129,6 +130,7 @@ export const TagMergeModal: React.FC<ITagMergeModalProps> = ({
                   onSelect={(items) => setDest(items[0])}
                   values={dest ? [dest] : undefined}
                   excludeIds={tag?.id ? [tag.id] : []}
+                  menuPortalTarget={document.body}
                 />
               </Col>
             </Form.Group>
diff --git a/ui/v2.5/src/docs/en/Changelog/v0270.md b/ui/v2.5/src/docs/en/Changelog/v0270.md
index b9e1c7b67..cb8751e75 100644
--- a/ui/v2.5/src/docs/en/Changelog/v0270.md
+++ b/ui/v2.5/src/docs/en/Changelog/v0270.md
@@ -29,6 +29,7 @@
 * Scene Player now allows interacting with the controls before playing video, and errors no longer prevent interacting with the Scene Player. ([#5145](https://github.com/stashapp/stash/pull/5145))
 
 ### 🐛 Bug fixes
+* **[0.27.1]** Fixed dropdowns not displaying correctly in the merge dialogs.
 * Fixed videos and images having incorrect dimensions when the orientation flag is set to a non-default value during scan. ([#5188](https://github.com/stashapp/stash/pull/5188), [#5189](https://github.com/stashapp/stash/pull/5189))
 * Fixed mp4 videos being incorrectly transcoded when the file has opus audio codec. ([#5030](https://github.com/stashapp/stash/pull/5030))
 * Fixed o-history being imported as view-history when importing from JSON. ([#5127](https://github.com/stashapp/stash/pull/5127))