Minor changes on SortHelper and SideNavMini.

Author: kevzlou7979

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

@@ -1,3 +1,22 @@
+/*
+ * #%L
+ * GwtMaterial
+ * %%
+ * Copyright (C) 2015 - 2021 GwtMaterialDesign
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
 package gwt.material.design.client.base.helper;
 
 import static gwt.material.design.jquery.client.api.JQuery.$;
@@ -12,13 +31,15 @@ public class UiSortHelper {
      * @param dataAttribute     - The data attribute that indicate the order of each children (i.e order -> data-attribute='order')
      */
     public static void sort(String containerSelector, String childSelector, String dataAttribute) {
-        $(containerSelector + " " + childSelector).sort((elem1, elem2) -> {
-            Object elem1Order = $(elem1).data(dataAttribute);
-            Object elem2Order = $(elem2).data(dataAttribute);
-            if (elem1Order != null && elem2Order != null) {
-                return Integer.parseInt(elem2Order.toString()) < Integer.parseInt(elem1Order.toString()) ? 1 : -1;
-            }
-            return -1;
-        }).appendTo(containerSelector);
+        if (containerSelector != null && !containerSelector.isEmpty() && childSelector != null && !childSelector.isEmpty() && dataAttribute != null && !dataAttribute.isEmpty()) {
+            $(containerSelector + " " + childSelector + "[data-order]").sort((elem1, elem2) -> {
+                Object elem1Order = $(elem1).data(dataAttribute);
+                Object elem2Order = $(elem2).data(dataAttribute);
+                if (elem1Order != null && elem2Order != null) {
+                    return Integer.parseInt(elem2Order.toString()) < Integer.parseInt(elem1Order.toString()) ? 1 : -1;
+                }
+                return -1;
+            }).appendTo(containerSelector);
+        }
     }
 }

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

@@ -19,13 +19,9 @@
  */
 package gwt.material.design.client.ui;
 
-import com.google.gwt.user.client.ui.Widget;
 import gwt.material.design.client.base.AbstractSideNav;
-import gwt.material.design.client.base.MaterialWidget;
 import gwt.material.design.client.constants.SideNavType;
 
-import static gwt.material.design.client.js.JsMaterialElement.$;
-
 //@formatter:off
 
 /**
@@ -54,44 +50,30 @@
 public class MaterialSideNavMini extends AbstractSideNav {
 
     private boolean overlay;
-    private boolean expandable;
-    private boolean expandOnClick;
+    private boolean expandOnClick = true;
+    private boolean collapseOnClick = true;
 
     public MaterialSideNavMini() {
-        super(SideNavType.MINI);
+        super(SideNavType.MINI_WITH_EXPAND);
         setShowOnAttach(false);
     }
 
     @Override
     protected void setup() {
         applyBodyScroll();
-        if (isExpandable()) {
-            setType(SideNavType.MINI_WITH_EXPAND);
-            applyTransition(getElement());
-            int originalWidth = getWidth();
-            int miniWidth = 64;
-            pushElement(getMain(), miniWidth);
-            pushElementMargin(getFooter(), miniWidth);
-            setWidth(miniWidth);
-
-            registerHandler(addOpeningHandler(event -> expand(originalWidth)));
-            registerHandler(addClosingHandler(event -> collapse(miniWidth)));
-
-            // Add Opening when sidenav link is clicked by default
-            for (Widget w : getChildren()) {
-                if (w instanceof MaterialWidget && isExpandOnClick()) {
-                    $(w.getElement()).off("click").on("click", (e, param1) -> {
-                        if (!getElement().hasClassName("expanded")) {
-                            open();
-                        }
-                        return true;
-                    });
-                }
-            }
-        } else {
-            setType(SideNavType.MINI);
-            setWidth(64);
-        }
+        applyTransition(getElement());
+        int originalWidth = getWidth();
+        int miniWidth = 64;
+        pushElement(getMain(), miniWidth);
+        pushElementMargin(getFooter(), miniWidth);
+        setWidth(miniWidth);
+
+        registerHandler(addOpeningHandler(event -> {
+            if (expandOnClick) expand(originalWidth);
+        }));
+        registerHandler(addClosingHandler(event -> {
+            if (collapseOnClick) collapse(miniWidth);
+        }));
     }
 
     protected void expand(int width) {
@@ -112,12 +94,12 @@ protected void collapse(int width) {
         }
     }
 
-    public void setExpandable(boolean expandable) {
-        this.expandable = expandable;
+    public boolean isCollapseOnClick() {
+        return collapseOnClick;
     }
 
-    public boolean isExpandable() {
-        return expandable;
+    public void setCollapseOnClick(boolean collapseOnClick) {
+        this.collapseOnClick = collapseOnClick;
     }
 
     public boolean isExpandOnClick() {