Skip to content

Commit 7e6f571

Browse files
ZedwagZedwag
authored
Calendar: remove m_ frefix
1 parent be3fa25 commit 7e6f571

13 files changed

Lines changed: 40 additions & 26 deletions

packages/devextreme/js/__internal/ui/calendar/m_calendar.base_view.ts renamed to packages/devextreme/js/__internal/ui/calendar/calendar.base_view.ts

File renamed without changes.

packages/devextreme/js/__internal/ui/calendar/m_calendar.multiple.selection.strategy.ts renamed to packages/devextreme/js/__internal/ui/calendar/calendar.multiple.selection.strategy.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type { DxEvent } from '@js/events';
22

3-
import type Calendar from './m_calendar';
4-
import type { WeekNumberClickEvent } from './m_calendar.base_view';
5-
import CalendarSelectionStrategy from './m_calendar.selection.strategy';
3+
import type Calendar from './calendar';
4+
import type { WeekNumberClickEvent } from './calendar.base_view';
5+
import CalendarSelectionStrategy from './calendar.selection.strategy';
66

77
class CalendarMultiSelectionStrategy extends CalendarSelectionStrategy {
88
constructor(component: Calendar) {

packages/devextreme/js/__internal/ui/calendar/m_calendar.navigator.ts renamed to packages/devextreme/js/__internal/ui/calendar/calendar.navigator.ts

File renamed without changes.

packages/devextreme/js/__internal/ui/calendar/m_calendar.range.selection.strategy.ts renamed to packages/devextreme/js/__internal/ui/calendar/calendar.range.selection.strategy.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import dateUtils from '@js/core/utils/date';
22
import type { DxEvent } from '@js/events';
33

4-
import type Calendar from './m_calendar';
5-
import type { CellEvent, WeekNumberClickEvent } from './m_calendar.base_view';
6-
import CalendarSelectionStrategy from './m_calendar.selection.strategy';
4+
import type Calendar from './calendar';
5+
import type { CellEvent, WeekNumberClickEvent } from './calendar.base_view';
6+
import CalendarSelectionStrategy from './calendar.selection.strategy';
77

88
const DAY_INTERVAL = 86400000;
99

@@ -154,6 +154,7 @@ class CalendarRangeSelectionStrategy extends CalendarSelectionStrategy {
154154
const rangeStartDate = new Date(Math.max(firstDateInViews.getTime(), startDate.getTime()));
155155
const rangeEndDate = new Date(Math.min(lastDateInViews.getTime(), endDate.getTime()));
156156

157+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
157158
return [
158159
...dateUtils.getDatesOfInterval(rangeStartDate, rangeEndDate, DAY_INTERVAL),
159160
rangeEndDate,

packages/devextreme/js/__internal/ui/calendar/m_calendar.selection.strategy.ts renamed to packages/devextreme/js/__internal/ui/calendar/calendar.selection.strategy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import dateUtils from '@js/core/utils/date';
33
import { isDefined } from '@js/core/utils/type';
44
import type { DxEvent } from '@js/events';
55

6-
import type Calendar from './m_calendar';
6+
import type Calendar from './calendar';
77

88
class CalendarSelectionStrategy {
99
public NAME!: string;

packages/devextreme/js/__internal/ui/calendar/m_calendar.single.selection.strategy.ts renamed to packages/devextreme/js/__internal/ui/calendar/calendar.single.selection.strategy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { DxEvent } from '@js/events';
22

3-
import type Calendar from './m_calendar';
4-
import CalendarSelectionStrategy from './m_calendar.selection.strategy';
3+
import type Calendar from './calendar';
4+
import CalendarSelectionStrategy from './calendar.selection.strategy';
55

66
class CalendarSingleSelectionStrategy extends CalendarSelectionStrategy {
77
constructor(component: Calendar) {

packages/devextreme/js/__internal/ui/calendar/m_calendar.ts renamed to packages/devextreme/js/__internal/ui/calendar/calendar.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ import type { SwipeEndEvent, SwipeStartEvent, SwipeUpdateEvent } from '@ts/event
3636
import Button from '@ts/ui/button/wrapper';
3737
import Editor from '@ts/ui/editor/editor';
3838

39-
import type { BaseViewProperties, CellEvent } from './m_calendar.base_view';
40-
import CalendarMultipleSelectionStrategy from './m_calendar.multiple.selection.strategy';
41-
import type { NavigatorOptions } from './m_calendar.navigator';
42-
import Navigator from './m_calendar.navigator';
43-
import CalendarRangeSelectionStrategy from './m_calendar.range.selection.strategy';
44-
import CalendarSingleSelectionStrategy from './m_calendar.single.selection.strategy';
39+
import type { BaseViewProperties, CellEvent } from './calendar.base_view';
40+
import CalendarMultipleSelectionStrategy from './calendar.multiple.selection.strategy';
41+
import type { NavigatorOptions } from './calendar.navigator';
42+
import Navigator from './calendar.navigator';
43+
import CalendarRangeSelectionStrategy from './calendar.range.selection.strategy';
44+
import CalendarSingleSelectionStrategy from './calendar.single.selection.strategy';
4545
import type {
4646
CenturyView, DecadeView, MonthView, MonthViewProperties, YearView,
47-
} from './m_calendar.views';
48-
import Views from './m_calendar.views';
47+
} from './calendar.views';
48+
import Views from './calendar.views';
4949

5050
const CALENDAR_CLASS = 'dx-calendar';
5151
const CALENDAR_BODY_CLASS = 'dx-calendar-body';

packages/devextreme/js/__internal/ui/calendar/m_calendar.views.ts renamed to packages/devextreme/js/__internal/ui/calendar/calendar.views.ts

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import type {
99
CalendarSelectionMode, FirstDayOfWeek, WeekNumberRule,
1010
} from '@js/ui/calendar';
1111

12-
import type { BaseViewProperties } from './m_calendar.base_view';
13-
import BaseView from './m_calendar.base_view';
12+
import type { BaseViewProperties } from './calendar.base_view';
13+
import BaseView from './calendar.base_view';
1414

1515
const CALENDAR_OTHER_MONTH_CLASS = 'dx-calendar-other-month';
1616
const CALENDAR_OTHER_VIEW_CLASS = 'dx-calendar-other-view';
@@ -149,13 +149,15 @@ export class MonthView extends BaseView<MonthViewProperties> {
149149
const { weekNumberRule = 'auto', firstDayOfWeek } = this.option();
150150

151151
if (weekNumberRule === 'auto') {
152+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
152153
return dateUtils.getWeekNumber(
153154
date,
154155
firstDayOfWeek,
155156
firstDayOfWeek === 1 ? 'firstFourDays' : 'firstDay',
156157
);
157158
}
158159

160+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
159161
return dateUtils.getWeekNumber(date, firstDayOfWeek, weekNumberRule);
160162
}
161163

@@ -168,6 +170,7 @@ export class MonthView extends BaseView<MonthViewProperties> {
168170
_isTodayCell(cellDate: Date): boolean {
169171
const { _todayDate: today } = this.option();
170172

173+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
171174
return dateUtils.sameDate(cellDate, today());
172175
}
173176

@@ -185,10 +188,12 @@ export class MonthView extends BaseView<MonthViewProperties> {
185188
}
186189

187190
_isStartDayOfMonth(cellDate: Date): boolean {
191+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
188192
return dateUtils.sameDate(cellDate, dateUtils.getFirstMonthDate(this.option('date')));
189193
}
190194

191195
_isEndDayOfMonth(cellDate: Date): boolean {
196+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
192197
return dateUtils.sameDate(cellDate, dateUtils.getLastMonthDate(this.option('date')));
193198
}
194199

@@ -232,6 +237,7 @@ export class MonthView extends BaseView<MonthViewProperties> {
232237
}
233238

234239
isBoundary(date: Date): boolean {
240+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
235241
return dateUtils.sameMonthAndYear(date, this.option('min')) || dateUtils.sameMonthAndYear(date, this.option('max'));
236242
}
237243

@@ -254,6 +260,7 @@ export class YearView extends BaseView {
254260
_isTodayCell(cellDate: Date): boolean {
255261
const { _todayDate: today } = this.option();
256262

263+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
257264
return dateUtils.sameMonthAndYear(cellDate, today());
258265
}
259266

@@ -308,6 +315,7 @@ export class YearView extends BaseView {
308315
}
309316

310317
isBoundary(date: Date): boolean {
318+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
311319
return dateUtils.sameYear(date, this.option('min')) || dateUtils.sameYear(date, this.option('max'));
312320
}
313321

@@ -322,6 +330,7 @@ export class DecadeView extends BaseView {
322330
_isTodayCell(cellDate: Date): boolean {
323331
const { _todayDate: today } = this.option();
324332

333+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
325334
return dateUtils.sameYear(cellDate, today());
326335
}
327336

@@ -375,6 +384,7 @@ export class DecadeView extends BaseView {
375384
}
376385

377386
_isValueOnCurrentView(currentDate: Date, value: Date): boolean {
387+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
378388
return dateUtils.sameDecade(currentDate, value);
379389
}
380390

@@ -387,6 +397,7 @@ export class DecadeView extends BaseView {
387397
}
388398

389399
isBoundary(date: Date): boolean {
400+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
390401
return dateUtils.sameDecade(date, this.option('min')) || dateUtils.sameDecade(date, this.option('max'));
391402
}
392403

@@ -401,6 +412,7 @@ export class CenturyView extends BaseView {
401412
_isTodayCell(cellDate: Date): boolean {
402413
const { _todayDate: today } = this.option();
403414

415+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
404416
return dateUtils.sameDecade(cellDate, today());
405417
}
406418

@@ -470,6 +482,7 @@ export class CenturyView extends BaseView {
470482
}
471483

472484
isBoundary(date: Date): boolean {
485+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
473486
return dateUtils.sameCentury(date, this.option('min')) || dateUtils.sameCentury(date, this.option('max'));
474487
}
475488

‎packages/devextreme/js/ui/calendar.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Calendar from '../__internal/ui/calendar/m_calendar';
1+
import Calendar from '../__internal/ui/calendar/calendar';
22
export default Calendar;
33

44
// STYLE calendar

‎packages/devextreme/testing/helpers/calendarFixtures.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import $ from 'jquery';
22
import { noop } from 'core/utils/common';
33
import Class from 'core/class';
4-
import Views from '__internal/ui/calendar/m_calendar.views';
4+
import Views from '__internal/ui/calendar/calendar.views';
55

66
const TEXTEDITOR_INPUT_SELECTOR = '.dx-texteditor-input';
77

0 commit comments

Comments
 (0)