Merge pull request #2021 from dmytroyarmak/fix-1987

fix(activeIndex) reset active option on clear model

Author: Jefiozie

src/uiSelectController.js

@@ -88,10 +88,14 @@ uis.controller('uiSelectCtrl',
     if (ctrl.resetSearchInput) {
       ctrl.search = EMPTY_SEARCH;
       //reset activeIndex
-      if (ctrl.selected && ctrl.items.length && !ctrl.multiple) {
-        ctrl.activeIndex = _findIndex(ctrl.items, function(item){
-          return angular.equals(this, item);
-        }, ctrl.selected);
+      if (!ctrl.multiple) {
+        if (ctrl.selected && ctrl.items.length) {
+          ctrl.activeIndex = _findIndex(ctrl.items, function(item){
+            return angular.equals(this, item);
+          }, ctrl.selected);
+        } else {
+          ctrl.activeIndex = 0;
+        }
       }
     }
   }

test/select.spec.js

@@ -846,6 +846,20 @@ describe('ui-select tests', function () {
     expect(getMatchLabel(el)).toEqual('-- None Selected --');
   });
 
+  it('should not have active option when model cleared', function () {
+    var el = createUiSelect();
+
+    clickItem(el, 'Samantha');
+    expect(el.scope().$select.activeIndex).toBe(5);
+
+    scope.selection.selected = null;
+    scope.$digest();
+
+    el.find(".ui-select-toggle").click();
+
+    expect(el.scope().$select.activeIndex).toBe(0);
+  });
+
   describe('backspace reset option', function () {
     it('should undefined model when pressing BACKSPACE key if backspaceReset=true', function () {
       var el = createUiSelect();