flexlayout-react 0.7.1 → 0.7.4

package/lib/model/Model.js

@@ -1,242 +1,230 @@
-"use strict";
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Model = void 0;
-var uuid_1 = require("uuid");
-var Attribute_1 = require("../Attribute");
-var AttributeDefinitions_1 = require("../AttributeDefinitions");
-var DockLocation_1 = require("../DockLocation");
-var Orientation_1 = require("../Orientation");
-var Rect_1 = require("../Rect");
-var Actions_1 = require("./Actions");
-var BorderNode_1 = require("./BorderNode");
-var BorderSet_1 = require("./BorderSet");
-var RowNode_1 = require("./RowNode");
-var TabNode_1 = require("./TabNode");
-var TabSetNode_1 = require("./TabSetNode");
-var Utils_1 = require("./Utils");
+import { v4 as getUUID } from "uuid";
+import { Attribute } from "../Attribute";
+import { AttributeDefinitions } from "../AttributeDefinitions";
+import { DockLocation } from "../DockLocation";
+import { Orientation } from "../Orientation";
+import { Rect } from "../Rect";
+import { Actions } from "./Actions";
+import { BorderNode } from "./BorderNode";
+import { BorderSet } from "./BorderSet";
+import { RowNode } from "./RowNode";
+import { TabNode } from "./TabNode";
+import { TabSetNode } from "./TabSetNode";
+import { adjustSelectedIndexAfterDock, adjustSelectedIndexAfterFloat } from "./Utils";
 /**
  * Class containing the Tree of Nodes used by the FlexLayout component
  */
