dockview-core 1.15.2 → 1.16.0

package/dist/cjs/splitview/splitview.js

@@ -473,34 +473,21 @@ var Splitview = /** @class */ (function () {
             var sash_1 = document.createElement('div');
             sash_1.className = 'sash';
             var onPointerStart_1 = function (event) {
-                var e_3, _a, e_4, _b;
+                var e_3, _a;
                 try {
-                    for (var _c = __values(_this.viewItems), _d = _c.next(); !_d.done; _d = _c.next()) {
-                        var item = _d.value;
+                    for (var _b = __values(_this.viewItems), _c = _b.next(); !_c.done; _c = _b.next()) {
+                        var item = _c.value;
                         item.enabled = false;
                     }
                 }
                 catch (e_3_1) { e_3 = { error: e_3_1 }; }
                 finally {
                     try {
-                        if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                     }
                     finally { if (e_3) throw e_3.error; }
                 }
-                var iframes = __spreadArray(__spreadArray([], __read((0, dom_1.getElementsByTagName)('iframe')), false), __read((0, dom_1.getElementsByTagName)('webview')), false);
-                try {
-                    for (var iframes_1 = __values(iframes), iframes_1_1 = iframes_1.next(); !iframes_1_1.done; iframes_1_1 = iframes_1.next()) {
-                        var iframe = iframes_1_1.value;
-                        iframe.style.pointerEvents = 'none';
-                    }
-                }
-                catch (e_4_1) { e_4 = { error: e_4_1 }; }
-                finally {
-                    try {
-                        if (iframes_1_1 && !iframes_1_1.done && (_b = iframes_1.return)) _b.call(iframes_1);
-                    }
-                    finally { if (e_4) throw e_4.error; }
-                }
+                var iframes = (0, dom_1.disableIframePointEvents)();
                 var start = _this._orientation === Orientation.HORIZONTAL
                     ? event.clientX
                     : event.clientY;
@@ -565,33 +552,21 @@ var Splitview = /** @class */ (function () {
                     _this.layoutViews();
                 };
                 var end = function () {
-                    var e_5, _a, e_6, _b;
+                    var e_4, _a;
                     try {
-                        for (var _c = __values(_this.viewItems), _d = _c.next(); !_d.done; _d = _c.next()) {
-                            var item = _d.value;
+                        for (var _b = __values(_this.viewItems), _c = _b.next(); !_c.done; _c = _b.next()) {
+                            var item = _c.value;
                             item.enabled = true;
                         }
                     }
-                    catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                    catch (e_4_1) { e_4 = { error: e_4_1 }; }
                     finally {
                         try {
-                            if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
-                        }
-                        finally { if (e_5) throw e_5.error; }
-                    }
-                    try {
-                        for (var iframes_2 = __values(iframes), iframes_2_1 = iframes_2.next(); !iframes_2_1.done; iframes_2_1 = iframes_2.next()) {
-                            var iframe = iframes_2_1.value;
-                            iframe.style.pointerEvents = 'auto';
+                            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                         }
+                        finally { if (e_4) throw e_4.error; }
                     }
-                    catch (e_6_1) { e_6 = { error: e_6_1 }; }
-                    finally {
-                        try {
-                            if (iframes_2_1 && !iframes_2_1.done && (_b = iframes_2.return)) _b.call(iframes_2);
-                        }
-                        finally { if (e_6) throw e_6.error; }
-                    }
+                    iframes.release();
                     _this.saveProportions();
                     document.removeEventListener('pointermove', onPointerMove);
                     document.removeEventListener('pointerup', end);
@@ -624,7 +599,7 @@ var Splitview = /** @class */ (function () {
         this._onDidAddView.fire(view);
     };
     Splitview.prototype.distributeViewSizes = function () {
-        var e_7, _a, e_8, _b;
+        var e_5, _a, e_6, _b;
         var _this = this;
         var flexibleViewItems = [];
         var flexibleSize = 0;
@@ -637,12 +612,12 @@ var Splitview = /** @class */ (function () {
                 }
             }
         }
-        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+        catch (e_5_1) { e_5 = { error: e_5_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_7) throw e_7.error; }
+            finally { if (e_5) throw e_5.error; }
         }
         var size = Math.floor(flexibleSize / flexibleViewItems.length);
         try {
@@ -651,12 +626,12 @@ var Splitview = /** @class */ (function () {
                 item.size = (0, math_1.clamp)(size, item.minimumSize, item.maximumSize);
             }
         }
-        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+        catch (e_6_1) { e_6 = { error: e_6_1 }; }
         finally {
             try {
                 if (flexibleViewItems_1_1 && !flexibleViewItems_1_1.done && (_b = flexibleViewItems_1.return)) _b.call(flexibleViewItems_1);
             }
-            finally { if (e_8) throw e_8.error; }
+            finally { if (e_6) throw e_6.error; }
         }
         var indexes = (0, math_1.range)(this.viewItems.length);
         var lowPriorityIndexes = indexes.filter(function (i) { return _this.viewItems[i].priority === LayoutPriority.Low; });
@@ -740,7 +715,7 @@ var Splitview = /** @class */ (function () {
         this.saveProportions();
     };
     Splitview.prototype.distributeEmptySpace = function (lowPriorityIndex) {
-        var e_9, _a, e_10, _b;
+        var e_7, _a, e_8, _b;
         var _this = this;
         var contentSize = this.viewItems.reduce(function (r, i) { return r + i.size; }, 0);
         var emptyDelta = this.size - contentSize;
@@ -753,12 +728,12 @@ var Splitview = /** @class */ (function () {
                 (0, array_1.pushToStart)(indexes, index);
             }
         }
-        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
         finally {
             try {
                 if (highPriorityIndexes_2_1 && !highPriorityIndexes_2_1.done && (_a = highPriorityIndexes_2.return)) _a.call(highPriorityIndexes_2);
             }
-            finally { if (e_9) throw e_9.error; }
+            finally { if (e_7) throw e_7.error; }
         }
         try {
             for (var lowPriorityIndexes_2 = __values(lowPriorityIndexes), lowPriorityIndexes_2_1 = lowPriorityIndexes_2.next(); !lowPriorityIndexes_2_1.done; lowPriorityIndexes_2_1 = lowPriorityIndexes_2.next()) {
@@ -766,12 +741,12 @@ var Splitview = /** @class */ (function () {
                 (0, array_1.pushToEnd)(indexes, index);
             }
         }
-        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        catch (e_8_1) { e_8 = { error: e_8_1 }; }
         finally {
             try {
                 if (lowPriorityIndexes_2_1 && !lowPriorityIndexes_2_1.done && (_b = lowPriorityIndexes_2.return)) _b.call(lowPriorityIndexes_2);
             }
-            finally { if (e_10) throw e_10.error; }
+            finally { if (e_8) throw e_8.error; }
         }
         if (typeof lowPriorityIndex === 'number') {
             (0, array_1.pushToEnd)(indexes, lowPriorityIndex);
@@ -808,29 +783,47 @@ var Splitview = /** @class */ (function () {
         if (this.viewItems.length === 0) {
             return;
         }
-        var sashCount = this.viewItems.length - 1;
-        var marginReducedSize = (this.margin * sashCount) / this.viewItems.length;
+        var visibleViewItems = this.viewItems.filter(function (i) { return i.visible; });
+        var sashCount = Math.max(0, visibleViewItems.length - 1);
+        var marginReducedSize = (this.margin * sashCount) / Math.max(1, visibleViewItems.length);
         var totalLeftOffset = 0;
         var viewLeftOffsets = [];
-        for (var i = 0; i < this.viewItems.length - 1; i++) {
-            totalLeftOffset += this.viewItems[i].size;
-            viewLeftOffsets.push(totalLeftOffset);
-            var offset = Math.min(Math.max(0, totalLeftOffset - 2), this.size - this.margin);
-            if (this._orientation === Orientation.HORIZONTAL) {
-                this.sashes[i].container.style.left = "".concat(offset, "px");
-                this.sashes[i].container.style.top = "0px";
+        var sashWidth = 4; // hardcoded in css
+        var runningVisiblePanelCount = this.viewItems.reduce(function (arr, viewItem, i) {
+            var flag = viewItem.visible ? 1 : 0;
+            if (i === 0) {
+                arr.push(flag);
             }
-            if (this._orientation === Orientation.VERTICAL) {
-                this.sashes[i].container.style.left = "0px";
-                this.sashes[i].container.style.top = "".concat(offset, "px");
+            else {
+                arr.push(arr[i - 1] + flag);
             }
-        }
+            return arr;
+        }, []);
+        // calculate both view and cash positions
         this.viewItems.forEach(function (view, i) {
-            var size = view.size - marginReducedSize;
-            var offset = i === 0
+            totalLeftOffset += _this.viewItems[i].size;
+            viewLeftOffsets.push(totalLeftOffset);
+            var size = view.visible ? view.size - marginReducedSize : 0;
+            var visiblePanelsBeforeThisView = Math.max(0, runningVisiblePanelCount[i] - 1);
+            var offset = i === 0 || visiblePanelsBeforeThisView === 0
                 ? 0
                 : viewLeftOffsets[i - 1] +
-                    (i / sashCount) * marginReducedSize;
+                    (visiblePanelsBeforeThisView / sashCount) * marginReducedSize;
+            if (i < _this.viewItems.length - 1) {
+                // calculate sash position
+                var newSize = view.visible
+                    ? offset + size - sashWidth / 2 + _this.margin / 2
+                    : offset;
+                if (_this._orientation === Orientation.HORIZONTAL) {
+                    _this.sashes[i].container.style.left = "".concat(newSize, "px");
+                    _this.sashes[i].container.style.top = "0px";
+                }
+                if (_this._orientation === Orientation.VERTICAL) {
+                    _this.sashes[i].container.style.left = "0px";
+                    _this.sashes[i].container.style.top = "".concat(newSize, "px");
+                }
+            }
+            // calculate view position
             if (_this._orientation === Orientation.HORIZONTAL) {
                 view.container.style.width = "".concat(size, "px");
                 view.container.style.left = "".concat(offset, "px");
@@ -847,7 +840,7 @@ var Splitview = /** @class */ (function () {
         });
     };
     Splitview.prototype.findFirstSnapIndex = function (indexes) {
-        var e_11, _a, e_12, _b;
+        var e_9, _a, e_10, _b;
         try {
             // visible views first
             for (var indexes_1 = __values(indexes), indexes_1_1 = indexes_1.next(); !indexes_1_1.done; indexes_1_1 = indexes_1.next()) {
@@ -861,12 +854,12 @@ var Splitview = /** @class */ (function () {
                 }
             }
         }
-        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+        catch (e_9_1) { e_9 = { error: e_9_1 }; }
         finally {
             try {
                 if (indexes_1_1 && !indexes_1_1.done && (_a = indexes_1.return)) _a.call(indexes_1);
             }
-            finally { if (e_11) throw e_11.error; }
+            finally { if (e_9) throw e_9.error; }
         }
         try {
             // then, hidden views
@@ -882,12 +875,12 @@ var Splitview = /** @class */ (function () {
                 }
             }
         }
-        catch (e_12_1) { e_12 = { error: e_12_1 }; }
+        catch (e_10_1) { e_10 = { error: e_10_1 }; }
         finally {
             try {
                 if (indexes_2_1 && !indexes_2_1.done && (_b = indexes_2.return)) _b.call(indexes_2);
             }
-            finally { if (e_12) throw e_12.error; }
+            finally { if (e_10) throw e_10.error; }
         }
         return undefined;
     };
@@ -971,7 +964,7 @@ var Splitview = /** @class */ (function () {
         return element;
     };
     Splitview.prototype.dispose = function () {
-        var e_13, _a;
+        var e_11, _a;
         this._onDidSashEnd.dispose();
         this._onDidAddView.dispose();
         this._onDidRemoveView.dispose();
@@ -987,12 +980,12 @@ var Splitview = /** @class */ (function () {
                 viewItem.dispose();
             }
         }
-        catch (e_13_1) { e_13 = { error: e_13_1 }; }
+        catch (e_11_1) { e_11 = { error: e_11_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_13) throw e_13.error; }
+            finally { if (e_11) throw e_11.error; }
         }
         this.element.remove();
     };

package/dist/cjs/splitview/splitviewComponent.d.ts

@@ -83,7 +83,7 @@ export declare class SplitviewComponent extends Resizable implements ISplitviewC
     get maximumSize(): number;
     get height(): number;
     get width(): number;
-    constructor(options: SplitviewComponentOptions);
+    constructor(parentElement: HTMLElement, options: SplitviewComponentOptions);
     updateOptions(options: Partial<SplitviewComponentUpdateOptions>): void;
     focus(): void;
     movePanel(from: number, to: number): void;

package/dist/cjs/splitview/splitviewComponent.js

@@ -64,8 +64,8 @@ var resizable_1 = require("../resizable");
  */
 var SplitviewComponent = /** @class */ (function (_super) {
     __extends(SplitviewComponent, _super);
-    function SplitviewComponent(options) {
-        var _this = _super.call(this, options.parentElement, options.disableAutoResizing) || this;
+    function SplitviewComponent(parentElement, options) {
+        var _this = _super.call(this, parentElement, options.disableAutoResizing) || this;
         _this._splitviewChangeDisposable = new lifecycle_1.MutableDisposable();
         _this._panels = new Map();
         _this._onDidLayoutfromJSON = new events_1.Emitter();
@@ -76,6 +76,9 @@ var SplitviewComponent = /** @class */ (function (_super) {
         _this.onDidRemoveView = _this._onDidRemoveView.event;
         _this._onDidLayoutChange = new events_1.Emitter();
         _this.onDidLayoutChange = _this._onDidLayoutChange.event;
+        if (typeof options.className === 'string') {
+            _this.element.classList.add(options.className);
+        }
         _this._options = options;
         if (!options.components) {
             options.components = {};