dockview 1.7.4 → 1.7.5

package/dist/dockview.noStyle.js

@@ -1,6 +1,6 @@
 /**
  * dockview
- * @version 1.7.4
+ * @version 1.7.5
  * @link https://github.com/mathuo/dockview
  * @license MIT
  */
@@ -221,7 +221,7 @@
         element.addEventListener(type, listener, options);
         return {
             dispose: () => {
-                element.removeEventListener(type, listener);
+                element.removeEventListener(type, listener, options);
             },
         };
     }
@@ -229,7 +229,7 @@
         element.addEventListener(type, listener, options);
         return {
             dispose: () => {
-                element.removeEventListener(type, listener);
+                element.removeEventListener(type, listener, options);
             },
         };
     }
@@ -993,12 +993,10 @@
                         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 = {
@@ -2101,36 +2099,30 @@
             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++) {
@@ -2148,7 +2140,7 @@
             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
@@ -2861,25 +2853,32 @@
         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';
                     /**
@@ -2894,11 +2893,8 @@
                     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();
             }));
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dockview",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "description": "Zero dependency layout manager supporting tabs, grids and splitviews with ReactJS support",
   "main": "./dist/cjs/index.js",
   "types": "./dist/cjs/index.d.ts",
@@ -56,7 +56,7 @@
   "author": "https://github.com/mathuo",
   "license": "MIT",
   "dependencies": {
-    "dockview-core": "^1.7.4"
+    "dockview-core": "^1.7.5"
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^15.0.1",
@@ -73,5 +73,5 @@
     "rollup": "^3.15.0",
     "rollup-plugin-postcss": "^4.0.2"
   },
-  "gitHead": "7dde18c6369bb154425ca36e2e8cec3b8fdbfe35"
+  "gitHead": "54bc30c1aa7bd523a5fea025cf438ef221cc3a9b"
 }