diff --git a/packages/devextreme/js/__internal/grids/new/card_view/options_controller.ts b/packages/devextreme/js/__internal/grids/new/card_view/options_controller.ts index ebb4defdc2e7..ba559230d725 100644 --- a/packages/devextreme/js/__internal/grids/new/card_view/options_controller.ts +++ b/packages/devextreme/js/__internal/grids/new/card_view/options_controller.ts @@ -1,7 +1,7 @@ import { OptionsController } from '@ts/grids/new/grid_core/options_controller/options_controller_base'; import type { Options } from './types'; -import type { CardView } from './widget_base'; +import type { CardView } from './widget'; class CardViewOptionsController extends OptionsController> {} diff --git a/packages/devextreme/js/__internal/grids/new/card_view/widget_base.test.ts b/packages/devextreme/js/__internal/grids/new/card_view/widget.test.ts similarity index 95% rename from packages/devextreme/js/__internal/grids/new/card_view/widget_base.test.ts rename to packages/devextreme/js/__internal/grids/new/card_view/widget.test.ts index fa2c508d69a6..5a0c07c50da7 100644 --- a/packages/devextreme/js/__internal/grids/new/card_view/widget_base.test.ts +++ b/packages/devextreme/js/__internal/grids/new/card_view/widget.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ import { describe, expect, it } from '@jest/globals'; -import { CardView } from './widget_base'; +import { CardView } from './widget'; describe('common', () => { describe('initial render', () => { diff --git a/packages/devextreme/js/__internal/grids/new/card_view/widget_base.ts b/packages/devextreme/js/__internal/grids/new/card_view/widget.ts similarity index 96% rename from packages/devextreme/js/__internal/grids/new/card_view/widget_base.ts rename to packages/devextreme/js/__internal/grids/new/card_view/widget.ts index cd689ef6e475..aeec273cea2e 100644 --- a/packages/devextreme/js/__internal/grids/new/card_view/widget_base.ts +++ b/packages/devextreme/js/__internal/grids/new/card_view/widget.ts @@ -6,7 +6,7 @@ import $ from '@js/core/renderer'; import * as DataControllerModule from '@ts/grids/new/grid_core/data_controller'; import { MainView as MainViewBase } from '@ts/grids/new/grid_core/main_view'; import { OptionsController as OptionsControllerBase } from '@ts/grids/new/grid_core/options_controller/options_controller'; -import { GridCoreNewBase } from '@ts/grids/new/grid_core/widget_base'; +import { GridCoreNewBase } from '@ts/grids/new/grid_core/widget'; import { ContentView } from './content_view/view'; import { HeaderPanelView } from './header_panel/view'; diff --git a/packages/devextreme/js/__internal/grids/new/data_grid/options_controller.ts b/packages/devextreme/js/__internal/grids/new/data_grid/options_controller.ts index 5be2faec77b2..16b8615b02aa 100644 --- a/packages/devextreme/js/__internal/grids/new/data_grid/options_controller.ts +++ b/packages/devextreme/js/__internal/grids/new/data_grid/options_controller.ts @@ -1,7 +1,7 @@ import { OptionsController } from '@ts/grids/new/grid_core/options_controller/options_controller_base'; import type { Options } from './types'; -import type CardView from './widget_base'; +import type CardView from './widget'; class CardViewOptionsController extends OptionsController> {} diff --git a/packages/devextreme/js/__internal/grids/new/data_grid/widget_base.ts b/packages/devextreme/js/__internal/grids/new/data_grid/widget.ts similarity index 93% rename from packages/devextreme/js/__internal/grids/new/data_grid/widget_base.ts rename to packages/devextreme/js/__internal/grids/new/data_grid/widget.ts index 09966df20ac0..d77abc0104f4 100644 --- a/packages/devextreme/js/__internal/grids/new/data_grid/widget_base.ts +++ b/packages/devextreme/js/__internal/grids/new/data_grid/widget.ts @@ -2,7 +2,7 @@ import registerComponent from '@js/core/component_registrator'; // import { MainView as MainViewBase } from '@ts/grids/new/grid_core/main_view'; import { OptionsController as OptionsControllerBase } from '@ts/grids/new/grid_core/options_controller/options_controller'; -import { GridCoreNewBase } from '@ts/grids/new/grid_core/widget_base'; +import { GridCoreNewBase } from '@ts/grids/new/grid_core/widget'; // import { MainView } from './main_view'; import { OptionsController } from './options_controller'; diff --git a/packages/devextreme/js/__internal/grids/new/grid_core/columns_controller/public_methods.ts b/packages/devextreme/js/__internal/grids/new/grid_core/columns_controller/public_methods.ts index 4ce74bc27b0f..b76cb347635a 100644 --- a/packages/devextreme/js/__internal/grids/new/grid_core/columns_controller/public_methods.ts +++ b/packages/devextreme/js/__internal/grids/new/grid_core/columns_controller/public_methods.ts @@ -3,7 +3,7 @@ /* eslint-disable @typescript-eslint/explicit-function-return-type */ import type { Constructor } from '../types'; -import type { GridCoreNewBase } from '../widget_base'; +import type { GridCoreNewBase } from '../widget'; import { ColumnsController } from './columns_controller'; import type { Column } from './types'; diff --git a/packages/devextreme/js/__internal/grids/new/grid_core/data_controller/public_methods.ts b/packages/devextreme/js/__internal/grids/new/grid_core/data_controller/public_methods.ts index d392b81c0d18..a93586f97980 100644 --- a/packages/devextreme/js/__internal/grids/new/grid_core/data_controller/public_methods.ts +++ b/packages/devextreme/js/__internal/grids/new/grid_core/data_controller/public_methods.ts @@ -4,7 +4,7 @@ import type DataSource from '@js/data/data_source'; import type { Constructor } from '../types'; -import type { GridCoreNewBase } from '../widget_base'; +import type { GridCoreNewBase } from '../widget'; import { DataController } from './data_controller'; export function PublicMethods>(GridCore: T) { diff --git a/packages/devextreme/js/__internal/grids/new/grid_core/options.ts b/packages/devextreme/js/__internal/grids/new/grid_core/options.ts index 6298d85863ee..788772dc2fbe 100644 --- a/packages/devextreme/js/__internal/grids/new/grid_core/options.ts +++ b/packages/devextreme/js/__internal/grids/new/grid_core/options.ts @@ -7,7 +7,7 @@ import * as dataController from './data_controller'; import { filterPanel } from './filtering'; import type { SearchProperties } from './search/types'; import * as toolbar from './toolbar'; -import type { GridCoreNew } from './widget_base'; +import type { GridCoreNew } from './widget'; export type Options = & WidgetOptions diff --git a/packages/devextreme/js/__internal/grids/new/grid_core/widget_base.ts b/packages/devextreme/js/__internal/grids/new/grid_core/widget.ts similarity index 100% rename from packages/devextreme/js/__internal/grids/new/grid_core/widget_base.ts rename to packages/devextreme/js/__internal/grids/new/grid_core/widget.ts diff --git a/packages/devextreme/js/__internal/grids/new/grid_core/widget_mock.ts b/packages/devextreme/js/__internal/grids/new/grid_core/widget_mock.ts index d868ff7534f8..aab25f8b364a 100644 --- a/packages/devextreme/js/__internal/grids/new/grid_core/widget_mock.ts +++ b/packages/devextreme/js/__internal/grids/new/grid_core/widget_mock.ts @@ -1,6 +1,6 @@ import type { CompatibilityColumnsController } from './columns_controller/compatibility'; import type { CompatibilityDataController } from './data_controller'; -import type { GridCoreNewBase } from './widget_base'; +import type { GridCoreNewBase } from './widget'; export class WidgetMock { public NAME = 'dxDataGrid'; diff --git a/packages/devextreme/js/ui/card_view.js b/packages/devextreme/js/ui/card_view.js index 68addd52a4c2..29cd595503c8 100644 --- a/packages/devextreme/js/ui/card_view.js +++ b/packages/devextreme/js/ui/card_view.js @@ -1,3 +1,3 @@ // STYLE cardView -export { default } from '../__internal/grids/new/card_view/widget_base'; +export { default } from '../__internal/grids/new/card_view/widget'; diff --git a/packages/devextreme/js/ui/data_grid_new.js b/packages/devextreme/js/ui/data_grid_new.js index 114c55c60c52..c24c1d326a07 100644 --- a/packages/devextreme/js/ui/data_grid_new.js +++ b/packages/devextreme/js/ui/data_grid_new.js @@ -1 +1 @@ -export { default } from '../__internal/grids/new/data_grid/widget_base'; +export { default } from '../__internal/grids/new/data_grid/widget';