dockview-react 1.14.2 → 1.15.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  /**
2
2
  * dockview-react
3
- * @version 1.14.2
3
+ * @version 1.15.1
4
4
  * @link https://github.com/mathuo/dockview
5
5
  * @license MIT
6
6
  */
@@ -528,6 +528,9 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
528
528
  }
529
529
  return false;
530
530
  }
531
+ function addTestId(element, id) {
532
+ element.setAttribute('data-testid', id);
533
+ }
531
534
 
532
535
  function tail(arr) {
533
536
  if (arr.length === 0) {
@@ -589,7 +592,11 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
589
592
 
590
593
  const clamp = (value, min, max) => {
591
594
  if (min > max) {
592
- throw new Error(`${min} > ${max} is an invalid condition`);
595
+ /**
596
+ * caveat: an error should be thrown here if this was a proper `clamp` function but we need to handle
597
+ * cases where `min` > `max` and in those cases return `min`.
598
+ */
599
+ return min;
593
600
  }
594
601
  return Math.min(max, Math.max(value, min));
595
602
  };
@@ -794,7 +801,14 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
794
801
  this._disabled = value;
795
802
  toggleClass(this.element, 'dv-splitview-disabled', value);
796
803
  }
804
+ get margin() {
805
+ return this._margin;
806
+ }
807
+ set margin(value) {
808
+ this._margin = value;
809
+ }
797
810
  constructor(container, options) {
811
+ var _a;
798
812
  this.container = container;
799
813
  this.viewItems = [];
800
814
  this.sashes = [];
@@ -805,6 +819,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
805
819
  this._startSnappingEnabled = true;
806
820
  this._endSnappingEnabled = true;
807
821
  this._disabled = false;
822
+ this._margin = 0;
808
823
  this._onDidSashEnd = new Emitter();
809
824
  this.onDidSashEnd = this._onDidSashEnd.event;
810
825
  this._onDidAddView = new Emitter();
@@ -893,6 +908,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
893
908
  };
894
909
  this._orientation = options.orientation;
895
910
  this.element = this.createContainer();
911
+ this.margin = (_a = options.margin) !== null && _a !== void 0 ? _a : 0;
896
912
  this.proportionalLayout =
897
913
  options.proportionalLayout === undefined
898
914
  ? true
@@ -947,9 +963,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
947
963
  if (index < 0 || index >= this.viewItems.length) {
948
964
  throw new Error('Index out of bounds');
949
965
  }
950
- toggleClass(this.container, 'visible', visible);
951
966
  const viewItem = this.viewItems[index];
952
- toggleClass(this.container, 'visible', visible);
953
967
  viewItem.setVisible(visible, viewItem.size);
954
968
  this.distributeEmptySpace(index);
955
969
  this.layoutViews();
@@ -1261,15 +1275,29 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
1261
1275
  this._proportions = this.viewItems.map((i) => i.visible ? i.size / this._contentSize : undefined);
1262
1276
  }
1263
1277
  }
1278
+ /**
1279
+ * Margin explain:
1280
+ *
1281
+ * For `n` views in a splitview there will be `n-1` margins `m`.
1282
+ *
1283
+ * To fit the margins each view must reduce in size by `(m * (n - 1)) / n`.
1284
+ *
1285
+ * For each view `i` the offet must be adjusted by `m * i/(n - 1)`.
1286
+ */
1264
1287
  layoutViews() {
1265
1288
  this._contentSize = this.viewItems.reduce((r, i) => r + i.size, 0);
1266
- let sum = 0;
1267
- const x = [];
1268
1289
  this.updateSashEnablement();
1290
+ if (this.viewItems.length === 0) {
1291
+ return;
1292
+ }
1293
+ const sashCount = this.viewItems.length - 1;
1294
+ const marginReducedSize = (this.margin * sashCount) / this.viewItems.length;
1295
+ let totalLeftOffset = 0;
1296
+ const viewLeftOffsets = [];
1269
1297
  for (let i = 0; i < this.viewItems.length - 1; i++) {
1270
- sum += this.viewItems[i].size;
1271
- x.push(sum);
1272
- const offset = Math.min(Math.max(0, sum - 2), this.size - 4);
1298
+ totalLeftOffset += this.viewItems[i].size;
1299
+ viewLeftOffsets.push(totalLeftOffset);
1300
+ const offset = Math.min(Math.max(0, totalLeftOffset - 2), this.size - this.margin);
1273
1301
  if (this._orientation === exports.Orientation.HORIZONTAL) {
1274
1302
  this.sashes[i].container.style.left = `${offset}px`;
1275
1303
  this.sashes[i].container.style.top = `0px`;
@@ -1280,19 +1308,24 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
1280
1308
  }
1281
1309
  }
1282
1310
  this.viewItems.forEach((view, i) => {
1311
+ const size = view.size - marginReducedSize;
1312
+ const offset = i === 0
1313
+ ? 0
1314
+ : viewLeftOffsets[i - 1] +
1315
+ (i / sashCount) * marginReducedSize;
1283
1316
  if (this._orientation === exports.Orientation.HORIZONTAL) {
1284
- view.container.style.width = `${view.size}px`;
1285
- view.container.style.left = i == 0 ? '0px' : `${x[i - 1]}px`;
1317
+ view.container.style.width = `${size}px`;
1318
+ view.container.style.left = `${offset}px`;
1286
1319
  view.container.style.top = '';
1287
1320
  view.container.style.height = '';
1288
1321
  }
1289
1322
  if (this._orientation === exports.Orientation.VERTICAL) {
1290
- view.container.style.height = `${view.size}px`;
1291
- view.container.style.top = i == 0 ? '0px' : `${x[i - 1]}px`;
1323
+ view.container.style.height = `${size}px`;
1324
+ view.container.style.top = `${offset}px`;
1292
1325
  view.container.style.width = '';
1293
1326
  view.container.style.left = '';
1294
1327
  }
1295
- view.view.layout(view.size, this._orthogonalSize);
1328
+ view.view.layout(view.size - marginReducedSize, this._orthogonalSize);
1296
1329
  });
1297
1330
  }
