Skip to content

Commit 1fd65f2

Browse files
FirstDayOfWeek -> DayOfWeek (#33523)
1 parent 9eb4367 commit 1fd65f2

34 files changed

Lines changed: 115 additions & 97 deletions

File tree

apps/demos/Demos/Calendar/Overview/React/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default function App() {
3131
const [useCellTemplate, setUseCellTemplate] = useState<boolean | null>(null);
3232
const [disabled, setDisabled] = useState<boolean>(false);
3333
const [showWeekNumbers, setShowWeekNumbers] = useState<boolean>(false);
34-
const [firstDay, setFirstDay] = useState<CalendarTypes.FirstDayOfWeek>(0);
34+
const [firstDay, setFirstDay] = useState<CalendarTypes.DayOfWeek>(0);
3535
const [weekNumberRule, setWeekNumberRule] = useState<CalendarTypes.WeekNumberRule>('auto');
3636

3737
const onCurrentValueChange = useCallback(

apps/demos/Demos/Calendar/Overview/Vue/App.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ const currentValue = ref(new Date());
9090
const cellTemplate = ref('cell');
9191
const disabled = ref(false);
9292
const showWeekNumbers = ref(false);
93-
const firstDay = ref<DxCalendarTypes.FirstDayOfWeek>(0);
93+
const firstDay = ref<DxCalendarTypes.DayOfWeek>(0);
9494
const weekNumberRule = ref<DxCalendarTypes.WeekNumberRule>('auto');
9595
const weekDays = [
9696
{ id: 0, text: 'Sunday' },

packages/devextreme-angular/src/common/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export type {
2525
DataStructure,
2626
DataType,
2727
DateLike,
28+
DayOfWeek,
2829
DefaultOptionsRule,
2930
Direction,
3031
DisplayMode,

packages/devextreme-angular/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ export namespace Common {
109109
export type DataStructure = import('devextreme/common').DataStructure;
110110
export type DataType = import('devextreme/common').DataType;
111111
export type DateLike = import('devextreme/common').DateLike;
112+
export type DayOfWeek = import('devextreme/common').DayOfWeek;
112113
export type DefaultOptionsRule<T> = import('devextreme/common').DefaultOptionsRule<T>;
113114
export type Direction = import('devextreme/common').Direction;
114115
export type DisplayMode = import('devextreme/common').DisplayMode;

packages/devextreme-angular/src/ui/calendar/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323

2424

2525
import type { DisabledDate, CalendarZoomLevel, DisposingEvent, InitializedEvent, OptionChangedEvent, ValueChangedEvent, CalendarSelectionMode, WeekNumberRule } from 'devextreme/ui/calendar';
26-
import type { FirstDayOfWeek, ValidationMessageMode, Position, ValidationStatus } from 'devextreme/common';
26+
import type { DayOfWeek, ValidationMessageMode, Position, ValidationStatus } from 'devextreme/common';
2727

2828
import DxCalendar from 'devextreme/ui/calendar';
2929

@@ -168,10 +168,10 @@ export class DxCalendarComponent extends DxComponent implements OnDestroy, Contr
168168
169169
*/
170170
@Input()
171-
get firstDayOfWeek(): FirstDayOfWeek | undefined {
171+
get firstDayOfWeek(): DayOfWeek | undefined {
172172
return this._getOption('firstDayOfWeek');
173173
}
174-
set firstDayOfWeek(value: FirstDayOfWeek | undefined) {
174+
set firstDayOfWeek(value: DayOfWeek | undefined) {
175175
this._setOption('firstDayOfWeek', value);
176176
}
177177

@@ -635,7 +635,7 @@ export class DxCalendarComponent extends DxComponent implements OnDestroy, Contr
635635
* This member supports the internal infrastructure and is not intended to be used directly from your code.
636636
637637
*/
638-
@Output() firstDayOfWeekChange: EventEmitter<FirstDayOfWeek | undefined>;
638+
@Output() firstDayOfWeekChange: EventEmitter<DayOfWeek | undefined>;
639639

640640
/**
641641

packages/devextreme-angular/src/ui/date-box/nested/calendar-options.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717

1818

1919
import type { DisabledDate, CalendarZoomLevel, DisposingEvent, InitializedEvent, OptionChangedEvent, ValueChangedEvent, CalendarSelectionMode, WeekNumberRule } from 'devextreme/ui/calendar';
20-
import type { FirstDayOfWeek, ValidationMessageMode, Position, ValidationStatus } from 'devextreme/common';
20+
import type { DayOfWeek, ValidationMessageMode, Position, ValidationStatus } from 'devextreme/common';
2121

2222
import {
2323
DxIntegrationModule,
@@ -91,10 +91,10 @@ export class DxoDateBoxCalendarOptionsComponent extends NestedOption implements
9191
}
9292

9393
@Input()
94-
get firstDayOfWeek(): FirstDayOfWeek | undefined {
94+
get firstDayOfWeek(): DayOfWeek | undefined {
9595
return this._getOption('firstDayOfWeek');
9696
}
97-
set firstDayOfWeek(value: FirstDayOfWeek | undefined) {
97+
set firstDayOfWeek(value: DayOfWeek | undefined) {
9898
this._setOption('firstDayOfWeek', value);
9999
}
100100

packages/devextreme-angular/src/ui/date-range-box/nested/calendar-options.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717

1818

1919
import type { DisabledDate, CalendarZoomLevel, DisposingEvent, InitializedEvent, OptionChangedEvent, ValueChangedEvent, CalendarSelectionMode, WeekNumberRule } from 'devextreme/ui/calendar';
20-
import type { FirstDayOfWeek, ValidationMessageMode, Position, ValidationStatus } from 'devextreme/common';
20+
import type { DayOfWeek, ValidationMessageMode, Position, ValidationStatus } from 'devextreme/common';
2121

2222
import {
2323
DxIntegrationModule,
@@ -91,10 +91,10 @@ export class DxoDateRangeBoxCalendarOptionsComponent extends NestedOption implem
9191
}
9292

9393
@Input()
94-
get firstDayOfWeek(): FirstDayOfWeek | undefined {
94+
get firstDayOfWeek(): DayOfWeek | undefined {
9595
return this._getOption('firstDayOfWeek');
9696
}
97-
set firstDayOfWeek(value: FirstDayOfWeek | undefined) {
97+
set firstDayOfWeek(value: DayOfWeek | undefined) {
9898
this._setOption('firstDayOfWeek', value);
9999
}
100100

packages/devextreme-angular/src/ui/gantt/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {
2525
import type { dxGanttColumn, dxGanttContextMenu, dxGanttFilterRow, dxGanttHeaderFilter, ContentReadyEvent, ContextMenuPreparingEvent, CustomCommandEvent, DependencyDeletedEvent, DependencyDeletingEvent, DependencyInsertedEvent, DependencyInsertingEvent, DisposingEvent, InitializedEvent, OptionChangedEvent, ResourceAssignedEvent, ResourceAssigningEvent, ResourceDeletedEvent, ResourceDeletingEvent, ResourceInsertedEvent, ResourceInsertingEvent, ResourceManagerDialogShowingEvent, ResourceUnassignedEvent, ResourceUnassigningEvent, ScaleCellPreparedEvent, SelectionChangedEvent, TaskClickEvent, TaskDblClickEvent, TaskDeletedEvent, TaskDeletingEvent, TaskEditDialogShowingEvent, TaskInsertedEvent, TaskInsertingEvent, TaskMovingEvent, TaskUpdatedEvent, TaskUpdatingEvent, GanttScaleType, dxGanttSorting, dxGanttStripLine, GanttTaskTitlePosition, dxGanttToolbar } from 'devextreme/ui/gantt';
2626
import type { default as DataSource, DataSourceOptions } from 'devextreme/data/data_source';
2727
import type { Store } from 'devextreme/data/store';
28-
import type { FirstDayOfWeek } from 'devextreme/common';
28+
import type { DayOfWeek } from 'devextreme/common';
2929

3030
import DxGantt from 'devextreme/ui/gantt';
3131

@@ -277,10 +277,10 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange
277277
278278
*/
279279
@Input()
280-
get firstDayOfWeek(): FirstDayOfWeek | undefined {
280+
get firstDayOfWeek(): DayOfWeek | undefined {
281281
return this._getOption('firstDayOfWeek');
282282
}
283-
set firstDayOfWeek(value: FirstDayOfWeek | undefined) {
283+
set firstDayOfWeek(value: DayOfWeek | undefined) {
284284
this._setOption('firstDayOfWeek', value);
285285
}
286286

@@ -991,7 +991,7 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange
991991
* This member supports the internal infrastructure and is not intended to be used directly from your code.
992992
993993
*/
994-
@Output() firstDayOfWeekChange: EventEmitter<FirstDayOfWeek | undefined>;
994+
@Output() firstDayOfWeekChange: EventEmitter<DayOfWeek | undefined>;
995995

996996
/**
997997

packages/devextreme-angular/src/ui/nested/base/calendar-options.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
Component,
66
} from '@angular/core';
77

8-
import type { FirstDayOfWeek, Position, ValidationMessageMode, ValidationStatus } from 'devextreme/common';
8+
import type { DayOfWeek, Position, ValidationMessageMode, ValidationStatus } from 'devextreme/common';
99
import type { CalendarSelectionMode, CalendarZoomLevel, DisposingEvent, InitializedEvent, OptionChangedEvent, ValueChangedEvent, WeekNumberRule } from 'devextreme/ui/calendar';
1010

1111
@Component({
@@ -61,10 +61,10 @@ export abstract class DxoCalendarOptions extends NestedOption {
6161
this._setOption('elementAttr', value);
6262
}
6363

64-
get firstDayOfWeek(): FirstDayOfWeek | undefined {
64+
get firstDayOfWeek(): DayOfWeek | undefined {
6565
return this._getOption('firstDayOfWeek');
6666
}
67-
set firstDayOfWeek(value: FirstDayOfWeek | undefined) {
67+
set firstDayOfWeek(value: DayOfWeek | undefined) {
6868
this._setOption('firstDayOfWeek', value);
6969
}
7070

packages/devextreme-angular/src/ui/nested/view-dxi.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212

1313

1414

15-
import type { FirstDayOfWeek, Orientation } from 'devextreme/common';
15+
import type { DayOfWeek, Orientation } from 'devextreme/common';
1616
import type { AllDayPanelMode, CellAppointmentsLimit, dxSchedulerScrolling, ViewType } from 'devextreme/ui/scheduler';
1717

1818
import {
@@ -110,10 +110,10 @@ export class DxiViewComponent extends CollectionNestedOption {
110110
}
111111

112112
@Input()
113-
get firstDayOfWeek(): FirstDayOfWeek | undefined {
113+
get firstDayOfWeek(): DayOfWeek | undefined {
114114
return this._getOption('firstDayOfWeek');
115115
}
116-
set firstDayOfWeek(value: FirstDayOfWeek | undefined) {
116+
set firstDayOfWeek(value: DayOfWeek | undefined) {
117117
this._setOption('firstDayOfWeek', value);
118118
}
119119

0 commit comments

Comments
 (0)