Fix #103: Dialogs trigger context menu twice

Author: Corentin Lefebvre

lib/js/Dialog.d.ts

@@ -1,11 +1,12 @@
 import { DockManager } from "./DockManager.js";
-import { Point } from "./Point.js";
-import { PanelContainer } from "./PanelContainer.js";
+import { DockNode } from "./DockNode.js";
 import { DraggableContainer } from "./DraggableContainer.js";
-import { ResizableContainer } from "./ResizableContainer.js";
 import { EventHandler } from "./EventHandler.js";
-import { DockNode } from "./DockNode.js";
-export declare class Dialog {
+import { PanelContainer } from "./PanelContainer.js";
+import { Point } from "./Point.js";
+import { ResizableContainer } from "./ResizableContainer.js";
+import { IContextMenuProvider } from "./interfaces/IContextMenuProvider.js";
+export declare class Dialog implements IContextMenuProvider {
     elementDialog: HTMLDivElement & {
         floatingDialog: Dialog;
     };
@@ -23,9 +24,6 @@ export declare class Dialog {
     keyPressHandler: EventHandler;
     focusHandler: EventHandler;
     grayoutParent: PanelContainer;
-    contextmenuHandler: EventHandler;
-    _ctxMenu: HTMLDivElement;
-    _windowsContextMenuCloseBound: any;
     constructor(panel: PanelContainer, dockManager: DockManager, grayoutParent?: PanelContainer, disableResize?: boolean);
     saveState(x: number, y: number): void;
     static fromElement(id: string, dockManager: DockManager): Dialog;
@@ -44,7 +42,5 @@ export declare class Dialog {
     remove(): void;
     show(): void;
     static createContextMenuContentCallback: (dialog: Dialog, documentMangerNodes: DockNode[]) => Node[];
-    oncontextMenuClicked(e: MouseEvent): void;
-    closeContextMenu(): void;
-    windowsContextMenuClose(e: Event): void;
+    createContextMenuItems(): Node[];
 }

lib/js/Dialog.js

@@ -1,19 +1,20 @@
-import { DockManager } from "./DockManager.js";
-import { UndockInitiator } from "./UndockInitiator.js";
 import { ContainerType } from "./ContainerType.js";
+import { Dialog } from "./Dialog.js";
+import { DockManager } from "./DockManager.js";
 import { EventHandler } from "./EventHandler.js";
-import { ISize } from "./interfaces/ISize.js";
-import { IDockContainerWithSize } from "./interfaces/IDockContainerWithSize.js";
-import { IState } from "./interfaces/IState.js";
 import { Point } from "./Point.js";
-import { IDockContainer } from "./interfaces/IDockContainer.js";
-import { PanelType } from "./enums/PanelType.js";
-import { Dialog } from "./Dialog.js";
 import { TabPage } from './TabPage.js';
+import { UndockInitiator } from "./UndockInitiator.js";
+import { PanelType } from "./enums/PanelType.js";
+import { IContextMenuProvider } from "./interfaces/IContextMenuProvider.js";
+import { IDockContainer } from "./interfaces/IDockContainer.js";
+import { IDockContainerWithSize } from "./interfaces/IDockContainerWithSize.js";
+import { ISize } from "./interfaces/ISize.js";
+import { IState } from "./interfaces/IState.js";
 /**
  * This dock container wraps the specified element on a panel frame with a title bar and close button
  */
-export declare class PanelContainer implements IDockContainerWithSize {
+export declare class PanelContainer implements IDockContainerWithSize, IContextMenuProvider {
     closePanelContainerCallback: (panelContainer: PanelContainer) => Promise<boolean>;
     onTitleChanged: (panelContainer: PanelContainer, title: string) => void;
     elementPanel: HTMLDivElement;
@@ -55,9 +56,11 @@ export declare class PanelContainer implements IDockContainerWithSize {
     _hideCloseButton: boolean;
     _grayOut: HTMLDivElement;
     _ctxMenu: HTMLDivElement;
+    private _contextMenuProvider;
     constructor(elementContent: HTMLElement, dockManager: DockManager, title?: string, panelType?: PanelType, hideCloseButton?: boolean);
     _initialize(): void;
     static createContextMenuContentCallback: (panelContainer: PanelContainer) => Node[];
+    createContextMenuItems(): Node[];
     oncontextMenuClicked(e: MouseEvent): void;
     closeContextMenu(): void;
     windowsContextMenuClose(e: Event): void;

lib/js/Dialog.js.map

@@ -3,6 +3,7 @@ export * from './enums/TabHostDirection.js';
 export * from './enums/WheelTypes.js';
 export * from './i18n/Defaults.js';
 export * from './i18n/Localizer.js';
+export * from './interfaces/IContextMenuProvider.js';
 export * from './interfaces/IDockContainer.js';
 export * from './interfaces/IDockContainerWithSize.js';
 export * from './interfaces/ILayoutEventListener.js';

lib/js/PanelContainer.d.ts

@@ -0,0 +1,3 @@
+export interface IContextMenuProvider {
+    createContextMenuItems(): Node[];
+}