Skip to content

Commit d0251d7

Browse files
fix: some internal types are double-wrapped in DxEvent<> (DevExpress#30819)
1 parent 8c821c2 commit d0251d7

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

packages/devextreme/js/__internal/ui/overlay/overlay.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ const PREVENT_SAFARI_SCROLLING_CLASS = 'dx-prevent-safari-scrolling';
7373

7474
type AnimationDirection = 'to' | 'from';
7575

76-
export type PointerLikeEvent = DxEvent<MouseEvent | PointerEvent | TouchEvent>;
76+
type PointerLikeNativeEvents = MouseEvent | PointerEvent | TouchEvent;
77+
export type PointerLikeEvent = DxEvent<PointerLikeNativeEvents>;
7778

7879
type EventHandler = (e: PointerLikeEvent) => boolean | undefined;
7980

@@ -136,7 +137,7 @@ export type PositioningEvent<
136137
TPosition = OverlayProperties['position'],
137138
> = NativeEventInfo<
138139
Overlay,
139-
PointerLikeEvent
140+
PointerLikeNativeEvents
140141
> & {
141142
readonly position: TPosition;
142143
};

packages/devextreme/js/__internal/ui/splitter/resize_handle.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -319,31 +319,31 @@ class ResizeHandle extends Widget<ResizeHandleProperties> {
319319
this._attachEventHandlers();
320320
}
321321

322-
_resizeStartHandler(e: DxEvent<InteractionEvent>): void {
322+
_resizeStartHandler(e: InteractionEvent): void {
323323
this._getAction(RESIZE_EVENT.onResizeStart)({
324324
event: e,
325325
});
326326
}
327327

328-
_resizeHandler(e: DxEvent<InteractionEvent>): void {
328+
_resizeHandler(e: InteractionEvent): void {
329329
this._getAction(RESIZE_EVENT.onResize)({
330330
event: e,
331331
});
332332
}
333333

334-
_resizeEndHandler(e: DxEvent<InteractionEvent>): void {
334+
_resizeEndHandler(e: InteractionEvent): void {
335335
this._getAction(RESIZE_EVENT.onResizeEnd)({
336336
event: e,
337337
});
338338
}
339339

340-
_collapsePrevHandler(e: DxEvent<InteractionEvent>): void {
340+
_collapsePrevHandler(e: InteractionEvent): void {
341341
this._getAction(COLLAPSE_EVENT.onCollapsePrev)({
342342
event: e,
343343
});
344344
}
345345

346-
_collapseNextHandler(e: DxEvent<InteractionEvent>): void {
346+
_collapseNextHandler(e: InteractionEvent): void {
347347
this._getAction(COLLAPSE_EVENT.onCollapseNext)({
348348
event: e,
349349
});

0 commit comments

Comments
 (0)