@nocobase/flow-engine 2.1.0-beta.25 → 2.1.0-beta.26

package/lib/components/dnd/gridDragPlanner.js

@@ -851,6 +851,18 @@ const findCellByPath = /* @__PURE__ */ __name((layout, path) => {
   }
   return null;
 }, "findCellByPath");
+const findCellByPathOrClosestAncestor = /* @__PURE__ */ __name((layout, path) => {
+  if (!(path == null ? void 0 : path.length)) {
+    return null;
+  }
+  for (let length = path.length; length > 0; length -= 1) {
+    const target = findCellByPath(layout, path.slice(0, length));
+    if (target) {
+      return target;
+    }
+  }
+  return null;
+}, "findCellByPathOrClosestAncestor");
 const removeItemFromGridLayout = /* @__PURE__ */ __name((layout, sourceUid) => {
   const removeFromRows = /* @__PURE__ */ __name((rows) => rows.map((row) => {
     const cellsWithSizes = row.cells.map((cell, index) => {
@@ -918,7 +930,7 @@ const simulateGridLayoutForSlot = /* @__PURE__ */ __name(({
   removeItemFromGridLayout(cloned, sourceUid);
   switch (slot.type) {
     case "column": {
-      const target = findCellByPath(cloned, targetPath);
+      const target = findCellByPathOrClosestAncestor(cloned, targetPath);
       if (!target) {
         break;
       }
@@ -934,7 +946,7 @@ const simulateGridLayoutForSlot = /* @__PURE__ */ __name(({
       break;
     }
     case "empty-column": {
-      const target = findCellByPath(cloned, targetPath);
+      const target = findCellByPathOrClosestAncestor(cloned, targetPath);
       if (target) {
         delete target.cell.rows;
         target.cell.items = [sourceUid];
@@ -942,7 +954,7 @@ const simulateGridLayoutForSlot = /* @__PURE__ */ __name(({
       break;
     }
     case "column-edge": {
-      const target = findCellByPath(cloned, targetPath);
+      const target = findCellByPathOrClosestAncestor(cloned, targetPath);
       if (!target) {
         break;
       }
@@ -969,7 +981,7 @@ const simulateGridLayoutForSlot = /* @__PURE__ */ __name(({
       if (!targetItemUid) {
         break;
       }
-      const target = findCellByPath(cloned, targetPath);
+      const target = findCellByPathOrClosestAncestor(cloned, targetPath);
       if (!(target == null ? void 0 : target.cell.items)) {
         break;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.1.0-beta.25",
+  "version": "2.1.0-beta.26",
   "private": false,
   "description": "A standalone flow engine for NocoBase, managing workflows, models, and actions.",
   "main": "lib/index.js",
@@ -8,8 +8,8 @@
   "dependencies": {
     "@formily/antd-v5": "1.x",
     "@formily/reactive": "2.x",
-    "@nocobase/sdk": "2.1.0-beta.25",
-    "@nocobase/shared": "2.1.0-beta.25",
+    "@nocobase/sdk": "2.1.0-beta.26",
+    "@nocobase/shared": "2.1.0-beta.26",
     "ahooks": "^3.7.2",
     "axios": "^1.7.0",
     "dayjs": "^1.11.9",
@@ -37,5 +37,5 @@
   ],
   "author": "NocoBase Team",
   "license": "Apache-2.0",
-  "gitHead": "824f8b8200e9fe086135768934d3ef427b212446"
+  "gitHead": "b17e1a72057813fa27d8435bf0f2af67ea4b059f"
 }

package/src/components/__tests__/gridDragPlanner.test.ts

@@ -829,6 +829,52 @@ describe('simulateLayoutForSlot', () => {
     expect(nestedRows[1].sizes).toEqual([12, 12]);
   });
 
+  it('keeps nested column insertion target when removing a sibling collapses the original path', () => {
+    const layout = createLayout(
+      {
+        vyvfw2jw071: [['6ad3ccaabd5', 'ff8b4b57f65']],
+        ablhoqw51gb: [['21b422021b8']],
+      },
+      {
+        vyvfw2jw071: [24],
+        ablhoqw51gb: [24],
+      },
+      ['vyvfw2jw071', 'ablhoqw51gb'],
+    );
+    layout.layout = normalizeGridLayout({
+      rows: layout.rows,
+      sizes: layout.sizes,
+      rowOrder: layout.rowOrder,
+      itemUids: ['6ad3ccaabd5', 'ff8b4b57f65', '21b422021b8'],
+    });
+
+    const slot: LayoutSlot = {
+      type: 'column',
+      rowId: 'll5vo5pzj3u',
+      columnIndex: 0,
+      insertIndex: 1,
+      position: 'after',
+      path: [
+        { rowId: 'vyvfw2jw071', cellId: 'vyvfw2jw071:cell:0' },
+        { rowId: 'll5vo5pzj3u', cellId: 'ghy612j5zzg' },
+      ],
+      rect,
+    };
+
+    const result = simulateLayoutForSlot({ slot, sourceUid: 'ff8b4b57f65', layout });
+
+    expect(result.layout!.rows).toMatchObject([
+      {
+        id: 'vyvfw2jw071',
+        cells: [{ items: ['6ad3ccaabd5', 'ff8b4b57f65'] }],
+      },
+      {
+        id: 'ablhoqw51gb',
+        cells: [{ items: ['21b422021b8'] }],
+      },
+    ]);
+  });
+
   it('treats dragging an item to its own item-edge as no-op', () => {
     const layout = createLayout(
       {

package/src/components/dnd/gridDragPlanner.ts

@@ -1146,6 +1146,21 @@ const findCellByPath = (layout: GridLayoutV2, path?: GridLayoutPath) => {
   return null;
 };
 
+const findCellByPathOrClosestAncestor = (layout: GridLayoutV2, path?: GridLayoutPath) => {
+  if (!path?.length) {
+    return null;
+  }
+
+  for (let length = path.length; length > 0; length -= 1) {
+    const target = findCellByPath(layout, path.slice(0, length));
+    if (target) {
+      return target;
+    }
+  }
+
+  return null;
+};
+
 const removeItemFromGridLayout = (layout: GridLayoutV2, sourceUid: string) => {
   const removeFromRows = (rows: GridRowV2[]): GridRowV2[] =>
     rows
@@ -1231,7 +1246,7 @@ const simulateGridLayoutForSlot = ({
 
   switch (slot.type) {
     case 'column': {
-      const target = findCellByPath(cloned, targetPath);
+      const target = findCellByPathOrClosestAncestor(cloned, targetPath);
       if (!target) {
         break;
       }
@@ -1247,7 +1262,7 @@ const simulateGridLayoutForSlot = ({
       break;
     }
     case 'empty-column': {
-      const target = findCellByPath(cloned, targetPath);
+      const target = findCellByPathOrClosestAncestor(cloned, targetPath);
       if (target) {
         delete target.cell.rows;
         target.cell.items = [sourceUid];
@@ -1255,7 +1270,7 @@ const simulateGridLayoutForSlot = ({
       break;
     }
     case 'column-edge': {
-      const target = findCellByPath(cloned, targetPath);
+      const target = findCellByPathOrClosestAncestor(cloned, targetPath);
       if (!target) {
         break;
       }
@@ -1282,7 +1297,7 @@ const simulateGridLayoutForSlot = ({
       if (!targetItemUid) {
         break;
       }
-      const target = findCellByPath(cloned, targetPath);
+      const target = findCellByPathOrClosestAncestor(cloned, targetPath);
       if (!target?.cell.items) {
         break;
       }