From c7d2ddc5db4870c72b659321c425bc10a9c22903 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 3 Aug 2021 13:13:48 +1000
Subject: [PATCH] Fix unsetting performer gender (#1606)

* Fix unset performer gender
* Fix button group appearing over select menu
---
 ui/v2.5/src/components/Changelog/versions/v090.md               | 1 +
 .../Performers/PerformerDetails/PerformerEditPanel.tsx          | 2 +-
 ui/v2.5/src/index.scss                                          | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/Changelog/versions/v090.md b/ui/v2.5/src/components/Changelog/versions/v090.md
index cbb8b0f3f..b03c020e7 100644
--- a/ui/v2.5/src/components/Changelog/versions/v090.md
+++ b/ui/v2.5/src/components/Changelog/versions/v090.md
@@ -6,6 +6,7 @@
 * Added de-DE language option. ([#1578](https://github.com/stashapp/stash/pull/1578))
 
 ### 🐛 Bug fixes
+* Fix unsetting performer gender not working correctly. ([#1606](https://github.com/stashapp/stash/pull/1606))
 * Fix is missing date scene criterion causing invalid SQL. ([#1577](https://github.com/stashapp/stash/pull/1577))
 * Fix rendering of carousel images on Apple devices. ([#1562](https://github.com/stashapp/stash/pull/1562))
 * Show New and Delete buttons in mobile view. ([#1539](https://github.com/stashapp/stash/pull/1539))
\ No newline at end of file
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index b89cbbd89..da024bb0e 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -466,7 +466,7 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
   function getUpdateValues(values: InputValues): GQL.PerformerUpdateInput {
     return {
       ...values,
-      gender: stringToGender(values.gender),
+      gender: stringToGender(values.gender) ?? null,
       rating: values.rating ?? null,
       weight: Number(values.weight),
       id: performer.id ?? "",
diff --git a/ui/v2.5/src/index.scss b/ui/v2.5/src/index.scss
index 46acabbd7..58c81d61c 100755
--- a/ui/v2.5/src/index.scss
+++ b/ui/v2.5/src/index.scss
@@ -229,6 +229,7 @@ div.react-select__menu,
 div.dropdown-menu {
   background-color: $secondary;
   color: $text-color;
+  z-index: 3;
 
   .react-select__option,
   .dropdown-item {