1298
1331
  findFirstSnapIndex(indexes) {
@@ -1741,7 +1774,18 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
1741
1774
  set disabled(value) {
1742
1775
  this.splitview.disabled = value;
1743
1776
  }
1744
- constructor(orientation, proportionalLayout, styles, size, orthogonalSize, disabled, childDescriptors) {
1777
+ get margin() {
1778
+ return this.splitview.margin;
1779
+ }
1780
+ set margin(value) {
1781
+ this.splitview.margin = value;
1782
+ this.children.forEach((child) => {
1783
+ if (child instanceof BranchNode) {
1784
+ child.margin = value;
1785
+ }
1786
+ });
1787
+ }
1788
+ constructor(orientation, proportionalLayout, styles, size, orthogonalSize, disabled, margin, childDescriptors) {
1745
1789
  super();
1746
1790
  this.orientation = orientation;
1747
1791
  this.proportionalLayout = proportionalLayout;
@@ -1761,6 +1805,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
1761
1805
  orientation: this.orientation,
1762
1806
  proportionalLayout,
1763
1807
  styles,
1808
+ margin,
1764
1809
  });
1765
1810
  this.splitview.layout(this.size, this.orthogonalSize);
1766
1811
  }
@@ -1784,6 +1829,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
1784
1829
  descriptor,
1785
1830
  proportionalLayout,
1786
1831
  styles,
1832
+ margin,
1787
1833
  });
1788
1834
  }
1789
1835
  this.disabled = disabled;
@@ -1792,10 +1838,8 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
1792
1838
  }));
1793
1839
  this.setupChildrenEvents();
1794
1840
  }
1795
- setVisible(visible) {
1796
- for (const child of this.children) {
1797
- child.setVisible(visible);
1798
- }
1841
+ setVisible(_visible) {
1842
+ // noop
1799
1843
  }
1800
1844
  isChildVisible(index) {
1801
1845
  if (index < 0 || index >= this.children.length) {
@@ -1812,12 +1856,13 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
1812
1856
  }
1813
1857
  const wereAllChildrenHidden = this.splitview.contentSize === 0;
1814
1858
  this.splitview.setViewVisible(index, visible);
1859
+ // }
1815
1860
  const areAllChildrenHidden = this.splitview.contentSize === 0;
1816
1861
  // If all children are hidden then the parent should hide the entire splitview
1817
1862
  // If the entire splitview is hidden then the parent should show the splitview when a child is shown
1818
1863
  if ((visible && wereAllChildrenHidden) ||
1819
1864
  (!visible && areAllChildrenHidden)) {
1820
- this._onDidVisibilityChange.fire(visible);
1865
+ this._onDidVisibilityChange.fire({ visible });
1821
1866
  }
1822
1867
  }
1823
1868
  moveChild(from, to) {
@@ -1890,7 +1935,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
1890
1935
  this._onDidChange.fire({ size: e.orthogonalSize });
1891
1936
  }), ...this.children.map((c, i) => {
1892
1937
  if (c instanceof BranchNode) {
1893
- return c.onDidVisibilityChange((visible) => {
1938
+ return c.onDidVisibilityChange(({ visible }) => {
1894
1939
  this.setChildVisible(i, visible);
1895
1940
  });
1896
1941
  }
@@ -1920,7 +1965,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
1920
1965
  }
1921
1966
  function flipNode(node, size, orthogonalSize) {
1922
1967
  if (node instanceof BranchNode) {
1923
- const result = new BranchNode(orthogonal(node.orientation), node.proportionalLayout, node.styles, size, orthogonalSize, node.disabled);
1968
+ const result = new BranchNode(orthogonal(node.orientation), node.proportionalLayout, node.styles, size, orthogonalSize, node.disabled, node.margin);
1924
1969
  let totalSize = 0;
1925
1970
  for (let i = node.children.length - 1; i >= 0; i--) {
1926
1971
  const child = node.children[i];
@@ -2075,6 +2120,13 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
2075
2120
  }
2076
2121
  }
2077
2122
  }
2123
+ get margin() {
2124
+ return this._margin;
2125
+ }
2126
+ set margin(value) {
2127
+ this._margin = value;
2128
+ this.root.margin = value;
2129
+ }
2078
2130
  maximizedView() {
2079
2131
  var _a;
2080
2132
  return (_a = this._maximizedNode) === null || _a === void 0 ? void 0 : _a.leaf.view;
@@ -2160,13 +2212,14 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
2160
2212
  this.disposable.dispose();
2161
2213
  this._onDidChange.dispose();
2162
2214
  this._onDidMaximizedNodeChange.dispose();
2215
+ this._onDidViewVisibilityChange.dispose();
2163
2216
  this.root.dispose();
2164
2217
  this._maximizedNode = undefined;
2165
2218
  this.element.remove();
2166
2219
  }
2167
2220
  clear() {
2168
2221
  const orientation = this.root.orientation;
2169
- this.root = new BranchNode(orientation, this.proportionalLayout, this.styles, this.root.size, this.root.orthogonalSize, this._locked);
2222
+ this.root = new BranchNode(orientation, this.proportionalLayout, this.styles, this.root.size, this.root.orthogonalSize, this.locked, this.margin);
2170
2223
  }
2171
2224
  deserialize(json, deserializer) {
2172
2225
  const orientation = json.orientation;
@@ -2177,6 +2230,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
2177
2230
  this.root = this._deserializeNode(root, orientation, deserializer, orthogonalSize);
2178
2231
  }
2179
2232
  _deserializeNode(node, orientation, deserializer, orthogonalSize) {
2233
+ var _a;
2180
2234
  let result;
2181
2235
  if (node.type === 'branch') {
2182
2236
  const serializedChildren = node.data;
@@ -2188,10 +2242,14 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
2188
2242
  });
2189
2243
  result = new BranchNode(orientation, this.proportionalLayout, this.styles, node.size, // <- orthogonal size - flips at each depth
2190
2244
  orthogonalSize, // <- size - flips at each depth,
2191
- this._locked, children);
2245
+ this.locked, this.margin, children);
2192
2246
  }
2193
2247
  else {
2194
- result = new LeafNode(deserializer.fromJSON(node), orientation, orthogonalSize, node.size);
2248
+ const view = deserializer.fromJSON(node);
2249
+ if (typeof node.visible === 'boolean') {
2250
+ (_a = view.setVisible) === null || _a === void 0 ? void 0 : _a.call(view, node.visible);
2251
+ }
2252
+ result = new LeafNode(view, orientation, orthogonalSize, node.size);
2195
2253
  }
2196
2254
  return result;
2197
2255
  }
