dockview-core 4.4.1 → 4.5.0

package/dist/cjs/api/dockviewGroupPanelApi.d.ts

@@ -11,6 +11,10 @@ export interface DockviewGroupMoveParams {
      * The index to place the panel within a group, only applicable if the placement is within an existing group
      */
     index?: number;
+    /**
+     * Whether to skip setting the group as active after moving
+     */
+    skipSetActive?: boolean;
 }
 export interface DockviewGroupPanelApi extends GridviewPanelApi {
     readonly onDidLocationChange: Event<DockviewGroupPanelFloatingChangeEvent>;

package/dist/cjs/api/dockviewGroupPanelApi.js

@@ -54,23 +54,24 @@ var DockviewGroupPanelApiImpl = /** @class */ (function (_super) {
             : window;
     };
     DockviewGroupPanelApiImpl.prototype.moveTo = function (options) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         if (!this._group) {
             throw new Error(NOT_INITIALIZED_MESSAGE);
         }
         var group = (_a = options.group) !== null && _a !== void 0 ? _a : this.accessor.addGroup({
             direction: (0, droptarget_1.positionToDirection)((_b = options.position) !== null && _b !== void 0 ? _b : 'right'),
-            skipSetActive: true,
+            skipSetActive: (_c = options.skipSetActive) !== null && _c !== void 0 ? _c : false,
         });
         this.accessor.moveGroupOrPanel({
             from: { groupId: this._group.id },
             to: {
                 group: group,
                 position: options.group
-                    ? (_c = options.position) !== null && _c !== void 0 ? _c : 'center'
+                    ? (_d = options.position) !== null && _d !== void 0 ? _d : 'center'
                     : 'center',
                 index: options.index,
             },
+            skipSetActive: options.skipSetActive,
         });
     };
     DockviewGroupPanelApiImpl.prototype.maximize = function () {

package/dist/cjs/api/dockviewPanelApi.js

@@ -110,6 +110,7 @@ var DockviewPanelApiImpl = /** @class */ (function (_super) {
                     : 'center',
                 index: options.index,
             },
+            skipSetActive: options.skipSetActive,
         });
     };
     DockviewPanelApiImpl.prototype.setTitle = function (title) {

package/dist/cjs/dockview/dockviewComponent.d.ts

@@ -80,6 +80,7 @@ type MoveGroupOptions = {
         group: DockviewGroupPanel;
         position: Position;
     };
+    skipSetActive?: boolean;
 };
 type MoveGroupOrPanelOptions = {
     from: {
@@ -91,6 +92,7 @@ type MoveGroupOrPanelOptions = {
         position: Position;
         index?: number;
     };
+    skipSetActive?: boolean;
 };
 export interface FloatingGroupOptions {
     x?: number;

package/dist/cjs/dockview/dockviewComponent.js

@@ -1630,6 +1630,7 @@ var DockviewComponent = /** @class */ (function (_super) {
                     group: destinationGroup,
                     position: destinationTarget,
                 },
+                skipSetActive: options.skipSetActive,
             });
             return;
         }
