flexlayout-react 0.7.3 → 0.7.4

package/lib/view/Layout.js

@@ -1,390 +1,348 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-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.Layout = void 0;
-var React = require("react");
-var react_dom_1 = require("react-dom");
-var DockLocation_1 = require("../DockLocation");
-var DragDrop_1 = require("../DragDrop");
-var Actions_1 = require("../model/Actions");
-var BorderNode_1 = require("../model/BorderNode");
-var SplitterNode_1 = require("../model/SplitterNode");
-var TabNode_1 = require("../model/TabNode");
-var TabSetNode_1 = require("../model/TabSetNode");
-var Rect_1 = require("../Rect");
-var Types_1 = require("../Types");
-var BorderTabSet_1 = require("./BorderTabSet");
-var Splitter_1 = require("./Splitter");
-var Tab_1 = require("./Tab");
-var TabSet_1 = require("./TabSet");
-var FloatingWindow_1 = require("./FloatingWindow");
-var FloatingWindowTab_1 = require("./FloatingWindowTab");
-var TabFloating_1 = require("./TabFloating");
-var Orientation_1 = require("../Orientation");
-var Icons_1 = require("./Icons");
-var TabButtonStamp_1 = require("./TabButtonStamp");
-var defaultIcons = {
-    close: React.createElement(Icons_1.CloseIcon, null),
-    closeTabset: React.createElement(Icons_1.CloseIcon, null),
-    popout: React.createElement(Icons_1.PopoutIcon, null),
-    maximize: React.createElement(Icons_1.MaximizeIcon, null),
-    restore: React.createElement(Icons_1.RestoreIcon, null),
-    more: React.createElement(Icons_1.OverflowIcon, null),
+import * as React from "react";
+import { createPortal } from "react-dom";
+import { DockLocation } from "../DockLocation";
+import { DragDrop } from "../DragDrop";
+import { Actions } from "../model/Actions";
+import { BorderNode } from "../model/BorderNode";
+import { SplitterNode } from "../model/SplitterNode";
+import { TabNode } from "../model/TabNode";
+import { TabSetNode } from "../model/TabSetNode";
+import { Rect } from "../Rect";
+import { CLASSES } from "../Types";
+import { BorderTabSet } from "./BorderTabSet";
+import { Splitter } from "./Splitter";
+import { Tab } from "./Tab";
+import { TabSet } from "./TabSet";
+import { FloatingWindow } from "./FloatingWindow";
+import { FloatingWindowTab } from "./FloatingWindowTab";
+import { TabFloating } from "./TabFloating";
+import { Orientation } from "../Orientation";
+import { CloseIcon, MaximizeIcon, OverflowIcon, PopoutIcon, RestoreIcon } from "./Icons";
+import { TabButtonStamp } from "./TabButtonStamp";
+const defaultIcons = {
+    close: React.createElement(CloseIcon, null),
+    closeTabset: React.createElement(CloseIcon, null),
+    popout: React.createElement(PopoutIcon, null),
+    maximize: React.createElement(MaximizeIcon, null),
+    restore: React.createElement(RestoreIcon, null),
+    more: React.createElement(OverflowIcon, null),
 };
 // Popout windows work in latest browsers based on webkit (Chrome, Opera, Safari, latest Edge) and Firefox. They do
 // not work on any version if IE or the original Edge browser
 // Assume any recent desktop browser not IE or original Edge will work
 /** @internal */
 // @ts-ignore
-var isIEorEdge = typeof window !== "undefined" && (window.document.documentMode || /Edge\//.test(window.navigator.userAgent));
+const isIEorEdge = typeof window !== "undefined" && (window.document.documentMode || /Edge\//.test(window.navigator.userAgent));
 /** @internal */
-var isDesktop = typeof window !== "undefined" && window.matchMedia && window.matchMedia("(hover: hover) and (pointer: fine)").matches;
+const isDesktop = typeof window !== "undefined" && window.matchMedia && window.matchMedia("(hover: hover) and (pointer: fine)").matches;
 /** @internal */
-var defaultSupportsPopout = isDesktop && !isIEorEdge;
+const defaultSupportsPopout = isDesktop && !isIEorEdge;
 /**
  * A React component that hosts a multi-tabbed layout
  */
-var Layout = /** @class */ (function (_super) {
-    __extends(Layout, _super);
-    function Layout(props) {
-        var _this = _super.call(this, props) || this;
+export class Layout extends React.Component {
+    constructor(props) {
+        super(props);
         /** @internal */
-        _this.firstMove = false;
+        this.firstMove = false;
         /** @internal */
-        _this.dragRectRendered = true;
+        this.dragRectRendered = true;
         /** @internal */
-        _this.dragDivText = undefined;
+        this.dragDivText = undefined;
         /** @internal */
-        _this.edgeRectLength = 100;
+        this.edgeRectLength = 100;
         /** @internal */
-        _this.edgeRectWidth = 10;
+        this.edgeRectWidth = 10;
         /** @internal */
-        _this.onModelChange = function () {
-            _this.forceUpdate();
-            if (_this.props.onModelChange) {
-                _this.props.onModelChange(_this.props.model);
+        this.onModelChange = () => {
+            this.forceUpdate();
+            if (this.props.onModelChange) {
+                this.props.onModelChange(this.props.model);
             }
         };
         /** @internal */
-        _this.updateRect = function (domRect) {
-            if (domRect === void 0) { domRect = _this.getDomRect(); }
-            var rect = new Rect_1.Rect(0, 0, domRect.width, domRect.height);
-            if (!rect.equals(_this.state.rect) && rect.width !== 0 && rect.height !== 0) {
-                _this.setState({ rect: rect });
+        this.updateRect = (domRect = this.getDomRect()) => {
+            const rect = new Rect(0, 0, domRect.width, domRect.height);
+            if (!rect.equals(this.state.rect) && rect.width !== 0 && rect.height !== 0) {
+                this.setState({ rect });
             }
         };
         /** @internal */
-        _this.updateLayoutMetrics = function () {
-            if (_this.findHeaderBarSizeRef.current) {
-                var headerBarSize = _this.findHeaderBarSizeRef.current.getBoundingClientRect().height;
-                if (headerBarSize !== _this.state.calculatedHeaderBarSize) {
-                    _this.setState({ calculatedHeaderBarSize: headerBarSize });
+        this.updateLayoutMetrics = () => {
+            if (this.findHeaderBarSizeRef.current) {
+                const headerBarSize = this.findHeaderBarSizeRef.current.getBoundingClientRect().height;
+                if (headerBarSize !== this.state.calculatedHeaderBarSize) {
+                    this.setState({ calculatedHeaderBarSize: headerBarSize });
                 }
             }
-            if (_this.findTabBarSizeRef.current) {
-                var tabBarSize = _this.findTabBarSizeRef.current.getBoundingClientRect().height;
-                if (tabBarSize !== _this.state.calculatedTabBarSize) {
-                    _this.setState({ calculatedTabBarSize: tabBarSize });
+            if (this.findTabBarSizeRef.current) {
+                const tabBarSize = this.findTabBarSizeRef.current.getBoundingClientRect().height;
+                if (tabBarSize !== this.state.calculatedTabBarSize) {
+                    this.setState({ calculatedTabBarSize: tabBarSize });
                 }
             }
-            if (_this.findBorderBarSizeRef.current) {
-                var borderBarSize = _this.findBorderBarSizeRef.current.getBoundingClientRect().height;
-                if (borderBarSize !== _this.state.calculatedBorderBarSize) {
-                    _this.setState({ calculatedBorderBarSize: borderBarSize });
+            if (this.findBorderBarSizeRef.current) {
+                const borderBarSize = this.findBorderBarSizeRef.current.getBoundingClientRect().height;
+                if (borderBarSize !== this.state.calculatedBorderBarSize) {
+                    this.setState({ calculatedBorderBarSize: borderBarSize });
                 }
             }
         };
         /** @internal */
-        _this.getClassName = function (defaultClassName) {
-            if (_this.props.classNameMapper === undefined) {
+        this.getClassName = (defaultClassName) => {
+            if (this.props.classNameMapper === undefined) {
                 return defaultClassName;
             }
             else {
-                return _this.props.classNameMapper(defaultClassName);
+                return this.props.classNameMapper(defaultClassName);
             }
         };
         /** @internal */
-        _this.onCloseWindow = function (id) {
-            _this.doAction(Actions_1.Actions.unFloatTab(id));
+        this.onCloseWindow = (id) => {
+            this.doAction(Actions.unFloatTab(id));
             try {
-                _this.props.model.getNodeById(id)._setWindow(undefined);
+                this.props.model.getNodeById(id)._setWindow(undefined);
             }
             catch (e) {
                 // catch incase it was a model change
             }
         };
         /** @internal */
-        _this.onSetWindow = function (id, window) {
-            _this.props.model.getNodeById(id)._setWindow(window);
+        this.onSetWindow = (id, window) => {
+            this.props.model.getNodeById(id)._setWindow(window);
         };
         /** @internal */
-        _this.onCancelAdd = function () {
+        this.onCancelAdd = () => {
             var _a, _b;
-            var rootdiv = _this.selfRef.current;
-            rootdiv.removeChild(_this.dragDiv);
-            _this.dragDiv = undefined;
-            _this.hidePortal();
-            if (_this.fnNewNodeDropped != null) {
-                _this.fnNewNodeDropped();
-                _this.fnNewNodeDropped = undefined;
+            const rootdiv = this.selfRef.current;
+            rootdiv.removeChild(this.dragDiv);
+            this.dragDiv = undefined;
+            this.hidePortal();
+            if (this.fnNewNodeDropped != null) {
+                this.fnNewNodeDropped();
+                this.fnNewNodeDropped = undefined;
             }
             try {
-                (_b = (_a = _this.customDrop) === null || _a === void 0 ? void 0 : _a.invalidated) === null || _b === void 0 ? void 0 : _b.call(_a);
+                (_b = (_a = this.customDrop) === null || _a === void 0 ? void 0 : _a.invalidated) === null || _b === void 0 ? void 0 : _b.call(_a);
             }
             catch (e) {
                 console.error(e);
             }
-            DragDrop_1.DragDrop.instance.hideGlass();
-            _this.newTabJson = undefined;
-            _this.customDrop = undefined;
+            DragDrop.instance.hideGlass();
+            this.newTabJson = undefined;
+            this.customDrop = undefined;
         };
         /** @internal */
-        _this.onCancelDrag = function (wasDragging) {
+        this.onCancelDrag = (wasDragging) => {
             var _a, _b;
             if (wasDragging) {
-                var rootdiv = _this.selfRef.current;
+                const rootdiv = this.selfRef.current;
                 try {
-                    rootdiv.removeChild(_this.outlineDiv);
+                    rootdiv.removeChild(this.outlineDiv);
                 }
                 catch (e) { }
                 try {
-                    rootdiv.removeChild(_this.dragDiv);
+                    rootdiv.removeChild(this.dragDiv);
                 }
                 catch (e) { }
-                _this.dragDiv = undefined;
-                _this.hidePortal();
-                _this.setState({ showEdges: false });
-                if (_this.fnNewNodeDropped != null) {
-                    _this.fnNewNodeDropped();
-                    _this.fnNewNodeDropped = undefined;
+                this.dragDiv = undefined;
+                this.hidePortal();
+                this.setState({ showEdges: false });
+                if (this.fnNewNodeDropped != null) {
+                    this.fnNewNodeDropped();
+                    this.fnNewNodeDropped = undefined;
                 }
                 try {
-                    (_b = (_a = _this.customDrop) === null || _a === void 0 ? void 0 : _a.invalidated) === null || _b === void 0 ? void 0 : _b.call(_a);
+                    (_b = (_a = this.customDrop) === null || _a === void 0 ? void 0 : _a.invalidated) === null || _b === void 0 ? void 0 : _b.call(_a);
                 }
                 catch (e) {
                     console.error(e);
                 }
-                DragDrop_1.DragDrop.instance.hideGlass();
-                _this.newTabJson = undefined;
-                _this.customDrop = undefined;
+                DragDrop.instance.hideGlass();
+                this.newTabJson = undefined;
+                this.customDrop = undefined;
             }
-            _this.setState({ showHiddenBorder: DockLocation_1.DockLocation.CENTER });
+            this.setState({ showHiddenBorder: DockLocation.CENTER });
         };
         /** @internal */
-        _this.onDragDivMouseDown = function (event) {
+        this.onDragDivMouseDown = (event) => {
             event.preventDefault();
-            _this.dragStart(event, _this.dragDivText, TabNode_1.TabNode._fromJson(_this.newTabJson, _this.props.model, false), true, undefined, undefined);
+            this.dragStart(event, this.dragDivText, TabNode._fromJson(this.newTabJson, this.props.model, false), true, undefined, undefined);
         };
         /** @internal */
-        _this.dragStart = function (event, dragDivText, node, allowDrag, onClick, onDoubleClick) {
+        this.dragStart = (event, dragDivText, node, allowDrag, onClick, onDoubleClick) => {
             if (!allowDrag) {
-                DragDrop_1.DragDrop.instance.startDrag(event, undefined, undefined, undefined, undefined, onClick, onDoubleClick, _this.currentDocument, _this.selfRef.current);
+                DragDrop.instance.startDrag(event, undefined, undefined, undefined, undefined, onClick, onDoubleClick, this.currentDocument, this.selfRef.current);
             }
             else {
-                _this.dragNode = node;
-                _this.dragDivText = dragDivText;
-                DragDrop_1.DragDrop.instance.startDrag(event, _this.onDragStart, _this.onDragMove, _this.onDragEnd, _this.onCancelDrag, onClick, onDoubleClick, _this.currentDocument, _this.selfRef.current);
+                this.dragNode = node;
+                this.dragDivText = dragDivText;
+                DragDrop.instance.startDrag(event, this.onDragStart, this.onDragMove, this.onDragEnd, this.onCancelDrag, onClick, onDoubleClick, this.currentDocument, this.selfRef.current);
             }
         };
         /** @internal */
-        _this.dragRectRender = function (text, node, json, onRendered) {
-            var content;
+        this.dragRectRender = (text, node, json, onRendered) => {
+            let content;
             if (text !== undefined) {
                 content = React.createElement("div", { style: { whiteSpace: "pre" } }, text.replace("<br>", "\n"));
             }
             else {
-                if (node && node instanceof TabNode_1.TabNode) {
-                    content = (React.createElement(TabButtonStamp_1.TabButtonStamp, { node: node, layout: _this, iconFactory: _this.props.iconFactory, titleFactory: _this.props.titleFactory }));
+                if (node && node instanceof TabNode) {
+                    content = (React.createElement(TabButtonStamp, { node: node, layout: this, iconFactory: this.props.iconFactory, titleFactory: this.props.titleFactory }));
                 }
             }
-            if (_this.props.onRenderDragRect !== undefined) {
-                var customContent = _this.props.onRenderDragRect(content, node, json);
+            if (this.props.onRenderDragRect !== undefined) {
+                const customContent = this.props.onRenderDragRect(content, node, json);
                 if (customContent !== undefined) {
                     content = customContent;
                 }
             }
             // hide div until the render is complete
-            _this.dragDiv.style.visibility = "hidden";
-            _this.dragRectRendered = false;
-            _this.showPortal(React.createElement(DragRectRenderWrapper
+            this.dragDiv.style.visibility = "hidden";
+            this.dragRectRendered = false;
+            this.showPortal(React.createElement(DragRectRenderWrapper
             // wait for it to be rendered
             , { 
                 // wait for it to be rendered
-                onRendered: function () {
-                    _this.dragRectRendered = true;
+                onRendered: () => {
+                    this.dragRectRendered = true;
                     onRendered === null || onRendered === void 0 ? void 0 : onRendered();
-                } }, content), _this.dragDiv);
+                } }, content), this.dragDiv);
         };
         /** @internal */
-        _this.showPortal = function (control, element) {
-            var portal = (0, react_dom_1.createPortal)(control, element);
-            _this.setState({ portal: portal });
+        this.showPortal = (control, element) => {
+            const portal = createPortal(control, element);
+            this.setState({ portal });
         };
         /** @internal */
-        _this.hidePortal = function () {
-            _this.setState({ portal: undefined });
+        this.hidePortal = () => {
+            this.setState({ portal: undefined });
         };
         /** @internal */
-        _this.onDragStart = function () {
-            _this.dropInfo = undefined;
-            _this.customDrop = undefined;
-            var rootdiv = _this.selfRef.current;
-            _this.outlineDiv = _this.currentDocument.createElement("div");
-            _this.outlineDiv.className = _this.getClassName(Types_1.CLASSES.FLEXLAYOUT__OUTLINE_RECT);
-            _this.outlineDiv.style.visibility = "hidden";
-            rootdiv.appendChild(_this.outlineDiv);
-            if (_this.dragDiv == null) {
-                _this.dragDiv = _this.currentDocument.createElement("div");
-                _this.dragDiv.className = _this.getClassName(Types_1.CLASSES.FLEXLAYOUT__DRAG_RECT);
-                _this.dragDiv.setAttribute("data-layout-path", "/drag-rectangle");
-                _this.dragRectRender(_this.dragDivText, _this.dragNode, _this.newTabJson);
-                rootdiv.appendChild(_this.dragDiv);
+        this.onDragStart = () => {
+            this.dropInfo = undefined;
+            this.customDrop = undefined;
+            const rootdiv = this.selfRef.current;
+            this.outlineDiv = this.currentDocument.createElement("div");
+            this.outlineDiv.className = this.getClassName(CLASSES.FLEXLAYOUT__OUTLINE_RECT);
+            this.outlineDiv.style.visibility = "hidden";
+            rootdiv.appendChild(this.outlineDiv);
+            if (this.dragDiv == null) {
+                this.dragDiv = this.currentDocument.createElement("div");
+                this.dragDiv.className = this.getClassName(CLASSES.FLEXLAYOUT__DRAG_RECT);
+                this.dragDiv.setAttribute("data-layout-path", "/drag-rectangle");
+                this.dragRectRender(this.dragDivText, this.dragNode, this.newTabJson);
+                rootdiv.appendChild(this.dragDiv);
             }
             // add edge indicators
-            if (_this.props.model.getMaximizedTabset() === undefined) {
-                _this.setState({ showEdges: true });
+            if (this.props.model.getMaximizedTabset() === undefined) {
+                this.setState({ showEdges: true });
             }
-            if (_this.dragNode !== undefined && _this.dragNode instanceof TabNode_1.TabNode && _this.dragNode.getTabRect() !== undefined) {
-                _this.dragNode.getTabRect().positionElement(_this.outlineDiv);
+            if (this.dragNode !== undefined && this.dragNode instanceof TabNode && this.dragNode.getTabRect() !== undefined) {
+                this.dragNode.getTabRect().positionElement(this.outlineDiv);
             }
-            _this.firstMove = true;
+            this.firstMove = true;
             return true;
         };
         /** @internal */
-        _this.onDragMove = function (event) {
-            if (_this.firstMove === false) {
-                var speed = _this.props.model._getAttribute("tabDragSpeed");
-                _this.outlineDiv.style.transition = "top ".concat(speed, "s, left ").concat(speed, "s, width ").concat(speed, "s, height ").concat(speed, "s");
-            }
-            _this.firstMove = false;
-            var clientRect = _this.selfRef.current.getBoundingClientRect();
-            var pos = {
+        this.onDragMove = (event) => {
+            if (this.firstMove === false) {
+                const speed = this.props.model._getAttribute("tabDragSpeed");
+                this.outlineDiv.style.transition = `top ${speed}s, left ${speed}s, width ${speed}s, height ${speed}s`;
+            }
+            this.firstMove = false;
+            const clientRect = this.selfRef.current.getBoundingClientRect();
+            const pos = {
                 x: event.clientX - clientRect.left,
                 y: event.clientY - clientRect.top,
             };
-            _this.checkForBorderToShow(pos.x, pos.y);
+            this.checkForBorderToShow(pos.x, pos.y);
             // keep it between left & right
-            var dragRect = _this.dragDiv.getBoundingClientRect();
-            var newLeft = pos.x - dragRect.width / 2;
+            const dragRect = this.dragDiv.getBoundingClientRect();
+            let newLeft = pos.x - dragRect.width / 2;
             if (newLeft + dragRect.width > clientRect.width) {
                 newLeft = clientRect.width - dragRect.width;
             }
             newLeft = Math.max(0, newLeft);
-            _this.dragDiv.style.left = newLeft + "px";
-            _this.dragDiv.style.top = pos.y + 5 + "px";
-            if (_this.dragRectRendered && _this.dragDiv.style.visibility === "hidden") {
+            this.dragDiv.style.left = newLeft + "px";
+            this.dragDiv.style.top = pos.y + 5 + "px";
+            if (this.dragRectRendered && this.dragDiv.style.visibility === "hidden") {
                 // make visible once the drag rect has been rendered
-                _this.dragDiv.style.visibility = "visible";
+                this.dragDiv.style.visibility = "visible";
             }
-            var dropInfo = _this.props.model._findDropTargetNode(_this.dragNode, pos.x, pos.y);
+            let dropInfo = this.props.model._findDropTargetNode(this.dragNode, pos.x, pos.y);
             if (dropInfo) {
-                if (_this.props.onTabDrag) {
-                    _this.handleCustomTabDrag(dropInfo, pos, event);
+                if (this.props.onTabDrag) {
+                    this.handleCustomTabDrag(dropInfo, pos, event);
                 }
                 else {
-                    _this.dropInfo = dropInfo;
-                    _this.outlineDiv.className = _this.getClassName(dropInfo.className);
-                    dropInfo.rect.positionElement(_this.outlineDiv);
-                    _this.outlineDiv.style.visibility = "visible";
+                    this.dropInfo = dropInfo;
+                    this.outlineDiv.className = this.getClassName(dropInfo.className);
+                    dropInfo.rect.positionElement(this.outlineDiv);
+                    this.outlineDiv.style.visibility = "visible";
                 }
             }
         };
         /** @internal */
-        _this.onDragEnd = function (event) {
-            var rootdiv = _this.selfRef.current;
-            rootdiv.removeChild(_this.outlineDiv);
-            rootdiv.removeChild(_this.dragDiv);
-            _this.dragDiv = undefined;
-            _this.hidePortal();
-            _this.setState({ showEdges: false });
-            DragDrop_1.DragDrop.instance.hideGlass();
-            if (_this.dropInfo) {
-                if (_this.customDrop) {
-                    _this.newTabJson = undefined;
+        this.onDragEnd = (event) => {
+            const rootdiv = this.selfRef.current;
+            rootdiv.removeChild(this.outlineDiv);
+            rootdiv.removeChild(this.dragDiv);
+            this.dragDiv = undefined;
+            this.hidePortal();
+            this.setState({ showEdges: false });
+            DragDrop.instance.hideGlass();
+            if (this.dropInfo) {
+                if (this.customDrop) {
+                    this.newTabJson = undefined;
                     try {
-                        var _a = _this.customDrop, callback = _a.callback, dragging = _a.dragging, over = _a.over, x = _a.x, y = _a.y, location_1 = _a.location;
-                        callback(dragging, over, x, y, location_1);
-                        if (_this.fnNewNodeDropped != null) {
-                            _this.fnNewNodeDropped();
-                            _this.fnNewNodeDropped = undefined;
+                        const { callback, dragging, over, x, y, location } = this.customDrop;
+                        callback(dragging, over, x, y, location);
+                        if (this.fnNewNodeDropped != null) {
+                            this.fnNewNodeDropped();
+                            this.fnNewNodeDropped = undefined;
                         }
                     }
                     catch (e) {
                         console.error(e);
                     }
                 }
-                else if (_this.newTabJson !== undefined) {
-                    var newNode = _this.doAction(Actions_1.Actions.addNode(_this.newTabJson, _this.dropInfo.node.getId(), _this.dropInfo.location, _this.dropInfo.index));
-                    if (_this.fnNewNodeDropped != null) {
-                        _this.fnNewNodeDropped(newNode, event);
-                        _this.fnNewNodeDropped = undefined;
+                else if (this.newTabJson !== undefined) {
+                    const newNode = this.doAction(Actions.addNode(this.newTabJson, this.dropInfo.node.getId(), this.dropInfo.location, this.dropInfo.index));
+                    if (this.fnNewNodeDropped != null) {
+                        this.fnNewNodeDropped(newNode, event);
+                        this.fnNewNodeDropped = undefined;
                     }
-                    _this.newTabJson = undefined;
+                    this.newTabJson = undefined;
                 }
-                else if (_this.dragNode !== undefined) {
-                    _this.doAction(Actions_1.Actions.moveNode(_this.dragNode.getId(), _this.dropInfo.node.getId(), _this.dropInfo.location, _this.dropInfo.index));
+                else if (this.dragNode !== undefined) {
+                    this.doAction(Actions.moveNode(this.dragNode.getId(), this.dropInfo.node.getId(), this.dropInfo.location, this.dropInfo.index));
                 }
             }
-            _this.setState({ showHiddenBorder: DockLocation_1.DockLocation.CENTER });
+            this.setState({ showHiddenBorder: DockLocation.CENTER });
         };
-        _this.props.model._setChangeListener(_this.onModelChange);
-        _this.tabIds = [];
-        _this.selfRef = React.createRef();
-        _this.findHeaderBarSizeRef = React.createRef();
-        _this.findTabBarSizeRef = React.createRef();
-        _this.findBorderBarSizeRef = React.createRef();
-        _this.supportsPopout = props.supportsPopout !== undefined ? props.supportsPopout : defaultSupportsPopout;
-        _this.popoutURL = props.popoutURL ? props.popoutURL : "popout.html";
-        _this.icons = __assign(__assign({}, defaultIcons), props.icons);
-        _this.firstRender = true;
-        _this.state = {
-            rect: new Rect_1.Rect(0, 0, 0, 0),
+        this.props.model._setChangeListener(this.onModelChange);
+        this.tabIds = [];
+        this.selfRef = React.createRef();
+        this.findHeaderBarSizeRef = React.createRef();
+        this.findTabBarSizeRef = React.createRef();
+        this.findBorderBarSizeRef = React.createRef();
+        this.supportsPopout = props.supportsPopout !== undefined ? props.supportsPopout : defaultSupportsPopout;
+        this.popoutURL = props.popoutURL ? props.popoutURL : "popout.html";
+        this.icons = Object.assign(Object.assign({}, defaultIcons), props.icons);
+        this.state = {
+            rect: new Rect(0, 0, 0, 0),
             calculatedHeaderBarSize: 25,
             calculatedTabBarSize: 26,
             calculatedBorderBarSize: 30,
             editingTab: undefined,
-            showHiddenBorder: DockLocation_1.DockLocation.CENTER,
+            showHiddenBorder: DockLocation.CENTER,
             showEdges: false,
         };
-        _this.onDragEnter = _this.onDragEnter.bind(_this);
-        return _this;
+        this.onDragEnter = this.onDragEnter.bind(this);
     }
     /** @internal */
-    Layout.prototype.styleFont = function (style) {
+    styleFont(style) {
         if (this.props.font) {
             if (this.selfRef.current) {
                 if (this.props.font.size) {
@@ -402,11 +360,11 @@ var Layout = /** @class */ (function (_super) {
             }
         }
         return style;
-    };
+    }
     /** @internal */
-    Layout.prototype.doAction = function (action) {
+    doAction(action) {
         if (this.props.onAction !== undefined) {
-            var outcome = this.props.onAction(action);
+            const outcome = this.props.onAction(action);
             if (outcome !== undefined) {
                 return this.props.model.doAction(outcome);
             }
@@ -415,22 +373,21 @@ var Layout = /** @class */ (function (_super) {
         else {
             return this.props.model.doAction(action);
         }
-    };
+    }
     /** @internal */
-    Layout.prototype.componentDidMount = function () {
-        var _this = this;
+    componentDidMount() {
         this.updateRect();
         this.updateLayoutMetrics();
         // need to re-render if size changes
         this.currentDocument = this.selfRef.current.ownerDocument;
         this.currentWindow = this.currentDocument.defaultView;
-        this.resizeObserver = new ResizeObserver(function (entries) {
-            _this.updateRect(entries[0].contentRect);
+        this.resizeObserver = new ResizeObserver(entries => {
+            this.updateRect(entries[0].contentRect);
         });
         this.resizeObserver.observe(this.selfRef.current);
-    };
+    }
     /** @internal */
-    Layout.prototype.componentDidUpdate = function () {
+    componentDidUpdate() {
         this.updateLayoutMetrics();
         if (this.props.model !== this.previousModel) {
             if (this.previousModel !== undefined) {
@@ -440,69 +397,64 @@ var Layout = /** @class */ (function (_super) {
             this.previousModel = this.props.model;
         }
         // console.log("Layout time: " + this.layoutTime + "ms Render time: " + (Date.now() - this.start) + "ms");
-    };
+    }
     /** @internal */
-    Layout.prototype.getCurrentDocument = function () {
+    getCurrentDocument() {
         return this.currentDocument;
-    };
+    }
     /** @internal */
-    Layout.prototype.getDomRect = function () {
+    getDomRect() {
         return this.selfRef.current.getBoundingClientRect();
-    };
+    }
     /** @internal */
-    Layout.prototype.getRootDiv = function () {
+    getRootDiv() {
         return this.selfRef.current;
-    };
+    }
     /** @internal */
-    Layout.prototype.isSupportsPopout = function () {
+    isSupportsPopout() {
         return this.supportsPopout;
-    };
+    }
     /** @internal */
-    Layout.prototype.isRealtimeResize = function () {
+    isRealtimeResize() {
         var _a;
         return (_a = this.props.realtimeResize) !== null && _a !== void 0 ? _a : false;
-    };
+    }
     /** @internal */
-    Layout.prototype.onTabDrag = function () {
+    onTabDrag(...args) {
         var _a, _b;
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        return (_b = (_a = this.props).onTabDrag) === null || _b === void 0 ? void 0 : _b.call.apply(_b, __spreadArray([_a], args, false));
-    };
+        return (_b = (_a = this.props).onTabDrag) === null || _b === void 0 ? void 0 : _b.call(_a, ...args);
+    }
     /** @internal */
-    Layout.prototype.getPopoutURL = function () {
+    getPopoutURL() {
         return this.popoutURL;
-    };
+    }
     /** @internal */
-    Layout.prototype.componentWillUnmount = function () {
+    componentWillUnmount() {
         var _a;
         (_a = this.resizeObserver) === null || _a === void 0 ? void 0 : _a.unobserve(this.selfRef.current);
-    };
+    }
     /** @internal */
-    Layout.prototype.setEditingTab = function (tabNode) {
+    setEditingTab(tabNode) {
         this.setState({ editingTab: tabNode });
-    };
+    }
     /** @internal */
-    Layout.prototype.getEditingTab = function () {
+    getEditingTab() {
         return this.state.editingTab;
-    };
+    }
     /** @internal */
-    Layout.prototype.render = function () {
+    render() {
         // first render will be used to find the size (via selfRef)
-        if (this.firstRender) {
-            this.firstRender = false;
-            return (React.createElement("div", { ref: this.selfRef, className: this.getClassName(Types_1.CLASSES.FLEXLAYOUT__LAYOUT) }, this.metricsElements()));
+        if (!this.selfRef.current) {
+            return (React.createElement("div", { ref: this.selfRef, className: this.getClassName(CLASSES.FLEXLAYOUT__LAYOUT) }, this.metricsElements()));
         }
         this.props.model._setPointerFine(window && window.matchMedia && window.matchMedia("(pointer: fine)").matches);
         // this.start = Date.now();
-        var borderComponents = [];
-        var tabSetComponents = [];
-        var floatingWindows = [];
-        var tabComponents = {};
-        var splitterComponents = [];
-        var metrics = {
+        const borderComponents = [];
+        const tabSetComponents = [];
+        const floatingWindows = [];
+        const tabComponents = {};
+        const splitterComponents = [];
+        const metrics = {
             headerBarSize: this.state.calculatedHeaderBarSize,
             tabBarSize: this.state.calculatedTabBarSize,
             borderBarSize: this.state.calculatedBorderBarSize
@@ -511,11 +463,10 @@ var Layout = /** @class */ (function (_super) {
         this.centerRect = this.props.model._layout(this.state.rect, metrics);
         this.renderBorder(this.props.model.getBorderSet(), borderComponents, tabComponents, floatingWindows, splitterComponents);
         this.renderChildren("", this.props.model.getRoot(), tabSetComponents, tabComponents, floatingWindows, splitterComponents);
-        var nextTopIds = [];
-        var nextTopIdsMap = {};
+        const nextTopIds = [];
+        const nextTopIdsMap = {};
         // Keep any previous tabs in the same DOM order as before, removing any that have been deleted
-        for (var _i = 0, _a = this.tabIds; _i < _a.length; _i++) {
-            var t = _a[_i];
+        for (const t of this.tabIds) {
             if (tabComponents[t]) {
                 nextTopIds.push(t);
                 nextTopIdsMap[t] = t;
@@ -523,29 +474,28 @@ var Layout = /** @class */ (function (_super) {
         }
         this.tabIds = nextTopIds;
         // Add tabs that have been added to the DOM
-        for (var _b = 0, _c = Object.keys(tabComponents); _b < _c.length; _b++) {
-            var t = _c[_b];
+        for (const t of Object.keys(tabComponents)) {
             if (!nextTopIdsMap[t]) {
                 this.tabIds.push(t);
             }
         }
-        var edges = [];
+        const edges = [];
         if (this.state.showEdges) {
-            var r = this.centerRect;
-            var length_1 = this.edgeRectLength;
-            var width = this.edgeRectWidth;
-            var offset = this.edgeRectLength / 2;
-            var className = this.getClassName(Types_1.CLASSES.FLEXLAYOUT__EDGE_RECT);
-            var radius = 50;
-            edges.push(React.createElement("div", { key: "North", style: { top: r.y, left: r.x + r.width / 2 - offset, width: length_1, height: width, borderBottomLeftRadius: radius, borderBottomRightRadius: radius }, className: className }));
-            edges.push(React.createElement("div", { key: "West", style: { top: r.y + r.height / 2 - offset, left: r.x, width: width, height: length_1, borderTopRightRadius: radius, borderBottomRightRadius: radius }, className: className }));
-            edges.push(React.createElement("div", { key: "South", style: { top: r.y + r.height - width, left: r.x + r.width / 2 - offset, width: length_1, height: width, borderTopLeftRadius: radius, borderTopRightRadius: radius }, className: className }));
-            edges.push(React.createElement("div", { key: "East", style: { top: r.y + r.height / 2 - offset, left: r.x + r.width - width, width: width, height: length_1, borderTopLeftRadius: radius, borderBottomLeftRadius: radius }, className: className }));
+            const r = this.centerRect;
+            const length = this.edgeRectLength;
+            const width = this.edgeRectWidth;
+            const offset = this.edgeRectLength / 2;
+            const className = this.getClassName(CLASSES.FLEXLAYOUT__EDGE_RECT);
+            const radius = 50;
+            edges.push(React.createElement("div", { key: "North", style: { top: r.y, left: r.x + r.width / 2 - offset, width: length, height: width, borderBottomLeftRadius: radius, borderBottomRightRadius: radius }, className: className }));
+            edges.push(React.createElement("div", { key: "West", style: { top: r.y + r.height / 2 - offset, left: r.x, width: width, height: length, borderTopRightRadius: radius, borderBottomRightRadius: radius }, className: className }));
+            edges.push(React.createElement("div", { key: "South", style: { top: r.y + r.height - width, left: r.x + r.width / 2 - offset, width: length, height: width, borderTopLeftRadius: radius, borderTopRightRadius: radius }, className: className }));
+            edges.push(React.createElement("div", { key: "East", style: { top: r.y + r.height / 2 - offset, left: r.x + r.width - width, width: width, height: length, borderTopLeftRadius: radius, borderBottomLeftRadius: radius }, className: className }));
         }
         // this.layoutTime = (Date.now() - this.start);
-        return (React.createElement("div", { ref: this.selfRef, className: this.getClassName(Types_1.CLASSES.FLEXLAYOUT__LAYOUT), onDragEnter: this.props.onExternalDrag ? this.onDragEnter : undefined },
+        return (React.createElement("div", { ref: this.selfRef, className: this.getClassName(CLASSES.FLEXLAYOUT__LAYOUT), onDragEnter: this.props.onExternalDrag ? this.onDragEnter : undefined },
             tabSetComponents,
-            this.tabIds.map(function (t) {
+            this.tabIds.map((t) => {
                 return tabComponents[t];
             }),
             borderComponents,
@@ -554,140 +504,137 @@ var Layout = /** @class */ (function (_super) {
             floatingWindows,
             this.metricsElements(),
             this.state.portal));
-    };
+    }
     /** @internal */
-    Layout.prototype.metricsElements = function () {
+    metricsElements() {
         // used to measure the tab and border tab sizes
-        var fontStyle = this.styleFont({ visibility: "hidden" });
+        const fontStyle = this.styleFont({ visibility: "hidden" });
         return (React.createElement(React.Fragment, null,
-            React.createElement("div", { key: "findHeaderBarSize", ref: this.findHeaderBarSizeRef, style: fontStyle, className: this.getClassName(Types_1.CLASSES.FLEXLAYOUT__TABSET_HEADER_SIZER) }, "FindHeaderBarSize"),
-            React.createElement("div", { key: "findTabBarSize", ref: this.findTabBarSizeRef, style: fontStyle, className: this.getClassName(Types_1.CLASSES.FLEXLAYOUT__TABSET_SIZER) }, "FindTabBarSize"),
-            React.createElement("div", { key: "findBorderBarSize", ref: this.findBorderBarSizeRef, style: fontStyle, className: this.getClassName(Types_1.CLASSES.FLEXLAYOUT__BORDER_SIZER) }, "FindBorderBarSize")));
-    };
+            React.createElement("div", { key: "findHeaderBarSize", ref: this.findHeaderBarSizeRef, style: fontStyle, className: this.getClassName(CLASSES.FLEXLAYOUT__TABSET_HEADER_SIZER) }, "FindHeaderBarSize"),
+            React.createElement("div", { key: "findTabBarSize", ref: this.findTabBarSizeRef, style: fontStyle, className: this.getClassName(CLASSES.FLEXLAYOUT__TABSET_SIZER) }, "FindTabBarSize"),
+            React.createElement("div", { key: "findBorderBarSize", ref: this.findBorderBarSizeRef, style: fontStyle, className: this.getClassName(CLASSES.FLEXLAYOUT__BORDER_SIZER) }, "FindBorderBarSize")));
+    }
     /** @internal */
-    Layout.prototype.renderBorder = function (borderSet, borderComponents, tabComponents, floatingWindows, splitterComponents) {
-        for (var _i = 0, _a = borderSet.getBorders(); _i < _a.length; _i++) {
-            var border = _a[_i];
-            var borderPath = "/border/".concat(border.getLocation().getName());
+    renderBorder(borderSet, borderComponents, tabComponents, floatingWindows, splitterComponents) {
+        for (const border of borderSet.getBorders()) {
+            const borderPath = `/border/${border.getLocation().getName()}`;
             if (border.isShowing()) {
-                borderComponents.push(React.createElement(BorderTabSet_1.BorderTabSet, { key: "border_".concat(border.getLocation().getName()), path: borderPath, border: border, layout: this, iconFactory: this.props.iconFactory, titleFactory: this.props.titleFactory, icons: this.icons }));
-                var drawChildren = border._getDrawChildren();
-                var i = 0;
-                var tabCount = 0;
-                for (var _b = 0, drawChildren_1 = drawChildren; _b < drawChildren_1.length; _b++) {
-                    var child = drawChildren_1[_b];
-                    if (child instanceof SplitterNode_1.SplitterNode) {
-                        var path = borderPath + "/s";
-                        splitterComponents.push(React.createElement(Splitter_1.Splitter, { key: child.getId(), layout: this, node: child, path: path }));
+                borderComponents.push(React.createElement(BorderTabSet, { key: `border_${border.getLocation().getName()}`, path: borderPath, border: border, layout: this, iconFactory: this.props.iconFactory, titleFactory: this.props.titleFactory, icons: this.icons }));
+                const drawChildren = border._getDrawChildren();
+                let i = 0;
+                let tabCount = 0;
+                for (const child of drawChildren) {
+                    if (child instanceof SplitterNode) {
+                        let path = borderPath + "/s";
+                        splitterComponents.push(React.createElement(Splitter, { key: child.getId(), layout: this, node: child, path: path }));
                     }
-                    else if (child instanceof TabNode_1.TabNode) {
-                        var path = borderPath + "/t" + tabCount++;
+                    else if (child instanceof TabNode) {
+                        let path = borderPath + "/t" + tabCount++;
                         if (this.supportsPopout && child.isFloating()) {
-                            var rect = this._getScreenRect(child);
-                            floatingWindows.push(React.createElement(FloatingWindow_1.FloatingWindow, { key: child.getId(), url: this.popoutURL, rect: rect, title: child.getName(), id: child.getId(), onSetWindow: this.onSetWindow, onCloseWindow: this.onCloseWindow },
-                                React.createElement(FloatingWindowTab_1.FloatingWindowTab, { layout: this, node: child, factory: this.props.factory })));
-                            tabComponents[child.getId()] = React.createElement(TabFloating_1.TabFloating, { key: child.getId(), layout: this, path: path, node: child, selected: i === border.getSelected() });
+                            const rect = this._getScreenRect(child);
+                            floatingWindows.push(React.createElement(FloatingWindow, { key: child.getId(), url: this.popoutURL, rect: rect, title: child.getName(), id: child.getId(), onSetWindow: this.onSetWindow, onCloseWindow: this.onCloseWindow },
+                                React.createElement(FloatingWindowTab, { layout: this, node: child, factory: this.props.factory })));
+                            tabComponents[child.getId()] = React.createElement(TabFloating, { key: child.getId(), layout: this, path: path, node: child, selected: i === border.getSelected() });
                         }
                         else {
-                            tabComponents[child.getId()] = React.createElement(Tab_1.Tab, { key: child.getId(), layout: this, path: path, node: child, selected: i === border.getSelected(), factory: this.props.factory });
+                            tabComponents[child.getId()] = React.createElement(Tab, { key: child.getId(), layout: this, path: path, node: child, selected: i === border.getSelected(), factory: this.props.factory });
                         }
                     }
                     i++;
                 }
             }
         }
-    };
+    }
     /** @internal */
-    Layout.prototype.renderChildren = function (path, node, tabSetComponents, tabComponents, floatingWindows, splitterComponents) {
-        var drawChildren = node._getDrawChildren();
-        var splitterCount = 0;
-        var tabCount = 0;
-        var rowCount = 0;
-        for (var _i = 0, _a = drawChildren; _i < _a.length; _i++) {
-            var child = _a[_i];
-            if (child instanceof SplitterNode_1.SplitterNode) {
-                var newPath = path + "/s" + (splitterCount++);
-                splitterComponents.push(React.createElement(Splitter_1.Splitter, { key: child.getId(), layout: this, path: newPath, node: child }));
-            }
-            else if (child instanceof TabSetNode_1.TabSetNode) {
-                var newPath = path + "/ts" + (rowCount++);
-                tabSetComponents.push(React.createElement(TabSet_1.TabSet, { key: child.getId(), layout: this, path: newPath, node: child, iconFactory: this.props.iconFactory, titleFactory: this.props.titleFactory, icons: this.icons }));
+    renderChildren(path, node, tabSetComponents, tabComponents, floatingWindows, splitterComponents) {
+        const drawChildren = node._getDrawChildren();
+        let splitterCount = 0;
+        let tabCount = 0;
+        let rowCount = 0;
+        for (const child of drawChildren) {
+            if (child instanceof SplitterNode) {
+                const newPath = path + "/s" + (splitterCount++);
+                splitterComponents.push(React.createElement(Splitter, { key: child.getId(), layout: this, path: newPath, node: child }));
+            }
+            else if (child instanceof TabSetNode) {
+                const newPath = path + "/ts" + (rowCount++);
+                tabSetComponents.push(React.createElement(TabSet, { key: child.getId(), layout: this, path: newPath, node: child, iconFactory: this.props.iconFactory, titleFactory: this.props.titleFactory, icons: this.icons }));
                 this.renderChildren(newPath, child, tabSetComponents, tabComponents, floatingWindows, splitterComponents);
             }
-            else if (child instanceof TabNode_1.TabNode) {
-                var newPath = path + "/t" + (tabCount++);
-                var selectedTab = child.getParent().getChildren()[child.getParent().getSelected()];
+            else if (child instanceof TabNode) {
+                const newPath = path + "/t" + (tabCount++);
+                const selectedTab = child.getParent().getChildren()[child.getParent().getSelected()];
                 if (selectedTab === undefined) {
                     // this should not happen!
                     console.warn("undefined selectedTab should not happen");
                 }
                 if (this.supportsPopout && child.isFloating()) {
-                    var rect = this._getScreenRect(child);
-                    floatingWindows.push(React.createElement(FloatingWindow_1.FloatingWindow, { key: child.getId(), url: this.popoutURL, rect: rect, title: child.getName(), id: child.getId(), onSetWindow: this.onSetWindow, onCloseWindow: this.onCloseWindow },
-                        React.createElement(FloatingWindowTab_1.FloatingWindowTab, { layout: this, node: child, factory: this.props.factory })));
-                    tabComponents[child.getId()] = React.createElement(TabFloating_1.TabFloating, { key: child.getId(), layout: this, path: newPath, node: child, selected: child === selectedTab });
+                    const rect = this._getScreenRect(child);
+                    floatingWindows.push(React.createElement(FloatingWindow, { key: child.getId(), url: this.popoutURL, rect: rect, title: child.getName(), id: child.getId(), onSetWindow: this.onSetWindow, onCloseWindow: this.onCloseWindow },
+                        React.createElement(FloatingWindowTab, { layout: this, node: child, factory: this.props.factory })));
+                    tabComponents[child.getId()] = React.createElement(TabFloating, { key: child.getId(), layout: this, path: newPath, node: child, selected: child === selectedTab });
                 }
                 else {
-                    tabComponents[child.getId()] = React.createElement(Tab_1.Tab, { key: child.getId(), layout: this, path: newPath, node: child, selected: child === selectedTab, factory: this.props.factory });
+                    tabComponents[child.getId()] = React.createElement(Tab, { key: child.getId(), layout: this, path: newPath, node: child, selected: child === selectedTab, factory: this.props.factory });
                 }
             }
             else {
                 // is row
-                var newPath = path + ((child.getOrientation() === Orientation_1.Orientation.HORZ) ? "/r" : "/c") + (rowCount++);
+                const newPath = path + ((child.getOrientation() === Orientation.HORZ) ? "/r" : "/c") + (rowCount++);
                 this.renderChildren(newPath, child, tabSetComponents, tabComponents, floatingWindows, splitterComponents);
             }
         }
-    };
+    }
     /** @internal */
-    Layout.prototype._getScreenRect = function (node) {
-        var rect = node.getRect().clone();
-        var bodyRect = this.selfRef.current.getBoundingClientRect();
-        var navHeight = Math.min(80, this.currentWindow.outerHeight - this.currentWindow.innerHeight);
-        var navWidth = Math.min(80, this.currentWindow.outerWidth - this.currentWindow.innerWidth);
+    _getScreenRect(node) {
+        const rect = node.getRect().clone();
+        const bodyRect = this.selfRef.current.getBoundingClientRect();
+        const navHeight = Math.min(80, this.currentWindow.outerHeight - this.currentWindow.innerHeight);
+        const navWidth = Math.min(80, this.currentWindow.outerWidth - this.currentWindow.innerWidth);
         rect.x = rect.x + bodyRect.x + this.currentWindow.screenX + navWidth;
         rect.y = rect.y + bodyRect.y + this.currentWindow.screenY + navHeight;
         return rect;
-    };
+    }
     /**
      * Adds a new tab to the given tabset
      * @param tabsetId the id of the tabset where the new tab will be added
      * @param json the json for the new tab node
      */
-    Layout.prototype.addTabToTabSet = function (tabsetId, json) {
-        var tabsetNode = this.props.model.getNodeById(tabsetId);
+    addTabToTabSet(tabsetId, json) {
+        const tabsetNode = this.props.model.getNodeById(tabsetId);
         if (tabsetNode !== undefined) {
-            this.doAction(Actions_1.Actions.addNode(json, tabsetId, DockLocation_1.DockLocation.CENTER, -1));
+            this.doAction(Actions.addNode(json, tabsetId, DockLocation.CENTER, -1));
         }
-    };
+    }
     /**
      * Adds a new tab to the active tabset (if there is one)
      * @param json the json for the new tab node
      */
-    Layout.prototype.addTabToActiveTabSet = function (json) {
-        var tabsetNode = this.props.model.getActiveTabset();
+    addTabToActiveTabSet(json) {
+        const tabsetNode = this.props.model.getActiveTabset();
         if (tabsetNode !== undefined) {
-            this.doAction(Actions_1.Actions.addNode(json, tabsetNode.getId(), DockLocation_1.DockLocation.CENTER, -1));
+            this.doAction(Actions.addNode(json, tabsetNode.getId(), DockLocation.CENTER, -1));
         }
-    };
+    }
     /**
      * Adds a new tab by dragging a labeled panel to the drop location, dragging starts immediatelly
      * @param dragText the text to show on the drag panel
      * @param json the json for the new tab node
      * @param onDrop a callback to call when the drag is complete (node and event will be undefined if the drag was cancelled)
      */
-    Layout.prototype.addTabWithDragAndDrop = function (dragText, json, onDrop) {
+    addTabWithDragAndDrop(dragText, json, onDrop) {
         this.fnNewNodeDropped = onDrop;
         this.newTabJson = json;
-        this.dragStart(undefined, dragText, TabNode_1.TabNode._fromJson(json, this.props.model, false), true, undefined, undefined);
-    };
+        this.dragStart(undefined, dragText, TabNode._fromJson(json, this.props.model, false), true, undefined, undefined);
+    }
     /**
      * Move a tab/tabset using drag and drop
      * @param node the tab or tabset to drag
      * @param dragText the text to show on the drag panel
      */
-    Layout.prototype.moveTabWithDragAndDrop = function (node, dragText) {
+    moveTabWithDragAndDrop(node, dragText) {
         this.dragStart(undefined, dragText, node, true, undefined, undefined);
-    };
+    }
     /**
      * Adds a new tab by dragging a labeled panel to the drop location, dragging starts when you
      * mouse down on the panel
@@ -696,49 +643,47 @@ var Layout = /** @class */ (function (_super) {
      * @param json the json for the new tab node
      * @param onDrop a callback to call when the drag is complete (node and event will be undefined if the drag was cancelled)
      */
-    Layout.prototype.addTabWithDragAndDropIndirect = function (dragText, json, onDrop) {
-        var _this = this;
+    addTabWithDragAndDropIndirect(dragText, json, onDrop) {
         this.fnNewNodeDropped = onDrop;
         this.newTabJson = json;
-        DragDrop_1.DragDrop.instance.addGlass(this.onCancelAdd);
+        DragDrop.instance.addGlass(this.onCancelAdd);
         this.dragDivText = dragText;
         this.dragDiv = this.currentDocument.createElement("div");
-        this.dragDiv.className = this.getClassName(Types_1.CLASSES.FLEXLAYOUT__DRAG_RECT);
+        this.dragDiv.className = this.getClassName(CLASSES.FLEXLAYOUT__DRAG_RECT);
         this.dragDiv.addEventListener("mousedown", this.onDragDivMouseDown);
         this.dragDiv.addEventListener("touchstart", this.onDragDivMouseDown, { passive: false });
-        this.dragRectRender(this.dragDivText, undefined, this.newTabJson, function () {
-            if (_this.dragDiv) {
+        this.dragRectRender(this.dragDivText, undefined, this.newTabJson, () => {
+            if (this.dragDiv) {
                 // now it's been rendered into the dom it can be centered
-                _this.dragDiv.style.visibility = "visible";
-                var domRect = _this.dragDiv.getBoundingClientRect();
-                var r = new Rect_1.Rect(0, 0, domRect === null || domRect === void 0 ? void 0 : domRect.width, domRect === null || domRect === void 0 ? void 0 : domRect.height);
-                r.centerInRect(_this.state.rect);
-                _this.dragDiv.setAttribute("data-layout-path", "/drag-rectangle");
-                _this.dragDiv.style.left = r.x + "px";
-                _this.dragDiv.style.top = r.y + "px";
+                this.dragDiv.style.visibility = "visible";
+                const domRect = this.dragDiv.getBoundingClientRect();
+                const r = new Rect(0, 0, domRect === null || domRect === void 0 ? void 0 : domRect.width, domRect === null || domRect === void 0 ? void 0 : domRect.height);
+                r.centerInRect(this.state.rect);
+                this.dragDiv.setAttribute("data-layout-path", "/drag-rectangle");
+                this.dragDiv.style.left = r.x + "px";
+                this.dragDiv.style.top = r.y + "px";
             }
         });
-        var rootdiv = this.selfRef.current;
+        const rootdiv = this.selfRef.current;
         rootdiv.appendChild(this.dragDiv);
-    };
+    }
     /** @internal */
-    Layout.prototype.handleCustomTabDrag = function (dropInfo, pos, event) {
-        var _this = this;
+    handleCustomTabDrag(dropInfo, pos, event) {
         var _a, _b, _c;
-        var invalidated = (_a = this.customDrop) === null || _a === void 0 ? void 0 : _a.invalidated;
-        var currentCallback = (_b = this.customDrop) === null || _b === void 0 ? void 0 : _b.callback;
+        let invalidated = (_a = this.customDrop) === null || _a === void 0 ? void 0 : _a.invalidated;
+        const currentCallback = (_b = this.customDrop) === null || _b === void 0 ? void 0 : _b.callback;
         this.customDrop = undefined;
-        var dragging = this.newTabJson || (this.dragNode instanceof TabNode_1.TabNode ? this.dragNode : undefined);
-        if (dragging && (dropInfo.node instanceof TabSetNode_1.TabSetNode || dropInfo.node instanceof BorderNode_1.BorderNode) && dropInfo.index === -1) {
-            var selected = dropInfo.node.getSelectedNode();
-            var tabRect = selected === null || selected === void 0 ? void 0 : selected.getRect();
+        const dragging = this.newTabJson || (this.dragNode instanceof TabNode ? this.dragNode : undefined);
+        if (dragging && (dropInfo.node instanceof TabSetNode || dropInfo.node instanceof BorderNode) && dropInfo.index === -1) {
+            const selected = dropInfo.node.getSelectedNode();
+            const tabRect = selected === null || selected === void 0 ? void 0 : selected.getRect();
             if (selected && (tabRect === null || tabRect === void 0 ? void 0 : tabRect.contains(pos.x, pos.y))) {
-                var customDrop = undefined;
+                let customDrop = undefined;
                 try {
-                    var dest = this.onTabDrag(dragging, selected, pos.x - tabRect.x, pos.y - tabRect.y, dropInfo.location, function () { return _this.onDragMove(event); });
+                    const dest = this.onTabDrag(dragging, selected, pos.x - tabRect.x, pos.y - tabRect.y, dropInfo.location, () => this.onDragMove(event));
                     if (dest) {
                         customDrop = {
-                            rect: new Rect_1.Rect(dest.x + tabRect.x, dest.y + tabRect.y, dest.width, dest.height),
+                            rect: new Rect(dest.x + tabRect.x, dest.y + tabRect.y, dest.width, dest.height),
                             callback: dest.callback,
                             invalidated: dest.invalidated,
                             dragging: dragging,
@@ -760,14 +705,14 @@ var Layout = /** @class */ (function (_super) {
             }
         }
         this.dropInfo = dropInfo;
-        this.outlineDiv.className = this.getClassName(this.customDrop ? Types_1.CLASSES.FLEXLAYOUT__OUTLINE_RECT : dropInfo.className);
+        this.outlineDiv.className = this.getClassName(this.customDrop ? CLASSES.FLEXLAYOUT__OUTLINE_RECT : dropInfo.className);
         if (this.customDrop) {
             this.customDrop.rect.positionElement(this.outlineDiv);
         }
         else {
             dropInfo.rect.positionElement(this.outlineDiv);
         }
-        DragDrop_1.DragDrop.instance.setGlassCursorOverride((_c = this.customDrop) === null || _c === void 0 ? void 0 : _c.cursor);
+        DragDrop.instance.setGlassCursorOverride((_c = this.customDrop) === null || _c === void 0 ? void 0 : _c.cursor);
         this.outlineDiv.style.visibility = "visible";
         try {
             invalidated === null || invalidated === void 0 ? void 0 : invalidated();
@@ -775,72 +720,72 @@ var Layout = /** @class */ (function (_super) {
         catch (e) {
             console.error(e);
         }
-    };
+    }
     /** @internal */
-    Layout.prototype.onDragEnter = function (event) {
+    onDragEnter(event) {
         // DragDrop keeps track of number of dragenters minus the number of
         // dragleaves. Only start a new drag if there isn't one already.
-        if (DragDrop_1.DragDrop.instance.isDragging())
+        if (DragDrop.instance.isDragging())
             return;
-        var drag = this.props.onExternalDrag(event);
+        const drag = this.props.onExternalDrag(event);
         if (drag) {
             // Mimic addTabWithDragAndDrop, but pass in DragEvent
             this.fnNewNodeDropped = drag.onDrop;
             this.newTabJson = drag.json;
-            this.dragStart(event, drag.dragText, TabNode_1.TabNode._fromJson(drag.json, this.props.model, false), true, undefined, undefined);
+            this.dragStart(event, drag.dragText, TabNode._fromJson(drag.json, this.props.model, false), true, undefined, undefined);
         }
-    };
+    }
     /** @internal */
-    Layout.prototype.checkForBorderToShow = function (x, y) {
-        var r = this.props.model._getOuterInnerRects().outer;
-        var c = r.getCenter();
-        var margin = this.edgeRectWidth;
-        var offset = this.edgeRectLength / 2;
-        var overEdge = false;
-        if (this.props.model.isEnableEdgeDock() && this.state.showHiddenBorder === DockLocation_1.DockLocation.CENTER) {
+    checkForBorderToShow(x, y) {
+        const r = this.props.model._getOuterInnerRects().outer;
+        const c = r.getCenter();
+        const margin = this.edgeRectWidth;
+        const offset = this.edgeRectLength / 2;
+        let overEdge = false;
+        if (this.props.model.isEnableEdgeDock() && this.state.showHiddenBorder === DockLocation.CENTER) {
             if ((y > c.y - offset && y < c.y + offset) ||
                 (x > c.x - offset && x < c.x + offset)) {
                 overEdge = true;
             }
         }
-        var location = DockLocation_1.DockLocation.CENTER;
+        let location = DockLocation.CENTER;
         if (!overEdge) {
             if (x <= r.x + margin) {
-                location = DockLocation_1.DockLocation.LEFT;
+                location = DockLocation.LEFT;
             }
             else if (x >= r.getRight() - margin) {
-                location = DockLocation_1.DockLocation.RIGHT;
+                location = DockLocation.RIGHT;
             }
             else if (y <= r.y + margin) {
-                location = DockLocation_1.DockLocation.TOP;
+                location = DockLocation.TOP;
             }
             else if (y >= r.getBottom() - margin) {
-                location = DockLocation_1.DockLocation.BOTTOM;
+                location = DockLocation.BOTTOM;
             }
         }
         if (location !== this.state.showHiddenBorder) {
             this.setState({ showHiddenBorder: location });
         }
-    };
+    }
     /** @internal */
-    Layout.prototype.maximize = function (tabsetNode) {
-        this.doAction(Actions_1.Actions.maximizeToggle(tabsetNode.getId()));
-    };
+    maximize(tabsetNode) {
+        this.doAction(Actions.maximizeToggle(tabsetNode.getId()));
+    }
     /** @internal */
-    Layout.prototype.customizeTab = function (tabNode, renderValues) {
+    customizeTab(tabNode, renderValues) {
         if (this.props.onRenderTab) {
             this.props.onRenderTab(tabNode, renderValues);
         }
-    };
+    }
     /** @internal */
-    Layout.prototype.customizeTabSet = function (tabSetNode, renderValues) {
+    customizeTabSet(tabSetNode, renderValues) {
         if (this.props.onRenderTabSet) {
             this.props.onRenderTabSet(tabSetNode, renderValues);
         }
-    };
+    }
     /** @internal */
-    Layout.prototype.i18nName = function (id, param) {
-        var message;
+    i18nName(id, param) {
+        let message;
         if (this.props.i18nMapper) {
             message = this.props.i18nMapper(id, param);
         }
@@ -848,37 +793,35 @@ var Layout = /** @class */ (function (_super) {
             message = id + (param === undefined ? "" : param);
         }
         return message;
-    };
+    }
     /** @internal */
-    Layout.prototype.getOnRenderFloatingTabPlaceholder = function () {
+    getOnRenderFloatingTabPlaceholder() {
         return this.props.onRenderFloatingTabPlaceholder;
-    };
+    }
     /** @internal */
-    Layout.prototype.getShowOverflowMenu = function () {
+    getShowOverflowMenu() {
         return this.props.onShowOverflowMenu;
-    };
+    }
     /** @internal */
-    Layout.prototype.getTabSetPlaceHolderCallback = function () {
+    getTabSetPlaceHolderCallback() {
         return this.props.onTabSetPlaceHolder;
-    };
+    }
     /** @internal */
-    Layout.prototype.showContextMenu = function (node, event) {
+    showContextMenu(node, event) {
         if (this.props.onContextMenu) {
             this.props.onContextMenu(node, event);
         }
-    };
+    }
     /** @internal */
-    Layout.prototype.auxMouseClick = function (node, event) {
+    auxMouseClick(node, event) {
         if (this.props.onAuxMouseClick) {
             this.props.onAuxMouseClick(node, event);
         }
-    };
-    return Layout;
-}(React.Component));
-exports.Layout = Layout;
+    }
+}
 /** @internal */
-var DragRectRenderWrapper = function (props) {
-    React.useEffect(function () {
+const DragRectRenderWrapper = (props) => {
+    React.useEffect(() => {
         var _a;
         (_a = props.onRendered) === null || _a === void 0 ? void 0 : _a.call(props);
     }, [props]);