Merge pull request #288 from GwtMaterialDesign/release_2.0.1

Release 2.0.1

Author: kevzlou7979

.travis.yml

@@ -7,12 +7,12 @@ cache:
   - $HOME/.m2
 before_install:
 # install the gwt-material-jquery library before we build the demo
-- git clone -b release_2.0 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
+- git clone -b release_2.0.1 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
 - cd gwt-material-jquery
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..
 # install the gwt-material library before we build the demo
-- git clone -b release_2.0 https://github.com/GwtMaterialDesign/gwt-material.git
+- git clone -b release_2.0.1 https://github.com/GwtMaterialDesign/gwt-material.git
 - cd gwt-material
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..

.utility/deploy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -ev
-if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.0" ]; then
+if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.0.1" ]; then
   echo "<settings><servers><server><id>ossrh</id><username>\${env.OSSRH_USER}</username><password>\${env.OSSRH_PASS}</password></server></servers></settings>" > ~/settings.xml
   mvn deploy --settings ~/settings.xml
 fi

README.md

@@ -11,7 +11,7 @@ Gwt Material Design Extra Components for https://github.com/GwtMaterialDesign/gw
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-addins</artifactId>
-    <version>2.0</version>
+    <version>2.0.1</version>
 </dependency>
 ```
 

pom.xml

@@ -5,24 +5,24 @@
     <parent>
         <artifactId>gwt-material-parent</artifactId>
         <groupId>com.github.gwtmaterialdesign</groupId>
-        <version>2.0</version>
+        <version>2.0.1</version>
     </parent>
 
     <artifactId>gwt-material-addins</artifactId>
 
     <name>Gwt Material Addins</name>
-    <version>2.0</version>
+    <version>2.0.1</version>
     <description>Extra Components of GWT Material Framework</description>
 
     <properties>
-        <gwt-material.version>2.0</gwt-material.version>
+        <gwt-material.version>2.0.1</gwt-material.version>
     </properties>
 
     <scm>
         <connection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-addins.git</connection>
         <developerConnection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-addins.git</developerConnection>
         <url>http://github.com/GwtMaterialDesign/gwt-material-addins</url>
-        <tag>v2.0</tag>
+        <tag>v2.0.1</tag>
     </scm>
 
     <licenses>

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

@@ -219,19 +219,25 @@ public MaterialAutoComplete(SuggestOracle suggestions) {
         setup(suggestions);
     }
 
+    private HandlerRegistration listHandler, itemBoxKeyDownHandler, itemBoxBlurHandler, itemBoxClickHandler;
+
     @Override
     protected void onLoad() {
         super.onLoad();
 
-        registerHandler(list.addDomHandler(event -> suggestBox.showSuggestionList(), ClickEvent.getType()));
+        loadHandlers();
+    }
+
+    protected void loadHandlers() {
+        listHandler = list.addDomHandler(event -> suggestBox.showSuggestionList(), ClickEvent.getType());
 
-        registerHandler(itemBox.addBlurHandler(blurEvent -> {
+        itemBoxBlurHandler = itemBox.addBlurHandler(blurEvent -> {
             if (getValue().size() > 0) {
                 label.addStyleName(CssName.ACTIVE);
             }
-        }));
+        });
 
-        registerHandler(itemBox.addKeyDownHandler(event -> {
+        itemBoxKeyDownHandler = itemBox.addKeyDownHandler(event -> {
             boolean changed = false;
 
             switch (event.getNativeKeyCode()) {
@@ -278,34 +284,52 @@ protected void onLoad() {
                     itemBox.setFocus(true);
                     break;
             }
+        });
 
-            if (changed) {
-                ValueChangeEvent.fire(MaterialAutoComplete.this, getValue());
-            }
-        }));
+        itemBoxClickHandler = itemBox.addClickHandler(event -> suggestBox.showSuggestionList());
+    }
 
-        registerHandler(itemBox.addClickHandler(event -> suggestBox.showSuggestionList()));
+    @Override
+    protected void onUnload() {
+        super.onUnload();
 
-        registerHandler(suggestBox.addSelectionHandler(selectionEvent -> {
-            Suggestion selectedItem = selectionEvent.getSelectedItem();
-            itemBox.setValue("");
-            if (addItem(selectedItem)) {
-                ValueChangeEvent.fire(MaterialAutoComplete.this, getValue());
-            }
-            itemBox.setFocus(true);
-        }));
+        unloadHandlers();
+    }
+
+    protected void unloadHandlers() {
+        removeHandler(listHandler);
+        removeHandler(itemBoxBlurHandler);
+        removeHandler(itemBoxKeyDownHandler);
+        removeHandler(itemBoxClickHandler);
     }
 
     /**
      * Generate and build the List Items to be set on Auto Complete box.
      */
     protected void setup(SuggestOracle suggestions) {
+
+        if (itemBoxKeyDownHandler != null) {
+            itemBoxKeyDownHandler.removeHandler();
+        }
+
         list.setStyleName(AddinsCssName.MULTIVALUESUGGESTBOX_LIST);
         this.suggestions = suggestions;
         final ListItem item = new ListItem();
 
         item.setStyleName(AddinsCssName.MULTIVALUESUGGESTBOX_INPUT_TOKEN);
+
         suggestBox = new SuggestBox(suggestions, itemBox);
+        suggestBox.addSelectionHandler(selectionEvent -> {
+            Suggestion selectedItem = selectionEvent.getSelectedItem();
+            itemBox.setValue("");
+            if (addItem(selectedItem)) {
+                ValueChangeEvent.fire(MaterialAutoComplete.this, getValue());
+            }
+            itemBox.setFocus(true);
+        });
+
+        loadHandlers();
+
         setLimit(this.limit);
         String autocompleteId = DOM.createUniqueId();
         itemBox.getElement().setId(autocompleteId);
@@ -316,7 +340,7 @@ protected void setup(SuggestOracle suggestions) {
 
         panel.add(list);
         panel.getElement().setAttribute("onclick",
-            "document.getElementById('" + autocompleteId + "').focus()");
+                "document.getElementById('" + autocompleteId + "').focus()");
         panel.add(errorLabel);
         suggestBox.setFocus(true);
     }
@@ -355,7 +379,7 @@ protected boolean addItem(final Suggestion suggestion) {
 
         if (getType() == AutocompleteType.TEXT) {
             suggestionMap.clear();
-            itemBox.setText(suggestion.getDisplayString());
+            itemBox.setText(suggestion.getReplacementString());
         } else {
             final MaterialChip chip = chipProvider.getChip(suggestion);
             if (chip == null) {
@@ -526,6 +550,7 @@ public void setLimit(int limit) {
      * Set the number of suggestions to be displayed to the user. This differs from
      * setLimit() which set both the suggestions displayed AND the limit of values
      * allowed within the autocomplete.
+     *
      * @param limit
      */
     public void setAutoSuggestLimit(int limit) {
@@ -545,9 +570,8 @@ public void setPlaceholder(String placeholder) {
     }
 
     /**
-     * @see gwt.material.design.client.ui.MaterialValueBox#setLabel(String)
-     *
      * @param label
+     * @see gwt.material.design.client.ui.MaterialValueBox#setLabel(String)
      */
     public void setLabel(String label) {
         this.label.setText(label);

src/main/java/gwt/material/design/addins/client/combobox/MaterialComboBox.java

@@ -20,6 +20,7 @@
 package gwt.material.design.addins.client.combobox;
 
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Style;
 import com.google.gwt.event.logical.shared.*;
@@ -33,10 +34,13 @@
 import gwt.material.design.addins.client.combobox.events.UnselectItemEvent;
 import gwt.material.design.addins.client.combobox.js.JsComboBox;
 import gwt.material.design.addins.client.combobox.js.JsComboBoxOptions;
+import gwt.material.design.addins.client.combobox.js.LanguageOptions;
 import gwt.material.design.client.MaterialDesignBase;
 import gwt.material.design.client.base.*;
+import gwt.material.design.client.base.mixin.EnabledMixin;
 import gwt.material.design.client.base.mixin.ErrorMixin;
 import gwt.material.design.client.base.mixin.ReadOnlyMixin;
+import gwt.material.design.client.base.mixin.WavesMixin;
 import gwt.material.design.client.constants.CssName;
 import gwt.material.design.client.ui.MaterialLabel;
 import gwt.material.design.client.ui.html.Label;
@@ -102,6 +106,8 @@ public class MaterialComboBox<T> extends AbstractValueWidget<List<T>> implements
 
     private ErrorMixin<AbstractValueWidget, MaterialLabel> errorMixin;
     private ReadOnlyMixin<MaterialComboBox, MaterialWidget> readOnlyMixin;
+    private EnabledMixin<MaterialWidget> enabledMixin;
+    private WavesMixin<MaterialWidget> wavesMixin;
 
     public MaterialComboBox() {
         super(Document.get().createDivElement(), CssName.INPUT_FIELD, AddinsCssName.COMBOBOX);
@@ -298,6 +304,31 @@ public JQueryElement getDropdownParent() {
         return options.dropdownParent;
     }
 
+    /**
+     * Will get the Selection Results ul element containing all the combobox items.
+     */
+    public JQueryElement getDropdownResultElement() {
+        String dropdownId = getDropdownContainerElement().attr("id").toString();
+        if (dropdownId != null && !(dropdownId.isEmpty())) {
+            dropdownId = dropdownId.replace("container", "results");
+            return $("#" + dropdownId);
+        } else {
+            GWT.log("The element dropdown-result ul element is undefined.", new NullPointerException());
+        }
+        return null;
+    }
+
+    /**
+     * Will get the Selection dropdown container rendered
+     */
+    public JQueryElement getDropdownContainerElement() {
+        JQueryElement element = $(getElement()).find(".select2 .selection .select2-selection__rendered");
+        if (element == null) {
+            GWT.log("The element dropdown-container element is undefined.", new NullPointerException());
+        }
+        return element;
+    }
+
     /**
      * Set the upper label above the combobox
      */
@@ -315,16 +346,6 @@ public void setPlaceholder(String placeholder) {
         options.placeholder = placeholder;
     }
 
-    @Override
-    public void setEnabled(boolean enabled) {
-        listbox.setEnabled(enabled);
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return listbox.isEnabled();
-    }
-
     /**
      * Check if allow clear option is enabled
      */
@@ -474,7 +495,7 @@ public void setSingleValue(T value, boolean fireEvents) {
             setSelectedIndex(index);
 
             if (fireEvents) {
-                ValueChangeEvent.fireIfNotEqual(this, before, values);
+                ValueChangeEvent.fireIfNotEqual(this, before, Collections.singletonList(value));
             }
         }
     }
@@ -656,6 +677,28 @@ public void setTags(boolean tags) {
         options.tags = tags;
     }
 
+    /**
+     * Will provide a set of text objecs that can be used for i18n language support.
+     */
+    public void setLanguage(LanguageOptions language) {
+        options.language = language;
+    }
+
+    public LanguageOptions getLanguage() {
+        return options.language;
+    }
+
+    public void scrollTop(int offset) {
+        Scheduler.get().scheduleDeferred(() -> getDropdownResultElement().scrollTop(offset));
+    }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+
+        getEnabledMixin().updateWaves(enabled, this);
+    }
+
     public HandlerRegistration addSelectionHandler(SelectItemEvent.SelectComboHandler<T> selectionHandler) {
         return addHandler(selectionHandler, SelectItemEvent.getType());
     }
@@ -675,6 +718,14 @@ public HandlerRegistration addRemoveItemHandler(UnselectItemEvent.UnselectComboH
         return addHandler(handler, UnselectItemEvent.getType());
     }
 
+    @Override
+    protected EnabledMixin<MaterialWidget> getEnabledMixin() {
+        if (enabledMixin == null) {
+            enabledMixin = new EnabledMixin<>(listbox);
+        }
+        return enabledMixin;
+    }
+
     @Override
     public ErrorMixin<AbstractValueWidget, MaterialLabel> getErrorMixin() {
         if (errorMixin == null) {

src/main/java/gwt/material/design/addins/client/combobox/js/JsComboBoxOptions.java

@@ -65,4 +65,7 @@ public static final JsComboBoxOptions create() {
 
     @JsProperty
     public boolean tags;
+
+    @JsProperty
+    public LanguageOptions language;
 }