Grid Cell merging #16024

Open

MayaKirova wants to merge 82 commits intomasterfrom

mkirova/cell-merge-POC-2

Commits on Jul 2, 2025

chore(*): Cell merge POC.

MKirova
authored and
MKirova
committed
chore(*): Minor tweaks to suggestion.

MKirova
authored and
MKirova
committed

Commits on Jul 3, 2025

chore(*): Implement with rows that are retained outside the virt.frame.

MKirova
authored and
MKirova
committed

Commits on Jul 7, 2025

chore(*): Fix border styles.

MKirova
authored and
MKirova
committed
chore(*): Add handling for variable row height.

MKirova
authored and
MKirova
committed
chore(*): Add handling if different rows have different sizes.

MKirova
authored and
MKirova
committed
chore(*): Extract hardcoded styles in class.

MKirova
authored and
MKirova
committed
chore(*): Adjust API and members.

MKirova
authored and
MKirova
committed

Commits on Jul 8, 2025

chore(*): Add mergeStrategy for grid and merging comparer for column.

MKirova
authored and
MKirova
committed

Commits on Jul 9, 2025

chore(*): Adjust pipe triggers.

MKirova
authored and
MKirova
committed
chore(*): Re-use cell templates.

MKirova
authored and
MKirova
committed
chore(*): Fix row indexes in merged row area.

MKirova
authored and
MKirova
committed
chore(*): Adjust some styles for row selection.

MKirova
authored and
MKirova
committed

Commits on Jul 10, 2025

chore(*): Merged cells navigation.

MKirova
authored and
MKirova
committed
chore(*): Adjust for scenarios after horizontal nav into merged cell.

MKirova
authored and
MKirova
committed
chore(*): Add integration with pinning.

MKirova
authored and
MKirova
committed

Commits on Jul 11, 2025

chore(*): Merge cells in pinned col.

MKirova
authored and
MKirova
committed
chore(*): Adjust check for non-mergeable record types.

MKirova
authored and
MKirova
committed
chore(*): Break merge sequence on row activation. Discard custom merge nav.

MKirova
authored and
MKirova
committed
chore(*): Merge in pinned row area.

MKirova
authored and
MKirova
committed

Commits on Jul 14, 2025

chore(*): Implement selection per spec.

MKirova
authored and
MKirova
committed
chore(*): Add hover styles.

MKirova
authored and
MKirova
committed
chore(*): Fix duplicate host listeners.

MKirova
authored and
MKirova
committed
chore(*): Merge ghost(pinned) records with same value in main area.

MKirova
authored and
MKirova
committed

Commits on Jul 15, 2025

chore(*): Fix check for merged data.

MKirova
authored and
MKirova
committed
chore(*): Refactor to calculate mergedData rows only on chunk change.

MKirova
authored and
MKirova
committed
chore(*): Cache merge data index and re-use in template.

MKirova
authored and
MKirova
committed
chore(*): Cell merge in hierarchical grid - initial commit.

MKirova
authored and
MKirova
committed

Commits on Jul 16, 2025

chore(*): Implement for tree grid. Add 2 strategies.

MKirova
authored and
MKirova
committed
chore(*): Export strategies in package.

MKirova
authored and
MKirova
committed
chore(*): Fix chip displaying when in merged cell.

MKirova
authored and
MKirova
committed
chore(*): Minor tweaks. Console warn on invalid setup.

MKirova
authored and
MKirova
committed

Commits on Jul 17, 2025

chore(*): Fix lint errors.

MKirova
authored and
MKirova
committed
chore(*): Fix theming lint.

MKirova
authored and
MKirova
committed
chore(*): Fix build and imports.

MKirova
authored and
MKirova
committed
chore(*): Add null check.

MKirova
authored and
MKirova
committed
chore(*): Null check for activeRowIndex.

MKirova
authored and
MKirova
committed
chore(*): Generate elements config.

MKirova
authored and
MKirova
committed
chore(*): Break up merge groups on cell selection.

MKirova
authored and
MKirova
committed

Commits on Jul 18, 2025

chore(*): Update active indexes on events. Cache result to limit pipe trigger.

MKirova
authored and
MKirova
committed
chore(*): When searching, mark merged cells as a single result.

MKirova
authored and
MKirova
committed
chore(*): Refresh search if needed only.

