Merge branch 'release_2.1.1' of https://github.com/GwtMaterialDesign/gwt-material into release_2.1.1

Author: kevzlou7979

gwt-material/src/main/java/gwt/material/design/client/base/helper/EventHelper.java

@@ -30,14 +30,19 @@ public final class EventHelper {
 
     public static void onAttachOnce(HasAttachHandlers has, AttachEvent.Handler handler) {
         HandlerRegistration[] reg = new HandlerRegistration[1];
-        reg[0] = has.addAttachHandler(event -> {
-            if(event.isAttached()) {
-                handler.onAttachOrDetach(event);
 
-                if (reg[0] != null) {
-                    reg[0].removeHandler();
+        if (has.isAttached()) {
+            handler.onAttachOrDetach(null);
+        } else {
+            reg[0] = has.addAttachHandler(event -> {
+                if (event.isAttached()) {
+                    handler.onAttachOrDetach(event);
+
+                    if (reg[0] != null) {
+                        reg[0].removeHandler();
+                    }
                 }
-            }
-        });
+            });
+        }
     }
 }

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

@@ -190,8 +190,6 @@ public void reload() {
 
     /**
      * As of now use {@link MaterialDatePicker#setSelectionType(MaterialDatePickerType)}
-     *
-     * @param type
      */
     @Deprecated
     public void setDateSelectionType(MaterialDatePickerType type) {
@@ -399,28 +397,23 @@ public void setFormat(String format) {
 
     @Override
     public Date getValue() {
-        if (isAttached()) {
-            return getPickerDate();
-        }
-        else {
-            return this.date;
-        }
+        return isAttached() ? getPickerDate() : this.date;
     }
 
     @Override
     public void setValue(Date value, boolean fireEvents) {
         this.date = value;
         if (value == null) {
             clear();
-            return;
-        }
-        if (isAttached()) {
-            suppressChangeEvent = !fireEvents;
-            setPickerDate(JsDate.create((double) value.getTime()), pickatizedDateInput);
-            suppressChangeEvent = false;
-            label.addStyleName(CssName.ACTIVE);
+        } else {
+            if (isAttached()) {
+                suppressChangeEvent = !fireEvents;
+                setPickerDate(JsDate.create((double) value.getTime()), pickatizedDateInput);
+                suppressChangeEvent = false;
+                label.addStyleName(CssName.ACTIVE);
+            }
+            super.setValue(value, fireEvents);
         }
-        super.setValue(value, fireEvents);
     }
 
     @Override
@@ -476,7 +469,7 @@ protected void setupLanguage(DatePickerLanguage language) {
         if (language.getJs() != null) {
             ScriptInjector.fromString(language.getJs().getText()).setWindow(ScriptInjector.TOP_WINDOW).inject();
             getPicker().stop();
-            Scheduler.get().scheduleDeferred(() -> load());
+            Scheduler.get().scheduleDeferred(this::load);
         }
     }
 

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

@@ -627,7 +627,11 @@ public void setValue(T value) {
     @Override
     public void setValue(T value, boolean fireEvents) {
         int index = values.indexOf(value);
-        if (index >= 0) {
+        if (index < 0 && value instanceof String) {
+            index = getIndexByString((String) value);
+        }
+
+        if (index > -1) {
             T before = getValue();
             setSelectedIndexInternal(index);
 
@@ -637,6 +641,28 @@ public void setValue(T value, boolean fireEvents) {
         }
     }
 
+    // TODO: Optimize performance (maybe use a map)
+    public T getValueByString(String key) {
+        for (T value : values) {
+            if (keyFactory.generateKey(value).equals(key)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    // TODO: Optimize performance (maybe use a map)
+    public int getIndexByString(String key) {
+        int index = -1;
+        for (T value : values) {
+            index++;
+            if (keyFactory.generateKey(value).equals(key)) {
+                return index;
+            }
+        }
+        return index;
+    }
+
     public boolean isOld() {
         return getToggleOldMixin().isOn();
     }

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

@@ -53,13 +53,15 @@
 //@formatter:on
 public class MaterialRange extends AbstractValueWidget<Integer> implements HasChangeHandlers, HasStatusText {
 
+    private static String VALUE = "value";
+    private static String MAX = "max";
+    private static String MIN = "min";
+
     private Paragraph paragraph = new Paragraph();
     private MaterialInput rangeInputElement = new MaterialInput();
     private Span thumb = new Span();
     private Span value = new Span();
-    private static String VALUE = "value";
-    private static String MAX = "max";
-    private static String MIN = "min";
+
     private MaterialLabel errorLabel = new MaterialLabel();
     private StatusTextMixin<AbstractValueWidget, MaterialLabel> statusTextMixin;
 
@@ -195,41 +197,6 @@ public void setMax(Integer max) {
         setIntToRangeElement(MAX, max);
     }
 
-    @Override
-    public void setErrorText(String errorText) {
-        getStatusTextMixin().setErrorText(errorText);
-    }
-
-    @Override
-    public void setSuccessText(String successText) {
-        getStatusTextMixin().setSuccessText(successText);
-    }
-
-    @Override
-    public void setHelperText(String helperText) {
-        getStatusTextMixin().setHelperText(helperText);
-    }
-
-    @Override
-    public void clearStatusText() {
-        getStatusTextMixin().clearStatusText();
-    }
-
-    @Override
-    public void clearErrorText() {
-        getStatusTextMixin().clearErrorText();
-    }
-
-    @Override
-    public void clearHelperText() {
-        getStatusTextMixin().clearHelperText();
-    }
-
-    @Override
-    public void clearSuccessText() {
-        getStatusTextMixin().clearSuccessText();
-    }
-
     public MaterialLabel getErrorLabel() {
         return errorLabel;
     }

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

@@ -198,26 +198,6 @@ public void setLabel(Label label) {
         this.label = label;
     }
 
-    @Override
-    public void setErrorText(String errorText) {
-        getStatusTextMixin().setErrorText(errorText);
-    }
-
-    @Override
-    public void setSuccessText(String successText) {
-        getStatusTextMixin().setSuccessText(successText);
-    }
-
-    @Override
-    public void setHelperText(String helperText) {
-        getStatusTextMixin().setHelperText(helperText);
-    }
-
-    @Override
-    public void clearStatusText() {
-        getStatusTextMixin().clearStatusText();
-    }
-
     /**
      * Set the On State Label of the switch component
      */

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

@@ -19,12 +19,14 @@
  */
 package gwt.material.design.client.ui;
 
+import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.Widget;
 import gwt.material.design.client.js.JsMaterialElement;
 import gwt.material.design.jquery.client.api.Functions;
+import gwt.material.design.jquery.client.api.JQueryElement;
 
 import static gwt.material.design.jquery.client.api.JQuery.$;
 
@@ -58,6 +60,8 @@ public class MaterialToast {
     private Functions.Func callback;
     private Widget[] widgets;
 
+    private JQueryElement element;
+
     public MaterialToast(Widget... widgets) {
         this.widgets = widgets;
     }
@@ -140,23 +144,19 @@ public void toast(String msg, String className) {
      * @param className  class name to custom style your toast.
      */
     public void toast(String msg, int lifeMillis, String className) {
-        String genId = DOM.createUniqueId();
-        if (className == null) {
-            className = genId;
+        String id;
+        if (element != null) {
+            id = (String) element.attr("id");
         } else {
-            className += ' ' + genId;
+            id = DOM.createUniqueId();
         }
-        toast(msg, lifeMillis, genId, className, callback);
 
-        if (widgets != null) {
-            for (Widget widget : widgets) {
-                widget.getElement().getStyle().setPaddingLeft(30, Unit.PX);
-                RootPanel.get(genId).add(widget);
-            }
+        if (className == null) {
+            className = id;
+        } else {
+            className += ' ' + id;
         }
-    }
 
-    protected void toast(String msg, int lifeMillis, String id, String className, Functions.Func callback) {
         Object duration = lifeMillis;
         if (lifeMillis <= 0) {
             duration = "unlimited";
@@ -168,6 +168,43 @@ protected void toast(String msg, int lifeMillis, String id, String className, Fu
             }
         });
 
-        $(".toast." + id).attr("id", id);
+        element = $(".toast." + id);
+        element.attr("id", id);
+        //element.toggleClass(className, true);
+
+        if (widgets != null) {
+            RootPanel toast = RootPanel.get(id);
+            for (Widget widget : widgets) {
+                widget.getElement().getStyle().setPaddingLeft(20, Unit.PX);
+                toast.add(widget);
+            }
+        }
+    }
+
+    public void close() {
+        String id = getId();
+        if (id != null && !id.isEmpty()) {
+            Widget toast = RootPanel.get(id);
+            if (toast != null && toast.isAttached()) {
+                element.remove();
+            }
+        }
+    }
+
+    public boolean isOpen() {
+        String id = getId();
+        if (id != null && !id.isEmpty()) {
+            Widget toast = RootPanel.get(id);
+            return toast.isAttached() && toast.isVisible();
+        }
+        return false;
+    }
+
+    public String getId() {
+        return element != null ? (String) element.attr("id") : null;
+    }
+
+    public JQueryElement getElement() {
+        return element;
     }
 }