@linzjs/step-ag-grid 14.4.0 → 14.5.1

package/package.json

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

package/src/components/Grid.tsx

@@ -97,8 +97,8 @@ export const Grid = ({
     setOnCellEditingComplete,
     getColDef,
   } = useContext(GridContext);
-  const { updatedDep, updatingCols } = useContext(GridUpdatingContext);
-  const gridContext = useContext(GridContext);
+  const { checkUpdating, updatedDep, updatingCols } = useContext(GridUpdatingContext);
+  const { prePopupOps } = useContext(GridContext);
 
   const gridDivRef = useRef<HTMLDivElement>(null);
 
@@ -387,13 +387,23 @@ export const Grid = ({
    */
   const startCellEditing = useCallback(
     (event: CellEvent) => {
-      event.data.id &&
-        gridContext.startCellEditing({
-          rowId: event.data.id,
-          colId: event.column.getColId(),
+      prePopupOps();
+      if (!event.node.isSelected()) {
+        event.node.setSelected(true, true);
+      }
+      // Cell already being edited, so don't re-edit until finished
+      if (checkUpdating([event.colDef.field ?? ""], event.data.id)) {
+        return;
+      }
+
+      if (event.rowIndex !== null) {
+        event.api.startEditingCell({
+          rowIndex: event.rowIndex,
+          colKey: event.column.getColId(),
         });
+      }
     },
-    [gridContext],
+    [checkUpdating, prePopupOps],
   );
 
   /**
@@ -456,8 +466,9 @@ export const Grid = ({
       columnDefs.map((colDef) => ({
         ...colDef,
         suppressSizeToFit: (sizeColumns === "auto" || sizeColumns === "auto-skip-headers") && !colDef.flex,
+        sortable: colDef.sortable && params.defaultColDef?.sortable !== false,
       })),
-    [columnDefs, sizeColumns],
+    [columnDefs, params.defaultColDef?.sortable, sizeColumns],
   );
 
   /**

package/src/contexts/GridContextProvider.tsx

@@ -384,19 +384,20 @@ export const GridContextProvider = <RowType extends GridBaseRow>(props: GridCont
       const colDef = gridApi.getColumnDef(colId);
       if (!colDef) return;
 
-      // Cell already being edited, so don't re-edit until finished
-      if (checkUpdating([colDef.field ?? ""], rowId)) {
-        return;
-      }
+      prePopupOps();
       const rowNode = gridApi.getRowNode(`${rowId}`);
       if (!rowNode) {
         return;
       }
 
       if (!rowNode.isSelected()) {
-        rowNode.setSelected(true, true);
+        rowNode.setSelected(true, false);
+      }
+
+      // Cell already being edited, so don't re-edit until finished
+      if (checkUpdating([colDef.field ?? ""], rowId)) {
+        return;
       }
-      prePopupOps();
 
       const rowIndex = rowNode.rowIndex;
       if (rowIndex != null) {