Skip to content
Merged
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
26 changes: 22 additions & 4 deletions packages/devextreme-angular/src/ui/scheduler/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {

import type dxSortable from 'devextreme/ui/sortable';
import type dxDraggable from 'devextreme/ui/draggable';
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, RecurrenceEditMode, dxSchedulerScrolling, 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, 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';
Expand Down Expand Up @@ -762,6 +762,16 @@ export class DxSchedulerComponent extends DxComponent implements OnDestroy, OnCh
}



@Input()
get snapToCellsMode(): SnapToCellsMode {
return this._getOption('snapToCellsMode');
}
set snapToCellsMode(value: SnapToCellsMode) {
this._setOption('snapToCellsMode', value);
}


/**
* [descr:dxSchedulerOptions.startDateExpr]

Expand Down Expand Up @@ -884,10 +894,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>, intervalCount?: number, maxAppointmentsPerCell?: CellAppointmentsLimit | number, name?: string | undefined, offset?: number, resourceCellTemplate?: any, scrolling?: dxSchedulerScrolling, 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?: FirstDayOfWeek | undefined, groupByDate?: boolean, groupOrientation?: Orientation, groups?: Array<string>, 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>, intervalCount?: number, maxAppointmentsPerCell?: CellAppointmentsLimit | number, name?: string | undefined, offset?: number, resourceCellTemplate?: any, scrolling?: dxSchedulerScrolling, 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?: FirstDayOfWeek | undefined, groupByDate?: boolean, groupOrientation?: Orientation, groups?: Array<string>, 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 @@ -1397,6 +1407,13 @@ export class DxSchedulerComponent extends DxComponent implements OnDestroy, OnCh
*/
@Output() showCurrentTimeIndicatorChange: EventEmitter<boolean>;

/**

* This member supports the internal infrastructure and is not intended to be used directly from your code.

*/
@Output() snapToCellsModeChange: EventEmitter<SnapToCellsMode>;

