GridCore: make expand column header rowspan equal to header rows count (T1317623)#32816
Merged
anna-shakhova merged 2 commits intoDevExpress:26_1from Mar 11, 2026
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Updates GridCore’s header column layout so the expand (command) column header uses a rowspan equal to the total header row count, fixing banded header rendering inconsistencies (T1317623).
Changes:
- Adjusted visible-column compilation to insert expand columns only in the first header row and apply
rowspan = headerRowCount. - Centralized the GridCore
Columntype incolumns_controller/types.tsand updated internal imports accordingly. - Replaced/relocated coverage: removed outdated QUnit cases and added Jest tests for the updated expand-column header behavior.
Reviewed changes
Copilot reviewed 28 out of 28 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsController.tests.js | Removes QUnit tests whose expectations no longer match the corrected expand-column header layout. |
| packages/devextreme/js/__internal/grids/grid_core/views/utils.ts | Switches to the shared Column type from columns_controller/types. |
| packages/devextreme/js/__internal/grids/grid_core/views/m_columns_view.ts | Updates Column type import to the shared types module. |
| packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts | Updates Column type import to the shared types module. |
| packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts | Updates Column type import and removes no-longer-needed eslint suppression. |
| packages/devextreme/js/__internal/grids/grid_core/m_utils.ts | Updates Column type import to the shared types module. |
| packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation.ts | Updates Column type import to the shared types module. |
| packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_headers_keyboard_navigation.ts | Updates Column type import to the shared types module. |
| packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_column_keyboard_navigation_core.ts | Updates Column type import to the shared types module. |
| packages/devextreme/js/__internal/grids/grid_core/editing/types.ts | Updates Column type import to the shared types module. |
| packages/devextreme/js/__internal/grids/grid_core/columns_controller/types.ts | Introduces/extends a shared internal Column interface (incl. rowspan/colspan) and consolidates imports. |
| packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller_utils.ts | Refactors processExpandColumns to accept a target rowspan and splice expand columns deterministically. |
| packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller.ts | Changes header visible-columns generation: expand columns are placed only in the first header row with rowspan = rowCount. |
| packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller.test.ts | Adds Jest coverage for expand-column placement and header rowspan in band/grouped layouts. |
| packages/devextreme/js/__internal/grids/grid_core/column_headers/m_column_headers.ts | Updates Column type import to the shared types module. |
| packages/devextreme/js/__internal/grids/grid_core/ai_column/views/m_ai_prompt_editor_view.ts | Updates Column type import to the shared types module. |
| packages/devextreme/js/__internal/grids/grid_core/ai_column/views/m_ai_prompt_editor_view.test.ts | Updates Column type import to the shared types module. |
| packages/devextreme/js/__internal/grids/grid_core/ai_column/views/m_ai_column_view.ts | Updates Column type import to the shared types module. |
| packages/devextreme/js/__internal/grids/grid_core/ai_column/utils.ts | Updates Column type import to the shared types module. |
| packages/devextreme/js/__internal/grids/grid_core/ai_column/utils.test.ts | Updates Column type import to the shared types module. |
| packages/devextreme/js/__internal/grids/grid_core/ai_column/controllers/m_ai_prompt_editor_view_controller.ts | Updates Column type import to the shared types module. |
| packages/devextreme/js/__internal/grids/grid_core/ai_column/controllers/m_ai_column_controller.ts | Updates Column type import to the shared types module. |
| packages/devextreme/js/__internal/grids/grid_core/adaptivity/utils.ts | Updates Column type import to the shared types module. |
| packages/devextreme/js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts | Updates Column type import to the shared types module. |
| packages/devextreme/js/__internal/grids/data_grid/summary/utils.ts | Updates Column type import to the shared types module. |
| packages/devextreme/js/__internal/grids/data_grid/keyboard_navigation/m_headers_keyboard_navigation.ts | Updates Column type import to the shared types module. |
| packages/devextreme/js/__internal/grids/data_grid/keyboard_navigation/m_group_panel_keyboard_navigation.ts | Updates Column type import to the shared types module. |
| packages/devextreme/js/__internal/grids/data_grid/keyboard_navigation/m_column_keyboard_navigation_mixin.ts | Updates Column type import to the shared types module. |
anna-shakhova
force-pushed
the
26_1__T1317623_multirow_expand_header
branch
from
0f89788 to
cf669c4
Compare
anna-shakhova
force-pushed
the
26_1__T1317623_multirow_expand_header
branch
from
cf669c4 to
94da4db
Compare
e2e/testcafe-devextreme/tests/dataGrid/common/fixedColumns/visual.ts
Outdated
Show resolved
Hide resolved
anna-shakhova
force-pushed
the
26_1__T1317623_multirow_expand_header
branch
from
94da4db to
265b0c5
Compare
anna-shakhova
commented
Mar 6, 2026
packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller.ts
Show resolved
Hide resolved
Alyar666
requested changes
Mar 10, 2026
Contributor
Alyar666
left a comment
Alyar666
left a comment
There was a problem hiding this comment.
There is a missing border in RTL mode:
Alyar666
reviewed
Mar 10, 2026
...es/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller_utils.ts
Show resolved
Hide resolved
Alyar666
approved these changes
Mar 10, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.