- MaterialTimePicker and Autocomplete - Improve the placeholder to be uniform to other form fields.

- MaterialTimePicker and Autocomplete - Fixed the margins and extra paddings to fix the vertical spacing.
- MaterialTimePicker and Autocomplete - Fixed some minor styles on disabled state.

Author: kevzlou7979

src/main/java/gwt/material/design/addins/client/autocomplete/MaterialAutoComplete.java

@@ -39,13 +39,16 @@
 import gwt.material.design.client.constants.ProgressType;
 import gwt.material.design.client.ui.MaterialChip;
 import gwt.material.design.client.ui.MaterialLabel;
+import gwt.material.design.client.ui.MaterialToast;
+import gwt.material.design.client.ui.html.Label;
 import gwt.material.design.client.ui.html.ListItem;
 import gwt.material.design.client.ui.html.UnorderedList;
 
 import java.util.*;
 import java.util.Map.Entry;
 
 //@formatter:off
+
 /**
  * <p>
  * Use GWT Autocomplete to search for matches from local or remote data sources.
@@ -93,7 +96,7 @@
  *         List&lt;UserSuggestion&gt; list = new ArrayList&lt;&gt;();
  *
  *         /{@literal *}
- *         {@literal *}  Finds the contacts that meets the criteria. Note that since the 
+ *         {@literal *}  Finds the contacts that meets the criteria. Note that since the
  *         {@literal *}  requestSuggestions method is asynchronous, you can fetch the
  *         {@literal *}  results from the server instead of using a local contacts List.
  *         {@literal *}/
@@ -144,7 +147,7 @@
  *     for (Suggestion value : values) {
  *         if (value instanceof UserSuggestion){
  *             UserSuggestion us = (UserSuggestion) value;
- *             User user = us.getUser();                            
+ *             User user = us.getUser();
  *             users.add(user);
  *         }
  *     }
@@ -169,6 +172,7 @@ public class MaterialAutoComplete extends MaterialWidget implements HasError, Ha
     }
 
     private Map<Suggestion, Widget> suggestionMap = new LinkedHashMap<>();
+    private Label label = new Label();
 
     private List<ListItem> itemsHighlighted = new ArrayList<>();
     private FlowPanel panel = new FlowPanel();
@@ -179,7 +183,7 @@ public class MaterialAutoComplete extends MaterialWidget implements HasError, Ha
     private int limit = 0;
     private MaterialLabel lblError = new MaterialLabel();
     private final ProgressMixin<MaterialAutoComplete> progressMixin = new ProgressMixin<>(this);
-    
+
     private String selectedChipStyle = "blue white-text";
     private boolean directInputAllowed = true;
     private MaterialChipProvider chipProvider = new DefaultMaterialChipProvider();
@@ -196,7 +200,7 @@ public class MaterialAutoComplete extends MaterialWidget implements HasError, Ha
      * sources.
      */
     public MaterialAutoComplete() {
-        super(Document.get().createDivElement());
+        super(Document.get().createDivElement(), "autocomplete", "input-field");
         add(panel);
     }
 
@@ -231,6 +235,7 @@ protected void generateAutoComplete(SuggestOracle suggestions) {
         itemBox.getElement().setId(autocompleteId);
 
         item.add(box);
+        item.add(label);
         list.add(item);
 
         list.addDomHandler(new ClickHandler() {
@@ -240,6 +245,15 @@ public void onClick(ClickEvent event) {
             }
         }, ClickEvent.getType());
 
+        itemBox.addBlurHandler(new BlurHandler() {
+            @Override
+            public void onBlur(BlurEvent event) {
+                if(getValue().size() > 0) {
+                    label.addStyleName("active");
+                }
+            }
+        });
+
         itemBox.addKeyDownHandler(new KeyDownHandler() {
             public void onKeyDown(KeyDownEvent event) {
                 boolean itemsChanged = false;
@@ -266,15 +280,15 @@ public void onKeyDown(KeyDownEvent event) {
 
                                     ListItem li = (ListItem) list.getWidget(list.getWidgetCount() - 2);
                                     MaterialChip p = (MaterialChip) li.getWidget(0);
-                                    
+
                                     boolean removable = true;
-                                    
+
                                     Set<Entry<Suggestion, Widget>> entrySet = suggestionMap.entrySet();
                                     for (Entry<Suggestion, Widget> entry : entrySet) {
                                         if (p.equals(entry.getValue())) {
                                             if (chipProvider.isChipRemovable(entry.getKey())){
                                                 suggestionMap.remove(entry.getKey());
-                                                itemsChanged = true;                                                
+                                                itemsChanged = true;
                                             }
                                             else {
                                                 removable = false;
@@ -284,7 +298,7 @@ public void onKeyDown(KeyDownEvent event) {
                                     }
 
                                     if (removable){
-                                        list.remove(li);                                        
+                                        list.remove(li);
                                     }
                                 }
                             }
@@ -294,25 +308,25 @@ public void onKeyDown(KeyDownEvent event) {
                         if (itemBox.getValue().trim().isEmpty()) {
                             for (ListItem li : itemsHighlighted) {
                                 MaterialChip p = (MaterialChip) li.getWidget(0);
-                                
+
                                 boolean removable = true;
-                                
+
                                 Set<Entry<Suggestion, Widget>> entrySet = suggestionMap.entrySet();
                                 for (Entry<Suggestion, Widget> entry : entrySet) {
                                     if (p.equals(entry.getValue())) {
                                         if (chipProvider.isChipRemovable(entry.getKey())){
                                             suggestionMap.remove(entry.getKey());
-                                            itemsChanged = true;                                            
+                                            itemsChanged = true;
                                         }
                                         else {
                                             removable = false;
                                         }
                                         break;
                                     }
                                 }
-                                
+
                                 if (removable){
-                                    li.removeFromParent();                                   
+                                    li.removeFromParent();
                                 }
                             }
                             itemsHighlighted.clear();
@@ -393,8 +407,8 @@ public void onClick(ClickEvent clickEvent) {
                         }
                     }
                 }
-            });                
-            
+            });
+
             if (chip.getIcon() != null){
                 chip.getIcon().addClickHandler(new ClickHandler() {
                     public void onClick(ClickEvent clickEvent) {
@@ -406,7 +420,7 @@ public void onClick(ClickEvent clickEvent) {
                             box.showSuggestionList();
                         }
                     }
-                });                
+                });
             }
 
             suggestionMap.put(suggestion, chip);