MKirova
authored and
MKirova
committed

Commits on Jul 21, 2025

chore(*): Fix scrollTo when scrolling to a merged cell that has larger rowspan.

MKirova
authored and
MKirova
committed
chore(*): Add basic merging tests.

MKirova
authored and
MKirova
committed
chore(*): Add some UI tests for merging.

MKirova
authored and
MKirova
committed

Commits on Jul 22, 2025

chore(*): Add some integration tests.

MKirova
authored and
MKirova
committed

Commits on Jul 23, 2025

chore(*): Add more integration tests.

MKirova
authored and
MKirova
committed
chore(*): Add more integration tests.

MKirova
authored and
MKirova
committed

Commits on Jul 24, 2025

chore(*): Add Hgrid and TreeGrid integration tests.

MKirova
authored and
MKirova
committed
chore(*): Fix lint i tests.

MKirova
authored and
MKirova
committed
chore(*): Update Changelog.

MKirova
authored and
MKirova
committed
Merge branch 'master' into mkirova/cell-merge-POC-2

MKirova
authored and
MKirova
committed
chore(*): Fix unrelated respy issue in combo tests.

MKirova
authored and
MKirova
committed
chore(*): Fix hardcoded value in unrelated test.

MKirova
authored and
MKirova
committed

Commits on Jul 25, 2025

chore(*): Improve samples a bit.

MKirova
authored and
MKirova
committed

Commits on Jul 28, 2025

chore(*): In case cell is merged cell placeholder, do not render content.

MKirova
authored and
MKirova
committed
chore(*): Adjust indexes when there are pinned rows to top.

MKirova
authored and
MKirova
committed
chore(*): Fix templates in hgrid and tgrid.

MKirova
authored and
MKirova
committed
chore(*): Update external merge container on data changing.

MKirova
authored and
MKirova
committed
chore(*): Adjust selection check for pinned row root.

MKirova
authored and
MKirova
committed
chore(*): Fix more indexes due to row pinning.

MKirova
authored and
MKirova
committed
chore(*): Fix tgrid check.

MKirova
authored and
MKirova
committed
chore(*): Clear active row indexes when selection is cleared.

MKirova
authored and
MKirova
committed
chore(*): Adjust selection check to use pinned view if row is pinned.

MKirova
authored and
MKirova
committed
chore(*): Fix scrollbar disappearing on data changing.

MKirova
authored and
MKirova
committed
chore(*): Notify changes after merge data is updated.

MKirova
authored and
MKirova
committed

Commits on Jul 29, 2025

chore(*): Apply review comments on styles.

MKirova
authored and
MKirova
committed
chore(*): Extract key from tree grid record.

MKirova
authored and
MKirova
committed
chore(*): Update merge indexes when in a paged grid context.

MKirova
authored and
MKirova
committed
chore(*): Update size if repaint was requested. Optimize a bit index calc.

MKirova
authored and
MKirova
committed
chore(*): Remove unnecessary inherit that overrides selection in pin area.

MKirova
authored and
MKirova
committed
chore(*): Fix timing issue between activation and drag selection.

MKirova
authored and
MKirova
committed
chore(*): Make activation and merge tests async.

MKirova
authored and
MKirova
committed

Commits on Jul 30, 2025

chore(*): Approximate click position in merge cell to activate closest row.

MKirova
authored and
MKirova
committed
chore(*): Pass clientY when simulating pointer events in tests.

MKirova
authored and
MKirova
committed

Commits on Jul 31, 2025

Merge remote-tracking branch 'origin/master' into mkirova/cell-merge-POC-2
ChronosSF
committed
chore(*): Fix background styles when pinned and merged.

MKirova
authored and
MKirova
committed
Merge branch 'mkirova/cell-merge-POC-2' of https://github.com/IgniteUI/igniteui-angular into mkirova/cell-merge-POC-2

MKirova
authored and
MKirova
committed
chore(*): Fix background styles when merged, hovered and selected.

MKirova
authored and
MKirova
committed
chore(*): Add merge strategy to pipe trigger so that it can be changed runtime.

MKirova
authored and
MKirova
committed
chore(*): Change detect on runtime strategy change.

MKirova
authored and
MKirova
committed
Merge branch 'master' into mkirova/cell-merge-POC-2
ChronosSF
authored