dockview 1.7.4 → 1.7.5

package/dist/dockview.amd.js

@@ -1,6 +1,6 @@
 /**
  * dockview
- * @version 1.7.4
+ * @version 1.7.5
  * @link https://github.com/mathuo/dockview
  * @license MIT
  */
@@ -247,7 +247,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
       element.addEventListener(type, listener, options);
       return {
           dispose: () => {
-              element.removeEventListener(type, listener);
+              element.removeEventListener(type, listener, options);
           },
       };
   }
@@ -255,7 +255,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
       element.addEventListener(type, listener, options);
       return {
           dispose: () => {
-              element.removeEventListener(type, listener);
+              element.removeEventListener(type, listener, options);
           },
       };
   }
@@ -1019,12 +1019,10 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
                       this.saveProportions();
                       document.removeEventListener('mousemove', mousemove);
                       document.removeEventListener('mouseup', end);
-                      document.removeEventListener('mouseend', end);
                       this._onDidSashEnd.fire(undefined);
                   };
                   document.addEventListener('mousemove', mousemove);
                   document.addEventListener('mouseup', end);
-                  document.addEventListener('mouseend', end);
               };
               sash.addEventListener('mousedown', onStart);
               const sashItem = {
@@ -2127,36 +2125,30 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
           if (!(node instanceof LeafNode)) {
               throw new Error('Invalid location');
           }
-          const view = node.view;
-          node.dispose(); // dispose of node
-          const child = parent.removeChild(index, sizing);
-          child.dispose();
+          parent.removeChild(index, sizing);
           if (parent.children.length === 0) {
-              return view;
+              return node.view;
           }
           if (parent.children.length > 1) {
-              return view;
+              return node.view;
           }
           const sibling = parent.children[0];
           if (pathToParent.length === 0) {
               // parent is root
               if (sibling instanceof LeafNode) {
-                  return view;
+                  return node.view;
               }
               // we must promote sibling to be the new root
-              const child = parent.removeChild(0, sizing);
-              child.dispose();
+              parent.removeChild(0, sizing);
               this.root = sibling;
-              return view;
+              return node.view;
           }
           const [grandParent, ..._] = [...pathToParent].reverse();
           const [parentIndex, ...__] = [...rest].reverse();
           const isSiblingVisible = parent.isChildVisible(0);
-          const childNode = parent.removeChild(0, sizing);
-          childNode.dispose();
+          parent.removeChild(0, sizing);
           const sizes = grandParent.children.map((_size, i) => grandParent.getChildSize(i));
-          const parentNode = grandParent.removeChild(parentIndex, sizing);
-          parentNode.dispose();
+          grandParent.removeChild(parentIndex, sizing);
           if (sibling instanceof BranchNode) {
               sizes.splice(parentIndex, 1, ...sibling.children.map((c) => c.size));
               for (let i = 0; i < sibling.children.length; i++) {
@@ -2174,7 +2166,7 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
           for (let i = 0; i < sizes.length; i++) {
               grandParent.resizeChild(i, sizes[i]);
           }
-          return view;
+          return node.view;
       }
       layout(width, height) {
           const [size, orthogonalSize] = this.root.orientation === exports.Orientation.HORIZONTAL
@@ -2887,25 +2879,32 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
       constructor(el) {
           super();
           this.el = el;
-          this.disposable = new MutableDisposable();
+          this.dataDisposable = new MutableDisposable();
+          this.pointerEventsDisposable = new MutableDisposable();
           this._onDragStart = new Emitter();
           this.onDragStart = this._onDragStart.event;
-          this.iframes = [];
-          this.addDisposables(this._onDragStart);
+          this.addDisposables(this._onDragStart, this.dataDisposable, this.pointerEventsDisposable);
           this.configure();
       }
       configure() {
           this.addDisposables(this._onDragStart, addDisposableListener(this.el, 'dragstart', (event) => {
-              this.iframes = [
+              const iframes = [
                   ...getElementsByTagName('iframe'),
                   ...getElementsByTagName('webview'),
               ];
-              for (const iframe of this.iframes) {
+              this.pointerEventsDisposable.value = {
+                  dispose: () => {
+                      for (const iframe of iframes) {
+                          iframe.style.pointerEvents = 'auto';
+                      }
+                  },
+              };
+              for (const iframe of iframes) {
                   iframe.style.pointerEvents = 'none';
               }
               this.el.classList.add('dv-dragged');
               setTimeout(() => this.el.classList.remove('dv-dragged'), 0);
-              this.disposable.value = this.getData(event.dataTransfer);
+              this.dataDisposable.value = this.getData(event.dataTransfer);
               if (event.dataTransfer) {
                   event.dataTransfer.effectAllowed = 'move';
                   /**
@@ -2920,11 +2919,8 @@ define(['exports', 'react', 'react-dom'], (function (exports, React, ReactDOM) {
                   event.dataTransfer.setData('text/plain', '__dockview_internal_drag_event__');
               }
           }), addDisposableListener(this.el, 'dragend', () => {
-              for (const iframe of this.iframes) {
-                  iframe.style.pointerEvents = 'auto';
-              }
-              this.iframes = [];
-              this.disposable.dispose();
+              this.pointerEventsDisposable.dispose();
+              this.dataDisposable.dispose();
           }));
       }
   }