Standardize Drag-to-Popup Logic in ViewportControllers #8115

Author: tobiu

apps/agentos/view/InterventionPanel.mjs

@@ -39,6 +39,7 @@ class InterventionPanel extends Panel {
          */
         items: [{
             module : GridContainer,
+            reference: 'intervention',
             store  : Interventions,
             columns: [{
                 dataField: 'timestamp',

apps/agentos/view/ViewportController.mjs

@@ -13,13 +13,16 @@ class ViewportController extends Controller {
      * @member {String[]} connectedApps=[]
      */
     connectedApps = []
-
+    /**
+     * @member {Boolean} #isReintegrating=false
+     * @private
+     */
+    #isReintegrating = false
     /**
      * @member {Boolean} #isWindowDragging=false
      * @private
      */
     #isWindowDragging = false
-
     /**
      * @member {Object} widgetIndexMap
      */
@@ -58,7 +61,7 @@ class ViewportController extends Controller {
                 url        = await Neo.Main.getByPath({path: 'document.URL', windowId}),
                 widgetName = new URL(url).searchParams.get('name'),
                 widget     = me.getReference(widgetName),
-                parent     = widget.up('panel');
+                parent     = widget?.up('panel');
 
             if (!me.#isWindowDragging) {
                 parent.hide()
@@ -67,7 +70,7 @@ class ViewportController extends Controller {
             me.connectedApps.push(widgetName);
 
             // Add the widget to the popup window
-            mainView.add(widget)
+            mainView.add(widget, false, !me.#isWindowDragging)
         }
     }
 
@@ -79,7 +82,7 @@ class ViewportController extends Controller {
     async onWindowDisconnect(data) {
         let me = this;
 
-        if (me.#isWindowDragging) {
+        if (me.#isWindowDragging || me.#isReintegrating) {
             me.#isWindowDragging = false;
                 return
         }
@@ -109,19 +112,19 @@ class ViewportController extends Controller {
             {windowId}    = me,
             {sortZone}    = data,
             widgetName    = data.draggedItem.reference.replace('-panel', ''),
-            widget        = me.getReference(widgetName),
-            dashboard     = me.getReference('dashboard'),
-            itemPanel     = dashboard.items[me.widgetIndexMap[widgetName]],
-            bodyContainer = itemPanel.getReference('bodyContainer');
+            widget        = me.getReference(widgetName);
 
-        await Neo.Main.windowClose({names: widgetName, windowId});
+        me.#isReintegrating = true;
 
-        bodyContainer.add(widget);
+        sortZone.dragProxy.add(widget, true);
+
+        await Neo.Main.windowClose({names: widgetName, windowId});
 
+        me.#isReintegrating  = false;
         me.#isWindowDragging = false;
 
         sortZone.isWindowDragging = false;
-        sortZone.dragProxy.hidden = false;
+        sortZone.dragProxy.style = {opacity: 1};
 
         Neo.main.addon.DragDrop.setConfigs({isWindowDragging: false, windowId})
     }

apps/colors/view/ViewportController.mjs

@@ -29,6 +29,11 @@ class ViewportController extends Controller {
      * @member {Number|null} intervalId
      */
     intervalId = null
+    /**
+     * @member {Boolean} #isReintegrating=false
+     * @private
+     */
+    #isReintegrating = false
     /**
      * @summary A private flag to track if a drag operation is in the process of moving a widget to a new window.
      * @member {Boolean} #isWindowDragging=false
@@ -111,7 +116,7 @@ class ViewportController extends Controller {
 
             me.getReference(`detach-${widgetName}-button`).disabled = true;
 
-            mainView.add(widget)
+            mainView.add(widget, false, !me.#isWindowDragging)
         }
     }
 
@@ -126,7 +131,7 @@ class ViewportController extends Controller {
     async onAppDisconnect(data) {
         let me = this;
 
-        if (me.#isWindowDragging) {
+        if (me.#isWindowDragging || me.#isReintegrating) {
             me.#isWindowDragging = false;
             return
         }
@@ -246,19 +251,19 @@ class ViewportController extends Controller {
             {windowId}    = me,
             {sortZone}    = data,
             widgetName    = data.draggedItem.reference.replace('-panel', ''),
-            widget        = me.getReference(widgetName),
-            dashboard     = me.getReference('dashboard'),
-            itemPanel     = dashboard.items[me.widgetIndexMap[widgetName]],
-            bodyContainer = itemPanel.getReference('bodyContainer');
+            widget        = me.getReference(widgetName);
 
-        await Neo.Main.windowClose({names: widgetName, windowId});
+        me.#isReintegrating = true;
+
+        sortZone.dragProxy.add(widget, true);
 
-        bodyContainer.add(widget);
+        await Neo.Main.windowClose({names: widgetName, windowId});
 
+        me.#isReintegrating  = false;
         me.#isWindowDragging = false;
 
         sortZone.isWindowDragging = false;
-        sortZone.dragProxy.hidden = false;
+        sortZone.dragProxy.style = {opacity: 1};
 
         Neo.main.addon.DragDrop.setConfigs({isWindowDragging: false, windowId})
     }