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
Merged
merged 112 commits into from
Aug 29, 2025
Merged

Grid Cell merging #16024

merged 112 commits into from
Aug 29, 2025

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
@MayaKirova MayaKirova requested a review from mddragnev August 20, 2025 10:23
@MayaKirova
Copy link
Contributor Author

If you remove the paging of the base grid in the dev sample and hover over some of the merged cell and try to scroll with the wheel - from some position of the scrollbar you cannot continue scrolling down with the scroll wheel. This might be somethign with the newly introduced row that is above the display container. However, if the mouse hovers over some column of the grid that is not merged then it scrolls okay

Screen.Recording.2025-08-19.at.4.34.00.pm.mov

@mddragnev should be fixed now.

mddragnev
mddragnev previously approved these changes Aug 20, 2025
View reviewed changes
@tishko0 tishko0 added ✅ status: verified Applies to PRs that have passed manual verification and removed ❌ status: awaiting-test PRs awaiting manual verification labels Aug 21, 2025
@ChronosSF ChronosSF requested a review from mddragnev August 28, 2025 13:39
@ChronosSF ChronosSF requested review from simeonoff and tishko0 August 28, 2025 13:54
@ChronosSF ChronosSF merged commit cd2b8ca into master Aug 29, 2025
5 checks passed
@ChronosSF ChronosSF deleted the mkirova/cell-merge-POC-2 branch August 29, 2025 11:44
@skrustev skrustev mentioned this pull request Oct 20, 2025
Merged
14 tasks
@IMinchev64 IMinchev64 mentioned this pull request Oct 21, 2025
Merged
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@simeonoff simeonoff simeonoff left review comments

@ChronosSF ChronosSF ChronosSF approved these changes

@mddragnev mddragnev mddragnev approved these changes

@tishko0 tishko0 tishko0 left review comments

@yradoeva yradoeva yradoeva left review comments

Assignees

@ChronosSF ChronosSF

Labels

design: verified grid: hierarchical-grid grid: tree-grid grid squash-merge Merge PR with "Squash and Merge" option triage: blocking version: 20.1.x ✅ status: verified Applies to PRs that have passed manual verification

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@MayaKirova @yradoeva @ChronosSF @dkamburov @mddragnev @simeonoff @tishko0 @IMinchev64