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.

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

Open
wants to merge 90 commits into
base: master
Choose a base branch
from
Open

Grid Cell merging #16024

wants to merge 90 commits into from

Conversation

MayaKirova
Copy link
Contributor

@MayaKirova MayaKirova commented Jul 4, 2025

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

@yradoeva

This comment was marked as resolved.

@sdimchevski sdimchevski requested a review from yradoeva July 31, 2025 09:51
@ChronosSF

This comment was marked as resolved.

@ChronosSF

This comment was marked as resolved.

@ChronosSF

This comment was marked as resolved.

@ChronosSF ChronosSF added ✅ status: verified Applies to PRs that have passed manual verification and removed 💥 status: in-test PRs currently being tested labels Jul 31, 2025
@ChronosSF
Copy link
Member

@dkamburov , @MayaKirova , I concluded testing the scenarios that I intended . Putting this as verified as I prefer the bulk to be merged and the items I found be handled as separate prs but you can go on about it as you wish.

I'll be on PTO until Tuesday so you can have someone else verify fixes if they become available prior.

@MayaKirova
Copy link
Contributor Author

MayaKirova commented Aug 1, 2025

@dkamburov , @MayaKirova , I concluded testing the scenarios that I intended . Putting this as verified as I prefer the bulk to be merged and the items I found be handled as separate prs but you can go on about it as you wish.

I'll be on PTO until Tuesday so you can have someone else verify fixes if they become available prior.

@ChronosSF @dkamburov Sure, I can add fixes in separate PRs. Just a side note about the one with master-detail:
Animation2

This is expected, because activation and/or selection is on the collapsed cell. And as per the spec activation/selection break the merge sequence.

All additional fixes can be found here and can be tested/merged separately: #16107

@MayaKirova MayaKirova mentioned this pull request Aug 1, 2025
14 tasks
@dkamburov dkamburov requested a review from tishko0 August 5, 2025 08:20
@ChronosSF ChronosSF requested review from mddragnev and removed request for rkaraivanov August 5, 2025 08:25

%igx-grid__td--merged-selected {
color: var-get($theme, 'row-selected-text-color');
background: var-get($theme, 'row-selected-background') !important;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why is important needed here and in the consequent placeholder selectors?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's because if the pinned cell style:

    %grid-cell--pinned {
        position: relative;
        background: inherit;
        z-index: 9999;
    }

It overwrites the background, when the cell is also pinned.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
design: verified grid: hierarchical-grid grid: tree-grid grid squash-merge Merge PR with "Squash and Merge" option ✅ status: verified Applies to PRs that have passed manual verification
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants