Skip to content

Commit 807ebfd

Browse files
Grids: T1313619 - CardView - OptionChangedEvent type is missing (DevExpress#31817)
Co-authored-by: Mikhail Preyskurantov <[email protected]>
1 parent 1978f2d commit 807ebfd

File tree

5 files changed

+37
-8
lines changed

5 files changed

+37
-8
lines changed

packages/devextreme-angular/src/ui/card-view/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
export { ExplicitTypes } from 'devextreme/ui/card_view';
2525

2626
import DataSource from 'devextreme/data/data_source';
27-
import { CardCover, CardHeader, ColumnProperties, dxCardViewEditing, HeaderPanel, CardClickEvent, CardDblClickEvent, CardHoverChangedEvent, CardInsertedEvent, CardInsertingEvent, CardPreparedEvent, CardRemovedEvent, CardRemovingEvent, CardUpdatedEvent, CardUpdatingEvent, ContextMenuPreparingEvent, EditCanceledEvent, EditCancelingEvent, EditingStartEvent, FieldCaptionClickEvent, FieldCaptionDblClickEvent, FieldCaptionPreparedEvent, FieldValueClickEvent, FieldValueDblClickEvent, FieldValuePreparedEvent, FocusedCardChanged, InitNewCardEvent, SavedEvent, SavingEvent, SelectionChangedEvent, Paging, RemoteOperations, SelectionConfiguration, dxCardViewToolbar } from 'devextreme/ui/card_view';
27+
import { CardCover, CardHeader, ColumnProperties, dxCardViewEditing, HeaderPanel, CardClickEvent, CardDblClickEvent, CardHoverChangedEvent, CardInsertedEvent, CardInsertingEvent, CardPreparedEvent, CardRemovedEvent, CardRemovingEvent, CardUpdatedEvent, CardUpdatingEvent, ContextMenuPreparingEvent, EditCanceledEvent, EditCancelingEvent, EditingStartEvent, FieldCaptionClickEvent, FieldCaptionDblClickEvent, FieldCaptionPreparedEvent, FieldValueClickEvent, FieldValueDblClickEvent, FieldValuePreparedEvent, FocusedCardChanged, InitNewCardEvent, OptionChangedEvent, SavedEvent, SavingEvent, SelectionChangedEvent, Paging, RemoteOperations, SelectionConfiguration, dxCardViewToolbar } from 'devextreme/ui/card_view';
2828
import { Mode, ScrollbarMode } from 'devextreme/common';
2929
import { ColumnChooser, FilterPanel, HeaderFilter, Pager, SearchPanel, Sorting } from 'devextreme/common/grids';
3030
import { DataSourceOptions } from 'devextreme/data/data_source';
@@ -872,7 +872,7 @@ export class DxCardViewComponent<TCardData = any, TKey = any> extends DxComponen
872872
873873
874874
*/
875-
@Output() onOptionChanged: EventEmitter<Object>;
875+
@Output() onOptionChanged: EventEmitter<OptionChangedEvent>;
876876

877877
/**
878878

packages/devextreme-vue/src/card-view.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { defineComponent } from "vue";
44
import { prepareComponentConfig } from "./core/index";
55
import CardView, { Properties } from "devextreme/ui/card_view";
66
import DataSource from "devextreme/data/data_source";
7-
import DOMComponent from "devextreme/core/dom_component";
87
import {
98
CardCover,
109
CardHeader,
@@ -33,6 +32,7 @@ import {
3332
FieldValuePreparedEvent,
3433
FocusedCardChanged,
3534
InitNewCardEvent,
35+
OptionChangedEvent,
3636
SavedEvent,
3737
SavingEvent,
3838
SelectionChangedEvent,
@@ -149,7 +149,7 @@ import {
149149
ContentReadyEvent,
150150
DisposingEvent,
151151
InitializedEvent,
152-
OptionChangedEvent,
152+
OptionChangedEvent as ButtonOptionChangedEvent,
153153
} from "devextreme/ui/button";
154154
import {
155155
FormItemType,
@@ -353,7 +353,7 @@ const componentConfig = {
353353
onFocusedCardChanged: Function as PropType<((e: FocusedCardChanged) => void)>,
354354
onInitialized: Function as PropType<((e: { component: Component<any>, element: any }) => void)>,
355355
onInitNewCard: Function as PropType<((e: InitNewCardEvent) => void)>,
356-
onOptionChanged: Function as PropType<((e: { component: DOMComponent, element: any, fullName: string, model: any, name: string, previousValue: any, value: any }) => void)>,
356+
onOptionChanged: Function as PropType<((e: OptionChangedEvent) => void)>,
357357
onSaved: Function as PropType<((e: SavedEvent) => void)>,
358358
onSaving: Function as PropType<((e: SavingEvent) => void)>,
359359
onSelectionChanged: Function as PropType<((e: SelectionChangedEvent) => void)>,
@@ -683,7 +683,7 @@ const DxButtonOptionsConfig = {
683683
onContentReady: Function as PropType<((e: ContentReadyEvent) => void)>,
684684
onDisposing: Function as PropType<((e: DisposingEvent) => void)>,
685685
onInitialized: Function as PropType<((e: InitializedEvent) => void)>,
686-
onOptionChanged: Function as PropType<((e: OptionChangedEvent) => void)>,
686+
onOptionChanged: Function as PropType<((e: ButtonOptionChangedEvent) => void)>,
687687
rtlEnabled: Boolean,
688688
stylingMode: String as PropType<ButtonStyle>,
689689
tabIndex: Number,

packages/devextreme/js/ui/card_view.d.ts

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import DataSource, { DataSourceLike } from '../data/data_source';
1414
import Widget, { WidgetOptions } from './widget/ui.widget';
1515
import {
1616
Cancelable,
17+
ChangedOptionInfo,
1718
EventInfo,
1819
NativeEventInfo,
1920
PointerInteractionEvent,
@@ -1125,6 +1126,14 @@ export type CardUpdatingEvent<TCardData = unknown, TKey = unknown> = EventInfo<d
11251126
newData: DeepPartial<TCardData>;
11261127
};
11271128

1129+
/**
1130+
* @docid _ui_card_view_OptionChangedEvent
1131+
* @public
1132+
* @type object
1133+
* @inherits EventInfo,ChangedOptionInfo
1134+
*/
1135+
export type OptionChangedEvent<TCardData = unknown, TKey = unknown> = EventInfo<dxCardView<TCardData, TKey>> & ChangedOptionInfo;
1136+
11281137
/**
11291138
* @docid _ui_card_view_SavedEvent
11301139
* @public
@@ -1290,7 +1299,7 @@ export type FocusedCardChanged = EventInfo<dxCardView> & WithCardInfo;
12901299
* @docid
12911300
* @deprecated use Properties instead
12921301
*/
1293-
export interface dxCardViewOptions<TCardData = unknown, TKey = unknown> extends WidgetOptions<dxCardView> {
1302+
export interface dxCardViewOptions<TCardData = unknown, TKey = unknown> extends Omit<WidgetOptions<dxCardView>, 'onOptionChanged'> {
12941303

12951304
// #region DataController
12961305

@@ -1686,6 +1695,13 @@ export interface dxCardViewOptions<TCardData = unknown, TKey = unknown> extends
16861695
* @action
16871696
*/
16881697
onCardUpdating?: (e: CardUpdatingEvent) => void;
1698+
/**
1699+
* @docid
1700+
* @public
1701+
* @type_function_param1 e:{ui/card_view:OptionChangedEvent}
1702+
* @action
1703+
*/
1704+
onOptionChanged?: (e: OptionChangedEvent) => void;
16891705
/**
16901706
* @docid
16911707
* @public

packages/devextreme/js/ui/card_view_types.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export {
3838
CardRemovingEvent,
3939
CardUpdatedEvent,
4040
CardUpdatingEvent,
41+
OptionChangedEvent,
4142
SavedEvent,
4243
SavingEvent,
4344
SelectionConfiguration,

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10642,6 +10642,14 @@ declare module DevExpress.ui {
1064210642
*/
1064310643
promise?: PromiseLike<void>;
1064410644
};
10645+
/**
10646+
* [descr:_ui_card_view_OptionChangedEvent]
10647+
*/
10648+
export type OptionChangedEvent<
10649+
TCardData = unknown,
10650+
TKey = unknown
10651+
> = DevExpress.common.core.events.EventInfo<dxCardView<TCardData, TKey>> &
10652+
DevExpress.common.core.events.ChangedOptionInfo;
1064510653

1064610654
export type PredefinedToolbarItem =
1064710655
| 'columnChooserButton'
@@ -10788,7 +10796,7 @@ declare module DevExpress.ui {
1078810796
* @deprecated [depNote:dxCardViewOptions]
1078910797
*/
1079010798
export interface dxCardViewOptions<TCardData = unknown, TKey = unknown>
10791-
extends WidgetOptions<dxCardView> {
10799+
extends Omit<WidgetOptions<dxCardView>, 'onOptionChanged'> {
1079210800
/**
1079310801
* [descr:dxCardViewOptions.dataSource]
1079410802
*/
@@ -11081,6 +11089,10 @@ declare module DevExpress.ui {
1108111089
* [descr:dxCardViewOptions.onCardUpdating]
1108211090
*/
1108311091
onCardUpdating?: (e: DevExpress.ui.dxCardView.CardUpdatingEvent) => void;
11092+
/**
11093+
* [descr:dxCardViewOptions.onOptionChanged]
11094+
*/
11095+
onOptionChanged?: (e: DevExpress.ui.dxCardView.OptionChangedEvent) => void;
1108411096
/**
1108511097
* [descr:dxCardViewOptions.onSaved]
1108611098
*/

0 commit comments

Comments
 (0)