diff --git a/packages/devextreme/eslint-scheduler-allowlist.mjs b/packages/devextreme/eslint-scheduler-allowlist.mjs index 28f374de2d3e..1632e1e151a5 100644 --- a/packages/devextreme/eslint-scheduler-allowlist.mjs +++ b/packages/devextreme/eslint-scheduler-allowlist.mjs @@ -113,10 +113,10 @@ const schedulerLegacyMembers = [ // appointment_popup/m_legacy_popup.ts '_ignorePreventScrollEventsDeprecation', - // header/m_header.ts + // header/header.ts '_useShortDateFormat', - // header/m_view_switcher.ts + // header/view_switcher.ts '_wrapperClassExternal', // utils/options/constants.ts, utils/options/types.ts diff --git a/packages/devextreme/js/__internal/scheduler/header/m_calendar.ts b/packages/devextreme/js/__internal/scheduler/header/calendar.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/header/m_calendar.ts rename to packages/devextreme/js/__internal/scheduler/header/calendar.ts diff --git a/packages/devextreme/js/__internal/scheduler/header/m_date_navigator.test.ts b/packages/devextreme/js/__internal/scheduler/header/date_navigator.test.ts similarity index 97% rename from packages/devextreme/js/__internal/scheduler/header/m_date_navigator.test.ts rename to packages/devextreme/js/__internal/scheduler/header/date_navigator.test.ts index b966e2ed7b57..5abd88f53022 100644 --- a/packages/devextreme/js/__internal/scheduler/header/m_date_navigator.test.ts +++ b/packages/devextreme/js/__internal/scheduler/header/date_navigator.test.ts @@ -5,8 +5,8 @@ import type { ToolbarItem } from '@js/ui/scheduler'; import { CLASS, DEFAULT_ITEMS, getDateNavigator, ITEMS_NAME, -} from './m_date_navigator'; -import type { SchedulerHeader } from './m_header'; +} from './date_navigator'; +import type { SchedulerHeader } from './header'; describe('getDateNavigator', () => { it('should return default options in case of item is empty', () => { diff --git a/packages/devextreme/js/__internal/scheduler/header/m_date_navigator.ts b/packages/devextreme/js/__internal/scheduler/header/date_navigator.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/header/m_date_navigator.ts rename to packages/devextreme/js/__internal/scheduler/header/date_navigator.ts index fc4a8a8dc29c..6c70b2976a42 100644 --- a/packages/devextreme/js/__internal/scheduler/header/m_date_navigator.ts +++ b/packages/devextreme/js/__internal/scheduler/header/date_navigator.ts @@ -6,7 +6,7 @@ import { current, isMaterialBased } from '@js/ui/themes'; import type { Item as ToolbarItem } from '@js/ui/toolbar'; import { dateUtilsTs } from '@ts/core/utils/date'; import { extend } from '@ts/core/utils/m_extend'; -import type { SchedulerHeader } from '@ts/scheduler/header/m_header'; +import type { SchedulerHeader } from '@ts/scheduler/header/header'; import { Direction } from './constants'; diff --git a/packages/devextreme/js/__internal/scheduler/header/m_header.ts b/packages/devextreme/js/__internal/scheduler/header/header.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/header/m_header.ts rename to packages/devextreme/js/__internal/scheduler/header/header.ts index 5e47e2662909..ef7174ce2196 100644 --- a/packages/devextreme/js/__internal/scheduler/header/m_header.ts +++ b/packages/devextreme/js/__internal/scheduler/header/header.ts @@ -14,26 +14,26 @@ import type { OptionChanged } from '@ts/core/widget/types'; import Widget from '@ts/core/widget/widget'; import type { NormalizedView, SafeSchedulerOptions } from '@ts/scheduler/utils/options/types'; +import SchedulerCalendar from './calendar'; import type { Direction } from './constants'; -import SchedulerCalendar from './m_calendar'; import { getDateNavigator, getTodayButtonOptions, -} from './m_date_navigator'; +} from './date_navigator'; +import type { + EventMapHandler, + HeaderOptions, IntervalOptions, +} from './types'; import { getCaption, getNextIntervalDate, getStep, nextWeek, -} from './m_utils'; +} from './utils'; import { getDropDownViewSwitcher, getTabViewSwitcher, -} from './m_view_switcher'; -import type { - EventMapHandler, - HeaderOptions, IntervalOptions, -} from './types'; +} from './view_switcher'; const CLASSES = { component: 'dx-scheduler-header', diff --git a/packages/devextreme/js/__internal/scheduler/header/m_utils.ts b/packages/devextreme/js/__internal/scheduler/header/utils.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/header/m_utils.ts rename to packages/devextreme/js/__internal/scheduler/header/utils.ts diff --git a/packages/devextreme/js/__internal/scheduler/header/m_view_switcher.integration.test.ts b/packages/devextreme/js/__internal/scheduler/header/view_switcher.integration.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/header/m_view_switcher.integration.test.ts rename to packages/devextreme/js/__internal/scheduler/header/view_switcher.integration.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/header/m_view_switcher.ts b/packages/devextreme/js/__internal/scheduler/header/view_switcher.ts similarity index 97% rename from packages/devextreme/js/__internal/scheduler/header/m_view_switcher.ts rename to packages/devextreme/js/__internal/scheduler/header/view_switcher.ts index 76ae6d55080d..78fc6bbdacf9 100644 --- a/packages/devextreme/js/__internal/scheduler/header/m_view_switcher.ts +++ b/packages/devextreme/js/__internal/scheduler/header/view_switcher.ts @@ -2,12 +2,12 @@ import { current, isFluent } from '@js/ui/themes'; import type { Item as ToolbarItem } from '@js/ui/toolbar'; import type { NormalizedView } from '../utils/options/types'; -import type { SchedulerHeader } from './m_header'; +import type { SchedulerHeader } from './header'; import { formatViews, getViewName, isOneView, -} from './m_utils'; +} from './utils'; const ClASS = { container: 'dx-scheduler-view-switcher', diff --git a/packages/devextreme/js/__internal/scheduler/m_scheduler.ts b/packages/devextreme/js/__internal/scheduler/m_scheduler.ts index d6c79d2dd6b9..eb0682e2a65d 100644 --- a/packages/devextreme/js/__internal/scheduler/m_scheduler.ts +++ b/packages/devextreme/js/__internal/scheduler/m_scheduler.ts @@ -38,7 +38,7 @@ import { AppointmentForm } from './appointment_popup/m_form'; import { ACTION_TO_APPOINTMENT, AppointmentPopup } from './appointment_popup/m_popup'; import AppointmentCollection from './appointments/m_appointment_collection'; import NotifyScheduler from './base/m_widget_notify_scheduler'; -import { SchedulerHeader } from './header/m_header'; +import { SchedulerHeader } from './header/header'; import type { HeaderOptions } from './header/types'; import { CompactAppointmentsHelper } from './m_compact_appointments_helper'; import { hide as hideLoading, show as showLoading } from './m_loading'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/header.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/header.tests.js index 6c4531cfa8cd..a3020036474b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/header.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/header.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import { createWrapper, initTestMarkup } from '../../helpers/scheduler/helpers.js'; const { testStart, test, module } = QUnit; import themes from 'ui/themes'; -import { getCaption } from '__internal/scheduler/header/m_utils'; +import { getCaption } from '__internal/scheduler/header/utils'; testStart(() => initTestMarkup());