Fixed issues with autocomplete selecting category items (win)

toggl-open-source · May 28, 2018 · bd4edf4 · bd4edf4
1 parent 2ae2397
commit bd4edf4
Showing 1 changed file with 26 additions and 11 deletions.
diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/AutoCompletion/AutoCompleteController.cs b/src/ui/windows/TogglDesktop/TogglDesktop/AutoCompletion/AutoCompleteController.cs
@@ -156,7 +156,6 @@ public void FillList(ListBox listBox, Action<AutoCompleteItem> selectWithClick,
                 }
                 visibleItems = items;
                 LB.ItemsSource = visibleItems;
-
             }
         }
 
@@ -212,7 +211,7 @@ public void Complete(string input)
                 visibleItems = filteredItems;
             }
             LB.ItemsSource = visibleItems;
-            this.selectIndex(1);
+            this.selectFirstItem(0);
         }
 
         private bool Filter(object item)
@@ -257,6 +256,19 @@ private void validateSelection()
              * */
         }
 
+        private void selectFirstItem(int index)
+        {
+            if (this.visibleItems.Count == 0 || index >= this.visibleItems.Count)
+                return;
+
+            if (this.visibleItems[index].Type < 0)
+            {
+                this.selectFirstItem(++index);
+                return;
+            }
+            this.selectIndex(index);
+        }
+
         private void selectIndex(int index)
         {
             if (index < 0 || this.visibleItems.Count == 0 || index >= this.visibleItems.Count)
@@ -277,13 +289,15 @@ public void SelectNext()
 
             var i = this.selectedIndex + 1;
             if (i == this.visibleItems.Count)
+            {
                 i = 0;
+            }
 
             if (this.visibleItems[i].Type < 0)
             {
-                i++;
-                if (i == this.visibleItems.Count)
-                    i = 0;
+                this.selectedIndex = i;
+                this.SelectNext();
+                return;
             }
             this.selectIndex(i);
         }
@@ -295,15 +309,16 @@ public void SelectPrevious()
 
             var i = this.selectedIndex - 1;
             if (i < 0)
-                i = this.visibleItems.Count - 1;
-
+            {
+                i = this.visibleItems.Count - 1;   
+            }
+
             if (this.visibleItems[i].Type < 0)
             {
-                i--;
-                if (i < 0)
-                    i = this.visibleItems.Count - 1;
+                this.selectedIndex = i;
+                this.SelectPrevious();
+                return;
             }
-
             this.selectIndex(i);
         }