-var Model = /** @class */ (function () {
+export class Model {
     /**
      * 'private' constructor. Use the static method Model.fromJson(json) to create a model
      *  @internal
      */
-    function Model() {
+    constructor() {
         /** @internal */
-        this._borderRects = { inner: Rect_1.Rect.empty(), outer: Rect_1.Rect.empty() };
+        this._borderRects = { inner: Rect.empty(), outer: Rect.empty() };
         this._attributes = {};
         this._idMap = {};
-        this._borders = new BorderSet_1.BorderSet(this);
+        this._borders = new BorderSet(this);
         this._pointerFine = true;
-        this._showHiddenBorder = DockLocation_1.DockLocation.CENTER;
+        this._showHiddenBorder = DockLocation.CENTER;
     }
     /**
      * Loads the model from the given json object
      * @param json the json model to load
      * @returns {Model} a new Model object
      */
-    Model.fromJson = function (json) {
-        var model = new Model();
+    static fromJson(json) {
+        const model = new Model();
         Model._attributeDefinitions.fromJson(json.global, model._attributes);
         if (json.borders) {
-            model._borders = BorderSet_1.BorderSet._fromJson(json.borders, model);
+            model._borders = BorderSet._fromJson(json.borders, model);
         }
-        model._root = RowNode_1.RowNode._fromJson(json.layout, model);
+        model._root = RowNode._fromJson(json.layout, model);
         model._tidy(); // initial tidy of node tree
         return model;
-    };
+    }
     /** @internal */
-    Model._createAttributeDefinitions = function () {
-        var attributeDefinitions = new AttributeDefinitions_1.AttributeDefinitions();
-        attributeDefinitions.add("legacyOverflowMenu", false).setType(Attribute_1.Attribute.BOOLEAN);
+    static _createAttributeDefinitions() {
+        const attributeDefinitions = new AttributeDefinitions();
+        attributeDefinitions.add("legacyOverflowMenu", false).setType(Attribute.BOOLEAN);
         // splitter
-        attributeDefinitions.add("splitterSize", -1).setType(Attribute_1.Attribute.NUMBER);
-        attributeDefinitions.add("splitterExtra", 0).setType(Attribute_1.Attribute.NUMBER);
-        attributeDefinitions.add("enableEdgeDock", true).setType(Attribute_1.Attribute.BOOLEAN);
-        attributeDefinitions.add("rootOrientationVertical", false).setType(Attribute_1.Attribute.BOOLEAN);
+        attributeDefinitions.add("splitterSize", -1).setType(Attribute.NUMBER);
+        attributeDefinitions.add("splitterExtra", 0).setType(Attribute.NUMBER);
+        attributeDefinitions.add("enableEdgeDock", true).setType(Attribute.BOOLEAN);
+        attributeDefinitions.add("rootOrientationVertical", false).setType(Attribute.BOOLEAN);
         attributeDefinitions.add("marginInsets", { top: 0, right: 0, bottom: 0, left: 0 })
             .setType("IInsets");
-        attributeDefinitions.add("enableUseVisibility", false).setType(Attribute_1.Attribute.BOOLEAN);
+        attributeDefinitions.add("enableUseVisibility", false).setType(Attribute.BOOLEAN);
         // tab
-        attributeDefinitions.add("tabEnableClose", true).setType(Attribute_1.Attribute.BOOLEAN);
+        attributeDefinitions.add("tabEnableClose", true).setType(Attribute.BOOLEAN);
         attributeDefinitions.add("tabCloseType", 1).setType("ICloseType");
-        attributeDefinitions.add("tabEnableFloat", false).setType(Attribute_1.Attribute.BOOLEAN);
-        attributeDefinitions.add("tabEnableDrag", true).setType(Attribute_1.Attribute.BOOLEAN);
-        attributeDefinitions.add("tabEnableRename", true).setType(Attribute_1.Attribute.BOOLEAN);
-        attributeDefinitions.add("tabClassName", undefined).setType(Attribute_1.Attribute.STRING);
-        attributeDefinitions.add("tabIcon", undefined).setType(Attribute_1.Attribute.STRING);
-        attributeDefinitions.add("tabEnableRenderOnDemand", true).setType(Attribute_1.Attribute.BOOLEAN);
-        attributeDefinitions.add("tabDragSpeed", 0.3).setType(Attribute_1.Attribute.NUMBER);
-        attributeDefinitions.add("tabBorderWidth", -1).setType(Attribute_1.Attribute.NUMBER);
-        attributeDefinitions.add("tabBorderHeight", -1).setType(Attribute_1.Attribute.NUMBER);
+        attributeDefinitions.add("tabEnableFloat", false).setType(Attribute.BOOLEAN);
+        attributeDefinitions.add("tabEnableDrag", true).setType(Attribute.BOOLEAN);
+        attributeDefinitions.add("tabEnableRename", true).setType(Attribute.BOOLEAN);
+        attributeDefinitions.add("tabClassName", undefined).setType(Attribute.STRING);
+        attributeDefinitions.add("tabIcon", undefined).setType(Attribute.STRING);
+        attributeDefinitions.add("tabEnableRenderOnDemand", true).setType(Attribute.BOOLEAN);
+        attributeDefinitions.add("tabDragSpeed", 0.3).setType(Attribute.NUMBER);
+        attributeDefinitions.add("tabBorderWidth", -1).setType(Attribute.NUMBER);
+        attributeDefinitions.add("tabBorderHeight", -1).setType(Attribute.NUMBER);
         // tabset
-        attributeDefinitions.add("tabSetEnableDeleteWhenEmpty", true).setType(Attribute_1.Attribute.BOOLEAN);
-        attributeDefinitions.add("tabSetEnableDrop", true).setType(Attribute_1.Attribute.BOOLEAN);
-        attributeDefinitions.add("tabSetEnableDrag", true).setType(Attribute_1.Attribute.BOOLEAN);
-        attributeDefinitions.add("tabSetEnableDivide", true).setType(Attribute_1.Attribute.BOOLEAN);
-        attributeDefinitions.add("tabSetEnableMaximize", true).setType(Attribute_1.Attribute.BOOLEAN);
-        attributeDefinitions.add("tabSetEnableClose", false).setType(Attribute_1.Attribute.BOOLEAN);
-        attributeDefinitions.add("tabSetAutoSelectTab", true).setType(Attribute_1.Attribute.BOOLEAN);
-        attributeDefinitions.add("tabSetClassNameTabStrip", undefined).setType(Attribute_1.Attribute.STRING);
-        attributeDefinitions.add("tabSetClassNameHeader", undefined).setType(Attribute_1.Attribute.STRING);
-        attributeDefinitions.add("tabSetEnableTabStrip", true).setType(Attribute_1.Attribute.BOOLEAN);
-        attributeDefinitions.add("tabSetHeaderHeight", 0).setType(Attribute_1.Attribute.NUMBER);
-        attributeDefinitions.add("tabSetTabStripHeight", 0).setType(Attribute_1.Attribute.NUMBER);
+        attributeDefinitions.add("tabSetEnableDeleteWhenEmpty", true).setType(Attribute.BOOLEAN);
+        attributeDefinitions.add("tabSetEnableDrop", true).setType(Attribute.BOOLEAN);
+        attributeDefinitions.add("tabSetEnableDrag", true).setType(Attribute.BOOLEAN);
+        attributeDefinitions.add("tabSetEnableDivide", true).setType(Attribute.BOOLEAN);
+        attributeDefinitions.add("tabSetEnableMaximize", true).setType(Attribute.BOOLEAN);
+        attributeDefinitions.add("tabSetEnableClose", false).setType(Attribute.BOOLEAN);
+        attributeDefinitions.add("tabSetAutoSelectTab", true).setType(Attribute.BOOLEAN);
+        attributeDefinitions.add("tabSetClassNameTabStrip", undefined).setType(Attribute.STRING);
+        attributeDefinitions.add("tabSetClassNameHeader", undefined).setType(Attribute.STRING);
+        attributeDefinitions.add("tabSetEnableTabStrip", true).setType(Attribute.BOOLEAN);
+        attributeDefinitions.add("tabSetHeaderHeight", 0).setType(Attribute.NUMBER);
+        attributeDefinitions.add("tabSetTabStripHeight", 0).setType(Attribute.NUMBER);
         attributeDefinitions.add("tabSetMarginInsets", { top: 0, right: 0, bottom: 0, left: 0 })
             .setType("IInsets");
         attributeDefinitions.add("tabSetBorderInsets", { top: 0, right: 0, bottom: 0, left: 0 })
             .setType("IInsets");
         attributeDefinitions.add("tabSetTabLocation", "top").setType("ITabLocation");
-        attributeDefinitions.add("tabSetMinWidth", 0).setType(Attribute_1.Attribute.NUMBER);
-        attributeDefinitions.add("tabSetMinHeight", 0).setType(Attribute_1.Attribute.NUMBER);
+        attributeDefinitions.add("tabSetMinWidth", 0).setType(Attribute.NUMBER);
+        attributeDefinitions.add("tabSetMinHeight", 0).setType(Attribute.NUMBER);
         // border
-        attributeDefinitions.add("borderSize", 200).setType(Attribute_1.Attribute.NUMBER);
-        attributeDefinitions.add("borderMinSize", 0).setType(Attribute_1.Attribute.NUMBER);
-        attributeDefinitions.add("borderBarSize", 0).setType(Attribute_1.Attribute.NUMBER);
-        attributeDefinitions.add("borderEnableDrop", true).setType(Attribute_1.Attribute.BOOLEAN);
-        attributeDefinitions.add("borderAutoSelectTabWhenOpen", true).setType(Attribute_1.Attribute.BOOLEAN);
-        attributeDefinitions.add("borderAutoSelectTabWhenClosed", false).setType(Attribute_1.Attribute.BOOLEAN);
-        attributeDefinitions.add("borderClassName", undefined).setType(Attribute_1.Attribute.STRING);
-        attributeDefinitions.add("borderEnableAutoHide", false).setType(Attribute_1.Attribute.BOOLEAN);
+        attributeDefinitions.add("borderSize", 200).setType(Attribute.NUMBER);
+        attributeDefinitions.add("borderMinSize", 0).setType(Attribute.NUMBER);
+        attributeDefinitions.add("borderBarSize", 0).setType(Attribute.NUMBER);
+        attributeDefinitions.add("borderEnableDrop", true).setType(Attribute.BOOLEAN);
+        attributeDefinitions.add("borderAutoSelectTabWhenOpen", true).setType(Attribute.BOOLEAN);
+        attributeDefinitions.add("borderAutoSelectTabWhenClosed", false).setType(Attribute.BOOLEAN);
+        attributeDefinitions.add("borderClassName", undefined).setType(Attribute.STRING);
+        attributeDefinitions.add("borderEnableAutoHide", false).setType(Attribute.BOOLEAN);
         return attributeDefinitions;
-    };
+    }
     /** @internal */
-    Model.prototype._setChangeListener = function (listener) {
+    _setChangeListener(listener) {
         this._changeListener = listener;
-    };
+    }
     /**
      * Get the currently active tabset node
      */
-    Model.prototype.getActiveTabset = function () {
+    getActiveTabset() {
         if (this._activeTabSet && this.getNodeById(this._activeTabSet.getId())) {
             return this._activeTabSet;
         }
         else {
             return undefined;
         }
-    };
+    }
     /** @internal */
-    Model.prototype._getShowHiddenBorder = function () {
+    _getShowHiddenBorder() {
         return this._showHiddenBorder;
-    };
+    }
     /** @internal */
-    Model.prototype._setShowHiddenBorder = function (location) {
+    _setShowHiddenBorder(location) {
         this._showHiddenBorder = location;
-    };
+    }
     /** @internal */
-    Model.prototype._setActiveTabset = function (tabsetNode) {
+    _setActiveTabset(tabsetNode) {
         this._activeTabSet = tabsetNode;
-    };
+    }
     /**
      * Get the currently maximized tabset node
      */
-    Model.prototype.getMaximizedTabset = function () {
+    getMaximizedTabset() {
         return this._maximizedTabSet;
-    };
+    }
     /** @internal */
-    Model.prototype._setMaximizedTabset = function (tabsetNode) {
+    _setMaximizedTabset(tabsetNode) {
         this._maximizedTabSet = tabsetNode;
-    };
+    }
     /**
      * Gets the root RowNode of the model
      * @returns {RowNode}
      */
-    Model.prototype.getRoot = function () {
+    getRoot() {
         return this._root;
-    };
-    Model.prototype.isRootOrientationVertical = function () {
+    }
+    isRootOrientationVertical() {
         return this._attributes.rootOrientationVertical;
-    };
-    Model.prototype.isUseVisibility = function () {
+    }
+    isUseVisibility() {
         return this._attributes.enableUseVisibility;
-    };
+    }
     /**
      * Gets the
      * @returns {BorderSet|*}
      */
-    Model.prototype.getBorderSet = function () {
+    getBorderSet() {
         return this._borders;
-    };
+    }
     /** @internal */
-    Model.prototype._getOuterInnerRects = function () {
+    _getOuterInnerRects() {
         return this._borderRects;
-    };
+    }
     /** @internal */
-    Model.prototype._getPointerFine = function () {
+    _getPointerFine() {
         return this._pointerFine;
-    };
+    }
     /** @internal */
-    Model.prototype._setPointerFine = function (pointerFine) {
+    _setPointerFine(pointerFine) {
         this._pointerFine = pointerFine;
-    };
+    }
     /**
      * Visits all the nodes in the model and calls the given function for each
      * @param fn a function that takes visited node and a integer level as parameters
      */
-    Model.prototype.visitNodes = function (fn) {
+    visitNodes(fn) {
         this._borders._forEachNode(fn);
         this._root._forEachNode(fn, 0);
-    };
+    }
     /**
      * Gets a node by its id
      * @param id the id to find
      */
-    Model.prototype.getNodeById = function (id) {
+    getNodeById(id) {
         return this._idMap[id];
-    };
+    }
     /**
      * Update the node tree by performing the given action,
      * Actions should be generated via static methods on the Actions class
      * @param action the action to perform
      * @returns added Node for Actions.addNode; undefined otherwise
      */
-    Model.prototype.doAction = function (action) {
-        var returnVal = undefined;
+    doAction(action) {
+        let returnVal = undefined;
         // console.log(action);
         switch (action.type) {
-            case Actions_1.Actions.ADD_NODE: {
-                var newNode = new TabNode_1.TabNode(this, action.data.json, true);
-                var toNode = this._idMap[action.data.toNode];
-                if (toNode instanceof TabSetNode_1.TabSetNode || toNode instanceof BorderNode_1.BorderNode || toNode instanceof RowNode_1.RowNode) {
-                    toNode.drop(newNode, DockLocation_1.DockLocation.getByName(action.data.location), action.data.index, action.data.select);
+            case Actions.ADD_NODE: {
+                const newNode = new TabNode(this, action.data.json, true);
+                const toNode = this._idMap[action.data.toNode];
+                if (toNode instanceof TabSetNode || toNode instanceof BorderNode || toNode instanceof RowNode) {
+                    toNode.drop(newNode, DockLocation.getByName(action.data.location), action.data.index, action.data.select);
                     returnVal = newNode;
                 }
                 break;
             }
-            case Actions_1.Actions.MOVE_NODE: {
-                var fromNode = this._idMap[action.data.fromNode];
-                if (fromNode instanceof TabNode_1.TabNode || fromNode instanceof TabSetNode_1.TabSetNode) {
-                    var toNode = this._idMap[action.data.toNode];
-                    if (toNode instanceof TabSetNode_1.TabSetNode || toNode instanceof BorderNode_1.BorderNode || toNode instanceof RowNode_1.RowNode) {
-                        toNode.drop(fromNode, DockLocation_1.DockLocation.getByName(action.data.location), action.data.index, action.data.select);
+            case Actions.MOVE_NODE: {
+                const fromNode = this._idMap[action.data.fromNode];
+                if (fromNode instanceof TabNode || fromNode instanceof TabSetNode) {
+                    const toNode = this._idMap[action.data.toNode];
+                    if (toNode instanceof TabSetNode || toNode instanceof BorderNode || toNode instanceof RowNode) {
+                        toNode.drop(fromNode, DockLocation.getByName(action.data.location), action.data.index, action.data.select);
                     }
                 }
                 break;
             }
-            case Actions_1.Actions.DELETE_TAB: {
-                var node = this._idMap[action.data.node];
-                if (node instanceof TabNode_1.TabNode) {
+            case Actions.DELETE_TAB: {
+                const node = this._idMap[action.data.node];
+                if (node instanceof TabNode) {
                     node._delete();
                 }
                 break;
             }
-            case Actions_1.Actions.DELETE_TABSET: {
-                var node = this._idMap[action.data.node];
-                if (node instanceof TabSetNode_1.TabSetNode) {
+            case Actions.DELETE_TABSET: {
+                const node = this._idMap[action.data.node];
+                if (node instanceof TabSetNode) {
                     // first delete all child tabs that are closeable
-                    var children = __spreadArray([], node.getChildren(), true);
-                    for (var i = 0; i < children.length; i++) {
-                        var child = children[i];
+                    const children = [...node.getChildren()];
+                    for (let i = 0; i < children.length; i++) {
+                        const child = children[i];
                         if (child.isEnableClose()) {
                             child._delete();
                         }
@@ -248,77 +236,77 @@ var Model = /** @class */ (function () {
                 }
                 break;
             }
-            case Actions_1.Actions.FLOAT_TAB: {
-                var node = this._idMap[action.data.node];
-                if (node instanceof TabNode_1.TabNode) {
+            case Actions.FLOAT_TAB: {
+                const node = this._idMap[action.data.node];
+                if (node instanceof TabNode) {
                     node._setFloating(true);
-                    (0, Utils_1.adjustSelectedIndexAfterFloat)(node);
+                    adjustSelectedIndexAfterFloat(node);
                 }
                 break;
             }
-            case Actions_1.Actions.UNFLOAT_TAB: {
-                var node = this._idMap[action.data.node];
-                if (node instanceof TabNode_1.TabNode) {
+            case Actions.UNFLOAT_TAB: {
+                const node = this._idMap[action.data.node];
+                if (node instanceof TabNode) {
                     node._setFloating(false);
-                    (0, Utils_1.adjustSelectedIndexAfterDock)(node);
+                    adjustSelectedIndexAfterDock(node);
                 }
                 break;
             }
-            case Actions_1.Actions.RENAME_TAB: {
-                var node = this._idMap[action.data.node];
-                if (node instanceof TabNode_1.TabNode) {
+            case Actions.RENAME_TAB: {
+                const node = this._idMap[action.data.node];
+                if (node instanceof TabNode) {
                     node._setName(action.data.text);
                 }
                 break;
             }
-            case Actions_1.Actions.SELECT_TAB: {
-                var tabNode = this._idMap[action.data.tabNode];
-                if (tabNode instanceof TabNode_1.TabNode) {
-                    var parent_1 = tabNode.getParent();
-                    var pos = parent_1.getChildren().indexOf(tabNode);
-                    if (parent_1 instanceof BorderNode_1.BorderNode) {
-                        if (parent_1.getSelected() === pos) {
-                            parent_1._setSelected(-1);
+            case Actions.SELECT_TAB: {
+                const tabNode = this._idMap[action.data.tabNode];
+                if (tabNode instanceof TabNode) {
+                    const parent = tabNode.getParent();
+                    const pos = parent.getChildren().indexOf(tabNode);
+                    if (parent instanceof BorderNode) {
+                        if (parent.getSelected() === pos) {
+                            parent._setSelected(-1);
                         }
                         else {
-                            parent_1._setSelected(pos);
+                            parent._setSelected(pos);
                         }
                     }
-                    else if (parent_1 instanceof TabSetNode_1.TabSetNode) {
-                        if (parent_1.getSelected() !== pos) {
-                            parent_1._setSelected(pos);
+                    else if (parent instanceof TabSetNode) {
+                        if (parent.getSelected() !== pos) {
+                            parent._setSelected(pos);
                         }
-                        this._activeTabSet = parent_1;
+                        this._activeTabSet = parent;
                     }
                 }
                 break;
             }
-            case Actions_1.Actions.SET_ACTIVE_TABSET: {
-                var tabsetNode = this._idMap[action.data.tabsetNode];
-                if (tabsetNode instanceof TabSetNode_1.TabSetNode) {
+            case Actions.SET_ACTIVE_TABSET: {
+                const tabsetNode = this._idMap[action.data.tabsetNode];
+                if (tabsetNode instanceof TabSetNode) {
                     this._activeTabSet = tabsetNode;
                 }
                 break;
             }
-            case Actions_1.Actions.ADJUST_SPLIT: {
-                var node1 = this._idMap[action.data.node1];
-                var node2 = this._idMap[action.data.node2];
-                if ((node1 instanceof TabSetNode_1.TabSetNode || node1 instanceof RowNode_1.RowNode) && (node2 instanceof TabSetNode_1.TabSetNode || node2 instanceof RowNode_1.RowNode)) {
+            case Actions.ADJUST_SPLIT: {
+                const node1 = this._idMap[action.data.node1];
+                const node2 = this._idMap[action.data.node2];
+                if ((node1 instanceof TabSetNode || node1 instanceof RowNode) && (node2 instanceof TabSetNode || node2 instanceof RowNode)) {
                     this._adjustSplitSide(node1, action.data.weight1, action.data.pixelWidth1);
                     this._adjustSplitSide(node2, action.data.weight2, action.data.pixelWidth2);
                 }
                 break;
             }
-            case Actions_1.Actions.ADJUST_BORDER_SPLIT: {
-                var node = this._idMap[action.data.node];
-                if (node instanceof BorderNode_1.BorderNode) {
+            case Actions.ADJUST_BORDER_SPLIT: {
+                const node = this._idMap[action.data.node];
+                if (node instanceof BorderNode) {
                     node._setSize(action.data.pos);
                 }
                 break;
             }
-            case Actions_1.Actions.MAXIMIZE_TOGGLE: {
-                var node = this._idMap[action.data.node];
-                if (node instanceof TabSetNode_1.TabSetNode) {
+            case Actions.MAXIMIZE_TOGGLE: {
+                const node = this._idMap[action.data.node];
+                if (node instanceof TabSetNode) {
                     if (node === this._maximizedTabSet) {
                         this._maximizedTabSet = undefined;
                     }
@@ -329,12 +317,12 @@ var Model = /** @class */ (function () {
                 }
                 break;
             }
-            case Actions_1.Actions.UPDATE_MODEL_ATTRIBUTES: {
+            case Actions.UPDATE_MODEL_ATTRIBUTES: {
                 this._updateAttrs(action.data.json);
                 break;
             }
-            case Actions_1.Actions.UPDATE_NODE_ATTRIBUTES: {
-                var node = this._idMap[action.data.node];
+            case Actions.UPDATE_NODE_ATTRIBUTES: {
+                const node = this._idMap[action.data.node];
                 node._updateAttrs(action.data.json);
                 break;
             }
@@ -346,67 +334,66 @@ var Model = /** @class */ (function () {
             this._changeListener();
         }
         return returnVal;
-    };
+    }
     /** @internal */
-    Model.prototype._updateIdMap = function () {
-        var _this = this;
+    _updateIdMap() {
         // regenerate idMap to stop it building up
         this._idMap = {};
-        this.visitNodes(function (node) { return (_this._idMap[node.getId()] = node); });
+        this.visitNodes((node) => (this._idMap[node.getId()] = node));
         // console.log(JSON.stringify(Object.keys(this._idMap)));
-    };
+    }
     /** @internal */
-    Model.prototype._adjustSplitSide = function (node, weight, pixels) {
+    _adjustSplitSide(node, weight, pixels) {
         node._setWeight(weight);
-        if (node.getWidth() != null && node.getOrientation() === Orientation_1.Orientation.VERT) {
+        if (node.getWidth() != null && node.getOrientation() === Orientation.VERT) {
             node._updateAttrs({ width: pixels });
         }
-        else if (node.getHeight() != null && node.getOrientation() === Orientation_1.Orientation.HORZ) {
+        else if (node.getHeight() != null && node.getOrientation() === Orientation.HORZ) {
             node._updateAttrs({ height: pixels });
         }
-    };
+    }
     /**
      * Converts the model to a json object
      * @returns {IJsonModel} json object that represents this model
      */
-    Model.prototype.toJson = function () {
-        var global = {};
+    toJson() {
+        const global = {};
         Model._attributeDefinitions.toJson(global, this._attributes);
         // save state of nodes
-        this.visitNodes(function (node) {
+        this.visitNodes((node) => {
             node._fireEvent("save", undefined);
         });
-        return { global: global, borders: this._borders._toJson(), layout: this._root.toJson() };
-    };
-    Model.prototype.getSplitterSize = function () {
-        var splitterSize = this._attributes.splitterSize;
+        return { global, borders: this._borders._toJson(), layout: this._root.toJson() };
+    }
+    getSplitterSize() {
+        let splitterSize = this._attributes.splitterSize;
         if (splitterSize === -1) {
             // use defaults
             splitterSize = this._pointerFine ? 8 : 12; // larger for mobile
         }
         return splitterSize;
-    };
-    Model.prototype.isLegacyOverflowMenu = function () {
+    }
+    isLegacyOverflowMenu() {
         return this._attributes.legacyOverflowMenu;
-    };
-    Model.prototype.getSplitterExtra = function () {
+    }
+    getSplitterExtra() {
         return this._attributes.splitterExtra;
-    };
-    Model.prototype.isEnableEdgeDock = function () {
+    }
+    isEnableEdgeDock() {
         return this._attributes.enableEdgeDock;
-    };
+    }
     /** @internal */
-    Model.prototype._addNode = function (node) {
-        var id = node.getId();
+    _addNode(node) {
+        const id = node.getId();
         if (this._idMap[id] !== undefined) {
-            throw new Error("Error: each node must have a unique id, duplicate id:".concat(node.getId()));
+            throw new Error(`Error: each node must have a unique id, duplicate id:${node.getId()}`);
         }
         if (node.getType() !== "splitter") {
             this._idMap[id] = node;
         }
-    };
+    }
     /** @internal */
-    Model.prototype._layout = function (rect, metrics) {
+    _layout(rect, metrics) {
         var _a;
         // let start = Date.now();
         this._borderRects = this._borders._layoutBorder({ outer: rect, inner: rect }, metrics);
@@ -415,70 +402,68 @@ var Model = /** @class */ (function () {
         this._root._layout(rect, metrics);
         // console.log("layout time: " + (Date.now() - start));
         return rect;
-    };
+    }
     /** @internal */
-    Model.prototype._findDropTargetNode = function (dragNode, x, y) {
-        var node = this._root._findDropTargetNode(dragNode, x, y);
+    _findDropTargetNode(dragNode, x, y) {
+        let node = this._root._findDropTargetNode(dragNode, x, y);
         if (node === undefined) {
             node = this._borders._findDropTargetNode(dragNode, x, y);
         }
         return node;
-    };
+    }
     /** @internal */
-    Model.prototype._tidy = function () {
+    _tidy() {
         // console.log("before _tidy", this.toString());
         this._root._tidy();
         // console.log("after _tidy", this.toString());
-    };
+    }
     /** @internal */
-    Model.prototype._updateAttrs = function (json) {
+    _updateAttrs(json) {
         Model._attributeDefinitions.update(json, this._attributes);
-    };
+    }
     /** @internal */
-    Model.prototype._nextUniqueId = function () {
-        return '#' + (0, uuid_1.v4)();
-    };
+    _nextUniqueId() {
+        return '#' + getUUID();
+    }
     /** @internal */
-    Model.prototype._getAttribute = function (name) {
+    _getAttribute(name) {
         return this._attributes[name];
-    };
+    }
     /**
      * Sets a function to allow/deny dropping a node
      * @param onAllowDrop function that takes the drag node and DropInfo and returns true if the drop is allowed
      */
-    Model.prototype.setOnAllowDrop = function (onAllowDrop) {
+    setOnAllowDrop(onAllowDrop) {
         this._onAllowDrop = onAllowDrop;
-    };
+    }
     /** @internal */
-    Model.prototype._getOnAllowDrop = function () {
+    _getOnAllowDrop() {
         return this._onAllowDrop;
-    };
+    }
     /**
      * set callback called when a new TabSet is created.
      * The tabNode can be undefined if it's the auto created first tabset in the root row (when the last
      * tab is deleted, the root tabset can be recreated)
      * @param onCreateTabSet
      */
-    Model.prototype.setOnCreateTabSet = function (onCreateTabSet) {
+    setOnCreateTabSet(onCreateTabSet) {
         this._onCreateTabSet = onCreateTabSet;
-    };
+    }
     /** @internal */
-    Model.prototype._getOnCreateTabSet = function () {
+    _getOnCreateTabSet() {
         return this._onCreateTabSet;
-    };
-    Model.toTypescriptInterfaces = function () {
+    }
+    static toTypescriptInterfaces() {
         console.log(Model._attributeDefinitions.toTypescriptInterface("Global", undefined));
-        console.log(RowNode_1.RowNode.getAttributeDefinitions().toTypescriptInterface("Row", Model._attributeDefinitions));
-        console.log(TabSetNode_1.TabSetNode.getAttributeDefinitions().toTypescriptInterface("TabSet", Model._attributeDefinitions));
-        console.log(TabNode_1.TabNode.getAttributeDefinitions().toTypescriptInterface("Tab", Model._attributeDefinitions));
-        console.log(BorderNode_1.BorderNode.getAttributeDefinitions().toTypescriptInterface("Border", Model._attributeDefinitions));
-    };
-    Model.prototype.toString = function () {
+        console.log(RowNode.getAttributeDefinitions().toTypescriptInterface("Row", Model._attributeDefinitions));
+        console.log(TabSetNode.getAttributeDefinitions().toTypescriptInterface("TabSet", Model._attributeDefinitions));
+        console.log(TabNode.getAttributeDefinitions().toTypescriptInterface("Tab", Model._attributeDefinitions));
+        console.log(BorderNode.getAttributeDefinitions().toTypescriptInterface("Border", Model._attributeDefinitions));
+    }
+    toString() {
         return JSON.stringify(this.toJson());
-    };
-    /** @internal */
-    Model._attributeDefinitions = Model._createAttributeDefinitions();
-    return Model;
-}());
-exports.Model = Model;
+    }
+}
+/** @internal */
+Model._attributeDefinitions = Model._createAttributeDefinitions();
 //# sourceMappingURL=Model.js.map