Merge pull request #437 from GwtMaterialDesign/release_2.7.0

Release 2.7.0
GwtMaterialDesign · May 8, 2023 · 0d6ae49 · 0d6ae49
2 parents 8e71181 + 6ae4fd0
commit 0d6ae49
Show file tree

Hide file tree

Showing 22 changed files with 351 additions and 137 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,17 +8,17 @@ cache:
   - $HOME/.m2
 before_install:
 # install the gwt-material-jquery library before we build the demo
-- git clone -b release_2.6.1 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
+- git clone -b release_2.7.0 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.6.1 https://github.com/GwtMaterialDesign/gwt-material.git
+- git clone -b release_2.7.0 https://github.com/GwtMaterialDesign/gwt-material.git
 - cd gwt-material
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..
 # install the gwt-material-table library before we build the demo
-- git clone -b release_2.6.1 https://github.com/GwtMaterialDesign/gwt-material-table.git
+- git clone -b release_2.7.0 https://github.com/GwtMaterialDesign/gwt-material-table.git
 - cd gwt-material-table
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..

diff --git a/.utility/deploy.sh b/.utility/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -ev
-if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.6.1" ]; then
+if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.8.0" ]; 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 -DskipTests --settings ~/settings.xml
 fi
diff --git a/README.md b/README.md
@@ -6,21 +6,21 @@
 
 Gwt Material Design Extra Components for https://github.com/GwtMaterialDesign/gwt-material <br>
 
