From f17d382fcb7392905049f2758bc840364509ea30 Mon Sep 17 00:00:00 2001
From: Josh Schmidt <oyejorge@gmail.com>
Date: Mon, 7 Jun 2021 18:53:58 -0600
Subject: [PATCH] updateOriginalInput() for duplicate items

---
 src/tom-select.ts               | 42 +++++++++++++++++++++------------
 test/tests/config-duplicates.js |  8 ++++---
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/tom-select.ts b/src/tom-select.ts
index 57aac177..e97bde8f 100644
--- a/src/tom-select.ts
+++ b/src/tom-select.ts
@@ -1333,7 +1333,7 @@ export default class TomSelect extends MicroPlugin(MicroEvent){
 					groups_order.push(optgroup);
 				}
 
-				// a child could only have one parent, so if you have more parents clone the child
+				// nodes can only have one parent, so if the option is in mutple groups, we need a clone
 				if( j > 0 ){
 					option_el = option_el.cloneNode(true) as HTMLElement;
 					setAttr(option_el,{id: option.$id+'-clone-'+j,'aria-selected':null});
@@ -2036,6 +2036,8 @@ export default class TomSelect extends MicroPlugin(MicroEvent){
 
 		if( self.is_select_tag ){
 
+			const selected = document.createDocumentFragment();
+
 			function AddSelected(option_el:HTMLOptionElement|null, value:string, label:string):HTMLOptionElement{
 
 				if( !option_el ){
@@ -2044,34 +2046,44 @@ export default class TomSelect extends MicroPlugin(MicroEvent){
 
 				option_el.selected = true;
 				setAttr(option_el,{selected:'true'});
-				self.input.prepend(option_el);
+				selected.append(option_el);
 
 				return option_el;
 			}
 
-			// remove selected attribute from options whose values are not in self.items
+			// unselect all selected options
 			self.input.querySelectorAll('option[selected]').forEach((option_el:Element) => {
-				const _opt = option_el as HTMLOptionElement;
-				if( self.items.indexOf(_opt.value) == -1 ){
-					setAttr(_opt,{selected:null});
-					_opt.selected = false;
-				}
+				setAttr(option_el,{selected:null});
+				(<HTMLOptionElement>option_el).selected = false;
 			});
 
-			// order selected <option> tags for values in self.items
-			for( i = self.items.length - 1; i >= 0; i-- ){
-				value			= self.items[i];
-				option			= self.options[value];
-				label			= option[self.settings.labelField] || '';
-				option.$option	= AddSelected(option.$option, value, label);
-			}
 
 			// nothing selected?
 			if( self.items.length == 0 && self.settings.mode == 'single' && !self.isRequired ){
 				option_el = self.input.querySelector('option[value=""]');
 				AddSelected(option_el, "", "");
+
+			// order selected <option> tags for values in self.items
+			}else{
+
+				for( i = 0; i < self.items.length; i++ ){
+					value			= self.items[i];
+					option			= self.options[value];
+					label			= option[self.settings.labelField] || '';
+
+					if( selected.contains(option.$option) ){
+						const reuse_opt = self.input.querySelector(`option[value="${addSlashes(value)}"]`) as HTMLOptionElement;
+						AddSelected(reuse_opt, value, label);
+					}else{
+						option.$option	= AddSelected(option.$option, value, label);
+					}
+				}
+
 			}
 
+			// prepend all of the selected options
+			self.input.prepend(selected);
+
 		} else {
 			self.input.value = self.getValue() as string;
 		}
diff --git a/test/tests/config-duplicates.js b/test/tests/config-duplicates.js
index 168908be..3baf3bc2 100644
--- a/test/tests/config-duplicates.js
+++ b/test/tests/config-duplicates.js
@@ -10,13 +10,15 @@ describe('duplicates', function() {
 		assert.equal(0,test.instance.items.length,0,'should start empty');
 		test.instance.addItem('a');
 		assert.equal(test.instance.items.length,1,'should add one');
+		assert.equal(test.instance.input.querySelectorAll('option[value="a"]').length, 1, 'should have 1 option w/ value=a in original select');
+
 		test.instance.addItem('a');
 		assert.equal(test.instance.items.length,2,'should add second');
-		test.instance.addItem('a');
+		assert.equal(test.instance.input.querySelectorAll('option[value="a"]').length, 2,'should have 3 options w/ value=a in original select');
 
+		test.instance.addItem('a');
 		assert.equal(test.instance.items.length,3,'should have all three');
-
-
+		assert.equal(test.instance.input.querySelectorAll('option[value="a"]').length, 3, 'should have 3 option w/ value=a in original select');
 
 		// remove items in order
 		const items = test.instance.controlChildren();