Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const CORE_DIRECTORY_FEATURE_MAP: Record<string, string> = {
data_controller: 'Data',

views: 'Core',
grid_view: 'Core',
editor_factory: 'Core',
error_handling: 'Core',
toast: 'Core',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import type { ColumnsController } from '../../grid_core/columns_controller/colum
import type { DataController } from '../../grid_core/data_controller/data_controller';
import type { DataSourceController } from '../../grid_core/data_source/data_source_controller';
import type { EditingController } from '../../grid_core/editing/m_editing';
import type { HeaderPanel } from '../../grid_core/header_panel/m_header_panel';
import type { HeaderPanel } from '../../grid_core/header_panel/header_panel';
import type { SelectionController } from '../../grid_core/selection/m_selection';
import type { ModuleType } from '../../grid_core/types';
import type { RowsView } from '../../grid_core/views/m_rows_view';
import type { RowsView } from '../../grid_core/views/rows_view';
import dataGridCore from '../core';
import { isDataColumn } from '../m_utils';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import type { ModuleType } from '@ts/grids/grid_core/types';
import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const';

import type { ColumnHeadersView } from '../../grid_core/column_headers/m_column_headers';
import type { HeaderPanel } from '../../grid_core/header_panel/m_header_panel';
import type { RowsView } from '../../grid_core/views/m_rows_view';
import type { HeaderPanel } from '../../grid_core/header_panel/header_panel';
import type { RowsView } from '../../grid_core/views/rows_view';
import gridCore from '../core';
import dataSourceAdapterProvider from '../data_source_adapter';
import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { gridViewModule } from '@ts/grids/grid_core/views/grid_view';
import { gridViewModule } from '@ts/grids/grid_core/grid_view/grid_view';

import gridCore from '../core';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { headerPanelModule } from '@ts/grids/grid_core/header_panel/m_header_panel';
import { headerPanelModule } from '@ts/grids/grid_core/header_panel/header_panel';

import gridCore from '../core';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { rowsModule } from '@ts/grids/grid_core/views/m_rows_view';
import { rowsModule } from '@ts/grids/grid_core/views/rows_view';

import gridCore from '../core';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { ColumnsView } from '@ts/grids/grid_core/views/columns_view';
import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const';

import type { EditingController } from '../../grid_core/editing/m_editing';
import type { RowsView } from '../../grid_core/views/m_rows_view';
import type { RowsView } from '../../grid_core/views/rows_view';
import gridCore from '../core';
import AggregateCalculator from '../m_aggregate_calculator';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
/* eslint-disable @typescript-eslint/no-unused-expressions */
/* eslint-disable prefer-rest-params */
import type { Column } from '@ts/grids/grid_core/columns_controller/types';
import type { ResizingController } from '@ts/grids/grid_core/grid_view/grid_view';
import type { ModuleType } from '@ts/grids/grid_core/types';
import type { ResizingController } from '@ts/grids/grid_core/views/grid_view';

import { COLUMN_VIEWS } from '../const';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import type { dxElementWrapper } from '@js/core/renderer';
import $ from '@js/core/renderer';
import type { ModuleType } from '@ts/grids/grid_core/types';
import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view';
import type { RowsView } from '@ts/grids/grid_core/views/rows_view';
import { FIELD_ITEM_CONTENT_CLASS } from '@ts/ui/form/constants';

import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import type { KeyboardNavigationController } from '../keyboard_navigation/m_keyb
import gridCoreUtils from '../m_utils';
import modules from '../modules/modules';
import type { OptionChanged, RowKey } from '../types';
import type { RowsView } from '../views/m_rows_view';
import type { RowsView } from '../views/rows_view';
import type { ColumnWidth, ViewCellOptions } from '../views/types';
import { isPercentWidth } from '../views/utils';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
AI_ASSISTANT_ICON_NAME,
CLASSES,
} from '@ts/grids/grid_core/ai_assistant/const';
import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/m_header_panel';
import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/header_panel';
import type { OptionChanged } from '@ts/grids/grid_core/types';
import type { ToolbarItem } from '@ts/grids/new/grid_core/toolbar/types';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import Popup from '@js/ui/popup/ui.popup';
import type { Item } from '@js/ui/tree_view';
import TreeView from '@js/ui/tree_view';
import type { DataChange } from '@ts/grids/grid_core/data_controller/types';
import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view';
import type { RowsView } from '@ts/grids/grid_core/views/rows_view';

