flexlayout-react 0.6.3 → 0.6.4

package/src/model/Model.ts

@@ -1,3 +1,4 @@
+import { v4 as getUUID } from "uuid";
 import { Attribute } from "../Attribute";
 import { AttributeDefinitions } from "../AttributeDefinitions";
 import { DockLocation } from "../DockLocation";
@@ -10,16 +11,14 @@ import { BorderNode } from "./BorderNode";
 import { BorderSet } from "./BorderSet";
 import { IDraggable } from "./IDraggable";
 import { IDropTarget } from "./IDropTarget";
-import { IJsonModel } from "./IJsonModel";
+import { IJsonModel, ITabSetAttributes } from "./IJsonModel";
 import { Node } from "./Node";
 import { RowNode } from "./RowNode";
 import { TabNode } from "./TabNode";
 import { TabSetNode } from "./TabSetNode";
-import { ITabSetAttributes } from "./IJsonModel";
 import { adjustSelectedIndexAfterDock, adjustSelectedIndexAfterFloat } from "./Utils";
-import * as uuid from "uuid";
 
-/** @hidden @internal */
+/** @internal */
 export interface ILayoutMetrics {
     headerBarSize: number;
     tabBarSize: number;
@@ -46,10 +45,10 @@ export class Model {
         model._tidy(); // initial tidy of node tree
         return model;
     }
-    /** @hidden @internal */
+    /** @internal */
     private static _attributeDefinitions: AttributeDefinitions = Model._createAttributeDefinitions();
 
-    /** @hidden @internal */
+    /** @internal */
     private static _createAttributeDefinitions(): AttributeDefinitions {
         const attributeDefinitions = new AttributeDefinitions();
 
@@ -111,35 +110,35 @@ export class Model {
         return attributeDefinitions;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     private _attributes: Record<string, any>;
-    /** @hidden @internal */
+    /** @internal */
     private _idMap: Record<string, Node>;
-    /** @hidden @internal */
+    /** @internal */
     private _changeListener?: () => void;
-    /** @hidden @internal */
+    /** @internal */
     private _root?: RowNode;
-    /** @hidden @internal */
+    /** @internal */
     private _borders: BorderSet;
-    /** @hidden @internal */
+    /** @internal */
     private _onAllowDrop?: (dragNode: Node, dropInfo: DropInfo) => boolean;
-    /** @hidden @internal */
+    /** @internal */
     private _maximizedTabSet?: TabSetNode;
-    /** @hidden @internal */
+    /** @internal */
     private _activeTabSet?: TabSetNode;
-    /** @hidden @internal */
+    /** @internal */
     private _borderRects: { inner: Rect; outer: Rect } = { inner: Rect.empty(), outer: Rect.empty() };
-    /** @hidden @internal */
+    /** @internal */
     private _pointerFine: boolean;
-    /** @hidden @internal */
+    /** @internal */
     private _onCreateTabSet?: (tabNode?: TabNode) => ITabSetAttributes;
-    /** @hidden @internal */
+    /** @internal */
     private _showHiddenBorder: DockLocation;
 
 
     /**
      * 'private' constructor. Use the static method Model.fromJson(json) to create a model
-     *  @hidden @internal
+     *  @internal
      */
 
     private constructor() {
@@ -150,7 +149,7 @@ export class Model {
         this._showHiddenBorder = DockLocation.CENTER;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _setChangeListener(listener: (() => void) | undefined) {
         this._changeListener = listener;
     }
@@ -166,17 +165,17 @@ export class Model {
         }
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _getShowHiddenBorder() {
         return this._showHiddenBorder;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _setShowHiddenBorder(location: DockLocation) {
         this._showHiddenBorder = location;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _setActiveTabset(tabsetNode: TabSetNode | undefined) {
         this._activeTabSet = tabsetNode;
     }
@@ -188,7 +187,7 @@ export class Model {
         return this._maximizedTabSet;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _setMaximizedTabset(tabsetNode: (TabSetNode | undefined)) {
         this._maximizedTabSet = tabsetNode;
     }
@@ -217,17 +216,17 @@ export class Model {
         return this._borders;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _getOuterInnerRects() {
         return this._borderRects;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _getPointerFine() {
         return this._pointerFine;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _setPointerFine(pointerFine: boolean) {
         this._pointerFine = pointerFine;
     }
@@ -291,11 +290,12 @@ export class Model {
                 if (node instanceof TabSetNode) {
                     // first delete all child tabs that are closeable
                     const children = [...node.getChildren()];
-                    children.forEach((child, i) => {
+                    for (let i = 0; i < children.length; i++) {
+                        const child = children[i];
                         if ((child as TabNode).isEnableClose()) {
                             (child as TabNode)._delete();
                         }
-                    });
+                    }
 
                     if (node.getChildren().length === 0) {
                         node._delete();
@@ -408,7 +408,7 @@ export class Model {
         return returnVal;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _updateIdMap() {
         // regenerate idMap to stop it building up
         this._idMap = {};
@@ -416,7 +416,7 @@ export class Model {
         // console.log(JSON.stringify(Object.keys(this._idMap)));
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _adjustSplitSide(node: TabSetNode | RowNode, weight: number, pixels: number) {
         node._setWeight(weight);
         if (node.getWidth() != null && node.getOrientation() === Orientation.VERT) {
@@ -463,7 +463,7 @@ export class Model {
         return this._attributes.enableEdgeDock as boolean;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _addNode(node: Node) {
         const id = node.getId();
         if (this._idMap[id] !== undefined) {
@@ -475,7 +475,7 @@ export class Model {
         }
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _layout(rect: Rect, metrics: ILayoutMetrics) {
         // let start = Date.now();
         this._borderRects = this._borders._layoutBorder({ outer: rect, inner: rect }, metrics);
@@ -487,7 +487,7 @@ export class Model {
         return rect;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _findDropTargetNode(dragNode: Node & IDraggable, x: number, y: number) {
         let node = (this._root as RowNode)._findDropTargetNode(dragNode, x, y);
         if (node === undefined) {
@@ -496,24 +496,24 @@ export class Model {
         return node;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _tidy() {
         // console.log("before _tidy", this.toString());
         (this._root as RowNode)._tidy();
         // console.log("after _tidy", this.toString());
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _updateAttrs(json: any) {
         Model._attributeDefinitions.update(json, this._attributes);
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _nextUniqueId() {
-        return '#' + uuid.v4();
+        return '#' + getUUID();
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _getAttribute(name: string): any {
         return this._attributes[name];
     }
@@ -526,7 +526,7 @@ export class Model {
         this._onAllowDrop = onAllowDrop;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _getOnAllowDrop() {
         return this._onAllowDrop;
     }
@@ -541,7 +541,7 @@ export class Model {
         this._onCreateTabSet = onCreateTabSet;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _getOnCreateTabSet() {
         return this._onCreateTabSet;
     }

package/src/model/Node.ts

@@ -8,28 +8,28 @@ import { IJsonBorderNode, IJsonRowNode, IJsonTabNode, IJsonTabSetNode } from "./
 import { Model, ILayoutMetrics } from "./Model";
 
 export abstract class Node {
-    /** @hidden @internal */
+    /** @internal */
     protected _model: Model;
-    /** @hidden @internal */
+    /** @internal */
     protected _attributes: Record<string, any>;
-    /** @hidden @internal */
+    /** @internal */
     protected _parent?: Node;
-    /** @hidden @internal */
+    /** @internal */
     protected _children: Node[];
-    /** @hidden @internal */
+    /** @internal */
     protected _fixed: boolean;
-    /** @hidden @internal */
+    /** @internal */
     protected _rect: Rect;
-    /** @hidden @internal */
+    /** @internal */
     protected _visible: boolean;
-    /** @hidden @internal */
+    /** @internal */
     protected _listeners: Record<string, (params: any) => void>;
-    /** @hidden @internal */
+    /** @internal */
     protected _dirty: boolean = false;
-    /** @hidden @internal */
+    /** @internal */
     protected _tempSize: number = 0;
 
-    /** @hidden @internal */
+    /** @internal */
     protected constructor(model: Model) {
         this._model = model;
         this._attributes = {};
@@ -95,12 +95,12 @@ export abstract class Node {
 
     abstract toJson(): IJsonRowNode | IJsonBorderNode | IJsonTabSetNode | IJsonTabNode | undefined;
 
-    /** @hidden @internal */
+    /** @internal */
     _setId(id: string) {
         this._attributes.id = id;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _fireEvent(event: string, params: any) {
         // console.log(this._type, " fireEvent " + event + " " + JSON.stringify(params));
         if (this._listeners[event] !== undefined) {
@@ -108,7 +108,7 @@ export abstract class Node {
         }
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _getAttr(name: string) {
         let val = this._attributes[name];
 
@@ -123,16 +123,16 @@ export abstract class Node {
         return val;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _forEachNode(fn: (node: Node, level: number) => void, level: number) {
         fn(this, level);
         level++;
-        this._children.forEach((node) => {
+        for (const node of this._children) {
             node._forEachNode(fn, level);
-        });
+        }
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _setVisible(visible: boolean) {
         if (visible !== this._visible) {
             this._fireEvent("visibility", { visible });
@@ -140,42 +140,42 @@ export abstract class Node {
         }
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _getDrawChildren(): Node[] | undefined {
         return this._children;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _setParent(parent: Node) {
         this._parent = parent;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _setRect(rect: Rect) {
         this._rect = rect;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _setWeight(weight: number) {
         this._attributes.weight = weight;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _setSelected(index: number) {
         this._attributes.selected = index;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _isFixed() {
         return this._fixed;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _layout(rect: Rect, metrics: ILayoutMetrics) {
         this._rect = rect;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _findDropTargetNode(dragNode: Node & IDraggable, x: number, y: number): DropInfo | undefined {
         let rtn: DropInfo | undefined;
         if (this._rect.contains(x, y)) {
@@ -195,12 +195,12 @@ export abstract class Node {
         return rtn;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     canDrop(dragNode: Node & IDraggable, x: number, y: number): DropInfo | undefined {
         return undefined;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _canDockInto(dragNode: Node & IDraggable, dropInfo: DropInfo | undefined): boolean {
         if (dropInfo != null) {
             if (dropInfo.location === DockLocation.CENTER && dropInfo.node.isEnableDrop() === false) {
@@ -224,7 +224,7 @@ export abstract class Node {
         return true;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _removeChild(childNode: Node) {
         const pos = this._children.indexOf(childNode);
         if (pos !== -1) {
@@ -234,7 +234,7 @@ export abstract class Node {
         return pos;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _addChild(childNode: Node, pos?: number) {
         if (pos != null) {
             this._children.splice(pos, 0, childNode);
@@ -247,13 +247,13 @@ export abstract class Node {
         return pos;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _removeAll() {
         this._children = [];
         this._dirty = true;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _styleWithPosition(style?: Record<string, any>) {
         if (style == null) {
             style = {};
@@ -261,29 +261,29 @@ export abstract class Node {
         return this._rect.styleWithPosition(style);
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _getTempSize() {
         return this._tempSize;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _setTempSize(value: number) {
         this._tempSize = value;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     isEnableDivide() {
         return true;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _toAttributeString() {
         return JSON.stringify(this._attributes, undefined, "\t");
     }
 
     // implemented by subclasses
-    /** @hidden @internal */
+    /** @internal */
     abstract _updateAttrs(json: any): void;
-    /** @hidden @internal */
+    /** @internal */
     abstract _getAttributeDefinitions(): AttributeDefinitions;
 }