Skip to content

Commit e66e368

Browse files
author
Corentin Lefebvre
committed
Revert breaking changes
1 parent e1fd2bd commit e66e368

File tree

9 files changed

+31
-31
lines changed

9 files changed

+31
-31
lines changed

lib/js/Dialog.d.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { EventHandler } from "./EventHandler.js";
55
import { PanelContainer } from "./PanelContainer.js";
66
import { Point } from "./Point.js";
77
import { ResizableContainer } from "./ResizableContainer.js";
8-
import { ResizeDirection } from "./enums/ResizeDirection.js";
98
export declare class Dialog {
109
elementDialog: HTMLDivElement & {
1110
floatingDialog: Dialog;
@@ -16,7 +15,7 @@ export declare class Dialog {
1615
eventListener: DockManager;
1716
position: Point;
1817
resizable: ResizableContainer;
19-
resizeDirection: ResizeDirection;
18+
disableResize: boolean;
2019
mouseDownHandler: any;
2120
onKeyPressBound: any;
2221
noDocking: boolean;
@@ -27,8 +26,7 @@ export declare class Dialog {
2726
contextmenuHandler: EventHandler;
2827
_ctxMenu: HTMLDivElement;
2928
_windowsContextMenuCloseBound: any;
30-
static defaultResizeDirection: ResizeDirection;
31-
constructor(panel: PanelContainer, dockManager: DockManager, grayoutParent?: PanelContainer, resizeDirection?: ResizeDirection);
29+
constructor(panel: PanelContainer, dockManager: DockManager, grayoutParent?: PanelContainer, disableResize?: boolean);
3230
saveState(x: number, y: number): void;
3331
static fromElement(id: string, dockManager: DockManager): Dialog;
3432
_initialize(): void;

lib/js/Dialog.js

Lines changed: 7 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/js/Dialog.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/js/DockManager.d.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { DockManagerContext } from "./DockManagerContext.js";
55
import { DockModel } from "./DockModel.js";
66
import { DockNode } from "./DockNode.js";
77
import { DockWheel } from "./DockWheel.js";
8-
import { ResizeDirection } from "./enums/ResizeDirection.js";
98
import { EventHandler } from "./EventHandler.js";
109
import { IDockContainer } from "./interfaces/IDockContainer.js";
1110
import { ILayoutEventListener } from "./interfaces/ILayoutEventListener.js";
@@ -91,7 +90,7 @@ export declare class DockManager {
9190
dockDown(referenceNode: DockNode, container: PanelContainer, ratio: number): DockNode;
9291
/** Dock the [container] as a tab inside the [referenceNode] node */
9392
dockFill(referenceNode: DockNode, container: PanelContainer): DockNode;
94-
floatDialog(container: PanelContainer, x: number, y: number, grayoutParent?: PanelContainer, resizeDirection?: ResizeDirection): Dialog;
93+
floatDialog(container: PanelContainer, x: number, y: number, grayoutParent?: PanelContainer, disableResize?: boolean): Dialog;
9594
private _requestDockDialog;
9695
private _checkShowBackgroundContext;
9796
private _requestDockContainer;
@@ -109,7 +108,7 @@ export declare class DockManager {
109108
* Opens a Element in a Dialog
110109
* It is assumed that only leaf nodes (panels) can be undocked
111110
*/
112-
openInDialog(container: PanelContainer, event: any, dragOffset: Point, resizeDirection?: ResizeDirection): Dialog;
111+
openInDialog(container: PanelContainer, event: any, dragOffset: Point, disableResize?: boolean): Dialog;
113112
/** Undocks a panel and converts it into a floating dialog window
114113
* It is assumed that only leaf nodes (panels) can be undocked
115114
*/

lib/js/DockManager.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/js/DockManager.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

page/demo/ide/demo.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { DockManager } from "../../../lib/js/DockManager.js";
22
import { PanelContainer } from "../../../lib/js/PanelContainer.js";
33
import { PanelType } from "../../../lib/js/enums/PanelType.js";
4-
import { ResizeDirection } from "../../../lib/js/enums/ResizeDirection.js";
54

65
let dockManager,
76
storeKey = 'lastState';
@@ -143,7 +142,7 @@ window.onload = () => {
143142
dockManager.dockRight(documentNode, toolbox, 0.20);
144143
dockManager.dockFill(documentNode, editor1);
145144
dockManager.dockFill(documentNode, editor2);
146-
dockManager.floatDialog(infovisContainer, 50, 50, null, ResizeDirection.None);
145+
dockManager.floatDialog(infovisContainer, 50, 50, null, true);
147146
}
148147

149148
document.getElementById("dlg").onclick = () => {

src/Dialog.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export class Dialog {
1717
eventListener: DockManager;
1818
position: Point;
1919
resizable: ResizableContainer;
20-
resizeDirection: ResizeDirection;
20+
disableResize: boolean;
2121
mouseDownHandler: any;
2222
onKeyPressBound: any;
2323
noDocking: boolean;
@@ -29,14 +29,12 @@ export class Dialog {
2929
_ctxMenu: HTMLDivElement;
3030
_windowsContextMenuCloseBound: any;
3131

32-
static defaultResizeDirection: ResizeDirection = ResizeDirection.All & ~ResizeDirection.NorthEast;
33-
34-
constructor(panel: PanelContainer, dockManager: DockManager, grayoutParent?: PanelContainer, resizeDirection?: ResizeDirection) {
32+
constructor(panel: PanelContainer, dockManager: DockManager, grayoutParent?: PanelContainer, disableResize?: boolean) {
3533
this.panel = panel;
3634
this.dockManager = dockManager;
3735
this.eventListener = dockManager;
3836
this.grayoutParent = grayoutParent;
39-
this.resizeDirection = resizeDirection ?? Dialog.defaultResizeDirection;
37+
this.disableResize = disableResize;
4038
this._initialize();
4139
this.dockManager.context.model.dialogs.push(this);
4240
this.position = dockManager.defaultDialogPosition;
@@ -59,7 +57,12 @@ export class Dialog {
5957
this.elementDialog.tabIndex = 0;
6058
this.elementDialog.appendChild(this.panel.elementPanel);
6159
this.draggable = new DraggableContainer(this, this.panel, this.elementDialog, this.panel.elementTitle);
62-
this.resizable = new ResizableContainer(this, this.draggable, this.draggable.topLevelElement, this.resizeDirection);
60+
61+
const resizeDirection: ResizeDirection = this.disableResize
62+
? ResizeDirection.None
63+
: ResizeDirection.All & ~ResizeDirection.NorthEast;
64+
65+
this.resizable = new ResizableContainer(this, this.draggable, this.draggable.topLevelElement, resizeDirection);
6366

6467
this.dockManager.config.dialogRootElement.appendChild(this.elementDialog);
6568
this.elementDialog.classList.add('dialog-floating');

src/DockManager.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { DockModel } from "./DockModel.js";
88
import { DockNode } from "./DockNode.js";
99
import { DockWheel } from "./DockWheel.js";
1010
import { PanelType } from "./enums/PanelType.js";
11-
import { ResizeDirection } from "./enums/ResizeDirection.js";
1211
import { EventHandler } from "./EventHandler.js";
1312
import { FillDockContainer } from "./FillDockContainer.js";
1413
import { IDockContainer } from "./interfaces/IDockContainer.js";
@@ -372,7 +371,7 @@ export class DockManager {
372371
return this._requestDockContainer(referenceNode, container, this.layoutEngine.dockFill.bind(this.layoutEngine), false);
373372
}
374373

375-
floatDialog(container: PanelContainer, x: number, y: number, grayoutParent?: PanelContainer, resizeDirection?: ResizeDirection): Dialog {
374+
floatDialog(container: PanelContainer, x: number, y: number, grayoutParent?: PanelContainer, disableResize?: boolean): Dialog {
376375
let retdiag = undefined;
377376

378377
//check the dialog do not already exist
@@ -394,7 +393,7 @@ export class DockManager {
394393
let panel = container;
395394
Utils.removeNode(panel.elementPanel);
396395
panel.isDialog = true;
397-
let dialog = new Dialog(panel, this, grayoutParent, resizeDirection);
396+
let dialog = new Dialog(panel, this, grayoutParent, disableResize);
398397
dialog.setPosition(x, y);
399398
return dialog;
400399
}
@@ -520,9 +519,9 @@ export class DockManager {
520519
* Opens a Element in a Dialog
521520
* It is assumed that only leaf nodes (panels) can be undocked
522521
*/
523-
openInDialog(container: PanelContainer, event, dragOffset: Point, resizeDirection?: ResizeDirection) {
522+
openInDialog(container: PanelContainer, event, dragOffset: Point, disableResize?: boolean) {
524523
// Create a new dialog window for the undocked panel
525-
let dialog = new Dialog(container, this, null, resizeDirection);
524+
let dialog = new Dialog(container, this, null, disableResize);
526525

527526
if (event != null) {
528527
// Adjust the relative position

0 commit comments

Comments
 (0)