dockview-core 4.7.0 → 4.7.1

package/dist/cjs/dnd/abstractDragHandler.d.ts

@@ -1,11 +1,13 @@
 import { CompositeDisposable, IDisposable } from '../lifecycle';
 export declare abstract class DragHandler extends CompositeDisposable {
     protected readonly el: HTMLElement;
+    private disabled?;
     private readonly dataDisposable;
     private readonly pointerEventsDisposable;
     private readonly _onDragStart;
     readonly onDragStart: import("../events").Event<DragEvent>;
-    constructor(el: HTMLElement);
+    constructor(el: HTMLElement, disabled?: boolean | undefined);
+    setDisabled(disabled: boolean): void;
     abstract getData(event: DragEvent): IDisposable;
     protected isCancelled(_event: DragEvent): boolean;
     private configure;

package/dist/cjs/dnd/abstractDragHandler.js

@@ -21,9 +21,10 @@ var events_1 = require("../events");
 var lifecycle_1 = require("../lifecycle");
 var DragHandler = /** @class */ (function (_super) {
     __extends(DragHandler, _super);
-    function DragHandler(el) {
+    function DragHandler(el, disabled) {
         var _this = _super.call(this) || this;
         _this.el = el;
+        _this.disabled = disabled;
         _this.dataDisposable = new lifecycle_1.MutableDisposable();
         _this.pointerEventsDisposable = new lifecycle_1.MutableDisposable();
         _this._onDragStart = new events_1.Emitter();
@@ -32,13 +33,16 @@ var DragHandler = /** @class */ (function (_super) {
         _this.configure();
         return _this;
     }
+    DragHandler.prototype.setDisabled = function (disabled) {
+        this.disabled = disabled;
+    };
     DragHandler.prototype.isCancelled = function (_event) {
         return false;
     };
     DragHandler.prototype.configure = function () {
         var _this = this;
         this.addDisposables(this._onDragStart, (0, events_1.addDisposableListener)(this.el, 'dragstart', function (event) {
-            if (event.defaultPrevented || _this.isCancelled(event)) {
+            if (event.defaultPrevented || _this.isCancelled(event) || _this.disabled) {
                 event.preventDefault();
                 return;
             }

package/dist/cjs/dnd/groupDragHandler.d.ts

@@ -6,7 +6,7 @@ export declare class GroupDragHandler extends DragHandler {
     private readonly accessor;
     private readonly group;
     private readonly panelTransfer;
-    constructor(element: HTMLElement, accessor: DockviewComponent, group: DockviewGroupPanel);
+    constructor(element: HTMLElement, accessor: DockviewComponent, group: DockviewGroupPanel, disabled?: boolean);
     isCancelled(_event: DragEvent): boolean;
     getData(dragEvent: DragEvent): IDisposable;
 }

package/dist/cjs/dnd/groupDragHandler.js

@@ -23,8 +23,8 @@ var dataTransfer_1 = require("./dataTransfer");
 var ghost_1 = require("./ghost");
 var GroupDragHandler = /** @class */ (function (_super) {
     __extends(GroupDragHandler, _super);
-    function GroupDragHandler(element, accessor, group) {
-        var _this = _super.call(this, element) || this;
+    function GroupDragHandler(element, accessor, group, disabled) {
+        var _this = _super.call(this, element, disabled) || this;
         _this.accessor = accessor;
         _this.group = group;
         _this.panelTransfer = dataTransfer_1.LocalSelectionTransfer.getInstance();

package/dist/cjs/dockview/components/tab/tab.d.ts

@@ -12,6 +12,7 @@ export declare class Tab extends CompositeDisposable {
     private readonly _element;
     private readonly dropTarget;
     private content;
+    private readonly dragHandler;
     private readonly _onPointDown;
     readonly onPointerDown: Event<MouseEvent>;
     private readonly _onDropped;

package/dist/cjs/dockview/components/tab/tab.js

@@ -25,8 +25,8 @@ var abstractDragHandler_1 = require("../../../dnd/abstractDragHandler");
 var ghost_1 = require("../../../dnd/ghost");
 var TabDragHandler = /** @class */ (function (_super) {
     __extends(TabDragHandler, _super);
-    function TabDragHandler(element, accessor, group, panel) {
-        var _this = _super.call(this, element) || this;
+    function TabDragHandler(element, accessor, group, panel, disabled) {
+        var _this = _super.call(this, element, disabled) || this;
         _this.accessor = accessor;
         _this.group = group;
         _this.panel = panel;
@@ -63,7 +63,7 @@ var Tab = /** @class */ (function (_super) {
         _this._element.tabIndex = 0;
         _this._element.draggable = !_this.accessor.options.disableDnd;
         (0, dom_1.toggleClass)(_this.element, 'dv-inactive-tab', true);
-        var dragHandler = new TabDragHandler(_this._element, _this.accessor, _this.group, _this.panel);
+        _this.dragHandler = new TabDragHandler(_this._element, _this.accessor, _this.group, _this.panel, !!_this.accessor.options.disableDnd);
         _this.dropTarget = new droptarget_1.Droptarget(_this._element, {
             acceptedTargetZones: ['left', 'right'],
             overlayModel: { activationSize: { value: 50, type: 'percentage' } },
@@ -80,7 +80,7 @@ var Tab = /** @class */ (function (_super) {
             getOverrideTarget: function () { var _a; return (_a = group.model.dropTargetContainer) === null || _a === void 0 ? void 0 : _a.model; },
         });
         _this.onWillShowOverlay = _this.dropTarget.onWillShowOverlay;
-        _this.addDisposables(_this._onPointDown, _this._onDropped, _this._onDragStart, dragHandler.onDragStart(function (event) {
+        _this.addDisposables(_this._onPointDown, _this._onDropped, _this._onDragStart, _this.dragHandler.onDragStart(function (event) {
             if (event.dataTransfer) {
                 var style_1 = getComputedStyle(_this.element);
                 var newNode_1 = _this.element.cloneNode(true);
@@ -94,7 +94,7 @@ var Tab = /** @class */ (function (_super) {
                 });
             }
             _this._onDragStart.fire(event);
-        }), dragHandler, (0, events_1.addDisposableListener)(_this._element, 'pointerdown', function (event) {
+        }), _this.dragHandler, (0, events_1.addDisposableListener)(_this._element, 'pointerdown', function (event) {
             _this._onPointDown.fire(event);
         }), _this.dropTarget.onDrop(function (event) {
             _this._onDropped.fire(event);
@@ -121,6 +121,7 @@ var Tab = /** @class */ (function (_super) {
     };
     Tab.prototype.updateDragAndDropState = function () {
         this._element.draggable = !this.accessor.options.disableDnd;
+        this.dragHandler.setDisabled(!!this.accessor.options.disableDnd);
     };
     Tab.prototype.dispose = function () {
         _super.prototype.dispose.call(this);

package/dist/cjs/dockview/components/titlebar/voidContainer.d.ts

@@ -8,6 +8,7 @@ export declare class VoidContainer extends CompositeDisposable {
     private readonly group;
     private readonly _element;
     private readonly dropTarget;
+    private readonly handler;
     private readonly _onDrop;
     readonly onDrop: Event<DroptargetEvent>;
     private readonly _onDragStart;

package/dist/cjs/dockview/components/titlebar/voidContainer.js

@@ -39,7 +39,7 @@ var VoidContainer = /** @class */ (function (_super) {
         _this.addDisposables(_this._onDrop, _this._onDragStart, (0, events_1.addDisposableListener)(_this._element, 'pointerdown', function () {
             _this.accessor.doSetGroupActive(_this.group);
         }));
-        var handler = new groupDragHandler_1.GroupDragHandler(_this._element, accessor, group);
+        _this.handler = new groupDragHandler_1.GroupDragHandler(_this._element, accessor, group, !!_this.accessor.options.disableDnd);
         _this.dropTarget = new droptarget_1.Droptarget(_this._element, {
             acceptedTargetZones: ['center'],
             canDisplayOverlay: function (event, position) {
@@ -52,7 +52,7 @@ var VoidContainer = /** @class */ (function (_super) {
             getOverrideTarget: function () { var _a; return (_a = group.model.dropTargetContainer) === null || _a === void 0 ? void 0 : _a.model; },
         });
         _this.onWillShowOverlay = _this.dropTarget.onWillShowOverlay;
-        _this.addDisposables(handler, handler.onDragStart(function (event) {
+        _this.addDisposables(_this.handler, _this.handler.onDragStart(function (event) {
             _this._onDragStart.fire(event);
         }), _this.dropTarget.onDrop(function (event) {
             _this._onDrop.fire(event);
@@ -69,6 +69,7 @@ var VoidContainer = /** @class */ (function (_super) {
     VoidContainer.prototype.updateDragAndDropState = function () {
         this._element.draggable = !this.accessor.options.disableDnd;
         (0, dom_1.toggleClass)(this._element, 'dv-draggable', !this.accessor.options.disableDnd);
+        this.handler.setDisabled(!!this.accessor.options.disableDnd);
     };
     return VoidContainer;
 }(lifecycle_1.CompositeDisposable));

package/dist/cjs/dockview/dockviewComponent.js

@@ -1671,11 +1671,13 @@ var DockviewComponent = /** @class */ (function (_super) {
                 // remove the group and do not set a new group as active
                 this.doRemoveGroup(sourceGroup, { skipActive: true });
             }
+            // Check if destination group is empty - if so, force render the component
+            var isDestinationGroupEmpty_1 = destinationGroup.model.size === 0;
             this.movingLock(function () {
                 var _a;
                 return destinationGroup.model.openPanel(removedPanel_1, {
                     index: destinationIndex,
-                    skipSetActive: (_a = options.skipSetActive) !== null && _a !== void 0 ? _a : false,
+                    skipSetActive: ((_a = options.skipSetActive) !== null && _a !== void 0 ? _a : false) && !isDestinationGroupEmpty_1,
                     skipSetGroupActive: true,
                 });
             });

package/dist/dockview-core.amd.js

@@ -1,6 +1,6 @@
 /**
  * dockview-core
- * @version 4.7.0
+ * @version 4.7.1
  * @link https://github.com/mathuo/dockview
  * @license MIT
  */
@@ -3838,9 +3838,10 @@ define(['exports'], (function (exports) { 'use strict';
   }
 
   class DragHandler extends CompositeDisposable {
-      constructor(el) {
+      constructor(el, disabled) {
           super();
           this.el = el;
+          this.disabled = disabled;
           this.dataDisposable = new MutableDisposable();
           this.pointerEventsDisposable = new MutableDisposable();
           this._onDragStart = new Emitter();
@@ -3848,12 +3849,15 @@ define(['exports'], (function (exports) { 'use strict';
           this.addDisposables(this._onDragStart, this.dataDisposable, this.pointerEventsDisposable);
           this.configure();
       }
+      setDisabled(disabled) {
+          this.disabled = disabled;
+      }
       isCancelled(_event) {
           return false;
       }
       configure() {
           this.addDisposables(this._onDragStart, addDisposableListener(this.el, 'dragstart', (event) => {
-              if (event.defaultPrevented || this.isCancelled(event)) {
+              if (event.defaultPrevented || this.isCancelled(event) || this.disabled) {
                   event.preventDefault();
                   return;
               }
@@ -5053,8 +5057,8 @@ define(['exports'], (function (exports) { 'use strict';
   }
 
   class TabDragHandler extends DragHandler {
-      constructor(element, accessor, group, panel) {
-          super(element);
+      constructor(element, accessor, group, panel, disabled) {
+          super(element, disabled);
           this.accessor = accessor;
           this.group = group;
           this.panel = panel;
@@ -5090,7 +5094,7 @@ define(['exports'], (function (exports) { 'use strict';
           this._element.tabIndex = 0;
           this._element.draggable = !this.accessor.options.disableDnd;
           toggleClass(this.element, 'dv-inactive-tab', true);
-          const dragHandler = new TabDragHandler(this._element, this.accessor, this.group, this.panel);
+          this.dragHandler = new TabDragHandler(this._element, this.accessor, this.group, this.panel, !!this.accessor.options.disableDnd);
           this.dropTarget = new Droptarget(this._element, {
               acceptedTargetZones: ['left', 'right'],
               overlayModel: { activationSize: { value: 50, type: 'percentage' } },
@@ -5107,7 +5111,7 @@ define(['exports'], (function (exports) { 'use strict';
               getOverrideTarget: () => { var _a; return (_a = group.model.dropTargetContainer) === null || _a === void 0 ? void 0 : _a.model; },
           });
           this.onWillShowOverlay = this.dropTarget.onWillShowOverlay;
-          this.addDisposables(this._onPointDown, this._onDropped, this._onDragStart, dragHandler.onDragStart((event) => {
+          this.addDisposables(this._onPointDown, this._onDropped, this._onDragStart, this.dragHandler.onDragStart((event) => {
               if (event.dataTransfer) {
                   const style = getComputedStyle(this.element);
                   const newNode = this.element.cloneNode(true);
@@ -5119,7 +5123,7 @@ define(['exports'], (function (exports) { 'use strict';
                   });
               }
               this._onDragStart.fire(event);
-          }), dragHandler, addDisposableListener(this._element, 'pointerdown', (event) => {
+          }), this.dragHandler, addDisposableListener(this._element, 'pointerdown', (event) => {
               this._onPointDown.fire(event);
           }), this.dropTarget.onDrop((event) => {
               this._onDropped.fire(event);
@@ -5138,6 +5142,7 @@ define(['exports'], (function (exports) { 'use strict';
       }
       updateDragAndDropState() {
           this._element.draggable = !this.accessor.options.disableDnd;
+          this.dragHandler.setDisabled(!!this.accessor.options.disableDnd);
       }
       dispose() {
           super.dispose();
@@ -5179,8 +5184,8 @@ define(['exports'], (function (exports) { 'use strict';
   }
 
   class GroupDragHandler extends DragHandler {
-      constructor(element, accessor, group) {
-          super(element);
+      constructor(element, accessor, group, disabled) {
+          super(element, disabled);
           this.accessor = accessor;
           this.group = group;
           this.panelTransfer = LocalSelectionTransfer.getInstance();
@@ -5249,7 +5254,7 @@ define(['exports'], (function (exports) { 'use strict';
           this.addDisposables(this._onDrop, this._onDragStart, addDisposableListener(this._element, 'pointerdown', () => {
               this.accessor.doSetGroupActive(this.group);
           }));
-          const handler = new GroupDragHandler(this._element, accessor, group);
+          this.handler = new GroupDragHandler(this._element, accessor, group, !!this.accessor.options.disableDnd);
           this.dropTarget = new Droptarget(this._element, {
               acceptedTargetZones: ['center'],
               canDisplayOverlay: (event, position) => {
@@ -5262,7 +5267,7 @@ define(['exports'], (function (exports) { 'use strict';
               getOverrideTarget: () => { var _a; return (_a = group.model.dropTargetContainer) === null || _a === void 0 ? void 0 : _a.model; },
           });
           this.onWillShowOverlay = this.dropTarget.onWillShowOverlay;
-          this.addDisposables(handler, handler.onDragStart((event) => {
+          this.addDisposables(this.handler, this.handler.onDragStart((event) => {
               this._onDragStart.fire(event);
           }), this.dropTarget.onDrop((event) => {
               this._onDrop.fire(event);
@@ -5271,6 +5276,7 @@ define(['exports'], (function (exports) { 'use strict';
       updateDragAndDropState() {
           this._element.draggable = !this.accessor.options.disableDnd;
           toggleClass(this._element, 'dv-draggable', !this.accessor.options.disableDnd);
+          this.handler.setDisabled(!!this.accessor.options.disableDnd);
       }
   }
 
@@ -9684,11 +9690,13 @@ define(['exports'], (function (exports) { 'use strict';
                   // remove the group and do not set a new group as active
                   this.doRemoveGroup(sourceGroup, { skipActive: true });
               }
+              // Check if destination group is empty - if so, force render the component
+              const isDestinationGroupEmpty = destinationGroup.model.size === 0;
               this.movingLock(() => {
                   var _a;
                   return destinationGroup.model.openPanel(removedPanel, {
                       index: destinationIndex,
-                      skipSetActive: (_a = options.skipSetActive) !== null && _a !== void 0 ? _a : false,
+                      skipSetActive: ((_a = options.skipSetActive) !== null && _a !== void 0 ? _a : false) && !isDestinationGroupEmpty,
                       skipSetGroupActive: true,
                   });
               });