Skip to content

Commit 9798220

Browse files
ContextMenu: fix ts errors (DevExpress#30455)
1 parent 6f187e5 commit 9798220

File tree

7 files changed

+545
-332
lines changed

7 files changed

+545
-332
lines changed

packages/devextreme/js/__internal/core/widget/widget.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class Widget<
5858

5959
_contentReadyAction?: ((event?: Record<string, unknown>) => void) | null;
6060

61-
private _keyboardListenerId?: string | null;
61+
protected _keyboardListenerId?: string | null;
6262

6363
private _isReady?: boolean;
6464

packages/devextreme/js/__internal/ui/chat/messagelist.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { isDate, isDefined } from '@js/core/utils/type';
1515
import type { DxEvent } from '@js/events';
1616
import type { Message, TextMessage, User } from '@js/ui/chat';
1717
import type { Item as ContextMenuItem } from '@js/ui/context_menu';
18+
import type dxContextMenu from '@js/ui/context_menu';
1819
import type { WidgetOptions } from '@js/ui/widget/ui.widget';
1920
import type { OptionChanged } from '@ts/core/widget/types';
2021
import Widget from '@ts/core/widget/widget';
@@ -331,6 +332,7 @@ class MessageList extends Widget<Properties> {
331332
hideOnParentScroll: false,
332333
overlayContainer: this._scrollView.container(),
333334
visualContainer: this._scrollView.container(),
335+
// @ts-expect-error ts-error
334336
boundaryOffset: { h: 16 },
335337
});
336338

@@ -345,7 +347,7 @@ class MessageList extends Widget<Properties> {
345347
$contextMenu.appendTo(this.$element());
346348
}
347349

348-
_onContextMenuShowing(e: Cancelable & EventInfo<ContextMenu>): void {
350+
_onContextMenuShowing(e: Cancelable & EventInfo<dxContextMenu>): void {
349351
// @ts-expect-error ts-error
350352
const { jQEvent } = e;
351353

0 commit comments

Comments
 (0)