@openfin/core 30.73.4 → 30.73.5

package/package.json

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

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

@@ -15,11 +15,18 @@ export declare class TabDragController {
      * Additionally, if there is a new view to show in the stack, it will be shown at the position specified by
      * containerBounds
      *
+     * As drag interactions can under extreme circumstances complete before this chain of promises has completed,
+     * we need to pass in a isDragging() function which returns whether the drag is in progress.
+     * This allows us to cancel any layout affecting operations.
+     *
      * @param draggingView The view which is currently being dragged
+     * @param isLastViewInWindow Whether the draggin view is the last view in a window or not. If false, the dragging view will not hide.
+     * @param isDragging A function which returns true if the drag is still in progress. As we chain some async calls here, we want to avoid
+     * modifying any views if the drag has completed (as the post drag procedure will have taken care of it.)
      * @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: (draggingView: View, containerBounds?: OpenFin.Bounds, nextView?: View) => Promise<void>;
+    handleTabStackActiveView: (draggingView: View, isLastViewInWindow: boolean, isDragging: () => boolean, 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.

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

@@ -17,22 +17,30 @@ class TabDragController {
          * Additionally, if there is a new view to show in the stack, it will be shown at the position specified by
          * containerBounds
          *
+         * As drag interactions can under extreme circumstances complete before this chain of promises has completed,
+         * we need to pass in a isDragging() function which returns whether the drag is in progress.
+         * This allows us to cancel any layout affecting operations.
+         *
          * @param draggingView The view which is currently being dragged
+         * @param isLastViewInWindow Whether the draggin view is the last view in a window or not. If false, the dragging view will not hide.
+         * @param isDragging A function which returns true if the drag is still in progress. As we chain some async calls here, we want to avoid
+         * modifying any views if the drag has completed (as the post drag procedure will have taken care of it.)
          * @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 (draggingView, containerBounds, nextView) => {
+        this.handleTabStackActiveView = async (draggingView, isLastViewInWindow, isDragging, containerBounds, nextView) => {
             if (this.dropZonePreview) {
                 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));
+                    if (isDragging()) {
+                        await (nextView === null || nextView === void 0 ? void 0 : nextView.show());
+                    }
+                    if (isDragging()) {
+                        await (nextView === null || nextView === void 0 ? void 0 : nextView.setBounds(containerBounds));
+                    }
+                }
+                if (isDragging() && !isLastViewInWindow) {
+                    await draggingView.hide();
                 }
-                await draggingView.hide();
             }
         };
         /**