/**

* This member supports the internal infrastructure and is not intended to be used directly from your code.
Expand Down Expand Up @@ -1465,7 +1482,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>, intervalCount?: number, maxAppointmentsPerCell?: CellAppointmentsLimit | number, name?: string | undefined, offset?: number, resourceCellTemplate?: any, scrolling?: dxSchedulerScrolling, 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?: FirstDayOfWeek | undefined, groupByDate?: boolean, groupOrientation?: Orientation, groups?: Array<string>, 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 Expand Up @@ -1560,6 +1577,7 @@ export class DxSchedulerComponent extends DxComponent implements OnDestroy, OnCh
{ emit: 'shadeUntilCurrentTimeChange' },
{ emit: 'showAllDayPanelChange' },
{ emit: 'showCurrentTimeIndicatorChange' },
{ emit: 'snapToCellsModeChange' },
{ emit: 'startDateExprChange' },
{ emit: 'startDateTimeZoneExprChange' },
{ emit: 'startDayHourChange' },
Expand Down
10 changes: 9 additions & 1 deletion packages/devextreme-angular/src/ui/scheduler/nested/view-dxi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {



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

import {
Expand Down Expand Up @@ -190,6 +190,14 @@ export class DxiSchedulerViewComponent extends CollectionNestedOption {
this._setOption('scrolling', value);
}

@Input()
get snapToCellsMode(): SnapToCellsMode {
return this._getOption('snapToCellsMode');
}
set snapToCellsMode(value: SnapToCellsMode) {
this._setOption('snapToCellsMode', value);
}

@Input()
get startDate(): Date | number | string | undefined {
return this._getOption('startDate');
Expand Down
1 change: 1 addition & 0 deletions packages/devextreme-metadata/make-angular-metadata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ Ng.makeMetadata({
removeMembers(/\/scheduler:dxSchedulerOptions\.editing\.form/),
removeMembers(/\/scheduler:dxSchedulerOptions\.editing\.popup/),
removeMembers(/\/scheduler:dxSchedulerOptions\.resources\.icon/),
removeMembers(/\/scheduler:.*\.snapToCellsMode/),
removeMembers(/\/stepper:/),
removeMembers(/\/speech_to_text:/),
removeMembers(/\/tree_list:dxTreeListColumnButton.onClick/),
Expand Down
3 changes: 2 additions & 1 deletion packages/devextreme-react/src/scheduler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import dxScheduler, {
import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponentMeta } from "./core/component";
import NestedOption from "./core/nested-option";

import type { ViewType, AppointmentAddedEvent, AppointmentAddingEvent, AppointmentClickEvent, AppointmentContextMenuEvent, AppointmentDblClickEvent, AppointmentDeletedEvent, AppointmentDeletingEvent, AppointmentFormOpeningEvent, AppointmentRenderedEvent, AppointmentTooltipShowingEvent, AppointmentUpdatedEvent, AppointmentUpdatingEvent, CellClickEvent, CellContextMenuEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, AppointmentFormProperties, AppointmentFormIconsShowMode, SchedulerPredefinedToolbarItem, DateNavigatorItemProperties, SchedulerPredefinedDateNavigatorItem, dxSchedulerToolbarItem, AllDayPanelMode, AppointmentCollectorTemplateData, AppointmentTemplateData, AppointmentTooltipTemplateData, CellAppointmentsLimit, dxSchedulerScrolling } from "devextreme/ui/scheduler";
import type { ViewType, AppointmentAddedEvent, AppointmentAddingEvent, AppointmentClickEvent, AppointmentContextMenuEvent, AppointmentDblClickEvent, AppointmentDeletedEvent, AppointmentDeletingEvent, AppointmentFormOpeningEvent, AppointmentRenderedEvent, AppointmentTooltipShowingEvent, AppointmentUpdatedEvent, AppointmentUpdatingEvent, CellClickEvent, CellContextMenuEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, AppointmentFormProperties, AppointmentFormIconsShowMode, SchedulerPredefinedToolbarItem, DateNavigatorItemProperties, SchedulerPredefinedDateNavigatorItem, dxSchedulerToolbarItem, AllDayPanelMode, AppointmentCollectorTemplateData, AppointmentTemplateData, AppointmentTooltipTemplateData, CellAppointmentsLimit, dxSchedulerScrolling, SnapToCellsMode } from "devextreme/ui/scheduler";
import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, OptionChangedEvent } from "devextreme/ui/button";
import type { ContentReadyEvent as FormContentReadyEvent, DisposingEvent as FormDisposingEvent, InitializedEvent as FormInitializedEvent, FormItemType, FormPredefinedButtonItem, OptionChangedEvent as FormOptionChangedEvent, dxFormSimpleItem, dxFormGroupItem, dxFormTabbedItem, dxFormEmptyItem, dxFormButtonItem, LabelLocation, FormLabelMode, EditorEnterKeyEvent, FieldDataChangedEvent, SmartPastedEvent, SmartPastingEvent, FormItemComponent } from "devextreme/ui/form";
import type { ContentReadyEvent as ButtonGroupContentReadyEvent, DisposingEvent as ButtonGroupDisposingEvent, InitializedEvent as ButtonGroupInitializedEvent, OptionChangedEvent as ButtonGroupOptionChangedEvent, dxButtonGroupItem, ItemClickEvent, SelectionChangedEvent } from "devextreme/ui/button_group";
Expand Down Expand Up @@ -1460,6 +1460,7 @@ type IViewProps = React.PropsWithChildren<{
offset?: number;
resourceCellTemplate?: ((itemData: any, itemIndex: number, itemElement: any) => string | any) | template;
scrolling?: dxSchedulerScrolling;
snapToCellsMode?: SnapToCellsMode;
startDate?: Date | number | string | undefined;
startDayHour?: number;
timeCellTemplate?: ((itemData: any, itemIndex: number, itemElement: any) => string | any) | template;
Expand Down
6 changes: 6 additions & 0 deletions packages/devextreme-vue/src/scheduler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import {
OptionChangedEvent,
RecurrenceEditMode,
dxSchedulerScrolling,
SnapToCellsMode,
dxSchedulerToolbar,
AppointmentFormIconsShowMode,
SchedulerPredefinedToolbarItem,
Expand Down Expand Up @@ -197,6 +198,7 @@ type AccessibleOptions = Pick<Properties,
"shadeUntilCurrentTime" |
"showAllDayPanel" |
"showCurrentTimeIndicator" |
"snapToCellsMode" |
"startDateExpr" |
"startDateTimeZoneExpr" |
"startDayHour" |
Expand Down Expand Up @@ -283,6 +285,7 @@ const componentConfig = {
shadeUntilCurrentTime: Boolean,
showAllDayPanel: Boolean,
showCurrentTimeIndicator: Boolean,
snapToCellsMode: String as PropType<SnapToCellsMode>,
startDateExpr: String,
startDateTimeZoneExpr: String,
startDayHour: Number,
Expand Down Expand Up @@ -365,6 +368,7 @@ const componentConfig = {
"update:shadeUntilCurrentTime": null,
"update:showAllDayPanel": null,
"update:showCurrentTimeIndicator": null,
"update:snapToCellsMode": null,
"update:startDateExpr": null,
"update:startDateTimeZoneExpr": null,
"update:startDayHour": null,
Expand Down Expand Up @@ -1776,6 +1780,7 @@ const DxViewConfig = {
"update:offset": null,
"update:resourceCellTemplate": null,
"update:scrolling": null,
"update:snapToCellsMode": null,
"update:startDate": null,
"update:startDayHour": null,
"update:timeCellTemplate": null,
Expand All @@ -1801,6 +1806,7 @@ const DxViewConfig = {
offset: Number,
resourceCellTemplate: {},
scrolling: Object as PropType<dxSchedulerScrolling>,
snapToCellsMode: String as PropType<SnapToCellsMode>,
startDate: [Date, Number, String],
startDayHour: Number,
timeCellTemplate: {},
Expand Down
11 changes: 11 additions & 0 deletions packages/devextreme/js/ui/scheduler.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ export type AllDayPanelMode = 'all' | 'allDay' | 'hidden';
/** @public */
export type CellAppointmentsLimit = 'auto' | 'unlimited';
/** @public */
export type SnapToCellsMode = 'always' | 'auto' | 'never';
/** @public */
export type RecurrenceEditMode = 'dialog' | 'occurrence' | 'series';
/** @public */
export type AppointmentFormIconsShowMode = 'both' | 'main' | 'recurrence' | 'none';
Expand Down Expand Up @@ -1015,6 +1017,11 @@ export interface dxSchedulerOptions extends WidgetOptions<dxScheduler> {
* @default "all"
*/
allDayPanelMode?: AllDayPanelMode;
/**
* @docid
* @public
*/
snapToCellsMode?: SnapToCellsMode;
/**
* @docid
* @default 0
Expand Down Expand Up @@ -1145,6 +1152,10 @@ export interface dxSchedulerOptions extends WidgetOptions<dxScheduler> {
* @default "all"
*/
allDayPanelMode?: AllDayPanelMode;
/**
* @docid
*/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add a @default annotation for snapToCellsMode in the d.ts? Currently the docs show null as default.

snapToCellsMode?: SnapToCellsMode;
/**
* @docid
* @default 0
Expand Down
1 change: 1 addition & 0 deletions packages/devextreme/js/ui/scheduler_types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export {
ScrollMode,
AllDayPanelMode,
CellAppointmentsLimit,
SnapToCellsMode,
RecurrenceEditMode,
AppointmentFormIconsShowMode,
AppointmentFormProperties,
Expand Down
9 changes: 9 additions & 0 deletions packages/devextreme/ts/dx.all.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26326,6 +26326,7 @@ declare module DevExpress.ui {
| 'dateNavigator'
| 'viewSwitcher';
export type SchedulerScrollToAlign = 'start' | 'center';
export type SnapToCellsMode = 'always' | 'auto' | 'never';
/**
* [descr:TargetedAppointmentInfo]
* @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution.
Expand Down Expand Up @@ -26860,6 +26861,10 @@ declare module DevExpress.ui {
* [descr:dxSchedulerOptions.allDayPanelMode]
*/
allDayPanelMode?: DevExpress.ui.dxScheduler.AllDayPanelMode;
/**
* [descr:dxSchedulerOptions.snapToCellsMode]
*/
snapToCellsMode?: DevExpress.ui.dxScheduler.SnapToCellsMode;
/**
* [descr:dxSchedulerOptions.offset]
*/
Expand Down Expand Up @@ -27009,6 +27014,10 @@ declare module DevExpress.ui {
* [descr:dxSchedulerOptions.views.allDayPanelMode]
*/
allDayPanelMode?: DevExpress.ui.dxScheduler.AllDayPanelMode;
/**
* [descr:dxSchedulerOptions.views.snapToCellsMode]
*/
snapToCellsMode?: DevExpress.ui.dxScheduler.SnapToCellsMode;
/**
* [descr:dxSchedulerOptions.views.offset]
*/
Expand Down
Loading