version 3.2.13

ticlo · Oct 22, 2022 · 36b9823 · 36b9823
1 parent ddd581a
commit 36b9823
Show file tree

Hide file tree

Showing 28 changed files with 357 additions and 149 deletions.
diff --git a/es/Algorithm.js b/es/Algorithm.js
@@ -157,7 +157,7 @@ export function addTabToPanel(layout, source, panel, idx = -1) {
     if (tabs.length) {
         let newPanel = clone(panel);
         newPanel.tabs.splice(idx, 0, ...tabs);
-        newPanel.activeId = tabs[tabs.length - 1].id;
+        newPanel.activeId = tabs.at(-1).id;
         for (let tab of tabs) {
             tab.parent = newPanel;
         }

diff --git a/es/Divider.js b/es/Divider.js
@@ -78,7 +78,7 @@ export class Divider extends React.PureComponent {
             return;
         }
         let d = isVertical ? dy : dx;
-        let leftChild = beforeDivider[beforeDivider.length - 1];
+        let leftChild = beforeDivider.at(-1);
         let rightCild = afterDivider[0];
         let leftSize = leftChild.size + d;
         let rightSize = rightCild.size - d;

diff --git a/es/DockData.d.ts b/es/DockData.d.ts
@@ -293,9 +293,9 @@ export interface DockContext {
      * @param makeActive whether to make the tab the active child of parent panel
      * @returns returns false if the tab is not found
      */
-    updateTab(id: string, newTab: TabData, makeActive: boolean): boolean;
+    updateTab(id: string, newTab: TabData | null, makeActive?: boolean): boolean;
     /**
-     * Move focus to a dockpanel near by
+     * Move focus to a dockpanel nearby
      * @param fromElement
      * @param direction
      */

diff --git a/es/DockDropEdge.js b/es/DockDropEdge.js
@@ -128,7 +128,7 @@ export class DockDropEdge extends React.PureComponent {
         while (targetBox && lastDepth < depth) {
             if (targetBox.mode === mode) {
                 if (afterPanel) {
-                    if (targetBox.children[targetBox.children.length - 1] !== previousTarget) {
+                    if (targetBox.children.at(-1) !== previousTarget) {
                         // dont go deeper if current target is on different side of the box
                         break;
                     }

diff --git a/es/DockLayout.d.ts b/es/DockLayout.d.ts
@@ -1,5 +1,4 @@
 import * as React from "react";
-import { CSSProperties } from "react";
 import { BoxData, DockContext, DropDirection, LayoutBase, LayoutData, PanelBase, PanelData, TabBase, TabData, TabGroup, TabPaneCache } from "./DockData";
 import * as Algorithm from "./Algorithm";
 export interface LayoutProps {
@@ -57,7 +56,7 @@ export interface LayoutProps {
      * - if tabs is empty, but still remaining in layout because of panelLock, make sure also set the group if it's not null
      */
     afterPanelLoaded?(savedPanel: PanelBase, loadedPanel: PanelData): void;
-    style?: CSSProperties;
+    style?: React.CSSProperties;
     /**
      * when specified, docklayout will create a react portal for the maximized panel
      * use dom element as the value, or use the element's id
@@ -124,7 +123,7 @@ export declare class DockLayout extends DockPortalManager implements DockContext
         height: number;
     };
     /** @inheritDoc */
-    updateTab(id: string, newTab: TabData, makeActive?: boolean): boolean;
+    updateTab(id: string, newTab: TabData | null, makeActive?: boolean): boolean;
     /** @inheritDoc */
     navigateToPanel(fromElement?: HTMLElement, direction?: string): void;
     constructor(props: LayoutProps);

diff --git a/lib/Algorithm.js b/lib/Algorithm.js
@@ -165,7 +165,7 @@ function addTabToPanel(layout, source, panel, idx = -1) {
     if (tabs.length) {
         let newPanel = clone(panel);
         newPanel.tabs.splice(idx, 0, ...tabs);
-        newPanel.activeId = tabs[tabs.length - 1].id;
+        newPanel.activeId = tabs.at(-1).id;
         for (let tab of tabs) {
             tab.parent = newPanel;
         }

diff --git a/lib/Divider.js b/lib/Divider.js
@@ -1,10 +1,26 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Divider = void 0;
-const react_1 = __importDefault(require("react"));
+const React = __importStar(require("react"));
 const DragDropDiv_1 = require("./dragdrop/DragDropDiv");
 class BoxDataCache {
     constructor(data) {
@@ -53,7 +69,7 @@ function spiltSize(newSize, oldSize, children) {
     }
     return sizes;
 }
-class Divider extends react_1.default.PureComponent {
+class Divider extends React.PureComponent {
     constructor() {
         super(...arguments);
         this.startDrag = (e) => {
@@ -84,7 +100,7 @@ class Divider extends react_1.default.PureComponent {
             return;
         }
         let d = isVertical ? dy : dx;
-        let leftChild = beforeDivider[beforeDivider.length - 1];
+        let leftChild = beforeDivider.at(-1);
         let rightCild = afterDivider[0];
         let leftSize = leftChild.size + d;
         let rightSize = rightCild.size - d;
@@ -128,7 +144,7 @@ class Divider extends react_1.default.PureComponent {
         if (!className) {
             className = 'dock-divider';
         }
-        return (react_1.default.createElement(DragDropDiv_1.DragDropDiv, { className: className, onDragStartT: this.startDrag, onDragMoveT: this.dragMove, onDragEndT: this.dragEnd }));
+        return (React.createElement(DragDropDiv_1.DragDropDiv, { className: className, onDragStartT: this.startDrag, onDragMoveT: this.dragMove, onDragEndT: this.dragEnd }));
     }
 }
 exports.Divider = Divider;
diff --git a/lib/DividerBox.js b/lib/DividerBox.js
@@ -1,4 +1,23 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -10,15 +29,12 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DividerBox = void 0;
-const react_1 = __importDefault(require("react"));
+const React = __importStar(require("react"));
 const DockData_1 = require("./DockData");
 const Divider_1 = require("./Divider");
-class DividerBox extends react_1.default.PureComponent {
+class DividerBox extends React.PureComponent {
     constructor() {
         super(...arguments);
         this.getRef = (r) => {
@@ -74,7 +90,7 @@ class DividerBox extends react_1.default.PureComponent {
         if (Array.isArray((children))) {
             for (let i = 0; i < children.length; ++i) {
                 if (i > 0) {
-                    childrenRender.push(react_1.default.createElement(Divider_1.Divider, { idx: i, key: i, isVertical: isVertical, getDividerData: this.getDividerData, changeSizes: this.changeSizes }));
+                    childrenRender.push(React.createElement(Divider_1.Divider, { idx: i, key: i, isVertical: isVertical, getDividerData: this.getDividerData, changeSizes: this.changeSizes }));
                 }
                 childrenRender.push(children[i]);
             }
@@ -92,7 +108,7 @@ class DividerBox extends react_1.default.PureComponent {
         if (className) {
             cls = `${cls} ${className}`;
         }
-        return (react_1.default.createElement("div", Object.assign({ ref: this.getRef, className: cls }, others), childrenRender));
+        return (React.createElement("div", Object.assign({ ref: this.getRef, className: cls }, others), childrenRender));
     }
 }
 exports.DividerBox = DividerBox;

diff --git a/lib/DockBox.js b/lib/DockBox.js
@@ -1,14 +1,30 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DockBox = void 0;
-const react_1 = __importDefault(require("react"));
+const React = __importStar(require("react"));
 const DockData_1 = require("./DockData");
 const Divider_1 = require("./Divider");
 const DockPanel_1 = require("./DockPanel");
-class DockBox extends react_1.default.PureComponent {
+class DockBox extends React.PureComponent {
     constructor() {
         super(...arguments);
         this.getRef = (r) => {
@@ -57,15 +73,15 @@ class DockBox extends react_1.default.PureComponent {
         let childrenRender = [];
         for (let i = 0; i < children.length; ++i) {
             if (i > 0) {
-                childrenRender.push(react_1.default.createElement(Divider_1.Divider, { idx: i, key: i, isVertical: isVertical, onDragEnd: this.onDragEnd, getDividerData: this.getDividerData, changeSizes: this.changeSizes }));
+                childrenRender.push(React.createElement(Divider_1.Divider, { idx: i, key: i, isVertical: isVertical, onDragEnd: this.onDragEnd, getDividerData: this.getDividerData, changeSizes: this.changeSizes }));
             }
             let child = children[i];
             if ('tabs' in child) {
-                childrenRender.push(react_1.default.createElement(DockPanel_1.DockPanel, { size: child.size, panelData: child, key: child.id }));
+                childrenRender.push(React.createElement(DockPanel_1.DockPanel, { size: child.size, panelData: child, key: child.id }));
                 // render DockPanel
             }
             else if ('children' in child) {
-                childrenRender.push(react_1.default.createElement(DockBox, { size: child.size, boxData: child, key: child.id }));
+                childrenRender.push(React.createElement(DockBox, { size: child.size, boxData: child, key: child.id }));
             }
         }
         let cls;
@@ -88,7 +104,7 @@ class DockBox extends react_1.default.PureComponent {
         if (flexShrink < 1) {
             flexShrink = 1;
         }
-        return (react_1.default.createElement("div", { ref: this.getRef, className: cls, "data-dockid": id, style: { minWidth, minHeight, flex: `${flexGrow} ${flexShrink} ${size}px` } }, childrenRender));
+        return (React.createElement("div", { ref: this.getRef, className: cls, "data-dockid": id, style: { minWidth, minHeight, flex: `${flexGrow} ${flexShrink} ${size}px` } }, childrenRender));
     }
 }
 exports.DockBox = DockBox;

diff --git a/lib/DockData.d.ts b/lib/DockData.d.ts
@@ -293,9 +293,9 @@ export interface DockContext {
      * @param makeActive whether to make the tab the active child of parent panel
      * @returns returns false if the tab is not found
      */
-    updateTab(id: string, newTab: TabData, makeActive: boolean): boolean;
+    updateTab(id: string, newTab: TabData | null, makeActive?: boolean): boolean;
     /**
-     * Move focus to a dockpanel near by
+     * Move focus to a dockpanel nearby
      * @param fromElement
      * @param direction
      */

diff --git a/lib/DockData.js b/lib/DockData.js
@@ -1,10 +1,26 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DockContextConsumer = exports.DockContextProvider = exports.DockContextType = exports.placeHolderGroup = exports.maximePlaceHolderId = exports.placeHolderStyle = exports.defaultGroup = void 0;
-const react_1 = __importDefault(require("react"));
+const React = __importStar(require("react"));
 /** @ignore */
 exports.defaultGroup = {
     floatable: true,
@@ -19,7 +35,7 @@ exports.placeHolderGroup = {
     floatable: false,
 };
 /** @ignore */
-exports.DockContextType = react_1.default.createContext(null);
+exports.DockContextType = React.createContext(null);
 /** @ignore */
 exports.DockContextProvider = exports.DockContextType.Provider;
 /** @ignore */

diff --git a/lib/DockDropEdge.js b/lib/DockDropEdge.js
@@ -1,14 +1,30 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DockDropEdge = void 0;
-const react_1 = __importDefault(require("react"));
+const React = __importStar(require("react"));
 const DockData_1 = require("./DockData");
 const DragDropDiv_1 = require("./dragdrop/DragDropDiv");
 const DragManager_1 = require("./dragdrop/DragManager");
-class DockDropEdge extends react_1.default.PureComponent {
+class DockDropEdge extends React.PureComponent {
     constructor() {
         super(...arguments);
         this.getRef = (r) => {
@@ -134,7 +150,7 @@ class DockDropEdge extends react_1.default.PureComponent {
         while (targetBox && lastDepth < depth) {
             if (targetBox.mode === mode) {
                 if (afterPanel) {
-                    if (targetBox.children[targetBox.children.length - 1] !== previousTarget) {
+                    if (targetBox.children.at(-1) !== previousTarget) {
                         // dont go deeper if current target is on different side of the box
                         break;
                     }
@@ -156,7 +172,7 @@ class DockDropEdge extends react_1.default.PureComponent {
         return depth;
     }
     render() {
-        return (react_1.default.createElement(DragDropDiv_1.DragDropDiv, { getRef: this.getRef, className: "dock-drop-edge", onDragOverT: this.onDragOver, onDragLeaveT: this.onDragLeave, onDropT: this.onDrop }));
+        return (React.createElement(DragDropDiv_1.DragDropDiv, { getRef: this.getRef, className: "dock-drop-edge", onDragOverT: this.onDragOver, onDragLeaveT: this.onDragLeave, onDropT: this.onDrop }));
     }
     componentWillUnmount() {
         this.context.setDropRect(null, 'remove', this);