Skip to content

Commit e49fcdd

Browse files
authored
fix: Grid.isMultiSort() will now return true when appropriate (#2298)
1 parent 41743a9 commit e49fcdd

2 files changed

Lines changed: 21 additions & 1 deletion

File tree

  • vaadin-grid-flow-parent/vaadin-grid-flow/src

vaadin-grid-flow-parent/vaadin-grid-flow/src/main/java/com/vaadin/flow/component/grid/Grid.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3093,7 +3093,10 @@ public void setMultiSort(boolean multiSort) {
30933093
*/
30943094
public boolean isMultiSort() {
30953095
String multiSort = getElement().getAttribute("multi-sort");
3096-
return multiSort == null ? false : Boolean.valueOf(multiSort);
3096+
if (multiSort != null && multiSort.length() == 0) {
3097+
multiSort = "true";
3098+
}
3099+
return Boolean.parseBoolean(multiSort);
30973100
}
30983101

30993102
@ClientCallable

vaadin-grid-flow-parent/vaadin-grid-flow/src/test/java/com/vaadin/flow/component/grid/GridSortingTest.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,23 @@ public void template_renderer_non_comparable_property() {
263263
grid.getDataCommunicator().getBackEndSorting());
264264
}
265265

266+
@Test
267+
public void checkMultiSortDefaultValue() {
268+
Assert.assertFalse(grid.isMultiSort());
269+
}
270+
271+
@Test
272+
public void checkMultiSortFalse() {
273+
grid.setMultiSort(false);
274+
Assert.assertFalse(grid.isMultiSort());
275+
}
276+
277+
@Test
278+
public void checkMultiSortTrue() {
279+
grid.setMultiSort(true);
280+
Assert.assertTrue(grid.isMultiSort());
281+
}
282+
266283
private void setTestSorting() {
267284
JsonArray sortersArray = Json.createArray();
268285
sortersArray.set(0, createSortObject(getColumnId(nameColumn), "asc"));

0 commit comments

Comments
 (0)