import type { ColumnHeadersView } from '../column_headers/m_column_headers';
import type { ColumnsController } from '../columns_controller/columns_controller';
import type { DropLocationNames } from '../columns_controller/types';
import type { HeaderPanel } from '../header_panel/m_header_panel';
import type { HeaderPanel } from '../header_panel/header_panel';
import modules from '../modules/modules';
import type { ModuleType } from '../types';
import { ColumnsView } from '../views/columns_view';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ import type {
DraggingHeaderViewController,
} from '../columns_resizing_reordering/m_columns_resizing_reordering';
import type { Coordinates } from '../columns_resizing_reordering/types';
import type { ResizingController } from '../grid_view/grid_view';
import type { KeyboardNavigationController } from '../keyboard_navigation/m_keyboard_navigation';
import gridCoreUtils from '../m_utils';
import type { ColumnPoint, ModuleType } from '../types';
import type { ColumnsView } from '../views/columns_view';
import { normalizeWidth } from '../views/columns_view';
import type { ResizingController } from '../views/grid_view';
import type { RowsView } from '../views/m_rows_view';
import type { RowsView } from '../views/rows_view';
import type { RowsViewScrollEvent } from '../views/types';
import { CLASSES } from './const';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { isDefined, isString } from '@js/core/utils/type';
import type { Column } from '@ts/grids/grid_core/columns_controller/types';
import { ColumnContextMenuMixin } from '@ts/grids/grid_core/context_menu/m_column_context_menu_mixin';
import type { HeaderFilterController } from '@ts/grids/grid_core/header_filter/m_header_filter';
import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/m_header_panel';
import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/header_panel';
import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const';

import { CLASSES as REORDERING_CLASSES } from '../columns_resizing_reordering/const';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ import { CLASSES as COLUMN_HEADERS_CLASSES } from '@ts/grids/grid_core/column_he
import { getDraggingPanelBoundingRects } from '@ts/grids/grid_core/columns_resizing_reordering/utils';
import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/m_editor_factory';
import type { ColumnPoint, ModuleType } from '@ts/grids/grid_core/types';
import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view';
import type { RowsView } from '@ts/grids/grid_core/views/rows_view';

import type { ColumnChooserView } from '../column_chooser/m_column_chooser';
import type { ColumnHeadersView } from '../column_headers/m_column_headers';
import type { ColumnsController } from '../columns_controller/columns_controller';
import type { HeaderPanel } from '../header_panel/m_header_panel';
import type { HeaderPanel } from '../header_panel/header_panel';
import gridCoreUtils from '../m_utils';
import modules from '../modules/modules';
import type { PagerView } from '../pager/m_pager';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { ColumnChooserView } from '../column_chooser/m_column_chooser';
import type { ColumnHeadersView } from '../column_headers/m_column_headers';
import type { HeaderPanel } from '../header_panel/m_header_panel';
import type { HeaderPanel } from '../header_panel/header_panel';

export type DraggingPanel = ColumnHeadersView | ColumnChooserView | HeaderPanel;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ import { confirm } from '@js/ui/dialog';
import { current, isFluent } from '@js/ui/themes';
import domUtils from '@ts/core/utils/m_dom';
import type Store from '@ts/data/abstract_store';
import { HIDDEN_COLUMNS_WIDTH } from '@ts/grids/grid_core/adaptivity/const';
import type { DataController } from '@ts/grids/grid_core/data_controller/data_controller';
import { generateRowValues } from '@ts/grids/grid_core/data_controller/utils/row_values';
import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/m_header_panel';
import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/header_panel';
import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const';
import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view';
import type { RowsView } from '@ts/grids/grid_core/views/rows_view';

