Skip to content

Commit bae9e2d

Browse files
TucchhaaTucchhaa
authored
Scheduler - rename showIcons to iconsShowMode in d.ts (#31400)
1 parent f54a377 commit bae9e2d

8 files changed

Lines changed: 33 additions & 33 deletions

File tree

‎packages/devextreme-angular/src/ui/scheduler/index.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import dxScheduler from 'devextreme/ui/scheduler';
2626
import dxSortable from 'devextreme/ui/sortable';
2727
import dxDraggable from 'devextreme/ui/draggable';
2828
import DataSource from 'devextreme/data/data_source';
29-
import { AllDayPanelMode, ViewType, dxSchedulerAppointment, SchedulerAppointmentFormIconDisplay, 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';
29+
import { AllDayPanelMode, ViewType, dxSchedulerAppointment, AppointmentFormIconsShowMode, 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';
3030
import { event } from 'devextreme/events/events.types';
3131
import { DataSourceOptions } from 'devextreme/data/data_source';
3232
import { Store } from 'devextreme/data/store';
@@ -393,10 +393,10 @@ export class DxSchedulerComponent extends DxComponent implements OnDestroy, OnCh
393393
394394
*/
395395
@Input()
396-
get editing(): boolean | { allowAdding?: boolean, allowDeleting?: boolean, allowDragging?: boolean, allowResizing?: boolean, allowTimeZoneEditing?: boolean, allowUpdating?: boolean, form?: undefined | { items?: Array<dxFormButtonItem | dxFormEmptyItem | dxFormGroupItem | dxFormSimpleItem | dxFormTabbedItem>, onCanceled?: ((formData: any) => void), onSaved?: ((formData: any) => void), showIcons?: SchedulerAppointmentFormIconDisplay } } {
396+
get editing(): boolean | { allowAdding?: boolean, allowDeleting?: boolean, allowDragging?: boolean, allowResizing?: boolean, allowTimeZoneEditing?: boolean, allowUpdating?: boolean, form?: undefined | { iconsShowMode?: AppointmentFormIconsShowMode, items?: Array<dxFormButtonItem | dxFormEmptyItem | dxFormGroupItem | dxFormSimpleItem | dxFormTabbedItem>, onCanceled?: ((formData: any) => void), onSaved?: ((formData: any) => void) } } {
397397
return this._getOption('editing');
398398
}
399-
set editing(value: boolean | { allowAdding?: boolean, allowDeleting?: boolean, allowDragging?: boolean, allowResizing?: boolean, allowTimeZoneEditing?: boolean, allowUpdating?: boolean, form?: undefined | { items?: Array<dxFormButtonItem | dxFormEmptyItem | dxFormGroupItem | dxFormSimpleItem | dxFormTabbedItem>, onCanceled?: ((formData: any) => void), onSaved?: ((formData: any) => void), showIcons?: SchedulerAppointmentFormIconDisplay } }) {
399+
set editing(value: boolean | { allowAdding?: boolean, allowDeleting?: boolean, allowDragging?: boolean, allowResizing?: boolean, allowTimeZoneEditing?: boolean, allowUpdating?: boolean, form?: undefined | { iconsShowMode?: AppointmentFormIconsShowMode, items?: Array<dxFormButtonItem | dxFormEmptyItem | dxFormGroupItem | dxFormSimpleItem | dxFormTabbedItem>, onCanceled?: ((formData: any) => void), onSaved?: ((formData: any) => void) } }) {
400400
this._setOption('editing', value);
401401
}
402402

@@ -1202,7 +1202,7 @@ export class DxSchedulerComponent extends DxComponent implements OnDestroy, OnCh
12021202
* This member supports the internal infrastructure and is not intended to be used directly from your code.
12031203
12041204
*/
1205-
@Output() editingChange: EventEmitter<boolean | { allowAdding?: boolean, allowDeleting?: boolean, allowDragging?: boolean, allowResizing?: boolean, allowTimeZoneEditing?: boolean, allowUpdating?: boolean, form?: undefined | { items?: Array<dxFormButtonItem | dxFormEmptyItem | dxFormGroupItem | dxFormSimpleItem | dxFormTabbedItem>, onCanceled?: ((formData: any) => void), onSaved?: ((formData: any) => void), showIcons?: SchedulerAppointmentFormIconDisplay } }>;
1205+
@Output() editingChange: EventEmitter<boolean | { allowAdding?: boolean, allowDeleting?: boolean, allowDragging?: boolean, allowResizing?: boolean, allowTimeZoneEditing?: boolean, allowUpdating?: boolean, form?: undefined | { iconsShowMode?: AppointmentFormIconsShowMode, items?: Array<dxFormButtonItem | dxFormEmptyItem | dxFormGroupItem | dxFormSimpleItem | dxFormTabbedItem>, onCanceled?: ((formData: any) => void), onSaved?: ((formData: any) => void) } }>;
12061206

12071207
/**
12081208

‎packages/devextreme-angular/src/ui/scheduler/nested/editing.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import {
1414

1515

1616

17+
import { AppointmentFormIconsShowMode } from 'devextreme/ui/scheduler';
1718
import { dxFormButtonItem, dxFormEmptyItem, dxFormGroupItem, dxFormSimpleItem, dxFormTabbedItem } from 'devextreme/ui/form';
18-
import { SchedulerAppointmentFormIconDisplay } from 'devextreme/ui/scheduler';
1919

2020
import {
2121
DxIntegrationModule,
@@ -82,10 +82,10 @@ export class DxoSchedulerEditingComponent extends NestedOption implements OnDest
8282
}
8383

8484
@Input()
85-
get form(): undefined | { items?: Array<dxFormButtonItem | dxFormEmptyItem | dxFormGroupItem | dxFormSimpleItem | dxFormTabbedItem>, onCanceled?: ((formData: any) => void), onSaved?: ((formData: any) => void), showIcons?: SchedulerAppointmentFormIconDisplay } {
85+
get form(): undefined | { iconsShowMode?: AppointmentFormIconsShowMode, items?: Array<dxFormButtonItem | dxFormEmptyItem | dxFormGroupItem | dxFormSimpleItem | dxFormTabbedItem>, onCanceled?: ((formData: any) => void), onSaved?: ((formData: any) => void) } {
8686
return this._getOption('form');
8787
}
88-
set form(value: undefined | { items?: Array<dxFormButtonItem | dxFormEmptyItem | dxFormGroupItem | dxFormSimpleItem | dxFormTabbedItem>, onCanceled?: ((formData: any) => void), onSaved?: ((formData: any) => void), showIcons?: SchedulerAppointmentFormIconDisplay }) {
88+
set form(value: undefined | { iconsShowMode?: AppointmentFormIconsShowMode, items?: Array<dxFormButtonItem | dxFormEmptyItem | dxFormGroupItem | dxFormSimpleItem | dxFormTabbedItem>, onCanceled?: ((formData: any) => void), onSaved?: ((formData: any) => void) }) {
8989
this._setOption('form', value);
9090
}
9191

‎packages/devextreme-angular/src/ui/scheduler/nested/form.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import {
1616

1717

1818

19+
import { AppointmentFormIconsShowMode } from 'devextreme/ui/scheduler';
1920
import { dxFormButtonItem, dxFormEmptyItem, dxFormGroupItem, dxFormSimpleItem, dxFormTabbedItem } from 'devextreme/ui/form';
20-
import { SchedulerAppointmentFormIconDisplay } from 'devextreme/ui/scheduler';
2121

2222
import {
2323
DxIntegrationModule,
@@ -44,6 +44,14 @@ export class DxoSchedulerFormComponent extends NestedOption implements OnDestroy
4444
this.setChildren('items', value);
4545
}
4646

47+
@Input()
48+
get iconsShowMode(): AppointmentFormIconsShowMode {
49+
return this._getOption('iconsShowMode');
50+
}
51+
set iconsShowMode(value: AppointmentFormIconsShowMode) {
52+
this._setOption('iconsShowMode', value);
53+
}
54+
4755
@Input()
4856
get items(): Array<dxFormButtonItem | dxFormEmptyItem | dxFormGroupItem | dxFormSimpleItem | dxFormTabbedItem> {
4957
return this._getOption('items');
@@ -68,14 +76,6 @@ export class DxoSchedulerFormComponent extends NestedOption implements OnDestroy
6876
this._setOption('onSaved', value);
6977
}
7078

71-
@Input()
72-
get showIcons(): SchedulerAppointmentFormIconDisplay {
73-
return this._getOption('showIcons');
74-
}
75-
set showIcons(value: SchedulerAppointmentFormIconDisplay) {
76-
this._setOption('showIcons', value);
77-
}
78-
7979

8080
protected get _optionPath() {
8181
return 'form';

‎packages/devextreme-react/src/scheduler.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import dxScheduler, {
88
import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponentMeta } from "./core/component";
99
import NestedOption from "./core/nested-option";
1010

11-
import type { ViewType, AppointmentAddedEvent, AppointmentAddingEvent, AppointmentClickEvent, AppointmentContextMenuEvent, AppointmentDblClickEvent, AppointmentDeletedEvent, AppointmentDeletingEvent, AppointmentFormOpeningEvent, AppointmentRenderedEvent, AppointmentTooltipShowingEvent, AppointmentUpdatedEvent, AppointmentUpdatingEvent, CellClickEvent, CellContextMenuEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, SchedulerAppointmentFormIconDisplay, SchedulerPredefinedToolbarItem, DateNavigatorItemProperties, SchedulerPredefinedDateNavigatorItem, dxSchedulerToolbarItem, AllDayPanelMode, AppointmentCollectorTemplateData, AppointmentTemplateData, AppointmentTooltipTemplateData, CellAppointmentsLimit, dxSchedulerScrolling } from "devextreme/ui/scheduler";
11+
import type { ViewType, AppointmentAddedEvent, AppointmentAddingEvent, AppointmentClickEvent, AppointmentContextMenuEvent, AppointmentDblClickEvent, AppointmentDeletedEvent, AppointmentDeletingEvent, AppointmentFormOpeningEvent, AppointmentRenderedEvent, AppointmentTooltipShowingEvent, AppointmentUpdatedEvent, AppointmentUpdatingEvent, CellClickEvent, CellContextMenuEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, AppointmentFormIconsShowMode, SchedulerPredefinedToolbarItem, DateNavigatorItemProperties, SchedulerPredefinedDateNavigatorItem, dxSchedulerToolbarItem, AllDayPanelMode, AppointmentCollectorTemplateData, AppointmentTemplateData, AppointmentTooltipTemplateData, CellAppointmentsLimit, dxSchedulerScrolling } from "devextreme/ui/scheduler";
1212
import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, OptionChangedEvent } from "devextreme/ui/button";
1313
import type { ContentReadyEvent as ButtonGroupContentReadyEvent, DisposingEvent as ButtonGroupDisposingEvent, InitializedEvent as ButtonGroupInitializedEvent, OptionChangedEvent as ButtonGroupOptionChangedEvent, dxButtonGroupItem, ItemClickEvent, SelectionChangedEvent } from "devextreme/ui/button_group";
1414
import type { ContentReadyEvent as TabPanelContentReadyEvent, DisposingEvent as TabPanelDisposingEvent, InitializedEvent as TabPanelInitializedEvent, OptionChangedEvent as TabPanelOptionChangedEvent, dxTabPanelOptions, ItemClickEvent as TabPanelItemClickEvent, SelectionChangedEvent as TabPanelSelectionChangedEvent, dxTabPanelItem, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, SelectionChangingEvent, TitleClickEvent, TitleHoldEvent, TitleRenderedEvent } from "devextreme/ui/tab_panel";
@@ -398,10 +398,10 @@ type IEditingProps = React.PropsWithChildren<{
398398
allowTimeZoneEditing?: boolean;
399399
allowUpdating?: boolean;
400400
form?: Record<string, any> | undefined | {
401+
iconsShowMode?: AppointmentFormIconsShowMode;
401402
items?: Array<dxFormButtonItem | dxFormEmptyItem | dxFormGroupItem | dxFormSimpleItem | dxFormTabbedItem>;
402403
onCanceled?: ((formData: any) => void);
403404
onSaved?: ((formData: any) => void);
404-
showIcons?: SchedulerAppointmentFormIconDisplay;
405405
};
406406
}>
407407
const _componentEditing = (props: IEditingProps) => {
@@ -474,10 +474,10 @@ const EmptyItem = Object.assign<typeof _componentEmptyItem, NestedComponentMeta>
474474
// owners:
475475
// Editing
476476
type IFormProps = React.PropsWithChildren<{
477+
iconsShowMode?: AppointmentFormIconsShowMode;
477478
items?: Array<dxFormButtonItem | dxFormEmptyItem | dxFormGroupItem | dxFormSimpleItem | dxFormTabbedItem>;
478479
onCanceled?: ((formData: any) => void);
479480
onSaved?: ((formData: any) => void);
480-
showIcons?: SchedulerAppointmentFormIconDisplay;
481481
}>
482482
const _componentForm = (props: IFormProps) => {
483483
return React.createElement(NestedOption<IFormProps>, {

‎packages/devextreme-vue/src/scheduler.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import {
3232
RecurrenceEditMode,
3333
dxSchedulerScrolling,
3434
dxSchedulerToolbar,
35-
SchedulerAppointmentFormIconDisplay,
35+
AppointmentFormIconsShowMode,
3636
SchedulerPredefinedToolbarItem,
3737
DateNavigatorItemProperties,
3838
SchedulerPredefinedDateNavigatorItem,
@@ -748,16 +748,16 @@ const DxFormConfig = {
748748
emits: {
749749
"update:isActive": null,
750750
"update:hoveredElement": null,
751+
"update:iconsShowMode": null,
751752
"update:items": null,
752753
"update:onCanceled": null,
753754
"update:onSaved": null,
754-
"update:showIcons": null,
755755
},
756756
props: {
757+
iconsShowMode: String as PropType<AppointmentFormIconsShowMode>,
757758
items: Array as PropType<Array<dxFormButtonItem | dxFormEmptyItem | dxFormGroupItem | dxFormSimpleItem | dxFormTabbedItem>>,
758759
onCanceled: Function as PropType<((formData: any) => void)>,
759-
onSaved: Function as PropType<((formData: any) => void)>,
760-
showIcons: String as PropType<SchedulerAppointmentFormIconDisplay>
760+
onSaved: Function as PropType<((formData: any) => void)>
761761
}
762762
};
763763

‎packages/devextreme/js/ui/scheduler.d.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export type CellAppointmentsLimit = 'auto' | 'unlimited';
7878
/** @public */
7979
export type RecurrenceEditMode = 'dialog' | 'occurrence' | 'series';
8080
/** @public */
81-
export type SchedulerAppointmentFormIconDisplay = 'both' | 'main' | 'recurrence' | 'none';
81+
export type AppointmentFormIconsShowMode = 'both' | 'main' | 'recurrence' | 'none';
8282
/** @public */
8383
export type ViewType = 'agenda' | 'day' | 'month' | 'timelineDay' | 'timelineMonth' | 'timelineWeek' | 'timelineWorkWeek' | 'week' | 'workWeek';
8484
/** @public */
@@ -663,7 +663,7 @@ export interface dxSchedulerOptions extends WidgetOptions<dxScheduler> {
663663
* @default "main"
664664
* @public
665665
*/
666-
showIcons?: SchedulerAppointmentFormIconDisplay;
666+
iconsShowMode?: AppointmentFormIconsShowMode;
667667
} | undefined;
668668
};
669669
/**

‎packages/devextreme/js/ui/scheduler_types.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export {
55
AllDayPanelMode,
66
CellAppointmentsLimit,
77
RecurrenceEditMode,
8-
SchedulerAppointmentFormIconDisplay,
8+
AppointmentFormIconsShowMode,
99
ViewType,
1010
SchedulerPredefinedToolbarItem,
1111
SchedulerPredefinedDateNavigatorItem,

‎packages/devextreme/ts/dx.all.d.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26013,6 +26013,11 @@ declare module DevExpress.ui {
2601326013
Omit<AppointmentDraggingEvent, 'itemData'> & {
2601426014
itemData?: any;
2601526015
};
26016+
export type AppointmentFormIconsShowMode =
26017+
| 'both'
26018+
| 'main'
26019+
| 'recurrence'
26020+
| 'none';
2601626021
/**
2601726022
* [descr:_ui_scheduler_AppointmentFormOpeningEvent]
2601826023
*/
@@ -26174,11 +26179,6 @@ declare module DevExpress.ui {
2617426179
DevExpress.common.core.events.ChangedOptionInfo;
2617526180
export type Properties = dxSchedulerOptions;
2617626181
export type RecurrenceEditMode = 'dialog' | 'occurrence' | 'series';
26177-
export type SchedulerAppointmentFormIconDisplay =
26178-
| 'both'
26179-
| 'main'
26180-
| 'recurrence'
26181-
| 'none';
2618226182
export type SchedulerPredefinedDateNavigatorItem =
2618326183
| 'prev'
2618426184
| 'next'
@@ -26470,9 +26470,9 @@ declare module DevExpress.ui {
2647026470
*/
2647126471
onCanceled?: (formData: any) => void;
2647226472
/**
26473-
* [descr:dxSchedulerOptions.editing.form.showIcons]
26473+
* [descr:dxSchedulerOptions.editing.form.iconsShowMode]
2647426474
*/
26475-
showIcons?: DevExpress.ui.dxScheduler.SchedulerAppointmentFormIconDisplay;
26475+
iconsShowMode?: DevExpress.ui.dxScheduler.AppointmentFormIconsShowMode;
2647626476
}
2647726477
| undefined;
2647826478
};

0 commit comments

Comments
 (0)