@linzjs/step-ag-grid 17.4.4 → 17.4.6

package/package.json

@@ -2,7 +2,7 @@
   "name": "@linzjs/step-ag-grid",
   "repository": "github:linz/step-ag-grid.git",
   "license": "MIT",
-  "version": "17.4.4",
+  "version": "17.4.6",
   "keywords": [
     "aggrid",
     "ag-grid",

package/src/components/Grid.tsx

@@ -612,7 +612,7 @@ export const Grid = ({
   const onRowDragEnd = useCallback(
     async (event: RowDragEndEvent) => {
       const clientSideRowModel = event.api.getModel() as IClientSideRowModel;
-      if (event.node.rowIndex) {
+      if (event.node.rowIndex != null) {
         const lastHighlightedRowNode = clientSideRowModel.getLastHighlightedRowNode();
         const isBelow = lastHighlightedRowNode && lastHighlightedRowNode.highlighted === RowHighlightPosition.Below;
 
@@ -626,7 +626,7 @@ export const Grid = ({
         const moved = event.node.data;
         const target = event.overNode?.data;
         moved.id != target.id && //moved over a different row
-          moved.rowIndex != targetIndex && //moved to a different index
+          event.node.rowIndex != targetIndex && //moved to a different index
           params.onRowDragEnd &&
           (await params.onRowDragEnd(moved, target, targetIndex));
       }

package/src/utils/testUtil.ts

@@ -1,4 +1,4 @@
-import { waitFor, within } from "@testing-library/react";
+import { act, waitFor, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { isEqual } from "lodash-es";
 
@@ -21,7 +21,25 @@ export const findRow = async (rowId: number | string, within?: HTMLElement): Pro
   await waitFor(async () => {
     expect(getAllQuick({ classes: ".ag-row" }).length > 0).toBe(true);
   });
-  return await findQuick<HTMLDivElement>({ tagName: `div[row-id='${rowId}']:not(:empty)` }, within);
+  //if this is not wrapped in an act console errors are logged during testing
+  let row!: HTMLDivElement;
+  await act(async () => {
+    row = await findQuick<HTMLDivElement>(
+      { tagName: `.ag-center-cols-container div[row-id='${rowId}']:not(:empty)` },
+      within,
+    );
+    const leftCols = await findQuick<HTMLDivElement>(
+      { tagName: `.ag-pinned-left-cols-container div[row-id='${rowId}']` },
+      within,
+    );
+    const rightCols = await findQuick<HTMLDivElement>(
+      { tagName: `.ag-pinned-right-cols-container div[row-id='${rowId}']` },
+      within,
+    );
+    const combineChildren = [...leftCols.children, ...row.children, ...rightCols.children];
+    row.replaceChildren(...combineChildren);
+  });
+  return row;
 };
 
 export const queryRow = async (rowId: number | string, within?: HTMLElement): Promise<HTMLDivElement | null> => {