Do not reset search when clicking with ctrl/meta.

harvesthq · Oct 25, 2017 · 2d6d468 · 2d6d468
1 parent 4b9f2ea
commit 2d6d468
Show file tree

Hide file tree

Showing 3 changed files with 100 additions and 4 deletions.
diff --git a/coffee/chosen.jquery.coffee b/coffee/chosen.jquery.coffee
@@ -366,15 +366,18 @@ class Chosen extends AbstractChosen
 
       @form_field.options[item.options_index].selected = true
       @selected_option_count = null
-      @search_field.val("")
 
       if @is_multiple
         this.choice_build item
       else
         this.single_set_selected_text(this.choice_label(item))
 
       if @is_multiple && (!@hide_results_on_select || (evt.metaKey or evt.ctrlKey))
-        this.winnow_results(skip_highlight: true)
+        if evt.metaKey or evt.ctrlKey
+          this.winnow_results(skip_highlight: true)
+        else
+          @search_field.val("")
+          this.winnow_results()
       else
         this.results_hide()
         this.show_search_field_default()

diff --git a/coffee/chosen.proto.coffee b/coffee/chosen.proto.coffee
@@ -358,15 +358,18 @@ class @Chosen extends AbstractChosen
 
       @form_field.options[item.options_index].selected = true
       @selected_option_count = null
-      @search_field.value = ""
 
       if @is_multiple
         this.choice_build item
       else
         this.single_set_selected_text(this.choice_label(item))
 
       if @is_multiple && (!@hide_results_on_select || (evt.metaKey or evt.ctrlKey))
-        this.winnow_results(skip_highlight: true)
+        if evt.metaKey or evt.ctrlKey
+          this.winnow_results(skip_highlight: true)
+        else
+          @search_field.value = ""
+          this.winnow_results()
       else
         this.results_hide()
         this.show_search_field_default()

diff --git a/spec/jquery/searching.spec.coffee b/spec/jquery/searching.spec.coffee
@@ -279,3 +279,93 @@ describe "Searching", ->
         search_field.trigger("keyup")
         expect(div.find(".active-result").length).toBe(1)
         expect(div.find(".active-result")[0].innerText.slice(1)).toBe(boundary_thing)
+
+  it "does not clear search text or highlight first suggestion when holding ctrl/cmd and selecting multiple items", () ->
+    div = $("<div>").html("""
+      <select multiple>
+        <option></option>
+        <option>Betty Holberton</option>
+        <option>Radia Perlman</option>
+        <option>Barbara Liskov</option>
+        <option>Frances Allen</option>
+        <option>Shafi Goldwasser</option>
+        <option>Maria Klawe</option>
+        <option>Jean E. Sammet</option>
+        <option>Adele Goldberg</option>
+        <option>Jeannette Wing</option>
+        <option>Éva Tardos</option>
+        <option>Lynn Conway</option>
+        <option>Karen Spärck Jones</option>
+        <option>Sophie Wilson</option>
+        <option>Wendy Hall</option>
+      </select>
+    """)
+
+    div.find("select").chosen()
+    div.find(".chosen-container").trigger("mousedown") # open the drop
+
+    search_field = div.find(".chosen-search-input")
+    search_field.val("s").trigger("keyup")
+
+    results = div.find(".chosen-results")
+    first_result = results.find("li:nth-of-type(1)")
+    second_result = results.find("li:nth-of-type(2)")
+
+    expect(first_result.prop("class")).toContain("highlighted")
+
+    mouseup_with_meta = $.Event("mouseup")
+    mouseup_with_meta.metaKey = true
+    second_result.mouseover().trigger(mouseup_with_meta)
+
+    expect(div.find(".search-choice").length).toBe(1)
+    expect(search_field.val()).toBe("s")
+    expect(first_result.prop("class")).not.toContain("highlighted")
+
+    third_result = results.find("li:nth-of-type(3)")
+
+    mouseup_with_ctrl = $.Event("mouseup")
+    mouseup_with_ctrl.ctrlKey = true
+    third_result.mouseover().trigger(mouseup_with_ctrl)
+
+    expect(div.find(".search-choice").length).toBe(2)
+    expect(search_field.val()).toBe("s")
+    expect(first_result.prop("class")).not.toContain("highlighted")
+
+  it "clears search text and highlights first suggestion without ctrl/cmd and selecting multiple items without hide_results_on_select", () ->
+    div = $("<div>").html("""
+      <select multiple>
+        <option></option>
+        <option>Betty Holberton</option>
+        <option>Radia Perlman</option>
+        <option>Barbara Liskov</option>
+        <option>Frances Allen</option>
+        <option>Shafi Goldwasser</option>
+        <option>Maria Klawe</option>
+        <option>Jean E. Sammet</option>
+        <option>Adele Goldberg</option>
+        <option>Jeannette Wing</option>
+        <option>Éva Tardos</option>
+        <option>Lynn Conway</option>
+        <option>Karen Spärck Jones</option>
+        <option>Sophie Wilson</option>
+        <option>Wendy Hall</option>
+      </select>
+    """)
+
+    div.find("select").chosen(hide_results_on_select: false)
+    div.find(".chosen-container").trigger("mousedown") # open the drop
+
+    search_field = div.find(".chosen-search-input")
+    search_field.val("s").trigger("keyup")
+
+    results = div.find(".chosen-results")
+    first_result = results.find("li:nth-of-type(1)")
+    second_result = results.find("li:nth-of-type(2)")
+
+    expect(first_result.prop("class")).toContain("highlighted")
+
+    second_result.mouseover().mouseup()
+
+    expect(div.find(".search-choice").length).toBe(1)
+    expect(search_field.val()).toBe("")
+    expect(results.find("li:nth-of-type(1)").prop("class")).toContain("highlighted")