@openfin/core 30.73.1 → 30.73.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@openfin/core",
-    "version": "30.73.1",
+    "version": "30.73.2",
     "license": "Apache-2.0",
     "main": "./src/mock.js",
     "types": "./src/mock.d.ts",

package/src/api/platform/layout/controllers/tab-drag-controller.d.ts

@@ -9,17 +9,17 @@ export declare class TabDragController {
     constructor(viewOverlay: ViewOverlay);
     private dropZonePreview?;
     /**
-     * When a tab is dragged from a stack greater than one, it's view will need to be hidden and the
-     * view next in the stack shown.
      *
-     * Conversely, when a view is the last view in a window, it will need to remain visible.
+     * When a tab is dragged out of a stack, it will need to be hidden from the stack.
      *
-     * This function implements this logic accordingly
-     * @param movingView The view which is currently being dragged
-     * @param currentView The current active view of the tabstack
-     * @param isOnlyViewInWindow Indicates whether the moving view is the only in the platform window.
+     * Additionally, if there is a new view to show in the stack, it will be shown at the position specified by
+     * containerBounds
+     *
+     * @param draggingView The view which is currently being dragged
+     * @param containerBounds The bounds of the container of the view to be shown in the stack
+     * @param nextView The view which has become active after dragging the draggingView out.
      */
-    handleTabStackActiveView: (movingView: View, currentView: View, isOnlyViewInWindow: boolean) => Promise<void>;
+    handleTabStackActiveView: (draggingView: View, containerBounds?: OpenFin.Bounds, nextView?: View) => Promise<void>;
     /**
      * Extracts the border and backgroundColor css values from the drop zone preview,
      * and sets the viewOverlay to match them.
@@ -38,6 +38,8 @@ export declare class TabDragController {
      * Disables the click through setting on every view in the platform.
      */
     endDrag: () => Promise<void>;
+    private disposeObserve?;
+    disposeOverlayObserver: () => void;
     /**
      * Observes a golden-layout drop zone preview in order to render a BrowserView
      * overlay whenever a tab is dragged over a droppable region.

package/src/api/platform/layout/controllers/tab-drag-controller.js

@@ -11,29 +11,28 @@ class TabDragController {
     constructor(viewOverlay) {
         this.viewOverlay = viewOverlay;
         /**
-         * When a tab is dragged from a stack greater than one, it's view will need to be hidden and the
-         * view next in the stack shown.
          *
-         * Conversely, when a view is the last view in a window, it will need to remain visible.
+         * When a tab is dragged out of a stack, it will need to be hidden from the stack.
          *
-         * This function implements this logic accordingly
-         * @param movingView The view which is currently being dragged
-         * @param currentView The current active view of the tabstack
-         * @param isOnlyViewInWindow Indicates whether the moving view is the only in the platform window.
+         * Additionally, if there is a new view to show in the stack, it will be shown at the position specified by
+         * containerBounds
+         *
+         * @param draggingView The view which is currently being dragged
+         * @param containerBounds The bounds of the container of the view to be shown in the stack
+         * @param nextView The view which has become active after dragging the draggingView out.
          */
-        this.handleTabStackActiveView = async (movingView, currentView, isOnlyViewInWindow) => {
+        this.handleTabStackActiveView = async (draggingView, containerBounds, nextView) => {
             if (this.dropZonePreview) {
-                const hideMovingViewIfPossible = async () => {
-                    if (!isOnlyViewInWindow) {
-                        await movingView.hide();
-                    }
-                };
-                const showCurrentView = async () => {
-                    if (currentView.identity.name !== movingView.identity.name) {
-                        await currentView.show();
-                    }
-                };
-                await Promise.all([hideMovingViewIfPossible(), showCurrentView()]);
+                if (nextView && containerBounds) {
+                    // Due to https://github.com/electron/electron/issues/20064, 
+                    // setBounds does not work in certain scenarios.
+                    // Therefore we call it twice before and after showing to ensure as much 
+                    // visual fidelity as possible (although flicker can still occur).
+                    await (nextView === null || nextView === void 0 ? void 0 : nextView.setBounds(containerBounds));
+                    await (nextView === null || nextView === void 0 ? void 0 : nextView.show());
+                    await (nextView === null || nextView === void 0 ? void 0 : nextView.setBounds(containerBounds));
+                }
+                await draggingView.hide();
             }
         };
         /**
@@ -63,6 +62,12 @@ class TabDragController {
         this.endDrag = async () => {
             await this.viewOverlay.setIgnoreViewMouseEvents(false);
         };
+        this.disposeOverlayObserver = () => {
+            if (this.disposeObserve) {
+                this.disposeObserve();
+            }
+            this.dropZonePreview = undefined;
+        };
         /**
          * Observes a golden-layout drop zone preview in order to render a BrowserView
          * overlay whenever a tab is dragged over a droppable region.
@@ -74,7 +79,7 @@ class TabDragController {
                 this.dropZonePreview = dropZonePreview;
                 let lastBounds;
                 dropZonePreview.style.visibility = 'hidden';
-                dropZonePreview.addEventListener('drop-area-highlighted', async (e) => {
+                const onDropAreaHighlighted = async (e) => {
                     try {
                         const { bounds } = e.detail;
                         if (!lastBounds || !bounds_observer_1.isDomRectEqual(lastBounds, bounds)) {
@@ -85,8 +90,8 @@ class TabDragController {
                     catch (error) {
                         console.warn('Unexpected error encountered rendering tab drag preview.', error);
                     }
-                });
-                dropZonePreview.addEventListener('drop-area-hidden', async () => {
+                };
+                const onDropAreaHidden = async () => {
                     try {
                         lastBounds = undefined;
                         await this.viewOverlay.detachOverlay();
@@ -94,7 +99,16 @@ class TabDragController {
                     catch (error) {
                         console.warn('Unexpected error encountered hiding tab drag preview.', error);
                     }
-                });
+                };
+                dropZonePreview.addEventListener('drop-area-highlighted', onDropAreaHighlighted);
+                dropZonePreview.addEventListener('drop-area-hidden', onDropAreaHidden);
+                this.disposeObserve = () => {
+                    dropZonePreview.removeEventListener('drop-area-highlighted', onDropAreaHighlighted);
+                    dropZonePreview.removeEventListener('drop-area-hidden', onDropAreaHidden);
+                };
+            }
+            else {
+                console.warn('Tried to observe a drop zone overlay without disposing the previous.');
             }
         };
     }