import type {
DataChange,
Expand Down Expand Up @@ -1225,7 +1226,7 @@ class EditingControllerImpl extends modules.ViewController {

protected _getEditRowIndexCorrection(columnName?) {
const editColumn = columnName ? this._getColumnByName(columnName) : this._getEditColumn();
const isColumnHidden = editColumn?.visibleWidth === 'adaptiveHidden';
const isColumnHidden = editColumn?.visibleWidth === HIDDEN_COLUMNS_WIDTH;

return isColumnHidden ? 1 : 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { Deferred, when } from '@js/core/utils/deferred';
import { isElementInDom } from '@js/core/utils/dom';
import { isDefined, isString } from '@js/core/utils/type';
import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const';
import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view';
import type { RowsView } from '@ts/grids/grid_core/views/rows_view';

import type { ModuleType } from '../types';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import Button from '@js/ui/button';
import Form from '@js/ui/form';
import Popup from '@js/ui/popup/ui.popup';
import Scrollable from '@js/ui/scroll_view/ui.scrollable';
import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view';
import type { RowsView } from '@ts/grids/grid_core/views/rows_view';
import { FIELD_ITEM_CONTENT_CLASS } from '@ts/ui/form/constants';

import gridCoreUtils from '../m_utils';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable max-classes-per-file */
import { equalByValue } from '@js/core/utils/common';
import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view';
import type { RowsView } from '@ts/grids/grid_core/views/rows_view';

import type { ModuleType } from '../types';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import gridCoreUtils from '../m_utils';
import type { ViewController } from '../modules/modules';
import modules from '../modules/modules';
import type { Module, ModuleType } from '../types';
import type { RowsView } from '../views/m_rows_view';
import type { RowsView } from '../views/rows_view';

const EDITOR_INLINE_BLOCK = 'dx-editor-inline-block';
const CELL_FOCUS_DISABLED_CLASS = 'dx-cell-focus-disabled';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/c
import type { DataController } from '@ts/grids/grid_core/data_controller/data_controller';
import type { DataChange } from '@ts/grids/grid_core/data_controller/types';
import type { EditingController } from '@ts/grids/grid_core/editing/m_editing';
import type { ResizingController } from '@ts/grids/grid_core/grid_view/grid_view';
import modules from '@ts/grids/grid_core/modules/modules';
import type { ToastViewController } from '@ts/grids/grid_core/toast/toast_controller';
import type { OptionChanged } from '@ts/grids/grid_core/types';
import type { ResizingController } from '@ts/grids/grid_core/views/grid_view';
import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view';
import type { RowsView } from '@ts/grids/grid_core/views/rows_view';

import { CLASSES } from './const';
import type { GridError } from './types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import type { EditingController } from '@ts/grids/grid_core/editing/m_editing';
import type {
DataFilter, FilterSourceContext,
} from '@ts/grids/grid_core/filter/types';
import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/m_header_panel';
import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/header_panel';
import gridCoreUtils from '@ts/grids/grid_core/m_utils';
import modules from '@ts/grids/grid_core/modules/modules';
import type { ModuleType } from '@ts/grids/grid_core/types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import type { KeyboardNavigationController } from '../keyboard_navigation/m_keyb
import gridCoreUtils from '../m_utils';
import core from '../modules/modules';
import type { ModuleType } from '../types';
import type { RowsView } from '../views/m_rows_view';
import type { RowsView } from '../views/rows_view';
import type { VirtualScrollingDataControllerExtension } from '../virtual_scrolling/index';
import type { FocusDataSourceControllerExtension } from './extenders/focus_data_source_controller';
import { UiGridCoreFocusUtils } from './focus_utils';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import {
} from '@jest/globals';
import $ from '@js/core/renderer';
import type { Properties as DataGridProperties } from '@js/ui/data_grid';
import type { ColumnWidth } from '@ts/grids/grid_core/views/types';

import type { DataGridInstance } from '../../__tests__/__mock__/helpers/utils';
import {
afterTest, beforeTest, createDataGrid,
} from '../../__tests__/__mock__/helpers/utils';
import type { ColumnWidth } from '../types';

const CONTENT_WIDTH = 1000;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
export const CLASSES = {
gridBaseContainer: 'dx-gridbase-container',
borders: 'borders',
importantMargin: 'important-margin',
bestFit: 'best-fit',
};

export const E2E_ATTRIBUTES = {
a11yStatusContainer: 'e2e-a11y-general-status-container',
};

export const VIEW_NAMES = [
'columnsSeparatorView',
'blockSeparatorView',
'trackerView',
'headerPanel',
'columnHeadersView',
'rowsView',
'footerView',
'columnChooserView',
'filterPanelView',
'pagerView',
'draggingHeaderView',
'contextMenuView',
'headerFilterView',
'filterBuilderView',
'toastView',
'aiPromptEditorView',
'aiAssistantView',
] as const;
Loading
Loading