Skip to content

Grid Cell merging #16024

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 55 commits into
base: master
Choose a base branch
from
Open

Grid Cell merging #16024

wants to merge 55 commits into from
+10,191 −225

Conversation

MayaKirova
Copy link
Contributor

@MayaKirova MayaKirova commented Jul 4, 2025 •
edited
Loading

Grid cell merging feature as per spec

Additional information (check all that apply):

  • Bug fix
  • New functionality
  • Documentation
  • Demos
  • CI/CD

Checklist:

  • All relevant tags have been applied to this PR
  • This PR includes unit tests covering all the new code (test guidelines)
  • This PR includes API docs for newly added methods/properties (api docs guidelines)
  • This PR includes feature/README.MD updates for the feature docs
  • This PR includes general feature table updates in the root README.MD
  • This PR includes CHANGELOG.MD updates for newly added functionality
  • This PR contains breaking changes
  • This PR includes ng update migrations for the breaking changes (migrations guidelines)
  • This PR includes behavioral changes and the feature specification has been updated with them

@MayaKirova MayaKirova requested a review from ChronosSF July 4, 2025 07:40
MKirova added 25 commits July 7, 2025 14:46
chore(*): Fix border styles.
bb4e39f
chore(*): Add handling for variable row height.
e160c65
chore(*): Add handling if different rows have different sizes.
4667bb0
chore(*): Extract hardcoded styles in class.
febbd43
chore(*): Adjust API and members.
4c5d922
chore(*): Add mergeStrategy for grid and merging comparer for column.
a42b192
chore(*): Adjust pipe triggers.
1361952
chore(*): Re-use cell templates.
407357f
chore(*): Fix row indexes in merged row area.
f23dd6c
chore(*): Adjust some styles for row selection.
f6ffa42
chore(*): Merged cells navigation.
4d1b981
chore(*): Adjust for scenarios after horizontal nav into merged cell.
aca57ee
chore(*): Add integration with pinning.
e168c3a
chore(*): Merge cells in pinned col.
02b866a
chore(*): Adjust check for non-mergeable record types.
d515e97
chore(*): Break merge sequence on row activation. Discard custom merg…
95e5b40 
…e nav.
chore(*): Merge in pinned row area.
759b465
chore(*): Implement selection per spec.
9329079
chore(*): Add hover styles.
19c2efe
chore(*): Fix duplicate host listeners.
52860e8
chore(*): Merge ghost(pinned) records with same value in main area.
16d4ac6
chore(*): Fix check for merged data.
f81bd27
chore(*): Refactor to calculate mergedData rows only on chunk change.
2ba947e
chore(*): Cache merge data index and re-use in template.
95d0186
chore(*): Cell merge in hierarchical grid - initial commit.
2a65bc2
MKirova added 18 commits July 17, 2025 13:39
chore(*): Fix lint errors.
58e6bfa
chore(*): Fix theming lint.
5e81bf9
chore(*): Fix build and imports.
b2b61a7
chore(*): Add null check.
9a7a2d2
chore(*): Null check for activeRowIndex.
ce0c854
chore(*): Generate elements config.
a6fc511
chore(*): Break up merge groups on cell selection.
d025473
chore(*): Update active indexes on events. Cache result to limit pipe…
190f29d 
… trigger.
chore(*): When searching, mark merged cells as a single result.
50e7d85
chore(*): Refresh search if needed only.
1e560e8
chore(*): Fix scrollTo when scrolling to a merged cell that has large…
7db787a 
…r rowspan.
chore(*): Add basic merging tests.
86bc021
chore(*): Add some UI tests for merging.
91c457b
chore(*): Add some integration tests.
a5c5566
chore(*): Add more integration tests.
46ea7ae
chore(*): Add more integration tests.
f862469
chore(*): Add Hgrid and TreeGrid integration tests.
fc46739
chore(*): Fix lint i tests.
ea9baa6
@MayaKirova MayaKirova marked this pull request as ready for review July 24, 2025 11:46
@MayaKirova MayaKirova added the squash-merge Merge PR with "Squash and Merge" option label Jul 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChronosSF ChronosSF Awaiting requested review from ChronosSF

At least 1 approving review is required to merge this pull request.

Assignees

@dkamburov dkamburov

Labels
grid: hierarchical-grid grid: tree-grid grid squash-merge Merge PR with "Squash and Merge" option ❌ status: awaiting-test PRs awaiting manual verification
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@MayaKirova @dkamburov @IMinchev64