flexlayout-react 0.6.1 → 0.6.5

package/src/model/BorderSet.ts

@@ -1,24 +1,24 @@
-import DropInfo from "../DropInfo";
-import Orientation from "../Orientation";
-import Rect from "../Rect";
-import BorderNode from "./BorderNode";
-import IDraggable from "./IDraggable";
-import Model, { ILayoutMetrics } from "./Model";
-import Node from "./Node";
+import { DropInfo } from "../DropInfo";
+import { Orientation } from "../Orientation";
+import { Rect } from "../Rect";
+import { BorderNode } from "./BorderNode";
+import { IDraggable } from "./IDraggable";
+import { Model, ILayoutMetrics } from "./Model";
+import { Node } from "./Node";
 
-class BorderSet {
-    /** @hidden @internal */
+export class BorderSet {
+    /** @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 @@ 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();
@@ -61,7 +61,7 @@ class BorderSet {
             border._setAdjustedSize(border.getSize());
             const visible = border.getSelected() !== -1;
             if (border.getLocation().getOrientation() === Orientation.HORZ) {
-                sumWidth += border.getBorderBarSize() ;
+                sumWidth += border.getBorderBarSize();
                 if (visible) {
                     width -= this._model.getSplitterSize();
                     sumWidth += border.getSize();
@@ -86,13 +86,13 @@ class BorderSet {
                 // visible
                 const size = border._getAdjustedSize();
                 if (sumWidth > width && adjustableWidth > 0 && border.getLocation().getOrientation() === Orientation.HORZ && size > 0
-                 && size > border.getMinSize()) {
+                    && size > border.getMinSize()) {
                     border._setAdjustedSize(size - 1);
                     sumWidth--;
                     adjustableWidth--;
                     adjusted = true;
                 } else if (sumHeight > height && adjustableHeight > 0 && border.getLocation().getOrientation() === Orientation.VERT && size > 0
-                && size > border.getMinSize()) {
+                    && size > border.getMinSize()) {
                     border._setAdjustedSize(size - 1);
                     sumHeight--;
                     adjustableHeight--;
@@ -100,7 +100,7 @@ class BorderSet {
                 }
             }
             j = (j + 1) % showingBorders.length;
-            if (j===0) {
+            if (j === 0) {
                 if (adjusted) {
                     adjusted = false;
                 } else {
@@ -109,19 +109,19 @@ 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()) {
@@ -134,5 +134,3 @@ class BorderSet {
         return undefined;
     }
 }
-
-export default BorderSet;

package/src/model/IDraggable.ts

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

package/src/model/IDropTarget.ts

@@ -1,13 +1,14 @@
-import DockLocation from "../DockLocation";
-import DropInfo from "../DropInfo";
-import IDraggable from "./IDraggable";
-import Node from "./Node";
+import { DockLocation } from "../DockLocation";
+import { DropInfo } from "../DropInfo";
+import { IDraggable } from "./IDraggable";
+import { Node } from "./Node";
 
-export default interface IDropTarget {
-    /** @hidden @internal */
+export interface IDropTarget {
+    /** @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;
 }
+

package/src/model/IJsonModel.ts

@@ -1,7 +1,7 @@
 import { ICloseType } from './ICloseType';
-type IBorderLocation = "top" | "bottom" | "left" | "right";
-type ITabLocation = "top" | "bottom";
-type IInsets = { "top": number, "right": number, "bottom": number, "left": number };
+export type IBorderLocation = "top" | "bottom" | "left" | "right";
+export type ITabLocation = "top" | "bottom";
+export type IInsets = { "top": number, "right": number, "bottom": number, "left": number };
 
 export interface IJsonModel {
     global?: IGlobalAttributes;

package/src/model/Model.ts

@@ -1,25 +1,24 @@
-import Attribute from "../Attribute";
-import AttributeDefinitions from "../AttributeDefinitions";
-import DockLocation from "../DockLocation";
-import DropInfo from "../DropInfo";
-import Orientation from "../Orientation";
-import Rect from "../Rect";
-import Action from "./Action";
-import Actions from "./Actions";
-import BorderNode from "./BorderNode";
-import BorderSet from "./BorderSet";
-import IDraggable from "./IDraggable";
-import IDropTarget from "./IDropTarget";
-import { IJsonModel } from "./IJsonModel";
-import Node from "./Node";
-import RowNode from "./RowNode";
-import TabNode from "./TabNode";
-import TabSetNode from "./TabSetNode";
-import {ITabSetAttributes} from "./IJsonModel";
+import { v4 as getUUID } from "uuid";
+import { Attribute } from "../Attribute";
+import { AttributeDefinitions } from "../AttributeDefinitions";
+import { DockLocation } from "../DockLocation";
+import { DropInfo } from "../DropInfo";
+import { Orientation } from "../Orientation";
+import { Rect } from "../Rect";
+import { Action } from "./Action";
+import { Actions } from "./Actions";
+import { BorderNode } from "./BorderNode";
+import { BorderSet } from "./BorderSet";
+import { IDraggable } from "./IDraggable";
+import { IDropTarget } from "./IDropTarget";
+import { IJsonModel, ITabSetAttributes } from "./IJsonModel";
+import { Node } from "./Node";
+import { RowNode } from "./RowNode";
+import { TabNode } from "./TabNode";
+import { TabSetNode } from "./TabSetNode";
 import { adjustSelectedIndexAfterDock, adjustSelectedIndexAfterFloat } from "./Utils";
-import * as uuid from "uuid";
 
-/** @hidden @internal */
+/** @internal */
 export interface ILayoutMetrics {
     headerBarSize: number;
     tabBarSize: number;
@@ -29,7 +28,7 @@ export interface ILayoutMetrics {
 /**
  * Class containing the Tree of Nodes used by the FlexLayout component
  */
-class Model {
+export class Model {
     /**
      * Loads the model from the given json object
      * @param json the json model to load
@@ -46,10 +45,10 @@ 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 @@ 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 */
-    private _onCreateTabSet? : (tabNode?: TabNode) => ITabSetAttributes;
-    /** @hidden @internal */
+    /** @internal */
+    private _onCreateTabSet?: (tabNode?: TabNode) => ITabSetAttributes;
+    /** @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 @@ class Model {
         this._showHiddenBorder = DockLocation.CENTER;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _setChangeListener(listener: (() => void) | undefined) {
         this._changeListener = listener;
     }
@@ -166,17 +165,17 @@ 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 @@ class Model {
         return this._maximizedTabSet;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _setMaximizedTabset(tabsetNode: (TabSetNode | undefined)) {
         this._maximizedTabSet = tabsetNode;
     }
@@ -217,17 +216,17 @@ 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 @@ 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 @@ class Model {
         return returnVal;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _updateIdMap() {
         // regenerate idMap to stop it building up
         this._idMap = {};
@@ -416,7 +416,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ class Model {
         this._onAllowDrop = onAllowDrop;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _getOnAllowDrop() {
         return this._onAllowDrop;
     }
@@ -541,7 +541,7 @@ class Model {
         this._onCreateTabSet = onCreateTabSet;
     }
 
-    /** @hidden @internal */
+    /** @internal */
     _getOnCreateTabSet() {
         return this._onCreateTabSet;
     }
@@ -559,5 +559,3 @@ class Model {
     }
 }
 
-
-export default Model;