Merge pull request #216 from GwtMaterialDesign/release_2.7.0

Release 2.7.0

Author: kevzlou7979

.travis.yml

@@ -8,12 +8,12 @@ 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 ..

.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.7.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

README.md

@@ -11,20 +11,20 @@ A complex table component designed for the material design specifications!
 Support documentation can be found [here](https://github.com/GwtMaterialDesign/gwt-material-table/wiki)
 
 ## Maven
-Current Version 2.6.1
+Current Version 2.7.0
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-table</artifactId>
-    <version>2.6.1</version>
+    <version>2.7.0</version>
 </dependency>
 ```
 
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-table</artifactId>
-    <version>2.6.1</version>
+    <version>2.7.0</version>
 </dependency>
 ```
 

pom.xml

@@ -6,7 +6,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-table</artifactId>

src/main/java/gwt/material/design/client/data/AbstractDataView.java

@@ -537,7 +537,10 @@ public void renderColumn(Column<T, ?> column) {
                 th.addStyleName(TableCssName.SORTABLE);
                 accessibilityControl.registerHeaderControl(th);
             }
-
+            th.setResetSortCallback(() -> {
+                resetSort();
+                ColumnResetSortEvent.fire(this);
+            });
             addHeader(index, th);
             th.setVisible(!column.isHidden());
         }
@@ -1146,7 +1149,7 @@ public boolean isHeaderVisible(int colIndex) {
     }
 
     @Override
-    public final Column<T, ?> addColumn(ColumnValueProvider<T> renderer, String columnName) {
+    public final Column<T, ?> addColumn(ColumnValueProvider<T, String> renderer, String columnName) {
         return addColumn(columnName, new TextColumn<T>() {
             @Override
             public String getValue(T object) {
@@ -2649,6 +2652,18 @@ public void maybeApplyFrozenMargins() {
         }
     }
 
+    @Override
+    public void resetSort() {
+        for (TableHeader header : getHeaders()) {
+            if (header != null) {
+                if (header.getSortIcon() != null) {
+                    header.getSortIcon().setIconType(IconType.DEFAULT);
+                }
+                header.getElement().removeClassName(TableCssName.SELECTED);
+            }
+        }
+    }
+
     @Override
     public int getLeftFrozenColumns() {
         return leftFrozenColumns;

src/main/java/gwt/material/design/client/data/BaseRenderer.java

@@ -37,6 +37,7 @@
 import gwt.material.design.client.data.factory.Mode;
 import gwt.material.design.client.ui.MaterialCheckBox;
 import gwt.material.design.client.ui.MaterialIcon;
+import gwt.material.design.client.ui.MaterialToast;
 import gwt.material.design.client.ui.html.Div;
 import gwt.material.design.client.ui.table.TableData;
 import gwt.material.design.client.ui.table.TableHeader;
@@ -264,6 +265,10 @@ public ColumnContext<T> drawColumn(TableRow row, Context context, T rowValue, Co
                 data.setMaxWidth(column.getMaxWidth() + "px");
             }
 
+            if (column.getClassName() != null && !column.getClassName().isEmpty()) {
+                data.getElement().addClassName(column.getClassName());
+            }
+
             // Render the column cell
             if (column instanceof WidgetColumn) {
                 wrapper.setStyleName(TableCssName.WIDGET_CELL);
@@ -322,14 +327,17 @@ public TableHeader drawColumnHeader(Widget container, Column<T, ?> column, Strin
         if (column.isHelpEnabled()) {
             th.updateHelp(column.help());
         }
+
         HideOn hideOn = column.hideOn();
         if (hideOn != null) {
             th.setHideOn(hideOn);
         }
+
         TextAlign textAlign = column.textAlign();
         if (textAlign != null) {
             th.setTextAlign(textAlign);
         }
+
         if (column.numeric()) {
             th.addStyleName(TableCssName.NUMERIC);
         }
@@ -344,6 +352,10 @@ public TableHeader drawColumnHeader(Widget container, Column<T, ?> column, Strin
             th.setMaxWidth(column.getMaxWidth() + "px");
         }
 
+        if (column.getClassName() != null && !column.getClassName().isEmpty()) {
+            th.getElement().addClassName(column.getClassName());
+        }
+
         // Apply the style properties
         Style style = th.getElement().getStyle();
         Map<StyleName, String> styleProps = column.getStyleProperties();
@@ -363,7 +375,7 @@ public TableHeader drawColumnHeader(Widget container, Column<T, ?> column, Strin
             int percent = (columnWidth * 100) / rowWidth;
             th.setWidth(percent + "%");
         }
-        th.setVisible(true);
+        th.setVisible(column.isHidden());
         return th;
     }
 

src/main/java/gwt/material/design/client/data/DataView.java

@@ -168,4 +168,6 @@ public interface DataView<T> extends HasRows<T>, HasColumns<T>, HasDataSource<T>
     void setDefaultBlankPlaceholder(String defaultBlankPlaceholder);
 
     String getBlankPlaceholder();
+
+    void resetSort();
 }

src/main/java/gwt/material/design/client/data/EventHandlers.java

@@ -84,6 +84,11 @@ public interface EventHandlers<T> {
      */
     HandlerRegistration addColumnSortHandler(ColumnSortHandler<T> handler);
 
+    /**
+     * Add a handler that triggers when we reset sort in a column
+     */
+    HandlerRegistration addColumnResetSortHandler(ColumnResetSortHandler<T> handler);
+
     /**
      * Add a handler that triggers when a category is opened.
      */

src/main/java/gwt/material/design/client/data/HasColumns.java

@@ -53,7 +53,7 @@ public interface HasColumns<T> {
     /**
      * Add a new column to the data view.
      */
-    Column<T, ?> addColumn(ColumnValueProvider<T> provider, String columnName);
+    Column<T, ?> addColumn(ColumnValueProvider<T, String> provider, String columnName);
 
     /**
      * Remove an existing column by index.

src/main/java/gwt/material/design/client/data/component/CategoryComponent.java

@@ -214,7 +214,11 @@ public void buildColumns(List<Column<T, ?>> allColumns) {
             Column<T, ?> column = allColumns.get(i);
             if (column != null && !column.name().isEmpty()) {
                 TableHeader th = new TableHeader();
-                th.addStyleName("category");
+                th.addStyleName("category " + column.name().replace(" ", "-"));
+                String width = column.width();
+                th.setWidth(column.width());
+                if (width != null) th.setMinWidth(width);
+                if (width != null)  th.setMaxWidth(width);
                 parentTh.add(th);
                 tableHeaderMap.put(column.name(), th);
             }