Skip to content

Commit 0817c88

Browse files
authored
DataGrid: Fix the 'Move to the right' and 'Move to the left' context menu items in RTL mode (DevExpress#30023)
Co-authored-by: Alyar <>
1 parent b8306d4 commit 0817c88

7 files changed

+14
-6
lines changed

e2e/testcafe-devextreme/tests/dataGrid/common/keyboardNavigation/columnReordering.visual.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,14 @@ const DATA_GRID_SELECTOR = '#container';
7979
const contextMenu = dataGrid.getContextMenu();
8080
const headerRow = dataGrid.getHeaders().getHeaderRow(0);
8181
const firstHeaderCell = headerRow.getHeaderCell(0);
82+
const contextMenuItemText = `Move to the ${rtlEnabled ? 'left' : 'right'}`;
8283

8384
await t.rightClick(firstHeaderCell.element);
8485

8586
await takeScreenshot(`reorder_column_to_right_via_context_menu_when_rtlEnabled_=_${rtlEnabled}_1`);
8687

8788
await t
88-
.click(contextMenu.getItemByText('Move to the right'));
89+
.click(contextMenu.getItemByText(contextMenuItemText));
8990

9091
await takeScreenshot(`reorder_column_to_right_via_context_menu_when_rtlEnabled_=_${rtlEnabled}_2`);
9192

@@ -111,13 +112,14 @@ const DATA_GRID_SELECTOR = '#container';
111112
const contextMenu = dataGrid.getContextMenu();
112113
const headerRow = dataGrid.getHeaders().getHeaderRow(0);
113114
const lastHeaderCell = headerRow.getHeaderCell(3);
115+
const contextMenuItemText = `Move to the ${rtlEnabled ? 'right' : 'left'}`;
114116

115117
await t.rightClick(lastHeaderCell.element);
116118

117119
await takeScreenshot(`reorder_column_to_left_via_context_menu_when_rtlEnabled_=_${rtlEnabled}_1`);
118120

119121
await t
120-
.click(contextMenu.getItemByText('Move to the left'));
122+
.click(contextMenu.getItemByText(contextMenuItemText));
121123

122124
await takeScreenshot(`reorder_column_to_left_via_context_menu_when_rtlEnabled_=_${rtlEnabled}_2`);
123125

Loading
Loading
Loading
Loading

e2e/testcafe-devextreme/tests/dataGrid/common/keyboardNavigation/groupColumnReordering.visual.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,14 @@ const DATA_GRID_SELECTOR = '#container';
105105
const dataGrid = new DataGrid(DATA_GRID_SELECTOR);
106106
const contextMenu = dataGrid.getContextMenu();
107107
const firstGroupHeader = dataGrid.getGroupPanel().getHeader(0);
108+
const contextMenuItemText = `Move to the ${rtlEnabled ? 'left' : 'right'}`;
108109

109110
await t.rightClick(firstGroupHeader.element);
110111

111112
await takeScreenshot(`reorder_group_column_to_${rtlEnabled ? 'left' : 'right'}_via_context_menu_when_rtlEnabled_=_${rtlEnabled}_1`);
112113

113114
await t
114-
.click(contextMenu.getItemByText('Move to the right'));
115+
.click(contextMenu.getItemByText(contextMenuItemText));
115116

116117
await takeScreenshot(`reorder_group_column_to_${rtlEnabled ? 'left' : 'right'}_via_context_menu_when_rtlEnabled_=_${rtlEnabled}_2`);
117118

@@ -149,13 +150,14 @@ const DATA_GRID_SELECTOR = '#container';
149150
const dataGrid = new DataGrid(DATA_GRID_SELECTOR);
150151
const contextMenu = dataGrid.getContextMenu();
151152
const lastGroupHeader = dataGrid.getGroupPanel().getHeader(1);
153+
const contextMenuItemText = `Move to the ${rtlEnabled ? 'right' : 'left'}`;
152154

153155
await t.rightClick(lastGroupHeader.element);
154156

155157
await takeScreenshot(`reorder_group_column_to_${rtlEnabled ? 'right' : 'left'}_via_context_menu_when_rtlEnabled_=_${rtlEnabled}_1`);
156158

157159
await t
158-
.click(contextMenu.getItemByText('Move to the left'));
160+
.click(contextMenu.getItemByText(contextMenuItemText));
159161

160162
await takeScreenshot(`reorder_group_column_to_${rtlEnabled ? 'right' : 'left'}_via_context_menu_when_rtlEnabled_=_${rtlEnabled}_2`);
161163

packages/devextreme/js/__internal/grids/grid_core/context_menu/m_column_context_menu_mixin.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ export const ColumnContextMenuMixin = <T extends ModuleType<ColumnContextMenuMix
6161

6262
return [
6363
{
64-
text: messageLocalization.format('dxDataGrid-moveColumnToTheLeft'),
64+
text: rtlEnabled
65+
? messageLocalization.format('dxDataGrid-moveColumnToTheRight')
66+
: messageLocalization.format('dxDataGrid-moveColumnToTheLeft'),
6567
value: Direction.Previous,
6668
beginGroup: true,
6769
disabled: !keyboardNavigationController.canReorderColumn(
@@ -73,7 +75,9 @@ export const ColumnContextMenuMixin = <T extends ModuleType<ColumnContextMenuMix
7375
onItemClick,
7476
},
7577
{
76-
text: messageLocalization.format('dxDataGrid-moveColumnToTheRight'),
78+
text: rtlEnabled
79+
? messageLocalization.format('dxDataGrid-moveColumnToTheLeft')
80+
: messageLocalization.format('dxDataGrid-moveColumnToTheRight'),
7781
value: Direction.Next,
7882
disabled: !keyboardNavigationController.canReorderColumn(
7983
column,

0 commit comments

Comments
 (0)