@@ -1651,12 +1652,16 @@ var DockviewComponent = /** @class */ (function (_super) {
                 this.doRemoveGroup(sourceGroup, { skipActive: true });
             }
             this.movingLock(function () {
+                var _a;
                 return destinationGroup.model.openPanel(removedPanel_1, {
                     index: destinationIndex,
+                    skipSetActive: (_a = options.skipSetActive) !== null && _a !== void 0 ? _a : false,
                     skipSetGroupActive: true,
                 });
             });
-            this.doSetGroupAndPanelActive(destinationGroup);
+            if (!options.skipSetActive) {
+                this.doSetGroupAndPanelActive(destinationGroup);
+            }
             this._onDidMovePanel.fire({
                 panel: removedPanel_1,
                 from: sourceGroup,
@@ -1769,7 +1774,8 @@ var DockviewComponent = /** @class */ (function (_super) {
         var to = options.to.group;
         var target = options.to.position;
         if (target === 'center') {
-            var activePanel_1 = from.activePanel;
+            var activePanel = from.activePanel;
+            var targetActivePanel = to.activePanel;
             var panels_2 = this.movingLock(function () {
                 return __spreadArray([], __read(from.panels), false).map(function (p) {
                     return from.model.removePanel(p.id, {
@@ -1786,7 +1792,7 @@ var DockviewComponent = /** @class */ (function (_super) {
                     for (var panels_3 = __values(panels_2), panels_3_1 = panels_3.next(); !panels_3_1.done; panels_3_1 = panels_3.next()) {
                         var panel = panels_3_1.value;
                         to.model.openPanel(panel, {
-                            skipSetActive: panel !== activePanel_1,
+                            skipSetActive: true, // Always skip setting panels active during move
                             skipSetGroupActive: true,
                         });
                     }
@@ -1799,7 +1805,18 @@ var DockviewComponent = /** @class */ (function (_super) {
                     finally { if (e_17) throw e_17.error; }
                 }
             });
-            this.doSetGroupAndPanelActive(to);
+            if (!options.skipSetActive) {
+                // Make the moved panel (from the source group) active
+                if (activePanel) {
+                    this.doSetGroupAndPanelActive(to);
+                }
+            }
+            else if (targetActivePanel) {
+                // Ensure the target group's original active panel remains active
+                to.model.openPanel(targetActivePanel, {
+                    skipSetGroupActive: true
+                });
+            }
         }
         else {
             switch (from.api.location.type) {
@@ -1819,12 +1836,39 @@ var DockviewComponent = /** @class */ (function (_super) {
                     if (!selectedPopoutGroup) {
                         throw new Error('failed to find popout group');
                     }
-                    selectedPopoutGroup.disposable.dispose();
+                    // Remove from popout groups list to prevent automatic restoration
+                    var index = this._popoutGroups.indexOf(selectedPopoutGroup);
+                    if (index >= 0) {
+                        this._popoutGroups.splice(index, 1);
+                    }
+                    // Clean up the reference group (ghost) if it exists and is hidden
+                    if (selectedPopoutGroup.referenceGroup) {
+                        var referenceGroup = this.getPanel(selectedPopoutGroup.referenceGroup);
+                        if (referenceGroup && !referenceGroup.api.isVisible) {
+                            this.doRemoveGroup(referenceGroup, { skipActive: true });
+                        }
+                    }
+                    // Manually dispose the window without triggering restoration
+                    selectedPopoutGroup.window.dispose();
+                    // Update group's location and containers for target
+                    if (to.api.location.type === 'grid') {
+                        from.model.renderContainer = this.overlayRenderContainer;
+                        from.model.dropTargetContainer = this.rootDropTargetContainer;
+                        from.model.location = { type: 'grid' };
+                    }
+                    else if (to.api.location.type === 'floating') {
+                        from.model.renderContainer = this.overlayRenderContainer;
+                        from.model.dropTargetContainer = this.rootDropTargetContainer;
+                        from.model.location = { type: 'floating' };
+                    }
+                    break;
                 }
             }
-            if (from.api.location.type !== 'popout') {
+            // For moves to grid locations
+            if (to.api.location.type === 'grid') {
                 var referenceLocation = (0, gridview_1.getGridLocation)(to.element);
                 var dropLocation = (0, gridview_1.getRelativeLocation)(this.gridview.orientation, referenceLocation, target);
+                // Add to grid for all moves targeting grid location
                 var size = void 0;
                 switch (this.gridview.orientation) {
                     case splitview_1.Orientation.VERTICAL:
@@ -1842,10 +1886,49 @@ var DockviewComponent = /** @class */ (function (_super) {
                 }
                 this.gridview.addView(from, size, dropLocation);
             }
+            else if (to.api.location.type === 'floating') {
+                // For moves to floating locations, add as floating group
+                // Get the position/size from the target floating group
+                var targetFloatingGroup = this._floatingGroups.find(function (x) { return x.group === to; });
+                if (targetFloatingGroup) {
+                    var box = targetFloatingGroup.overlay.toJSON();
+                    // Calculate position based on available properties
+                    var left = void 0, top_1;
+                    if ('left' in box) {
+                        left = box.left + 50;
+                    }
+                    else if ('right' in box) {
+                        left = Math.max(0, box.right - box.width - 50);
+                    }
+                    else {
+                        left = 50; // Default fallback
+                    }
+                    if ('top' in box) {
+                        top_1 = box.top + 50;
+                    }
+                    else if ('bottom' in box) {
+                        top_1 = Math.max(0, box.bottom - box.height - 50);
+                    }
+                    else {
+                        top_1 = 50; // Default fallback
+                    }
+                    this.addFloatingGroup(from, {
+                        height: box.height,
+                        width: box.width,
+                        position: {
+                            left: left,
+                            top: top_1,
+                        },
+                    });
+                }
+            }
         }
         from.panels.forEach(function (panel) {
             _this._onDidMovePanel.fire({ panel: panel, from: from });
         });
+        if (!options.skipSetActive) {
+            this.doSetGroupAndPanelActive(from);
+        }
     };
     DockviewComponent.prototype.doSetGroupActive = function (group) {
         _super.prototype.doSetGroupActive.call(this, group);

package/dist/dockview-core.amd.js

@@ -1,6 +1,6 @@
 /**
  * dockview-core
- * @version 4.4.1
+ * @version 4.5.0
  * @link https://github.com/mathuo/dockview
  * @license MIT
  */
@@ -6665,23 +6665,24 @@ define(['exports'], (function (exports) { 'use strict';
               : window;
       }
       moveTo(options) {
-          var _a, _b, _c;
+          var _a, _b, _c, _d;
           if (!this._group) {
               throw new Error(NOT_INITIALIZED_MESSAGE);
           }
           const group = (_a = options.group) !== null && _a !== void 0 ? _a : this.accessor.addGroup({
               direction: positionToDirection((_b = options.position) !== null && _b !== void 0 ? _b : 'right'),
-              skipSetActive: true,
+              skipSetActive: (_c = options.skipSetActive) !== null && _c !== void 0 ? _c : false,
           });
           this.accessor.moveGroupOrPanel({
               from: { groupId: this._group.id },
               to: {
                   group,
                   position: options.group
-                      ? (_c = options.position) !== null && _c !== void 0 ? _c : 'center'
+                      ? (_d = options.position) !== null && _d !== void 0 ? _d : 'center'
                       : 'center',
                   index: options.index,
               },
+              skipSetActive: options.skipSetActive,
           });
       }
       maximize() {
@@ -6913,6 +6914,7 @@ define(['exports'], (function (exports) { 'use strict';
                       : 'center',
                   index: options.index,
               },
+              skipSetActive: options.skipSetActive,
           });
       }
       setTitle(title) {
@@ -9505,6 +9507,7 @@ define(['exports'], (function (exports) { 'use strict';
                       group: destinationGroup,
                       position: destinationTarget,
                   },
+                  skipSetActive: options.skipSetActive,
               });
               return;
           }
@@ -9523,11 +9526,17 @@ define(['exports'], (function (exports) { 'use strict';
                   // remove the group and do not set a new group as active
                   this.doRemoveGroup(sourceGroup, { skipActive: true });
               }
-              this.movingLock(() => destinationGroup.model.openPanel(removedPanel, {
-                  index: destinationIndex,
-                  skipSetGroupActive: true,
-              }));
-              this.doSetGroupAndPanelActive(destinationGroup);
+              this.movingLock(() => {
+                  var _a;
+                  return destinationGroup.model.openPanel(removedPanel, {
+                      index: destinationIndex,
+                      skipSetActive: (_a = options.skipSetActive) !== null && _a !== void 0 ? _a : false,
+                      skipSetGroupActive: true,
+                  });
+              });
+              if (!options.skipSetActive) {
+                  this.doSetGroupAndPanelActive(destinationGroup);
+              }
               this._onDidMovePanel.fire({
                   panel: removedPanel,
                   from: sourceGroup,
@@ -9630,6 +9639,7 @@ define(['exports'], (function (exports) { 'use strict';
           const target = options.to.position;
           if (target === 'center') {
               const activePanel = from.activePanel;
+              const targetActivePanel = to.activePanel;
               const panels = this.movingLock(() => [...from.panels].map((p) => from.model.removePanel(p.id, {
                   skipSetActive: true,
               })));
@@ -9639,12 +9649,23 @@ define(['exports'], (function (exports) { 'use strict';
               this.movingLock(() => {
                   for (const panel of panels) {
                       to.model.openPanel(panel, {
-                          skipSetActive: panel !== activePanel,
+                          skipSetActive: true, // Always skip setting panels active during move
                           skipSetGroupActive: true,
                       });
                   }
               });
-              this.doSetGroupAndPanelActive(to);
+              if (!options.skipSetActive) {
+                  // Make the moved panel (from the source group) active
+                  if (activePanel) {
+                      this.doSetGroupAndPanelActive(to);
+                  }
+              }
+              else if (targetActivePanel) {
+                  // Ensure the target group's original active panel remains active
+                  to.model.openPanel(targetActivePanel, {
+                      skipSetGroupActive: true
+                  });
+              }
           }
           else {
               switch (from.api.location.type) {
@@ -9664,12 +9685,39 @@ define(['exports'], (function (exports) { 'use strict';
                       if (!selectedPopoutGroup) {
                           throw new Error('failed to find popout group');
                       }
-                      selectedPopoutGroup.disposable.dispose();
+                      // Remove from popout groups list to prevent automatic restoration
+                      const index = this._popoutGroups.indexOf(selectedPopoutGroup);
+                      if (index >= 0) {
+                          this._popoutGroups.splice(index, 1);
+                      }
+                      // Clean up the reference group (ghost) if it exists and is hidden
+                      if (selectedPopoutGroup.referenceGroup) {
+                          const referenceGroup = this.getPanel(selectedPopoutGroup.referenceGroup);
+                          if (referenceGroup && !referenceGroup.api.isVisible) {
+                              this.doRemoveGroup(referenceGroup, { skipActive: true });
+                          }
+                      }
+                      // Manually dispose the window without triggering restoration
+                      selectedPopoutGroup.window.dispose();
+                      // Update group's location and containers for target
+                      if (to.api.location.type === 'grid') {
+                          from.model.renderContainer = this.overlayRenderContainer;
+                          from.model.dropTargetContainer = this.rootDropTargetContainer;
+                          from.model.location = { type: 'grid' };
+                      }
+                      else if (to.api.location.type === 'floating') {
+                          from.model.renderContainer = this.overlayRenderContainer;
+                          from.model.dropTargetContainer = this.rootDropTargetContainer;
+                          from.model.location = { type: 'floating' };
+                      }
+                      break;
                   }
               }
-              if (from.api.location.type !== 'popout') {
+              // For moves to grid locations
+              if (to.api.location.type === 'grid') {
                   const referenceLocation = getGridLocation(to.element);
                   const dropLocation = getRelativeLocation(this.gridview.orientation, referenceLocation, target);
+                  // Add to grid for all moves targeting grid location
                   let size;
                   switch (this.gridview.orientation) {
                       case exports.Orientation.VERTICAL:
@@ -9687,10 +9735,49 @@ define(['exports'], (function (exports) { 'use strict';
                   }
                   this.gridview.addView(from, size, dropLocation);
               }
+              else if (to.api.location.type === 'floating') {
+                  // For moves to floating locations, add as floating group
+                  // Get the position/size from the target floating group
+                  const targetFloatingGroup = this._floatingGroups.find((x) => x.group === to);
+                  if (targetFloatingGroup) {
+                      const box = targetFloatingGroup.overlay.toJSON();
+                      // Calculate position based on available properties
+                      let left, top;
+                      if ('left' in box) {
+                          left = box.left + 50;
+                      }
+                      else if ('right' in box) {
+                          left = Math.max(0, box.right - box.width - 50);
+                      }
+                      else {
+                          left = 50; // Default fallback
+                      }
+                      if ('top' in box) {
+                          top = box.top + 50;
+                      }
+                      else if ('bottom' in box) {
+                          top = Math.max(0, box.bottom - box.height - 50);
+                      }
+                      else {
+                          top = 50; // Default fallback
+                      }
+                      this.addFloatingGroup(from, {
+                          height: box.height,
+                          width: box.width,
+                          position: {
+                              left,
+                              top,
+                          },
+                      });
+                  }
+              }
           }
           from.panels.forEach((panel) => {
               this._onDidMovePanel.fire({ panel, from });
           });
+          if (!options.skipSetActive) {
+              this.doSetGroupAndPanelActive(from);
+          }
       }
       doSetGroupActive(group) {
           super.doSetGroupActive(group);