Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged column headers should work within declarative Grid. #12206

Merged
merged 1 commit into from
Feb 26, 2021

Conversation

Ansku
Copy link
Member

@Ansku Ansku commented Feb 25, 2021

  • 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


This change is Reviewable

- 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: vaadin#10464
Copy link
Member

@OlliTietavainenVaadin OlliTietavainenVaadin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 4 of 4 files at r1.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@Ansku Ansku merged commit d336bfa into vaadin:master Feb 26, 2021
Ansku added a commit that referenced this pull request Mar 5, 2021
- 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
@Ansku Ansku added this to the 8.12.4 milestone Mar 5, 2021
OlliTietavainenVaadin pushed a commit that referenced this pull request Mar 5, 2021
…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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Grid declarative throws if using colspan in header
2 participants