]> source.dussan.org Git - vaadin-framework.git/commit
projects / vaadin-framework.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 41be9fc) | patch
Merged column headers should work within declarative Grid. (#12206) (#12223)
authorAnna Koskinen <Ansku@users.noreply.github.com>
Fri, 5 Mar 2021 11:05:22 +0000 (13:05 +0200)
committerGitHub <noreply@github.com>
Fri, 5 Mar 2021 11:05:22 +0000 (13:05 +0200)
commit82ee2b665c7aef68605780391be2b03e1b79583d
tree6f4d116ac87bc4aa85f4b13b9dd19b93ad2781fatree | snapshot
parent41be9fc5d77da0a4d5eace494dc81a204f1b2e8acommit | diff
Merged column headers should work within declarative Grid. (#12206) (#12223)

* Merged column headers should work within declarative Grid. (#12206)

- null check to prevent NPE from the merged column headers
- convert to internal columnIds for merge handling
- use correct cell in merge handling
- switch away from streams in merge handling for easier readability
- regression test

Fixes: #10464
server/src/main/java/com/vaadin/ui/Grid.java diff | blob | history
server/src/main/java/com/vaadin/ui/components/grid/StaticSection.java diff | blob | history
uitest/src/main/java/com/vaadin/tests/declarative/DeclarativeGrid.java [new file with mode: 0644] blob
uitest/src/test/java/com/vaadin/tests/declarative/DeclarativeGridTest.java [new file with mode: 0644] blob
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework