Merge remote-tracking branch 'origin/fix-context-menu-keyboard-support' into pre-release

Author: citizensas

packages/core/src/internal/data-grid/data-grid.tsx

@@ -1283,6 +1283,25 @@ const DataGrid: React.ForwardRefRenderFunction<DataGridRef, DataGridProps> = (p,
     );
     useEventListener("contextmenu", onContextMenuImpl, eventTargetRef?.current ?? null, false);
 
+    const onContextMenuWithKeyboardImpl = React.useCallback(
+      (ev: MouseEvent) => {
+        const canvas = ref.current;
+        const currentSelectedCell = selectionRef.current.current?.cell
+        if (canvas === null || onContextMenu === undefined || currentSelectedCell === undefined)
+          return;
+        const bounds = getBoundsForItem(canvas, ...currentSelectedCell);
+        if (bounds) {
+          const args = getMouseArgsForPosition(canvas, bounds.x + bounds.width / 2, bounds.y + bounds.height / 2, ev);
+          onContextMenu(args, () => {
+          if (ev.cancelable) ev.preventDefault();
+          });
+        }
+      },
+      [getMouseArgsForPosition, onContextMenu, getBoundsForItem]
+   );
+
+    useEventListener("contextmenu", onContextMenuWithKeyboardImpl, ref?.current ?? null, false);
+
     const onAnimationFrame = React.useCallback<StepCallback>(values => {
         damageRegion.current = new CellSet(values.map(x => x.item));
         hoverValues.current = values;

packages/core/test/data-editor.test.tsx

@@ -196,6 +196,53 @@ describe("data-editor", () => {
         expect(spySelection).not.toHaveBeenCalled();
     });
 
+    test("opens contextmenu at selected cell position when fired on canvas", async () => {
+      const spy = vi.fn();
+
+      vi.useFakeTimers();
+      render(<DataEditor
+        {...basicProps}
+        gridSelection={{
+          columns: CompactSelection.empty(),
+          rows: CompactSelection.empty(),
+          current: {
+            cell: [1, 1],
+            range: { x: 1, y: 1, width: 1, height: 1 },
+            rangeStack: [],
+          },
+        }}
+        onCellContextMenu={spy}
+      />, { wrapper: Context });
+
+      prep();
+
+      const canvas = screen.getByTestId("data-grid-canvas");
+
+      fireEvent.contextMenu(canvas);
+
+      expect(spy).toHaveBeenCalledWith([1, 1], expect.anything());
+    });
+
+    test("does not open contextmenu when no cell selected", async () => {
+      const spy = vi.fn();
+
+      vi.useFakeTimers();
+      render(<DataEditor
+        {...basicProps}
+        gridSelection={{
+          columns: CompactSelection.empty(),
+          rows: CompactSelection.empty(),
+        }}
+        onCellContextMenu={spy}
+      />, { wrapper: Context });
+
+      prep();
+      const canvas = screen.getByTestId("data-grid-canvas");
+      fireEvent.contextMenu(canvas);
+
+      expect(spy).not.toHaveBeenCalled();
+    });
+
     test("middle click does not change selection", async () => {
         const spySelection = vi.fn();