revert(menu)

DevExpress · Oct 2, 2024 · 9d988b4 · 9d988b4
1 parent 978d27b
commit 9d988b4
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 26 deletions.
diff --git a/packages/devextreme/js/__internal/ui/context_menu/m_context_menu.ts b/packages/devextreme/js/__internal/ui/context_menu/m_context_menu.ts
@@ -366,8 +366,18 @@ class ContextMenu extends MenuBase {
     return !isInsideContextMenu;
   }
 
-  _hideOnFocusOut(): void {
-    this.hide();
+  _focusOutHandler(e): void {
+    const { relatedTarget } = e;
+
+    if (relatedTarget) {
+      const isTargetOutside = this._isTargetOutOfComponent(relatedTarget);
+
+      if (isTargetOutside) {
+        this.hide();
+      }
+    }
+
+    super._focusOutHandler(e);
   }
 
   _renderContentImpl(): void {

diff --git a/packages/devextreme/js/__internal/ui/context_menu/m_menu_base.ts b/packages/devextreme/js/__internal/ui/context_menu/m_menu_base.ts
@@ -38,7 +38,7 @@ const ITEM_URL_CLASS = 'dx-item-url';
 
 export type Properties = dxMenuBaseOptions<MenuBase, Item>;
 
-abstract class MenuBase extends HierarchicalCollectionWidget<Properties> {
+class MenuBase extends HierarchicalCollectionWidget<Properties> {
   static ItemClass = MenuItem;
 
   _editStrategy?: MenuBaseEditStrategy;
@@ -54,10 +54,6 @@ abstract class MenuBase extends HierarchicalCollectionWidget<Properties> {
 
   _showSubmenusTimeout?: any;
 
-  abstract _isTargetOutOfComponent(target: Element): boolean;
-
-  abstract _hideOnFocusOut(): void;
-
   _getDefaultOptions() {
     return extend(super._getDefaultOptions(), {
       items: [],
@@ -224,20 +220,6 @@ abstract class MenuBase extends HierarchicalCollectionWidget<Properties> {
     };
   }
 
-  _focusOutHandler(e) {
-    const { relatedTarget } = e;
-
-    if (relatedTarget) {
-      const isTargetOutside = this._isTargetOutOfComponent(relatedTarget);
-
-      if (isTargetOutside) {
-        this._hideOnFocusOut();
-      }
-    }
-
-    super._focusOutHandler(e);
-  }
-
   _selectByItem(selectedItem): void {
     if (!selectedItem) return;
 

diff --git a/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_editor.ts b/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_editor.ts
@@ -514,8 +514,6 @@ const DropDownEditor = TextBox.inherit({
       this._createPopup();
     }
 
-    // debugger;
-
     this.$element().toggleClass(DROP_DOWN_EDITOR_ACTIVE, opened);
     this._setPopupOption('visible', opened);
 

diff --git a/packages/devextreme/js/__internal/ui/menu/m_menu.ts b/packages/devextreme/js/__internal/ui/menu/m_menu.ts
@@ -288,7 +288,7 @@ class Menu extends MenuBase {
     this._initAdaptivity();
   }
 
-  _isTargetOutOfComponent(relatedTarget: Element): boolean {
+  _isTargetOutOfComponent(relatedTarget): boolean {
     const isInsideRootMenu = $(relatedTarget).closest(`.${DX_MENU_CLASS}`).length !== 0;
     const isInsideContextMenu = $(relatedTarget).closest(`.${DX_CONTEXT_MENU_CLASS}`).length !== 0;
 
@@ -297,8 +297,18 @@ class Menu extends MenuBase {
     return isTargetOutOfComponent;
   }
 
-  _hideOnFocusOut(): void {
-    this._hideVisibleSubmenu();
+  _focusOutHandler(e) {
+    const { relatedTarget } = e;
+
+    if (relatedTarget) {
+      const isTargetOutside = this._isTargetOutOfComponent(relatedTarget);
+
+      if (isTargetOutside) {
+        this._hideVisibleSubmenu();
+      }
+    }
+
+    super._focusOutHandler(e);
   }
 
   _renderHamburgerButton(): Element {