From 1c471acfd54602e522c9b516ab66c63b94d34ea7 Mon Sep 17 00:00:00 2001
From: James Burton <jamesejburton@gmail.com>
Date: Fri, 8 Jan 2021 19:03:46 +0000
Subject: [PATCH] Fixed bug when duplicating option tags (#1716)

---
 yesod-form-multi/ChangeLog.md             | 6 ++++++
 yesod-form-multi/Yesod/Form/MultiInput.hs | 5 ++++-
 yesod-form-multi/yesod-form-multi.cabal   | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/yesod-form-multi/ChangeLog.md b/yesod-form-multi/ChangeLog.md
index b4992af5..737cd3af 100644
--- a/yesod-form-multi/ChangeLog.md
+++ b/yesod-form-multi/ChangeLog.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.7.0.1
+
+[#1716](https://github.com/yesodweb/yesod/pull/1716)
+
+* Fixed bug where duplicating `<option>` tags caused the `value` field to be cleared
+
 ## 1.7.0
 
 [#1707](https://github.com/yesodweb/yesod/pull/1707)
diff --git a/yesod-form-multi/Yesod/Form/MultiInput.hs b/yesod-form-multi/Yesod/Form/MultiInput.hs
index b9bc76d5..37e6b6e1 100644
--- a/yesod-form-multi/Yesod/Form/MultiInput.hs
+++ b/yesod-form-multi/Yesod/Form/MultiInput.hs
@@ -304,11 +304,14 @@ mhelperMulti field@Field {..} fs@FieldSettings {..} wrapperClass defs minVals Mu
                     // input types where we don't want to reset the value
                     const keepValueTypes = ["radio", "checkbox", "button"];
 
+                    var shouldKeep = keepValueTypes.includes(e.prop('type'))
+                                        || e.prop("tagName") == "OPTION";
+
                     // uncheck any checkboxes or radio fields and empty any text boxes
                     if(e.prop('checked') == true)
                         e.prop('checked', false);
 
-                    if(!keepValueTypes.includes(e.prop('type')))
+                    if(!shouldKeep)
                         e.val("").trigger("change");
                         // trigger change is to ensure WYSIWYG editors are updated
                         // when their hidden code field is cleared
diff --git a/yesod-form-multi/yesod-form-multi.cabal b/yesod-form-multi/yesod-form-multi.cabal
index ddcec457..7e576ead 100644
--- a/yesod-form-multi/yesod-form-multi.cabal
+++ b/yesod-form-multi/yesod-form-multi.cabal
@@ -1,5 +1,5 @@
 name:            yesod-form-multi
-version:         1.7.0
+version:         1.7.0.1
 license:         MIT
 license-file:    LICENSE
 author:          James Burton <jamesejburton@gmail.com>