@@ -2221,7 +2279,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
2221
2279
  }
2222
2280
  const oldRoot = this.root;
2223
2281
  oldRoot.element.remove();
2224
- this._root = new BranchNode(orthogonal(oldRoot.orientation), this.proportionalLayout, this.styles, this.root.orthogonalSize, this.root.size, this._locked);
2282
+ this._root = new BranchNode(orthogonal(oldRoot.orientation), this.proportionalLayout, this.styles, this.root.orthogonalSize, this.root.size, this.locked, this.margin);
2225
2283
  if (oldRoot.children.length === 0) ;
2226
2284
  else if (oldRoot.children.length === 1) {
2227
2285
  // can remove one level of redundant branching if there is only a single child
@@ -2286,19 +2344,24 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
2286
2344
  }
2287
2345
  return findLeaf(this.root, reverse);
2288
2346
  }
2289
- constructor(proportionalLayout, styles, orientation) {
2347
+ constructor(proportionalLayout, styles, orientation, locked, margin) {
2290
2348
  this.proportionalLayout = proportionalLayout;
2291
2349
  this.styles = styles;
2292
2350
  this._locked = false;
2351
+ this._margin = 0;
2293
2352
  this._maximizedNode = undefined;
2294
2353
  this.disposable = new MutableDisposable();
2295
2354
  this._onDidChange = new Emitter();
2296
2355
  this.onDidChange = this._onDidChange.event;
2356
+ this._onDidViewVisibilityChange = new Emitter();
2357
+ this.onDidViewVisibilityChange = this._onDidViewVisibilityChange.event;
2297
2358
  this._onDidMaximizedNodeChange = new Emitter();
2298
2359
  this.onDidMaximizedNodeChange = this._onDidMaximizedNodeChange.event;
2299
2360
  this.element = document.createElement('div');
2300
2361
  this.element.className = 'grid-view';
2301
- this.root = new BranchNode(orientation, proportionalLayout, styles, 0, 0, this._locked);
2362
+ this._locked = locked !== null && locked !== void 0 ? locked : false;
2363
+ this._margin = margin !== null && margin !== void 0 ? margin : 0;
2364
+ this.root = new BranchNode(orientation, proportionalLayout, styles, 0, 0, this.locked, this.margin);
2302
2365
  }
2303
2366
  isViewVisible(location) {
2304
2367
  const [rest, index] = tail(location);
@@ -2317,6 +2380,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
2317
2380
  if (!(parent instanceof BranchNode)) {
2318
2381
  throw new Error('Invalid from location');
2319
2382
  }
2383
+ this._onDidViewVisibilityChange.fire();
2320
2384
  parent.setChildVisible(index, visible);
2321
2385
  }
2322
2386
  moveView(parentLocation, from, to) {
@@ -2349,7 +2413,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
2349
2413
  }
2350
2414
  const child = grandParent.removeChild(parentIndex);
2351
2415
  child.dispose();
2352
- const newParent = new BranchNode(parent.orientation, this.proportionalLayout, this.styles, parent.size, parent.orthogonalSize, this._locked);
2416
+ const newParent = new BranchNode(parent.orientation, this.proportionalLayout, this.styles, parent.size, parent.orthogonalSize, this.locked, this.margin);
2353
2417
  grandParent.addChild(newParent, parent.size, parentIndex);
2354
2418
  const newSibling = new LeafNode(parent.view, grandParent.orientation, parent.size);
2355
2419
  newParent.addChild(newSibling, newSiblingSize, 0);
@@ -2588,14 +2652,18 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
2588
2652
  this.onDidActiveChange = this._onDidActiveChange.event;
2589
2653
  this._bufferOnDidLayoutChange = new AsapEvent();
2590
2654
  this.onDidLayoutChange = this._bufferOnDidLayoutChange.onEvent;
2655
+ this._onDidViewVisibilityChangeMicroTaskQueue = new AsapEvent();
2656
+ this.onDidViewVisibilityChangeMicroTaskQueue = this._onDidViewVisibilityChangeMicroTaskQueue.onEvent;
2591
2657
  this.element.style.height = '100%';
2592
2658
  this.element.style.width = '100%';
2593
2659
  options.parentElement.appendChild(this.element);
2594
- this.gridview = new Gridview(!!options.proportionalLayout, options.styles, options.orientation);
2660
+ this.gridview = new Gridview(!!options.proportionalLayout, options.styles, options.orientation, options.locked, options.margin);
2595
2661
  this.gridview.locked = !!options.locked;
2596
2662
  this.element.appendChild(this.gridview.element);
2597
2663
  this.layout(0, 0, true); // set some elements height/widths
2598
- this.addDisposables(exports.DockviewDisposable.from(() => {
2664
+ this.addDisposables(this.gridview.onDidViewVisibilityChange(() => this._onDidViewVisibilityChangeMicroTaskQueue.fire()), this.onDidViewVisibilityChangeMicroTaskQueue(() => {
2665
+ this.layout(this.width, this.height, true);
2666
+ }), exports.DockviewDisposable.from(() => {
2599
2667
  var _a;
2600
2668
  (_a = this.element.parentElement) === null || _a === void 0 ? void 0 : _a.removeChild(this.element);
2601
2669
  }), this.gridview.onDidChange(() => {
@@ -3173,6 +3241,9 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
3173
3241
  get totalPanels() {
3174
3242
  return this.component.totalPanels;
3175
3243
  }
3244
+ get gap() {
3245
+ return this.component.gap;
3246
+ }
3176
3247
  /**
3177
3248
  * Invoked when the active group changes. May be undefined if no group is active.
3178
3249
  */
@@ -3209,6 +3280,9 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
3209
3280
  get onDidRemovePanel() {
3210
3281
  return this.component.onDidRemovePanel;
3211
3282
  }
3283
+ get onDidMovePanel() {
3284
+ return this.component.onDidMovePanel;
3285
+ }
3212
3286
  /**
3213
3287
  * Invoked after a layout is deserialzied using the `fromJSON` method.
3214
3288
  */
@@ -3349,8 +3423,8 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
3349
3423
  /**
3350
3424
  * Add a floating group
3351
3425
  */
3352
- addFloatingGroup(item, coord) {
3353
- return this.component.addFloatingGroup(item, coord);
3426
+ addFloatingGroup(item, options) {
3427
+ return this.component.addFloatingGroup(item, options);
3354
3428
  }
3355
3429
  /**
3356
3430
  * Create a component from a serialized object.
@@ -3400,6 +3474,9 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
3400
3474
  addPopoutGroup(item, options) {
3401
3475
  return this.component.addPopoutGroup(item, options);
3402
3476
  }
3477
+ setGap(gap) {
3478
+ this.component.updateOptions({ gap });
3479
+ }
3403
3480
  }
3404
3481
 
3405
3482
  class DragHandler extends CompositeDisposable {
@@ -4769,7 +4846,8 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
4769
4846
  this.accessor.addFloatingGroup(this.group, {
4770
4847
  x: left - rootLeft + 20,
4771
4848
  y: top - rootTop + 20,
4772
- }, { inDragMode: true });
4849
+ inDragMode: true,
4850
+ });
4773
4851
  }
4774
4852
  }), addDisposableListener(this.tabContainer, 'mousedown', (event) => {
4775
4853
  if (event.defaultPrevented) {
@@ -4838,7 +4916,8 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
4838
4916
  this.accessor.addFloatingGroup(panel, {
4839
4917
  x: left - rootLeft,
4840
4918
  y: top - rootTop,
4841
- }, { inDragMode: true });
4919
+ inDragMode: true,
4920
+ });
4842
4921
  return;
4843
4922
  }
4844
4923
  const isLeftClick = event.button === 0;
@@ -4911,6 +4990,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
4911
4990
  rootOverlayModel: undefined,
4912
4991
  locked: undefined,
4913
4992
  disableDnd: undefined,
4993
+ gap: undefined,
4914
4994
  };
4915
4995
  return Object.keys(properties);
4916
4996
  })();
@@ -5641,6 +5721,9 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
5641
5721
  get isActive() {
5642
5722
  return this.api.isActive;
5643
5723
  }
5724
+ get isVisible() {
5725
+ return this.api.isVisible;
5726
+ }
5644
5727
  constructor(id, component, options, api) {
5645
5728
  super(id, component, api !== null && api !== void 0 ? api : new GridviewPanelApiImpl(id, component));
5646
5729
  this._evaluatedMinimumWidth = 0;
@@ -6403,12 +6486,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
6403
6486
  this._element.appendChild(this.options.content);
6404
6487
  this.options.container.appendChild(this._element);
6405
6488
  // if input bad resize within acceptable boundaries
6406
- this.setBounds({
6407
- height: this.options.height,
6408
- width: this.options.width,
6409
- top: this.options.top,
6410
- left: this.options.left,
6411
- });
6489
+ this.setBounds(Object.assign(Object.assign(Object.assign(Object.assign({ height: this.options.height, width: this.options.width }, ('top' in this.options && { top: this.options.top })), ('bottom' in this.options && { bottom: this.options.bottom })), ('left' in this.options && { left: this.options.left })), ('right' in this.options && { right: this.options.right })));
6412
6490
  }
6413
6491
  setBounds(bounds = {}) {
6414
6492
  if (typeof bounds.height === 'number') {
@@ -6417,11 +6495,25 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
6417
6495
  if (typeof bounds.width === 'number') {
6418
6496
  this._element.style.width = `${bounds.width}px`;
6419
6497
  }
6420
- if (typeof bounds.top === 'number') {
6498
+ if ('top' in bounds && typeof bounds.top === 'number') {
6421
6499
  this._element.style.top = `${bounds.top}px`;
6500
+ this._element.style.bottom = 'auto';
6501
+ this.verticalAlignment = 'top';
6502
+ }
6503
+ if ('bottom' in bounds && typeof bounds.bottom === 'number') {
6504
+ this._element.style.bottom = `${bounds.bottom}px`;
6505
+ this._element.style.top = 'auto';
6506
+ this.verticalAlignment = 'bottom';
6422
6507
  }
6423
- if (typeof bounds.left === 'number') {
6508
+ if ('left' in bounds && typeof bounds.left === 'number') {
6424
6509
  this._element.style.left = `${bounds.left}px`;
6510
+ this._element.style.right = 'auto';
6511
+ this.horiziontalAlignment = 'left';
6512
+ }
6513
+ if ('right' in bounds && typeof bounds.right === 'number') {
6514
+ this._element.style.right = `${bounds.right}px`;
6515
+ this._element.style.left = 'auto';
6516
+ this.horiziontalAlignment = 'right';
6425
6517
  }
6426
6518
  const containerRect = this.options.container.getBoundingClientRect();
6427
6519
  const overlayRect = this._element.getBoundingClientRect();
@@ -6429,24 +6521,54 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
6429
6521
  // a minimum width of minimumViewportWidth must be inside the viewport
6430
6522
  const xOffset = Math.max(0, this.getMinimumWidth(overlayRect.width));
6431
6523
  // a minimum height of minimumViewportHeight must be inside the viewport
6432
- const yOffset = typeof this.options.minimumInViewportHeight === 'number'
6433
- ? Math.max(0, this.getMinimumHeight(overlayRect.height))
6434
- : 0;
6435
- const left = clamp(overlayRect.left - containerRect.left, -xOffset, Math.max(0, containerRect.width - overlayRect.width + xOffset));
6436
- const top = clamp(overlayRect.top - containerRect.top, -yOffset, Math.max(0, containerRect.height - overlayRect.height + yOffset));
6437
- this._element.style.left = `${left}px`;
6438
- this._element.style.top = `${top}px`;
6524
+ const yOffset = Math.max(0, this.getMinimumHeight(overlayRect.height));
6525
+ if (this.verticalAlignment === 'top') {
6526
+ const top = clamp(overlayRect.top - containerRect.top, -yOffset, Math.max(0, containerRect.height - overlayRect.height + yOffset));
6527
+ this._element.style.top = `${top}px`;
6528
+ this._element.style.bottom = 'auto';
6529
+ }
6530
+ if (this.verticalAlignment === 'bottom') {
6531
+ const bottom = clamp(containerRect.bottom - overlayRect.bottom, -yOffset, Math.max(0, containerRect.height - overlayRect.height + yOffset));
6532
+ this._element.style.bottom = `${bottom}px`;
6533
+ this._element.style.top = 'auto';
6534
+ }
6535
+ if (this.horiziontalAlignment === 'left') {
6536
+ const left = clamp(overlayRect.left - containerRect.left, -xOffset, Math.max(0, containerRect.width - overlayRect.width + xOffset));
6537
+ this._element.style.left = `${left}px`;
6538
+ this._element.style.right = 'auto';
6539
+ }
6540
+ if (this.horiziontalAlignment === 'right') {
6541
+ const right = clamp(containerRect.right - overlayRect.right, -xOffset, Math.max(0, containerRect.width - overlayRect.width + xOffset));
6542
+ this._element.style.right = `${right}px`;
6543
+ this._element.style.left = 'auto';
6544
+ }
6439
6545
  this._onDidChange.fire();
6440
6546
  }
6441
6547
  toJSON() {
6442
6548
  const container = this.options.container.getBoundingClientRect();
6443
6549
  const element = this._element.getBoundingClientRect();
6444
- return {
6445
- top: element.top - container.top,
6446
- left: element.left - container.left,
6447
- width: element.width,
6448
- height: element.height,
6449
- };
6550
+ const result = {};
6551
+ if (this.verticalAlignment === 'top') {
6552
+ result.top = parseFloat(this._element.style.top);
6553
+ }
6554
+ else if (this.verticalAlignment === 'bottom') {
6555
+ result.bottom = parseFloat(this._element.style.bottom);
6556
+ }
6557
+ else {
6558
+ result.top = element.top - container.top;
6559
+ }
6560
+ if (this.horiziontalAlignment === 'left') {
6561
+ result.left = parseFloat(this._element.style.left);
6562
+ }
6563
+ else if (this.horiziontalAlignment === 'right') {
6564
+ result.right = parseFloat(this._element.style.right);
6565
+ }
6566
+ else {
6567
+ result.left = element.left - container.left;
6568
+ }
6569
+ result.width = element.width;
6570
+ result.height = element.height;
6571
+ return result;
6450
6572
  }
6451
6573
  setupDrag(dragTarget, options = { inDragMode: false }) {
6452
6574
  const move = new MutableDisposable();
@@ -6478,12 +6600,30 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
6478
6600
  };
6479
6601
  }
6480
6602
  const xOffset = Math.max(0, this.getMinimumWidth(overlayRect.width));
6481
- const yOffset = Math.max(0, this.options.minimumInViewportHeight
6482
- ? this.getMinimumHeight(overlayRect.height)
6483
- : 0);
6484
- const left = clamp(x - offset.x, -xOffset, Math.max(0, containerRect.width - overlayRect.width + xOffset));
6603
+ const yOffset = Math.max(0, this.getMinimumHeight(overlayRect.height));
6485
6604
  const top = clamp(y - offset.y, -yOffset, Math.max(0, containerRect.height - overlayRect.height + yOffset));
6486
- this.setBounds({ top, left });
6605
+ const bottom = clamp(offset.y -
6606
+ y +
6607
+ containerRect.height -
6608
+ overlayRect.height, -yOffset, Math.max(0, containerRect.height - overlayRect.height + yOffset));
6609
+ const left = clamp(x - offset.x, -xOffset, Math.max(0, containerRect.width - overlayRect.width + xOffset));
6610
+ const right = clamp(offset.x - x + containerRect.width - overlayRect.width, -xOffset, Math.max(0, containerRect.width - overlayRect.width + xOffset));
6611
+ const bounds = {};
6612
+ // Anchor to top or to bottom depending on which one is closer
6613
+ if (top <= bottom) {
6614
+ bounds.top = top;
6615
+ }
6616
+ else {
6617
+ bounds.bottom = bottom;
6618
+ }
6619
+ // Anchor to left or to right depending on which one is closer
6620
+ if (left <= right) {
6621
+ bounds.left = left;
6622
+ }
6623
+ else {
6624
+ bounds.right = right;
6625
+ }
6626
+ this.setBounds(bounds);
6487
6627
  }), addDisposableWindowListener(window, 'mouseup', () => {
6488
6628
  toggleClass(this._element, 'dv-resize-container-dragging', false);
6489
6629
  move.dispose();
@@ -6551,8 +6691,10 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
6551
6691
  };
6552
6692
  }
6553
6693
  let top = undefined;
6694
+ let bottom = undefined;
6554
6695
  let height = undefined;
6555
6696
  let left = undefined;
6697
+ let right = undefined;
6556
6698
  let width = undefined;
6557
6699
  const moveTop = () => {
6558
6700
  top = clamp(y, -Number.MAX_VALUE, startPosition.originalY +
@@ -6566,6 +6708,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
6566
6708
  startPosition.originalY +
6567
6709
  startPosition.originalHeight -
6568
6710
  top;
6711
+ bottom = containerRect.height - top - height;
6569
6712
  };
6570
6713
  const moveBottom = () => {
6571
6714
  top =
@@ -6577,6 +6720,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
6577
6720
  ? -top +
6578
6721
  this.options.minimumInViewportHeight
6579
6722
  : Overlay.MINIMUM_HEIGHT, Number.MAX_VALUE);
6723
+ bottom = containerRect.height - top - height;
6580
6724
  };
6581
6725
  const moveLeft = () => {
6582
6726
  left = clamp(x, -Number.MAX_VALUE, startPosition.originalX +
@@ -6590,6 +6734,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
6590
6734
  startPosition.originalX +
6591
6735
  startPosition.originalWidth -
6592
6736
  left;
6737
+ right = containerRect.width - left - width;
6593
6738
  };
6594
6739
  const moveRight = () => {
6595
6740
  left =
@@ -6601,6 +6746,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
6601
6746
  ? -left +
6602
6747
  this.options.minimumInViewportWidth
6603
6748
  : Overlay.MINIMUM_WIDTH, Number.MAX_VALUE);
6749
+ right = containerRect.width - left - width;
6604
6750
  };
6605
6751
  switch (direction) {
6606
6752
  case 'top':
@@ -6632,7 +6778,24 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
6632
6778
  moveRight();
6633
6779
  break;
6634
6780
  }
6635
- this.setBounds({ height, width, top, left });
6781
+ const bounds = {};
6782
+ // Anchor to top or to bottom depending on which one is closer
6783
+ if (top <= bottom) {
6784
+ bounds.top = top;
6785
+ }
6786
+ else {
6787
+ bounds.bottom = bottom;
6788
+ }
6789
+ // Anchor to left or to right depending on which one is closer
6790
+ if (left <= right) {
6791
+ bounds.left = left;
6792
+ }
6793
+ else {
6794
+ bounds.right = right;
6795
+ }
6796
+ bounds.height = height;
6797
+ bounds.width = width;
6798
+ this.setBounds(bounds);
6636
6799
  }), {
6637
6800
  dispose: () => {
6638
6801
  for (const iframe of iframes) {
@@ -6655,7 +6818,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
6655
6818
  if (typeof this.options.minimumInViewportHeight === 'number') {
6656
6819
  return height - this.options.minimumInViewportHeight;
6657
6820
  }
6658
- return height;
6821
+ return 0;
6659
6822
  }
6660
6823
  dispose() {
6661
6824
  this._element.remove();
@@ -6678,7 +6841,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
6678
6841
  }
6679
6842
 
6680
6843
  const DEFAULT_FLOATING_GROUP_OVERFLOW_SIZE = 100;
6681
- const DEFAULT_FLOATING_GROUP_POSITION = { left: 100, top: 100 };
6844
+ const DEFAULT_FLOATING_GROUP_POSITION = { left: 100, top: 100, width: 300, height: 300 };
6682
6845
 
6683
6846
  function createFocusableElement() {
6684
6847
  const element = document.createElement('div');
@@ -7010,6 +7173,9 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
7010
7173
  get api() {
7011
7174
  return this._api;
7012
7175
  }
7176
+ get gap() {
7177
+ return this.gridview.margin;
7178
+ }
7013
7179
  constructor(options) {
7014
7180
  var _a;
7015
7181
  super({
@@ -7021,6 +7187,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
7021
7187
  parentElement: options.parentElement,
7022
7188
  disableAutoResizing: options.disableAutoResizing,
7023
7189
  locked: options.locked,
7190
+ margin: options.gap,
7024
7191
  });
7025
7192
  this.nextGroupId = sequentialNumberGenerator();
7026
7193
  this._deserializer = new DefaultDockviewDeserialzier(this);
@@ -7046,9 +7213,9 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
7046
7213
  this._onDidActivePanelChange = new Emitter();
7047
7214
  this.onDidActivePanelChange = this._onDidActivePanelChange.event;
7048
7215
  this._onDidMovePanel = new Emitter();
7216
+ this.onDidMovePanel = this._onDidMovePanel.event;
7049
7217
  this._floatingGroups = [];
7050
7218
  this._popoutGroups = [];
7051
- this._ignoreEvents = 0;
7052
7219
  this._onDidRemoveGroup = new Emitter();
7053
7220
  this.onDidRemoveGroup = this._onDidRemoveGroup.event;
7054
7221
  this._onDidAddGroup = new Emitter();
@@ -7062,7 +7229,9 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
7062
7229
  this.overlayRenderContainer = new OverlayRenderContainer(gready);
7063
7230
  toggleClass(this.gridview.element, 'dv-dockview', true);
7064
7231
  toggleClass(this.element, 'dv-debug', !!options.debug);
7065
- this.addDisposables(this.overlayRenderContainer, this._onWillDragPanel, this._onWillDragGroup, this._onWillShowOverlay, this._onDidActivePanelChange, this._onDidAddPanel, this._onDidRemovePanel, this._onDidLayoutFromJSON, this._onDidDrop, this._onWillDrop, this._onDidMovePanel, this._onDidAddGroup, this._onDidRemoveGroup, this._onDidActiveGroupChange, this._onUnhandledDragOverEvent, this.onDidAdd((event) => {
7232
+ this.addDisposables(this.overlayRenderContainer, this._onWillDragPanel, this._onWillDragGroup, this._onWillShowOverlay, this._onDidActivePanelChange, this._onDidAddPanel, this._onDidRemovePanel, this._onDidLayoutFromJSON, this._onDidDrop, this._onWillDrop, this._onDidMovePanel, this._onDidAddGroup, this._onDidRemoveGroup, this._onDidActiveGroupChange, this._onUnhandledDragOverEvent, this.onDidViewVisibilityChangeMicroTaskQueue(() => {
7233
+ this.updateWatermark();
7234
+ }), this.onDidAdd((event) => {
7066
7235
  if (!this._moving) {
7067
7236
  this._onDidAddGroup.fire(event);
7068
7237
  }
@@ -7076,7 +7245,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
7076
7245
  }
7077
7246
  }), exports.DockviewEvent.any(this.onDidAdd, this.onDidRemove)(() => {
7078
7247
  this.updateWatermark();
7079
- }), exports.DockviewEvent.any(this.onDidAddPanel, this.onDidRemovePanel, this.onDidActivePanelChange)(() => {
7248
+ }), exports.DockviewEvent.any(this.onDidAddPanel, this.onDidRemovePanel, this.onDidAddGroup, this.onDidRemove, this.onDidMovePanel, this.onDidActivePanelChange)(() => {
7080
7249
  this._bufferOnDidLayoutChange.fire();
7081
7250
  }), exports.DockviewDisposable.from(() => {
7082
7251
  // iterate over a copy of the array since .dispose() mutates the original array
@@ -7176,7 +7345,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
7176
7345
  var _a, _b, _c;
7177
7346
  if (itemToPopout instanceof DockviewPanel &&
7178
7347
  itemToPopout.group.size === 1) {
7179
- return this.addPopoutGroup(itemToPopout.group);
7348
+ return this.addPopoutGroup(itemToPopout.group, options);
7180
7349
  }
7181
7350
  const theme = getDockviewTheme(this.gridview.element);
7182
7351
  const element = this.element;
@@ -7327,8 +7496,8 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
7327
7496
  console.error('dockview: failed to create popout window', err);
7328
7497
  });
7329
7498
  }
7330
- addFloatingGroup(item, coord, options) {
7331
- var _a, _b, _c, _d, _e, _f, _g;
7499
+ addFloatingGroup(item, options) {
7500
+ var _a, _b, _c, _d, _e;
7332
7501
  let group;
7333
7502
  if (item instanceof DockviewPanel) {
7334
7503
  group = this.createGroup();
@@ -7373,26 +7542,62 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
7373
7542
  }
7374
7543
  }
7375
7544
  group.model.location = { type: 'floating' };
7376
- const overlayLeft = typeof (coord === null || coord === void 0 ? void 0 : coord.x) === 'number'
7377
- ? Math.max(coord.x, 0)
7378
- : DEFAULT_FLOATING_GROUP_POSITION.left;
7379
- const overlayTop = typeof (coord === null || coord === void 0 ? void 0 : coord.y) === 'number'
7380
- ? Math.max(coord.y, 0)
7381
- : DEFAULT_FLOATING_GROUP_POSITION.top;
7382
- const overlay = new Overlay({
7383
- container: this.gridview.element,
7384
- content: group.element,
7385
- height: (_b = coord === null || coord === void 0 ? void 0 : coord.height) !== null && _b !== void 0 ? _b : 300,
7386
- width: (_c = coord === null || coord === void 0 ? void 0 : coord.width) !== null && _c !== void 0 ? _c : 300,
7387
- left: overlayLeft,
7388
- top: overlayTop,
7389
- minimumInViewportWidth: this.options.floatingGroupBounds === 'boundedWithinViewport'
7545
+ function getAnchoredBox() {
7546
+ if (options === null || options === void 0 ? void 0 : options.position) {
7547
+ const result = {};
7548
+ if ('left' in options.position) {
7549
+ result.left = Math.max(options.position.left, 0);
7550
+ }
7551
+ else if ('right' in options.position) {
7552
+ result.right = Math.max(options.position.right, 0);
7553
+ }
7554
+ else {
7555
+ result.left = DEFAULT_FLOATING_GROUP_POSITION.left;
7556
+ }
7557
+ if ('top' in options.position) {
7558
+ result.top = Math.max(options.position.top, 0);
7559
+ }
7560
+ else if ('bottom' in options.position) {
7561
+ result.bottom = Math.max(options.position.bottom, 0);
7562
+ }
7563
+ else {
7564
+ result.top = DEFAULT_FLOATING_GROUP_POSITION.top;
7565
+ }
7566
+ if (typeof options.width === 'number') {
7567
+ result.width = Math.max(options.width, 0);
7568
+ }
7569
+ else {
7570
+ result.width = DEFAULT_FLOATING_GROUP_POSITION.width;
7571
+ }
7572
+ if (typeof options.height === 'number') {
7573
+ result.height = Math.max(options.height, 0);
7574
+ }
7575
+ else {
7576
+ result.height = DEFAULT_FLOATING_GROUP_POSITION.height;
7577
+ }
7578
+ return result;
7579
+ }
7580
+ return {
7581
+ left: typeof (options === null || options === void 0 ? void 0 : options.x) === 'number'
7582
+ ? Math.max(options.x, 0)
7583
+ : DEFAULT_FLOATING_GROUP_POSITION.left,
7584
+ top: typeof (options === null || options === void 0 ? void 0 : options.y) === 'number'
7585
+ ? Math.max(options.y, 0)
7586
+ : DEFAULT_FLOATING_GROUP_POSITION.top,
7587
+ width: typeof (options === null || options === void 0 ? void 0 : options.width) === 'number'
7588
+ ? Math.max(options.width, 0)
7589
+ : DEFAULT_FLOATING_GROUP_POSITION.width,
7590
+ height: typeof (options === null || options === void 0 ? void 0 : options.height) === 'number'
7591
+ ? Math.max(options.height, 0)
7592
+ : DEFAULT_FLOATING_GROUP_POSITION.height,
7593
+ };
7594
+ }
7595
+ const anchoredBox = getAnchoredBox();
7596
+ const overlay = new Overlay(Object.assign(Object.assign({ container: this.gridview.element, content: group.element }, anchoredBox), { minimumInViewportWidth: this.options.floatingGroupBounds === 'boundedWithinViewport'
7390
7597
  ? undefined
7391
- : (_e = (_d = this.options.floatingGroupBounds) === null || _d === void 0 ? void 0 : _d.minimumWidthWithinViewport) !== null && _e !== void 0 ? _e : DEFAULT_FLOATING_GROUP_OVERFLOW_SIZE,
7392
- minimumInViewportHeight: this.options.floatingGroupBounds === 'boundedWithinViewport'
7598
+ : (_c = (_b = this.options.floatingGroupBounds) === null || _b === void 0 ? void 0 : _b.minimumWidthWithinViewport) !== null && _c !== void 0 ? _c : DEFAULT_FLOATING_GROUP_OVERFLOW_SIZE, minimumInViewportHeight: this.options.floatingGroupBounds === 'boundedWithinViewport'
7393
7599
  ? undefined
7394
- : (_g = (_f = this.options.floatingGroupBounds) === null || _f === void 0 ? void 0 : _f.minimumHeightWithinViewport) !== null && _g !== void 0 ? _g : DEFAULT_FLOATING_GROUP_OVERFLOW_SIZE,
7395
- });
7600
+ : (_e = (_d = this.options.floatingGroupBounds) === null || _d === void 0 ? void 0 : _d.minimumHeightWithinViewport) !== null && _e !== void 0 ? _e : DEFAULT_FLOATING_GROUP_OVERFLOW_SIZE }));
7396
7601
  const el = group.element.querySelector('.void-container');
7397
7602
  if (!el) {
7398
7603
  throw new Error('failed to find drag handle');
@@ -7490,12 +7695,21 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
7490
7695
  group.overlay.minimumInViewportWidth =
7491
7696
  (_b = this.options.floatingGroupBounds) === null || _b === void 0 ? void 0 : _b.minimumWidthWithinViewport;
7492
7697
  }
7493
- group.overlay.setBounds({});
7698
+ group.overlay.setBounds();
7494
7699
  }
7495
7700
  }
7496
7701
  if (changed_rootOverlayOptions) {
7497
7702
  this._rootDropTarget.setOverlayModel(options.rootOverlayModel);
7498
7703
  }
7704
+ if (
7705
+ // if explicitly set as `undefined`
7706
+ 'gap' in options &&
7707
+ options.gap === undefined) {
7708
+ this.gridview.margin = 0;
7709
+ }
7710
+ if (typeof options.gap === 'number') {
7711
+ this.gridview.margin = options.gap;
7712
+ }
7499
7713
  this.layout(this.gridview.width, this.gridview.height, true);
7500
7714
  }
7501
7715
  layout(width, height, forceResize) {
@@ -7657,11 +7871,10 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
7657
7871
  const { data, position } = serializedFloatingGroup;
7658
7872
  const group = createGroupFromSerializedState(data);
7659
7873
  this.addFloatingGroup(group, {
7660
- x: position.left,
7661
- y: position.top,
7662
- height: position.height,
7663
- width: position.width,
7664
- }, { skipRemoveGroup: true, inDragMode: false });
7874
+ position: position,
7875
+ skipRemoveGroup: true,
7876
+ inDragMode: false,
7877
+ });
7665
7878
  }
7666
7879
  const serializedPopoutGroups = (_b = data.popoutGroups) !== null && _b !== void 0 ? _b : [];
7667
7880
  for (const serializedPopoutGroup of serializedPopoutGroups) {
@@ -7792,15 +8005,11 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
7792
8005
  if (options.floating) {
7793
8006
  const group = this.createGroup();
7794
8007
  this._onDidAddGroup.fire(group);
7795
- const o = typeof options.floating === 'object' &&
8008
+ const floatingGroupOptions = typeof options.floating === 'object' &&
7796
8009
  options.floating !== null
7797
8010
  ? options.floating
7798
8011
  : {};
7799
- this.addFloatingGroup(group, o, {
7800
- inDragMode: false,
7801
- skipRemoveGroup: true,
7802
- skipActiveGroup: true,
7803
- });
8012
+ this.addFloatingGroup(group, Object.assign(Object.assign({}, floatingGroupOptions), { inDragMode: false, skipRemoveGroup: true, skipActiveGroup: true }));
7804
8013
  panel = this.createPanel(options, group);
7805
8014
  group.model.openPanel(panel, {
7806
8015
  skipSetActive: options.inactive,
@@ -7839,11 +8048,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
7839
8048
  options.floating !== null
7840
8049
  ? options.floating
7841
8050
  : {};
7842
- this.addFloatingGroup(group, coordinates, {
7843
- inDragMode: false,
7844
- skipRemoveGroup: true,
7845
- skipActiveGroup: true,
7846
- });
8051
+ this.addFloatingGroup(group, Object.assign(Object.assign({}, coordinates), { inDragMode: false, skipRemoveGroup: true, skipActiveGroup: true }));
7847
8052
  panel = this.createPanel(options, group);
7848
8053
  group.model.openPanel(panel, {
7849
8054
  skipSetActive: options.inactive,
@@ -7898,6 +8103,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
7898
8103
  });
7899
8104
  const watermarkContainer = document.createElement('div');
7900
8105
  watermarkContainer.className = 'dv-watermark-container';
8106
+ addTestId(watermarkContainer, 'watermark-component');
7901
8107
  watermarkContainer.appendChild(this.watermark.element);
7902
8108
  this.gridview.element.appendChild(watermarkContainer);
7903
8109
  }
@@ -8086,6 +8292,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
8086
8292
  this.doSetGroupAndPanelActive(destinationGroup);
8087
8293
  this._onDidMovePanel.fire({
8088
8294
  panel: removedPanel,
8295
+ from: sourceGroup,
8089
8296
  });
8090
8297
  }
8091
8298
  else {
@@ -8109,6 +8316,10 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
8109
8316
  // if a group has one tab - we are essentially moving the 'group'
8110
8317
  // which is equivalent to swapping two views in this case
8111
8318
  this.gridview.moveView(sourceParentLocation, from, to);
8319
+ this._onDidMovePanel.fire({
8320
+ panel: this.getGroupPanel(sourceItemId),
8321
+ from: sourceGroup,
8322
+ });
8112
8323
  return;
8113
8324
  }
8114
8325
  }
@@ -8122,6 +8333,10 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
8122
8333
  const location = getRelativeLocation(this.gridview.orientation, updatedReferenceLocation, destinationTarget);
8123
8334
  this.movingLock(() => this.doAddGroup(targetGroup, location));
8124
8335
  this.doSetGroupAndPanelActive(targetGroup);
8336
+ this._onDidMovePanel.fire({
8337
+ panel: this.getGroupPanel(sourceItemId),
8338
+ from: sourceGroup,
8339
+ });
8125
8340
  }
8126
8341
  else {
8127
8342
  /**
@@ -8141,6 +8356,10 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
8141
8356
  skipSetGroupActive: true,
8142
8357
  }));
8143
8358
  this.doSetGroupAndPanelActive(group);
8359
+ this._onDidMovePanel.fire({
8360
+ panel: removedPanel,
8361
+ from: sourceGroup,
8362
+ });
8144
8363
  }
8145
8364
  }
8146
8365
  }
@@ -8165,9 +8384,6 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
8165
8384
  }
8166
8385
  });
8167
8386
  this.doSetGroupAndPanelActive(to);
8168
- panels.forEach((panel) => {
8169
- this._onDidMovePanel.fire({ panel });
8170
- });
8171
8387
  }
8172
8388
  else {
8173
8389
  switch (from.api.location.type) {
@@ -8193,10 +8409,10 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
8193
8409
  const referenceLocation = getGridLocation(to.element);
8194
8410
  const dropLocation = getRelativeLocation(this.gridview.orientation, referenceLocation, target);
8195
8411
  this.gridview.addView(from, exports.Sizing.Distribute, dropLocation);
8196
- from.panels.forEach((panel) => {
8197
- this._onDidMovePanel.fire({ panel });
8198
- });
8199
8412
  }
8413
+ from.panels.forEach((panel) => {
8414
+ this._onDidMovePanel.fire({ panel, from });
8415
+ });
8200
8416
  }
8201
8417
  doSetGroupActive(group) {
8202
8418
  super.doSetGroupActive(group);