flexlayout-react 0.6.3 → 0.6.4

package/src/DockLocation.ts

@@ -9,12 +9,12 @@ export class DockLocation {
     static RIGHT = new DockLocation("right", Orientation.HORZ, 1);
     static CENTER = new DockLocation("center", Orientation.VERT, 0);
 
-    /** @hidden @internal */
+    /** @internal */
     static getByName(name: string): DockLocation {
         return DockLocation.values[name];
     }
 
-    /** @hidden @internal */
+    /** @internal */
     static getLocation(rect: Rect, x: number, y: number) {
         x = (x - rect.x) / rect.width;
         y = (y - rect.y) / rect.height;
@@ -50,14 +50,14 @@ export class DockLocation {
         }
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _name: string;
-    /** @hidden @internal */
+    /** @internal */
     _orientation: Orientation;
-    /** @hidden @internal */
+    /** @internal */
     _indexPlus: number;
 
-    /** @hidden @internal */
+    /** @internal */
     constructor(name: string, orientation: Orientation, indexPlus: number) {
         this._name = name;
         this._orientation = orientation;
@@ -73,7 +73,7 @@ export class DockLocation {
         return this._orientation;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     getDockRect(r: Rect) {
         if (this === DockLocation.TOP) {
             return new Rect(r.x, r.y, r.width, r.height / 2);
@@ -89,7 +89,7 @@ export class DockLocation {
         }
     }
 
-    /** @hidden @internal */
+    /** @internal */
     split(rect: Rect, size: number) {
         if (this === DockLocation.TOP) {
             const r1 = new Rect(rect.x, rect.y, rect.width, size);
@@ -112,7 +112,7 @@ export class DockLocation {
         }
     }
 
-    /** @hidden @internal */
+    /** @internal */
     reflect() {
         if (this === DockLocation.TOP) {
             return DockLocation.BOTTOM;

package/src/DragDrop.ts

@@ -1,59 +1,59 @@
 import * as React from "react";
 import { Rect } from "./Rect";
 
-/** @hidden @internal */
+/** @internal */
 const canUseDOM = !!(typeof window !== "undefined" && window.document && window.document.createElement);
 
 export class DragDrop {
     static instance = new DragDrop();
 
-    /** @hidden @internal */
+    /** @internal */
     private _fDblClick: ((event: Event) => void) | undefined;
-    /** @hidden @internal */
+    /** @internal */
     private _fClick: ((event: Event) => void) | undefined;
-    /** @hidden @internal */
+    /** @internal */
     private _fDragEnd: ((event: Event) => void) | undefined;
-    /** @hidden @internal */
+    /** @internal */
     private _fDragMove: ((event: React.MouseEvent<Element>) => void) | undefined;
-    /** @hidden @internal */
+    /** @internal */
     private _fDragStart: ((pos: { clientX: number; clientY: number }) => boolean) | undefined;
-    /** @hidden @internal */
+    /** @internal */
     private _fDragCancel: ((wasDragging: boolean) => void) | undefined;
 
-    /** @hidden @internal */
+    /** @internal */
     private _glass: HTMLDivElement | undefined;
-    /** @hidden @internal */
+    /** @internal */
     private _defaultGlassCursor: string;
-    /** @hidden @internal */
+    /** @internal */
     private _glassCursorOverride: string | undefined;
-    /** @hidden @internal */
+    /** @internal */
     private _manualGlassManagement: boolean = false;
-    /** @hidden @internal */
+    /** @internal */
     private _lastClick: number;
-    /** @hidden @internal */
+    /** @internal */
     private _clickX: number;
-    /** @hidden @internal */
+    /** @internal */
     private _clickY: number;
-    /** @hidden @internal */
+    /** @internal */
     private _startX: number = 0;
-    /** @hidden @internal */
+    /** @internal */
     private _startY: number = 0;
-    /** @hidden @internal */
+    /** @internal */
     private _dragDepth: number = 0;
-    /** @hidden @internal */
+    /** @internal */
     private _glassShowing: boolean = false;
-    /** @hidden @internal */
+    /** @internal */
     private _dragging: boolean = false;
-    /** @hidden @internal */
+    /** @internal */
     private _active: boolean = false; // drag and drop is in progress, can be used on ios to prevent body scrolling (see demo)
-    /** @hidden @internal */
+    /** @internal */
     private _document?: HTMLDocument;
-    /** @hidden @internal */
+    /** @internal */
     private _rootElement?: HTMLElement | undefined;
-    /** @hidden @internal */
+    /** @internal */
     private _lastEvent?: Event | React.MouseEvent<HTMLDivElement, MouseEvent> | React.TouchEvent<HTMLDivElement> | React.DragEvent<Element> | undefined;
 
-    /** @hidden @internal */
+    /** @internal */
     private constructor() {
         if (canUseDOM) {
             // check for serverside rendering
@@ -121,12 +121,12 @@ export class DragDrop {
         }
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _updateGlassCursor() {
         this._glass!.style.cursor = this._glassCursorOverride ?? this._defaultGlassCursor;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _setDefaultGlassCursor(cursor: string) {
         this._defaultGlassCursor = cursor;
         this._updateGlassCursor()
@@ -226,7 +226,7 @@ export class DragDrop {
         return rtn;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     private _onKeyPress(event: KeyboardEvent) {
         if (event.keyCode === 27) {
             // esc
@@ -234,7 +234,7 @@ export class DragDrop {
         }
     }
 
-    /** @hidden @internal */
+    /** @internal */
     private _onDragCancel() {
         this._rootElement!.removeEventListener("dragenter", this._onDragEnter);
         this._rootElement!.removeEventListener("dragover", this._onMouseMove);
@@ -253,7 +253,7 @@ export class DragDrop {
         this._active = false;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     private _getLocationEvent(event: any) {
         let posEvent: any = event;
         if (event && event.touches) {
@@ -262,7 +262,7 @@ export class DragDrop {
         return posEvent;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     private _getLocationEventEnd(event: any) {
         let posEvent: any = event;
         if (event.changedTouches) {
@@ -271,14 +271,14 @@ export class DragDrop {
         return posEvent;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     private _stopPropagation(event: Event | React.MouseEvent<HTMLDivElement, MouseEvent> | React.TouchEvent<HTMLDivElement> | React.DragEvent<Element>) {
         if (event.stopPropagation) {
             event.stopPropagation();
         }
     }
 
-    /** @hidden @internal */
+    /** @internal */
     private _preventDefault(event: Event | React.MouseEvent<HTMLDivElement, MouseEvent> | React.TouchEvent<HTMLDivElement> | React.DragEvent<Element>) {
         if (event.preventDefault && event.cancelable) {
             event.preventDefault();
@@ -286,7 +286,7 @@ export class DragDrop {
         return event;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     private _onMouseMove(event: Event | React.MouseEvent<HTMLDivElement, MouseEvent> | React.TouchEvent<HTMLDivElement> | React.DragEvent<Element>) {
         this._lastEvent = event;
 
@@ -310,7 +310,7 @@ export class DragDrop {
         return false;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     private _onMouseUp(event: Event) {
         this._lastEvent = event;
 
@@ -346,19 +346,23 @@ export class DragDrop {
                 this._fDragCancel(this._dragging);
             }
             if (Math.abs(this._startX - posEvent.clientX) <= 5 && Math.abs(this._startY - posEvent.clientY) <= 5) {
+
+                let isDoubleClick = false;
                 const clickTime = new Date().getTime();
                 // check for double click
                 if (Math.abs(this._clickX - posEvent.clientX) <= 5 && Math.abs(this._clickY - posEvent.clientY) <= 5) {
                     if (clickTime - this._lastClick < 500) {
                         if (this._fDblClick) {
                             this._fDblClick(event);
+                            isDoubleClick = true;
                         }
                     }
                 }
-
-                if (this._fClick) {
+ 
+                if (!isDoubleClick && this._fClick) {
                     this._fClick(event);
                 }
+
                 this._lastClick = clickTime;
                 this._clickX = posEvent.clientX;
                 this._clickY = posEvent.clientY;
@@ -367,7 +371,7 @@ export class DragDrop {
         return false;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     private _onDragEnter(event: DragEvent) {
         this._preventDefault(event);
         this._stopPropagation(event);
@@ -375,7 +379,7 @@ export class DragDrop {
         return false;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     private _onDragLeave(event: DragEvent) {
         this._preventDefault(event);
         this._stopPropagation(event);

package/src/Orientation.ts

@@ -10,10 +10,10 @@ export class Orientation {
         }
     }
 
-    /** @hidden @internal */
+    /** @internal */
     private _name: string;
 
-    /** @hidden @internal */
+    /** @internal */
     private constructor(name: string) {
         this._name = name;
     }

package/src/PopupMenu.tsx

@@ -1,11 +1,11 @@
 import * as React from "react";
-import { DragDrop } from ".";
+import { DragDrop } from "./DragDrop";
 import { TabNode } from "./model/TabNode";
 import { CLASSES } from "./Types";
 import { ILayoutCallbacks } from "./view/Layout";
 import { TabButtonStamp } from "./view/TabButtonStamp";
 
-/** @hidden @internal */
+/** @internal */
 export function showPopup(
     triggerElement: Element,
     items: { index: number; node: TabNode }[],
@@ -69,7 +69,7 @@ export function showPopup(
     />, elm);
 }
 
-/** @hidden @internal */
+/** @internal */
 interface IPopupMenuProps {
     items: { index: number; node: TabNode }[];
     currentDocument: Document;
@@ -81,7 +81,7 @@ interface IPopupMenuProps {
     titleFactory?: (node: TabNode) => React.ReactNode | undefined;
 }
 
-/** @hidden @internal */
+/** @internal */
 const PopupMenu = (props: IPopupMenuProps) => {
     const { items, onHide, onSelect, classNameMapper, layout, iconFactory, titleFactory} = props;
 

package/src/Rect.ts

@@ -76,7 +76,7 @@ export class Rect {
         this.y = (outerRect.height - this.height) / 2;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _getSize(orientation: Orientation) {
         let prefSize = this.width;
         if (orientation === Orientation.VERT) {

package/src/model/BorderNode.ts

@@ -18,7 +18,7 @@ import { adjustSelectedIndex } from "./Utils";
 export class BorderNode extends Node implements IDropTarget {
     static readonly TYPE = "border";
 
-    /** @hidden @internal */
+    /** @internal */
     static _fromJson(json: any, model: Model) {
         const location = DockLocation.getByName(json.location);
         const border = new BorderNode(location, json, model);
@@ -32,10 +32,10 @@ export class BorderNode extends Node implements IDropTarget {
 
         return border;
     }
-    /** @hidden @internal */
+    /** @internal */
     private static _attributeDefinitions: AttributeDefinitions = BorderNode._createAttributeDefinitions();
 
-    /** @hidden @internal */
+    /** @internal */
     private static _createAttributeDefinitions(): AttributeDefinitions {
         const attributeDefinitions = new AttributeDefinitions();
         attributeDefinitions.add("type", BorderNode.TYPE, true).setType(Attribute.STRING).setFixed();
@@ -55,20 +55,20 @@ export class BorderNode extends Node implements IDropTarget {
         return attributeDefinitions;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     private _contentRect?: Rect;
-    /** @hidden @internal */
+    /** @internal */
     private _tabHeaderRect?: Rect;
-    /** @hidden @internal */
+    /** @internal */
     private _location: DockLocation;
-    /** @hidden @internal */
+    /** @internal */
     private _drawChildren: Node[];
-    /** @hidden @internal */
+    /** @internal */
     private _adjustedSize: number = 0;
-    /** @hidden @internal */
+    /** @internal */
     private _calculatedBorderBarSize: number = 0;
 
-    /** @hidden @internal */
+    /** @internal */
     constructor(location: DockLocation, json: any, model: Model) {
         super(model);
 
@@ -114,7 +114,7 @@ export class BorderNode extends Node implements IDropTarget {
         return this._getAttr("className") as string | undefined;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     calcBorderBarSize(metrics: ILayoutMetrics) {
         const barSize = this._getAttr("barSize") as number;
         if (barSize !== 0) {
@@ -195,12 +195,12 @@ export class BorderNode extends Node implements IDropTarget {
         return this._getAttr("enableAutoHide") as boolean;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _setSelected(index: number) {
         this._attributes.selected = index;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _setSize(pos: number) {
         const selected = this.getSelected();
         if (selected === -1) {
@@ -220,27 +220,27 @@ export class BorderNode extends Node implements IDropTarget {
         }
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _updateAttrs(json: any) {
         BorderNode._attributeDefinitions.update(json, this._attributes);
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _getDrawChildren() {
         return this._drawChildren;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _setAdjustedSize(size: number) {
         this._adjustedSize = size;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _getAdjustedSize() {
         return this._adjustedSize;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _layoutBorderOuter(outer: Rect, metrics: ILayoutMetrics) {
         this.calcBorderBarSize(metrics);
         const split1 = this._location.split(outer, this.getBorderBarSize()); // split border outer
@@ -248,7 +248,7 @@ export class BorderNode extends Node implements IDropTarget {
         return split1.end;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _layoutBorderInner(inner: Rect, metrics: ILayoutMetrics) {
         this._drawChildren = [];
         const location = this._location;
@@ -258,11 +258,12 @@ export class BorderNode extends Node implements IDropTarget {
 
         this._contentRect = split2.end;
 
-        this._children.forEach((child, i) => {
+        for (let i = 0; i< this._children.length; i++) {
+            const child = this._children[i];
             child._layout(this._contentRect!, metrics);
             child._setVisible(i === this.getSelected());
             this._drawChildren.push(child);
-        });
+        }
 
         if (this.getSelected() === -1) {
             return inner;
@@ -276,7 +277,7 @@ export class BorderNode extends Node implements IDropTarget {
         }
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _remove(node: TabNode) {
         const removedIndex = this._removeChild(node);
         if (this.getSelected() !== -1) {
@@ -284,7 +285,7 @@ export class BorderNode extends Node implements IDropTarget {
         }
     }
 
-    /** @hidden @internal */
+    /** @internal */
     canDrop(dragNode: Node & IDraggable, x: number, y: number): DropInfo | undefined {
         if (dragNode.getType() !== TabNode.TYPE) {
             return undefined;
@@ -366,7 +367,7 @@ export class BorderNode extends Node implements IDropTarget {
         return dropInfo;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     drop(dragNode: Node & IDraggable, location: DockLocation, index: number, select?: boolean): void {
         let fromIndex = 0;
         const dragParent = dragNode.getParent() as BorderNode | TabSetNode;
@@ -405,7 +406,7 @@ export class BorderNode extends Node implements IDropTarget {
         return json;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _getSplitterBounds(splitter: SplitterNode, useMinSize: boolean = false) {
         const pBounds = [0, 0];
         const minSize = useMinSize ? this.getMinSize() : 0;
@@ -428,7 +429,7 @@ export class BorderNode extends Node implements IDropTarget {
         return pBounds;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _calculateSplit(splitter: SplitterNode, splitterPos: number) {
         const pBounds = this._getSplitterBounds(splitter);
         if (this._location === DockLocation.BOTTOM || this._location === DockLocation.RIGHT) {
@@ -438,12 +439,12 @@ export class BorderNode extends Node implements IDropTarget {
         }
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _getAttributeDefinitions() {
         return BorderNode._attributeDefinitions;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     static getAttributeDefinitions() {
         return BorderNode._attributeDefinitions;
     }

package/src/model/BorderSet.ts

@@ -7,18 +7,18 @@ import { Model, ILayoutMetrics } from "./Model";
 import { Node } from "./Node";
 
 export class BorderSet {
-    /** @hidden @internal */
+    /** @internal */
     static _fromJson(json: any, model: Model) {
         const borderSet = new BorderSet(model);
         borderSet._borders = json.map((borderJson: any) => BorderNode._fromJson(borderJson, model));
         return borderSet;
     }
-    /** @hidden @internal */
+    /** @internal */
     private _model: Model;
-    /** @hidden @internal */
+    /** @internal */
     private _borders: BorderNode[];
 
-    /** @hidden @internal */
+    /** @internal */
     constructor(model: Model) {
         this._model = model;
         this._borders = [];
@@ -28,22 +28,22 @@ export class BorderSet {
         return this._borders;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _forEachNode(fn: (node: Node, level: number) => void) {
-        this._borders.forEach((borderNode) => {
+        for (const borderNode of this._borders) {
             fn(borderNode, 0);
-            borderNode.getChildren().forEach((node) => {
+            for (const node of borderNode.getChildren()) {
                 node._forEachNode(fn, 1);
-            });
-        });
+            }
+        }
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _toJson() {
         return this._borders.map((borderNode) => borderNode.toJson());
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _layoutBorder(outerInnerRects: { inner: Rect; outer: Rect }, metrics: ILayoutMetrics) {
         const rect = outerInnerRects.outer;
         const rootRow = this._model.getRoot();
@@ -109,19 +109,19 @@ export class BorderSet {
             }
         }
 
-        showingBorders.forEach((border) => {
+        for (const border of showingBorders) {
             outerInnerRects.outer = border._layoutBorderOuter(outerInnerRects.outer, metrics);
-        });
+        }
 
         outerInnerRects.inner = outerInnerRects.outer;
 
-        showingBorders.forEach((border) => {
+        for (const border of showingBorders) {
             outerInnerRects.inner = border._layoutBorderInner(outerInnerRects.inner, metrics);
-        });
+        }
         return outerInnerRects;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _findDropTargetNode(dragNode: Node & IDraggable, x: number, y: number): DropInfo | undefined {
         for (const border of this._borders) {
             if (border.isShowing()) {

package/src/model/IDraggable.ts

@@ -1,7 +1,7 @@
 export interface IDraggable {
-    /** @hidden @internal */
+    /** @internal */
     isEnableDrag(): boolean;
-    /** @hidden @internal */
+    /** @internal */
     getName(): string | undefined;
 }
 

package/src/model/IDropTarget.ts

@@ -4,11 +4,11 @@ import { IDraggable } from "./IDraggable";
 import { Node } from "./Node";
 
 export interface IDropTarget {
-    /** @hidden @internal */
+    /** @internal */
     canDrop(dragNode: Node & IDraggable, x: number, y: number): DropInfo | undefined;
-    /** @hidden @internal */
+    /** @internal */
     drop(dragNode: Node & IDraggable, location: DockLocation, index: number, select?: boolean): void;
-    /** @hidden @internal */
+    /** @internal */
     isEnableDrop(): boolean;
 }