-## Current Version 2.6.1
+## Current Version 2.7.0
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-addins</artifactId>
-    <version>2.6.1</version>
+    <version>2.7.0</version>
 </dependency>
 ```
 
-## Snapshot Version 2.6.1
+## Snapshot Version 2.8.0
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-addins</artifactId>
-    <version>2.6.1-SNAPSHOT</version>
+    <version>2.8.0-SNAPSHOT</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>gwt-material-parent</artifactId>
         <groupId>com.github.gwtmaterialdesign</groupId>
-        <version>2.6.1</version>
+        <version>2.7.0</version>
     </parent>
 
     <artifactId>gwt-material-addins</artifactId>
@@ -24,7 +24,7 @@
         <connection>scm:git:git@github.com:GwtMaterialDesign/gwt-material-addins.git</connection>
         <developerConnection>scm:git:git@github.com:GwtMaterialDesign/gwt-material-addins.git</developerConnection>
         <url>http://github.com/GwtMaterialDesign/gwt-material-addins</url>
-        <tag>v2.6.1</tag>
+        <tag>v2.7.0</tag>
     </scm>
 
     <licenses>

diff --git a/src/main/java/gwt/material/design/addins/client/combobox/MaterialComboBox.java b/src/main/java/gwt/material/design/addins/client/combobox/MaterialComboBox.java
@@ -24,6 +24,7 @@
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Style;
 import com.google.gwt.event.dom.client.DomEvent;
+import com.google.gwt.event.dom.client.KeyUpEvent;
 import com.google.gwt.event.logical.shared.*;
 import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.user.client.DOM;
@@ -59,12 +60,14 @@
 import gwt.material.design.client.events.ClosingEvent;
 import gwt.material.design.client.events.OpeningEvent;
 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.OptGroup;
 import gwt.material.design.client.ui.html.Option;
 import gwt.material.design.jquery.client.api.Event;
 import gwt.material.design.jquery.client.api.Functions;
 import gwt.material.design.jquery.client.api.JQueryElement;
+import gwt.material.design.jquery.client.api.KeyEvent;
 
 import java.util.*;
 
@@ -115,6 +118,7 @@ public class MaterialComboBox<T> extends AbstractValueWidget<List<T>> implements
     private int selectedIndex;
     private boolean open;
     private boolean suppressChangeEvent;
+    private boolean enableFocus;
     protected List<T> values = new ArrayList<>();
     private Label label = new Label();
     private MaterialLabel errorLabel = new MaterialLabel();
@@ -221,11 +225,19 @@ public void load() {
             return true;
         });
 
-        body().on(ComboBoxEvents.FOCUS, getSelectContainerSelector(), (e, param1) -> {
-            if (!e.getCurrentTarget().getClassName().contains("select2-container--focus")) {
-                DomEvent.fireNativeEvent(Document.get().createFocusEvent(), this, getElement());
-            }
-            return false;
+        if (enableFocus) {
+            body().on(ComboBoxEvents.FOCUS, getSelectContainerSelector(), (e, param1) -> {
+                if (!e.getCurrentTarget().getClassName().contains("select2-container--focus")) {
+                    DomEvent.fireNativeEvent(Document.get().createFocusEvent(), this, getElement());
+                }
+                return false;
+            });
+        }
+
+        body().on(ComboBoxEvents.KEYUP, getSearchFieldElement(), e -> {
+            KeyEvent keyEvent = (KeyEvent) e;
+            DomEvent.fireNativeEvent(Document.get().createKeyUpEvent(keyEvent.ctrlKey, keyEvent.altKey, keyEvent.shiftKey, Boolean.parseBoolean(keyEvent.metaKey), keyEvent.keyCode), this, getElement());
+            return true;
         });
 
         displayArrowForAllowClearOption(false);
@@ -256,10 +268,14 @@ public void unload() {
         jsComboBox.off(ComboBoxEvents.CHANGE);
         jsComboBox.off(ComboBoxEvents.SELECT);
         jsComboBox.off(ComboBoxEvents.UNSELECT);
+        jsComboBox.off(ComboBoxEvents.OPENING);
         jsComboBox.off(ComboBoxEvents.OPEN);
+        jsComboBox.off(ComboBoxEvents.CLOSING);
         jsComboBox.off(ComboBoxEvents.CLOSE);
         jsComboBox.off(ComboBoxEvents.CLEAR);
         jsComboBox.off(ComboBoxEvents.CLEARING);
+        jsComboBox.off(ComboBoxEvents.FOCUS);
+        jsComboBox.off(ComboBoxEvents.KEYUP);
         body().off("focus");
         jsComboBox.select2("destroy");
     }
@@ -1243,6 +1259,26 @@ public List<T> getOptions() {
         return values;
     }
 
+    public void focusSearchInput() {
+        $(getSearchFieldElement()).focus();
+    }
+
+    public void setSearchInputPlaceholder(String placeholder) {
+        $(getSearchFieldElement()).attr("placeholder", placeholder);
+    }
+
+    public void setSearchInputValue(String value) {
+        $(getSearchFieldElement()).val(value);
+    }
+
+    public boolean isEnableFocus() {
+        return enableFocus;
+    }
+
+    public void setEnableFocus(boolean enableFocus) {
+        this.enableFocus = enableFocus;
+    }
+
     @Override
     public void setAsyncDisplayLoader(AsyncDisplayLoader displayLoader) {
         getAsyncWidgetMixin().setAsyncDisplayLoader(displayLoader);
@@ -1256,6 +1292,10 @@ public String getSelectContainerSelector() {
         return "#" + getId() + " .select2.select2-container";
     }
 
+    public String getSearchFieldElement() {
+        return "#" + getId() + " .select2-search__field";
+    }
+
     @Override
     public AsyncDisplayLoader getAsyncDisplayLoader() {
         return getAsyncWidgetMixin().getAsyncDisplayLoader();

diff --git a/src/main/java/gwt/material/design/addins/client/combobox/events/ComboBoxEvents.java b/src/main/java/gwt/material/design/addins/client/combobox/events/ComboBoxEvents.java
@@ -19,6 +19,8 @@
  */
 package gwt.material.design.addins.client.combobox.events;
 
+import gwt.material.design.jquery.client.api.Event;
+
 /**
  * Events for Combobox
  *
@@ -36,4 +38,5 @@ public interface ComboBoxEvents {
     String CLEAR = "select2:clear";
     String CLEARING = "select2:clearing";
     String FOCUS = "focus";
+    String KEYUP = "keyup";
 }
diff --git a/src/main/java/gwt/material/design/addins/client/emptystate/MaterialEmptyState.java b/src/main/java/gwt/material/design/addins/client/emptystate/MaterialEmptyState.java
@@ -21,16 +21,15 @@
 
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Style.Unit;
+import com.google.gwt.user.client.ui.Widget;
 import gwt.material.design.addins.client.MaterialAddins;
 import gwt.material.design.addins.client.base.constants.AddinsCssName;
 import gwt.material.design.client.MaterialDesignBase;
 import gwt.material.design.client.base.HasIcon;
 import gwt.material.design.client.base.HasTitle;
 import gwt.material.design.client.base.MaterialWidget;
 import gwt.material.design.client.constants.*;
-import gwt.material.design.client.ui.MaterialIcon;
-import gwt.material.design.client.ui.MaterialLoader;
-import gwt.material.design.client.ui.MaterialTitle;
+import gwt.material.design.client.ui.*;
 import gwt.material.design.client.ui.html.Div;
 
 //@formatter:off
@@ -65,6 +64,7 @@ public class MaterialEmptyState extends MaterialWidget implements HasIcon, HasTi
     private boolean loading;
     private MaterialIcon icon = new MaterialIcon();
     private MaterialTitle title = new MaterialTitle();
+    private MaterialPanel actions = new MaterialPanel();
     private Div container = new Div();
 
     public MaterialEmptyState() {
@@ -91,6 +91,8 @@ protected void onLoad() {
         container.setWidth("100%");
         container.setStyleName(CssName.VALIGN + " " + CssName.CENTER);
         container.add(title);
+        actions.addStyleName("actions");
+        container.add(actions);
         title.insert(icon, 0);
     }
 
@@ -178,6 +180,12 @@ public Div getContainer() {
         return container;
     }
 
+    public void addAction(Widget widget) {
+        if (widget != null) {
+            actions.add(widget);
+        }
+    }
+
     public boolean isLoading() {
         return loading;
     }

diff --git a/src/main/java/gwt/material/design/addins/client/inputmask/AbstractInputMask.java b/src/main/java/gwt/material/design/addins/client/inputmask/AbstractInputMask.java
@@ -101,9 +101,7 @@ protected void onLoad() {
 
     @Override
     public void load() {
-        if (mask == null || mask.isEmpty()) {
-            GWT.log("You must provide a mask pattern in order to mask your field");
-        } else {
+        if (mask != null && !mask.isEmpty()) {
             load(mask);
         }
     }

diff --git a/src/main/java/gwt/material/design/addins/client/livestamp/MaterialLiveStamp.java b/src/main/java/gwt/material/design/addins/client/livestamp/MaterialLiveStamp.java
@@ -19,15 +19,13 @@
  */
 package gwt.material.design.addins.client.livestamp;
 
-import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.Element;
 import gwt.material.design.addins.client.MaterialAddins;
+import gwt.material.design.addins.client.livestamp.js.JsLiveStamp;
 import gwt.material.design.addins.client.moment.resources.MomentClientBundle;
 import gwt.material.design.addins.client.moment.resources.MomentClientDebugBundle;
 import gwt.material.design.client.MaterialDesignBase;
 import gwt.material.design.client.base.AbstractValueWidget;
-import gwt.material.design.client.base.JsLoader;
 
 import java.util.Date;
 
@@ -56,9 +54,9 @@
  * @see <a href="http://gwtmaterialdesign.github.io/gwt-material-demo/#livestamp">Material Live Stamp</a>
  * @see <a href="https://github.com/mattbradley/livestampjs">LiveStamp 1.1.2</a>
  */
-public class MaterialLiveStamp extends AbstractValueWidget<Date> implements JsLoader {
+public class MaterialLiveStamp extends AbstractValueWidget<Date> {
 
-    private Date date = new Date();
+    private Date value = new Date();
 
     static {
         if (MaterialAddins.isDebug()) {
@@ -75,45 +73,31 @@ public MaterialLiveStamp() {
     }
 
     @Override
-    protected void onLoad() {
-        super.onLoad();
+    protected void onUnload() {
+        super.onUnload();
 
-        load();
+        destroy();
     }
 
     @Override
-    public void load() {
-        if (date != null) {
-            setValue(date);
+    public void setValue(Date value, boolean fireEvents) {
+        super.setValue(value, fireEvents);
+        this.value = value;
+
+        if (value != null) {
+            getElement().setAttribute("data-livestamp", value.toString());
         } else {
-            GWT.log("You must specify the date value.", new IllegalStateException());
+            destroy();
         }
     }
 
-    @Override
-    public void unload() {
-        getElement().removeAttribute("data-livestamp");
-    }
-
-    @Override
-    public void reload() {
-        unload();
-        load();
-    }
-
-    @Override
-    public void setValue(Date date, boolean fireEvents) {
-        this.date = date;
-
-        if (date != null) {
-            getElement().setAttribute("data-livestamp", date.toString());
-
-            super.setValue(date, fireEvents);
-        }
+    public void destroy() {
+        JsLiveStamp.$(getElement()).livestamp("destroy");
+        getElement().setInnerText("-");
     }
 
     @Override
     public Date getValue() {
-        return date;
+        return value;
     }
 }
diff --git a/src/main/java/gwt/material/design/addins/client/livestamp/js/JsLiveStamp.java b/src/main/java/gwt/material/design/addins/client/livestamp/js/JsLiveStamp.java
@@ -43,5 +43,5 @@ public class JsLiveStamp extends JQueryElement {
     public static native JsLiveStamp $(String selector);
 
     @JsMethod
-    public native JsLiveStamp livestamp(int currentMillis);
+    public native JsLiveStamp livestamp(String method);
 }
diff --git a/src/main/java/gwt/material/design/addins/client/popupmenu/MaterialPopupMenu.java b/src/main/java/gwt/material/design/addins/client/popupmenu/MaterialPopupMenu.java
@@ -19,6 +19,7 @@
  */
 package gwt.material.design.addins.client.popupmenu;
 
+import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.event.logical.shared.*;
 import com.google.gwt.event.shared.HandlerRegistration;
@@ -72,8 +73,10 @@ protected void onLoad() {
     @Override
     public void load() {
         $(this).attr("tabindex", "0");
-        $(this).on("blur", e -> {
-            if (autoClose) {
+
+        $(this).off("mouseup").on("mouseup", e -> {
+            boolean closest = $(e.target).closest("#" + id).length() == 0;
+            if (autoClose && closest) {
                 close();
             }
             return true;
@@ -189,7 +192,7 @@ public HandlerRegistration addSelectionHandler(SelectionHandler<Element> selecti
     @Override
     public void open() {
         setVisible(true);
-        /*Scheduler.get().scheduleDeferred(() -> setFocus(true));*/
+        Scheduler.get().scheduleDeferred(() -> setFocus(true));
 
         // Check if dropdown is out of the container (Left)
         if ($(this).width() + $(this).offset().left > body().width()) {