Merge pull request #934 from happyhua/master

fix on issue 932, better handling on key down/up event.

Author: kevzlou7979

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialSearch.java

@@ -181,7 +181,7 @@ public void onKeyUp(KeyUpEvent event) {
                         reset(obj.getKeyword());
                     });
                     // If matches add to search result container and object to temp searches
-                    if (obj.getKeyword().toLowerCase().contains(keyword)) {
+                    if (match(obj, keyword)) {
                         searchResultPanel.add(link);
                         tempSearches.add(obj);
                     }
@@ -211,25 +211,21 @@ public void onKeyUp(KeyUpEvent event) {
 
                 // Selection logic using key down event to navigate the search results
                 int totalItems = searchResultPanel.getWidgetCount();
-                if (event.getNativeEvent().getKeyCode() == KeyCodes.KEY_DOWN) {
-                    if (curSel >= totalItems) {
-                        setCurSel(getCurSel());
-                        applyHighlightedItem((MaterialLink) searchResultPanel.getWidget(curSel - 1));
-                    } else {
-                        setCurSel(getCurSel() + 1);
-                        applyHighlightedItem((MaterialLink) searchResultPanel.getWidget(curSel));
+                if (totalItems > 0) {
+                    if (event.getNativeEvent().getKeyCode() == KeyCodes.KEY_DOWN) {
+                    	if (++curSel >= totalItems)
+                    		curSel = 0;
+                    	
+                    	applyHighlightedItem((MaterialLink) searchResultPanel.getWidget(curSel));
                     }
-                }
 
-                // Selection logic using key up event to navigate the search results
-                if (event.getNativeEvent().getKeyCode() == KeyCodes.KEY_UP) {
-                    if (curSel <= -1) {
-                        setCurSel(-1);
-                        applyHighlightedItem((MaterialLink) searchResultPanel.getWidget(curSel));
-                    } else {
-                        setCurSel(getCurSel() - 1);
-                        applyHighlightedItem((MaterialLink) searchResultPanel.getWidget(curSel));
-                    }
+                    // Selection logic using key up event to navigate the search results
+                    if (event.getNativeEvent().getKeyCode() == KeyCodes.KEY_UP) {
+                    	if (--curSel < 0)
+                    		curSel = totalItems - 1;
+                    	
+                    	applyHighlightedItem((MaterialLink) searchResultPanel.getWidget(curSel));
+                    }                	
                 }
             }
 
@@ -244,6 +240,10 @@ private void reset(String keyword) {
         }));
     }
 
+	protected boolean match(SearchObject obj, String keyword) {
+		return obj.getKeyword().toLowerCase().contains(keyword);
+	}
+
     @Override
     protected void onUnload() {
         super.onUnload();