@@ -19,7 +19,7 @@ import { extend } from '@js/core/utils/extend';
1919import { each } from '@js/core/utils/iterator' ;
2020import { getOuterHeight } from '@js/core/utils/size' ;
2121import {
22- isDefined , isFunction , isObject , isPlainObject , isRenderer , isWindow ,
22+ isDefined , isFunction , isObject , isPlainObject , isRenderer ,
2323} from '@js/core/utils/type' ;
2424import { getWindow , hasWindow } from '@js/core/utils/window' ;
2525import type { Item } from '@js/ui/context_menu' ;
@@ -75,8 +75,6 @@ class ContextMenu extends MenuBase {
7575
7676 _overlayContentId ?: string ;
7777
78- _showContextMenuEventHandler ?: ( event : unknown ) => any ;
79-
8078 getShowEvent ( showEventOption : {
8179 delay ?: number ;
8280 name ?: string ;
@@ -445,17 +443,7 @@ class ContextMenu extends MenuBase {
445443
446444 const eventName = addNamespace ( showEvent , this . NAME ) ;
447445
448- if ( this . _showContextMenuEventHandler ) {
449- eventsEngine . off (
450- domAdapter . getDocument ( ) ,
451- eventName ,
452- target ,
453- // @ts -expect-error
454- this . _showContextMenuEventHandler ,
455- ) ;
456- } else {
457- eventsEngine . off ( $ ( target ) , eventName ) ;
458- }
446+ eventsEngine . off ( $ ( target ) , eventName ) ;
459447 }
460448
461449 _attachShowContextMenuEvents ( ) {
@@ -483,14 +471,9 @@ class ContextMenu extends MenuBase {
483471 const handler = ( e ) => contextMenuAction ( { event : e , target : $ ( e . currentTarget ) } ) ;
484472
485473 contextMenuAction = this . _createAction ( contextMenuAction ) ;
474+
486475 // @ts -expect-error
487- if ( isRenderer ( target ) || target . nodeType || isWindow ( target ) ) {
488- this . _showContextMenuEventHandler = undefined ;
489- eventsEngine . on ( target , eventName , handler ) ;
490- } else {
491- this . _showContextMenuEventHandler = handler ;
492- eventsEngine . on ( domAdapter . getDocument ( ) , eventName , target , this . _showContextMenuEventHandler ) ;
493- }
476+ eventsEngine . on ( $ ( target ) , eventName , handler ) ;
494477 }
495478
496479 _hoverEndHandler ( e ) : void {
0 commit comments