Skip to content
Open
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
2 changes: 1 addition & 1 deletion apps/demos/Demos/Calendar/Overview/React/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default function App() {
const [useCellTemplate, setUseCellTemplate] = useState<boolean | null>(null);
const [disabled, setDisabled] = useState<boolean>(false);
const [showWeekNumbers, setShowWeekNumbers] = useState<boolean>(false);
const [firstDay, setFirstDay] = useState<CalendarTypes.FirstDayOfWeek>(0);
const [firstDay, setFirstDay] = useState<CalendarTypes.DayOfWeek>(0);
const [weekNumberRule, setWeekNumberRule] = useState<CalendarTypes.WeekNumberRule>('auto');

const onCurrentValueChange = useCallback(
Expand Down
2 changes: 1 addition & 1 deletion apps/demos/Demos/Calendar/Overview/Vue/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ const currentValue = ref(new Date());
const cellTemplate = ref('cell');
const disabled = ref(false);
const showWeekNumbers = ref(false);
const firstDay = ref<DxCalendarTypes.FirstDayOfWeek>(0);
const firstDay = ref<DxCalendarTypes.DayOfWeek>(0);
const weekNumberRule = ref<DxCalendarTypes.WeekNumberRule>('auto');
const weekDays = [
{ id: 0, text: 'Sunday' },
Expand Down
1 change: 1 addition & 0 deletions packages/devextreme-angular/src/common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export type {
DataStructure,
DataType,
DateLike,
DayOfWeek,
DefaultOptionsRule,
Direction,
DisplayMode,
Expand Down
1 change: 1 addition & 0 deletions packages/devextreme-angular/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ export namespace Common {
export type DataStructure = import('devextreme/common').DataStructure;
export type DataType = import('devextreme/common').DataType;
export type DateLike = import('devextreme/common').DateLike;
export type DayOfWeek = import('devextreme/common').DayOfWeek;
export type DefaultOptionsRule<T> = import('devextreme/common').DefaultOptionsRule<T>;
export type Direction = import('devextreme/common').Direction;
export type DisplayMode = import('devextreme/common').DisplayMode;
Expand Down
8 changes: 4 additions & 4 deletions packages/devextreme-angular/src/ui/calendar/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {


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

import DxCalendar from 'devextreme/ui/calendar';

Expand Down Expand Up @@ -168,10 +168,10 @@ export class DxCalendarComponent extends DxComponent implements OnDestroy, Contr

*/
@Input()
get firstDayOfWeek(): FirstDayOfWeek | undefined {
get firstDayOfWeek(): DayOfWeek | undefined {
return this._getOption('firstDayOfWeek');
}
set firstDayOfWeek(value: FirstDayOfWeek | undefined) {
set firstDayOfWeek(value: DayOfWeek | undefined) {
this._setOption('firstDayOfWeek', value);
}

Expand Down Expand Up @@ -635,7 +635,7 @@ export class DxCalendarComponent extends DxComponent implements OnDestroy, Contr
* This member supports the internal infrastructure and is not intended to be used directly from your code.

*/
@Output() firstDayOfWeekChange: EventEmitter<FirstDayOfWeek | undefined>;
@Output() firstDayOfWeekChange: EventEmitter<DayOfWeek | undefined>;

/**

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {


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

import {
DxIntegrationModule,
Expand Down Expand Up @@ -91,10 +91,10 @@ export class DxoDateBoxCalendarOptionsComponent extends NestedOption implements
}

@Input()
get firstDayOfWeek(): FirstDayOfWeek | undefined {
get firstDayOfWeek(): DayOfWeek | undefined {
return this._getOption('firstDayOfWeek');
}
set firstDayOfWeek(value: FirstDayOfWeek | undefined) {
set firstDayOfWeek(value: DayOfWeek | undefined) {
this._setOption('firstDayOfWeek', value);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {


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

import {
DxIntegrationModule,
Expand Down Expand Up @@ -91,10 +91,10 @@ export class DxoDateRangeBoxCalendarOptionsComponent extends NestedOption implem
}

@Input()
get firstDayOfWeek(): FirstDayOfWeek | undefined {
get firstDayOfWeek(): DayOfWeek | undefined {
return this._getOption('firstDayOfWeek');
}
set firstDayOfWeek(value: FirstDayOfWeek | undefined) {
set firstDayOfWeek(value: DayOfWeek | undefined) {
this._setOption('firstDayOfWeek', value);
}

Expand Down
8 changes: 4 additions & 4 deletions packages/devextreme-angular/src/ui/gantt/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
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';
import type { default as DataSource, DataSourceOptions } from 'devextreme/data/data_source';
import type { Store } from 'devextreme/data/store';
import type { FirstDayOfWeek } from 'devextreme/common';
import type { DayOfWeek } from 'devextreme/common';

import DxGantt from 'devextreme/ui/gantt';

Expand Down Expand Up @@ -277,10 +277,10 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange

*/
@Input()
get firstDayOfWeek(): FirstDayOfWeek | undefined {
get firstDayOfWeek(): DayOfWeek | undefined {
return this._getOption('firstDayOfWeek');
}
set firstDayOfWeek(value: FirstDayOfWeek | undefined) {
set firstDayOfWeek(value: DayOfWeek | undefined) {
this._setOption('firstDayOfWeek', value);
}

Expand Down Expand Up @@ -991,7 +991,7 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange
* This member supports the internal infrastructure and is not intended to be used directly from your code.

*/
@Output() firstDayOfWeekChange: EventEmitter<FirstDayOfWeek | undefined>;
@Output() firstDayOfWeekChange: EventEmitter<DayOfWeek | undefined>;

/**

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
Component,
} from '@angular/core';

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

@Component({
Expand Down Expand Up @@ -61,10 +61,10 @@ export abstract class DxoCalendarOptions extends NestedOption {
this._setOption('elementAttr', value);
}

get firstDayOfWeek(): FirstDayOfWeek | undefined {
get firstDayOfWeek(): DayOfWeek | undefined {
return this._getOption('firstDayOfWeek');
}
set firstDayOfWeek(value: FirstDayOfWeek | undefined) {
set firstDayOfWeek(value: DayOfWeek | undefined) {
this._setOption('firstDayOfWeek', value);
}

Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme-angular/src/ui/nested/view-dxi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {



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

import {
Expand Down Expand Up @@ -110,10 +110,10 @@ export class DxiViewComponent extends CollectionNestedOption {
}

@Input()
get firstDayOfWeek(): FirstDayOfWeek | undefined {
get firstDayOfWeek(): DayOfWeek | undefined {
return this._getOption('firstDayOfWeek');
}
set firstDayOfWeek(value: FirstDayOfWeek | undefined) {
set firstDayOfWeek(value: DayOfWeek | undefined) {
this._setOption('firstDayOfWeek', value);
}

Expand Down
22 changes: 11 additions & 11 deletions packages/devextreme-angular/src/ui/scheduler/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ import {

import type dxSortable from 'devextreme/ui/sortable';
import type dxDraggable from 'devextreme/ui/draggable';
import type { default as dxScheduler, AllDayPanelMode, ViewType, dxSchedulerAppointment, AppointmentFormProperties, DayOfWeek, CellAppointmentsLimit, AppointmentAddedEvent, AppointmentAddingEvent, AppointmentClickEvent, AppointmentContextMenuEvent, AppointmentDblClickEvent, AppointmentDeletedEvent, AppointmentDeletingEvent, AppointmentFormOpeningEvent, AppointmentRenderedEvent, AppointmentTooltipShowingEvent, AppointmentUpdatedEvent, AppointmentUpdatingEvent, CellClickEvent, CellContextMenuEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, OptionChangedEvent, SelectionEndEvent, RecurrenceEditMode, dxSchedulerScrolling, SnapToCellsMode, dxSchedulerToolbar } from 'devextreme/ui/scheduler';
import type { default as dxScheduler, AllDayPanelMode, ViewType, dxSchedulerAppointment, AppointmentFormProperties, CellAppointmentsLimit, AppointmentAddedEvent, AppointmentAddingEvent, AppointmentClickEvent, AppointmentContextMenuEvent, AppointmentDblClickEvent, AppointmentDeletedEvent, AppointmentDeletingEvent, AppointmentFormOpeningEvent, AppointmentRenderedEvent, AppointmentTooltipShowingEvent, AppointmentUpdatedEvent, AppointmentUpdatingEvent, CellClickEvent, CellContextMenuEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, OptionChangedEvent, SelectionEndEvent, RecurrenceEditMode, dxSchedulerScrolling, SnapToCellsMode, dxSchedulerToolbar } from 'devextreme/ui/scheduler';
import type { event } from 'devextreme/events/events.types';
import type { default as DataSource, DataSourceOptions } from 'devextreme/data/data_source';
import type { Store } from 'devextreme/data/store';
import type { FirstDayOfWeek, Orientation } from 'devextreme/common';
import type { DayOfWeek, Orientation } from 'devextreme/common';

import DxScheduler from 'devextreme/ui/scheduler';

Expand Down Expand Up @@ -454,10 +454,10 @@ export class DxSchedulerComponent extends DxComponent implements OnDestroy, OnCh

*/
@Input()
get firstDayOfWeek(): FirstDayOfWeek | undefined {
get firstDayOfWeek(): DayOfWeek | undefined {
return this._getOption('firstDayOfWeek');
}
set firstDayOfWeek(value: FirstDayOfWeek | undefined) {
set firstDayOfWeek(value: DayOfWeek | undefined) {
this._setOption('firstDayOfWeek', value);
}

Expand Down Expand Up @@ -516,10 +516,10 @@ export class DxSchedulerComponent extends DxComponent implements OnDestroy, OnCh


@Input()
get hiddenWeekDays(): Array<DayOfWeek> {
get hiddenWeekDays(): Array<DayOfWeek> | undefined {
return this._getOption('hiddenWeekDays');
}
set hiddenWeekDays(value: Array<DayOfWeek>) {
set hiddenWeekDays(value: Array<DayOfWeek> | undefined) {
this._setOption('hiddenWeekDays', value);
}

Expand Down Expand Up @@ -903,10 +903,10 @@ export class DxSchedulerComponent extends DxComponent implements OnDestroy, OnCh

*/
@Input()
get views(): Array<Record<string, any> | string> | { agendaDuration?: number, allDayPanelMode?: AllDayPanelMode, appointmentCollectorTemplate?: any, appointmentTemplate?: any, appointmentTooltipTemplate?: any, cellDuration?: number, dataCellTemplate?: any, dateCellTemplate?: any, endDayHour?: number, firstDayOfWeek?: FirstDayOfWeek | undefined, groupByDate?: boolean, groupOrientation?: Orientation, groups?: Array<string>, hiddenWeekDays?: Array<DayOfWeek>, intervalCount?: number, maxAppointmentsPerCell?: CellAppointmentsLimit | number, name?: string | undefined, offset?: number, resourceCellTemplate?: any, scrolling?: dxSchedulerScrolling, snapToCellsMode?: SnapToCellsMode, startDate?: Date | number | string | undefined, startDayHour?: number, timeCellTemplate?: any, type?: undefined | ViewType }[] {
get views(): Array<Record<string, any> | string> | { agendaDuration?: number, allDayPanelMode?: AllDayPanelMode, appointmentCollectorTemplate?: any, appointmentTemplate?: any, appointmentTooltipTemplate?: any, cellDuration?: number, dataCellTemplate?: any, dateCellTemplate?: any, endDayHour?: number, firstDayOfWeek?: DayOfWeek | undefined, groupByDate?: boolean, groupOrientation?: Orientation, groups?: Array<string>, hiddenWeekDays?: Array<DayOfWeek> | undefined, intervalCount?: number, maxAppointmentsPerCell?: CellAppointmentsLimit | number, name?: string | undefined, offset?: number, resourceCellTemplate?: any, scrolling?: dxSchedulerScrolling, snapToCellsMode?: SnapToCellsMode, startDate?: Date | number | string | undefined, startDayHour?: number, timeCellTemplate?: any, type?: undefined | ViewType }[] {
return this._getOption('views');
}
set views(value: Array<Record<string, any> | string> | { agendaDuration?: number, allDayPanelMode?: AllDayPanelMode, appointmentCollectorTemplate?: any, appointmentTemplate?: any, appointmentTooltipTemplate?: any, cellDuration?: number, dataCellTemplate?: any, dateCellTemplate?: any, endDayHour?: number, firstDayOfWeek?: FirstDayOfWeek | undefined, groupByDate?: boolean, groupOrientation?: Orientation, groups?: Array<string>, hiddenWeekDays?: Array<DayOfWeek>, intervalCount?: number, maxAppointmentsPerCell?: CellAppointmentsLimit | number, name?: string | undefined, offset?: number, resourceCellTemplate?: any, scrolling?: dxSchedulerScrolling, snapToCellsMode?: SnapToCellsMode, startDate?: Date | number | string | undefined, startDayHour?: number, timeCellTemplate?: any, type?: undefined | ViewType }[]) {
set views(value: Array<Record<string, any> | string> | { agendaDuration?: number, allDayPanelMode?: AllDayPanelMode, appointmentCollectorTemplate?: any, appointmentTemplate?: any, appointmentTooltipTemplate?: any, cellDuration?: number, dataCellTemplate?: any, dateCellTemplate?: any, endDayHour?: number, firstDayOfWeek?: DayOfWeek | undefined, groupByDate?: boolean, groupOrientation?: Orientation, groups?: Array<string>, hiddenWeekDays?: Array<DayOfWeek> | undefined, intervalCount?: number, maxAppointmentsPerCell?: CellAppointmentsLimit | number, name?: string | undefined, offset?: number, resourceCellTemplate?: any, scrolling?: dxSchedulerScrolling, snapToCellsMode?: SnapToCellsMode, startDate?: Date | number | string | undefined, startDayHour?: number, timeCellTemplate?: any, type?: undefined | ViewType }[]) {
this._setOption('views', value);
}

Expand Down Expand Up @@ -1261,7 +1261,7 @@ export class DxSchedulerComponent extends DxComponent implements OnDestroy, OnCh
* This member supports the internal infrastructure and is not intended to be used directly from your code.

*/
@Output() firstDayOfWeekChange: EventEmitter<FirstDayOfWeek | undefined>;
@Output() firstDayOfWeekChange: EventEmitter<DayOfWeek | undefined>;

/**

Expand Down Expand Up @@ -1296,7 +1296,7 @@ export class DxSchedulerComponent extends DxComponent implements OnDestroy, OnCh
* This member supports the internal infrastructure and is not intended to be used directly from your code.

*/
@Output() hiddenWeekDaysChange: EventEmitter<Array<DayOfWeek>>;
@Output() hiddenWeekDaysChange: EventEmitter<Array<DayOfWeek> | undefined>;

/**

Expand Down Expand Up @@ -1506,7 +1506,7 @@ export class DxSchedulerComponent extends DxComponent implements OnDestroy, OnCh
* This member supports the internal infrastructure and is not intended to be used directly from your code.

*/
@Output() viewsChange: EventEmitter<Array<Record<string, any> | string> | { agendaDuration?: number, allDayPanelMode?: AllDayPanelMode, appointmentCollectorTemplate?: any, appointmentTemplate?: any, appointmentTooltipTemplate?: any, cellDuration?: number, dataCellTemplate?: any, dateCellTemplate?: any, endDayHour?: number, firstDayOfWeek?: FirstDayOfWeek | undefined, groupByDate?: boolean, groupOrientation?: Orientation, groups?: Array<string>, hiddenWeekDays?: Array<DayOfWeek>, intervalCount?: number, maxAppointmentsPerCell?: CellAppointmentsLimit | number, name?: string | undefined, offset?: number, resourceCellTemplate?: any, scrolling?: dxSchedulerScrolling, snapToCellsMode?: SnapToCellsMode, startDate?: Date | number | string | undefined, startDayHour?: number, timeCellTemplate?: any, type?: undefined | ViewType }[]>;
@Output() viewsChange: EventEmitter<Array<Record<string, any> | string> | { agendaDuration?: number, allDayPanelMode?: AllDayPanelMode, appointmentCollectorTemplate?: any, appointmentTemplate?: any, appointmentTooltipTemplate?: any, cellDuration?: number, dataCellTemplate?: any, dateCellTemplate?: any, endDayHour?: number, firstDayOfWeek?: DayOfWeek | undefined, groupByDate?: boolean, groupOrientation?: Orientation, groups?: Array<string>, hiddenWeekDays?: Array<DayOfWeek> | undefined, intervalCount?: number, maxAppointmentsPerCell?: CellAppointmentsLimit | number, name?: string | undefined, offset?: number, resourceCellTemplate?: any, scrolling?: dxSchedulerScrolling, snapToCellsMode?: SnapToCellsMode, startDate?: Date | number | string | undefined, startDayHour?: number, timeCellTemplate?: any, type?: undefined | ViewType }[]>;

/**

Expand Down
12 changes: 6 additions & 6 deletions packages/devextreme-angular/src/ui/scheduler/nested/view-dxi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import {



import type { AllDayPanelMode, DayOfWeek, CellAppointmentsLimit, dxSchedulerScrolling, SnapToCellsMode, ViewType } from 'devextreme/ui/scheduler';
import type { FirstDayOfWeek, Orientation } from 'devextreme/common';
import type { AllDayPanelMode, CellAppointmentsLimit, dxSchedulerScrolling, SnapToCellsMode, ViewType } from 'devextreme/ui/scheduler';
import type { DayOfWeek, Orientation } from 'devextreme/common';

import {
DxIntegrationModule,
Expand Down Expand Up @@ -110,10 +110,10 @@ export class DxiSchedulerViewComponent extends CollectionNestedOption {
}

@Input()
get firstDayOfWeek(): FirstDayOfWeek | undefined {
get firstDayOfWeek(): DayOfWeek | undefined {
return this._getOption('firstDayOfWeek');
}
set firstDayOfWeek(value: FirstDayOfWeek | undefined) {
set firstDayOfWeek(value: DayOfWeek | undefined) {
this._setOption('firstDayOfWeek', value);
}

Expand Down Expand Up @@ -142,10 +142,10 @@ export class DxiSchedulerViewComponent extends CollectionNestedOption {
}

@Input()
get hiddenWeekDays(): Array<DayOfWeek> {
get hiddenWeekDays(): Array<DayOfWeek> | undefined {
return this._getOption('hiddenWeekDays');
}
set hiddenWeekDays(value: Array<DayOfWeek>) {
set hiddenWeekDays(value: Array<DayOfWeek> | undefined) {
this._setOption('hiddenWeekDays', value);
}

Expand Down
10 changes: 0 additions & 10 deletions packages/devextreme-metadata/aspnet/enums.ts
Original file line number Diff line number Diff line change
Expand Up @@ -421,16 +421,6 @@ export const enumItemRenamings = {
'datetime': 'DateTime',
},

'FirstDayOfWeek': {
'0': 'Sunday',
'1': 'Monday',
'2': 'Tuesday',
'3': 'Wednesday',
'4': 'Thursday',
'5': 'Friday',
'6': 'Saturday',
},

'GaugeOverlappingBehavior': {
'first': 'HideFirstLabel',
'last': 'HideLastLabel',
Expand Down
1 change: 1 addition & 0 deletions packages/devextreme-react/src/common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export type {
DataStructure,
DataType,
DateLike,
DayOfWeek,
DefaultOptionsRule,
Direction,
DisplayMode,
Expand Down
Loading
Loading