@@ -524,12 +538,12 @@ public void setLimit(int limit) {
 
     @Override
     public String getPlaceholder() {
-        return itemBox.getElement().getAttribute("placeholder");
+        return label.getText();
     }
 
     @Override
     public void setPlaceholder(String placeholder) {
-        itemBox.getElement().setAttribute("placeholder", placeholder);
+        label.setText(placeholder);
     }
 
     @Override
@@ -541,7 +555,7 @@ public void setError(String error) {
     public void setSuccess(String success) {
         errorMixin.setSuccess(success);
     }
-    
+
     @Override
     public void setHelperText(String helperText) {
         errorMixin.setHelperText(helperText);
@@ -585,20 +599,20 @@ public void setDirectInputAllowed(boolean directInputAllowed) {
     public boolean isDirectInputAllowed() {
         return directInputAllowed;
     }
-    
+
     /**
      * Sets the style class applied to chips when they are selected.
      * <p>
      * Defaults to "blue white-text".
      * </p>
-     * 
+     *
      * @param selectedChipStyle
      *          The class or classes to be applied to selected chips
      */
     public void setSelectedChipStyle(String selectedChipStyle) {
         this.selectedChipStyle = selectedChipStyle;
     }
-    
+
     /**
      * Returns the style class applied to chips when they are selected.
      * <p>
@@ -677,28 +691,28 @@ public static interface MaterialChipProvider {
          *         suggestion should be ignored.
          */
         MaterialChip getChip(Suggestion suggestion);
-        
+
         /**
          * Returns whether the chip defined by the suggestion should be selected when the user clicks on it.
-         * 
+         *
          * <p>
          * Selecion of chips is used to batch remove suggestions, for example.
          * </p>
-         * 
+         *
          * @param suggestion
          *            the selected {@link Suggestion}
-         *            
-         * @see MaterialAutoComplete#setSelectedChipStyle(String) 
+         *
+         * @see MaterialAutoComplete#setSelectedChipStyle(String)
          */
         boolean isChipSelectable(Suggestion suggestion);
-        
+
         /**
          * Returns whether the chip defined by the suggestion should be removed from the autocomplete when clicked on its icon.
-         * 
+         *
          * <p>
          * Override this method returning <code>false</code> to implement your own logic when the user clicks on the chip icon.
          * </p>
-         * 
+         *
          * @param suggestion
          *            the selected {@link Suggestion}
          */
@@ -708,10 +722,10 @@ public static interface MaterialChipProvider {
     /**
      * Default implementation of the {@link MaterialChipProvider} interface,
      * used by the {@link gwt.material.design.addins.client.autocomplete.MaterialAutoComplete}.
-     * 
+     *
      * <p>
      * By default all chips are selectable and removable. The default {@link IconType} used by the chips provided is the {@link IconType#CLOSE}.
-     * </p> 
+     * </p>
      *
      * @see gwt.material.design.addins.client.autocomplete.MaterialAutoComplete#setChipProvider(MaterialChipProvider)
      */
@@ -733,15 +747,15 @@ public MaterialChip getChip(Suggestion suggestion) {
             }
             chip.setText(textChip);
             chip.setIconType(IconType.CLOSE);
-            
+
             return chip;
         }
-        
+
         @Override
         public boolean isChipRemovable(Suggestion suggestion) {
             return true;
         }
-        
+
         @Override
         public boolean isChipSelectable(Suggestion suggestion) {
             return true;
@@ -789,4 +803,10 @@ public void setValue(List<? extends Suggestion> value, boolean fireEvents) {
             ValueChangeEvent.fire(this, getValue());
         }
     }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+        itemBox.setEnabled(enabled);
+    }
 }