[review fix] introduce hasViewportRelativeCoordinates to check both m…

…ouse events and pointer events

packages/modifiers/src/snapCenterToCursor.ts

@@ -2,8 +2,7 @@ import type {Modifier} from '@dnd-kit/core';
 import {
   getEventCoordinates,
   isTouchEvent,
-  isMouseEvent,
-  isPointerEvent,
+  hasViewportRelativeCoordinates,
 } from '@dnd-kit/utilities';
 
 export const snapCenterToCursor: Modifier = ({
@@ -15,8 +14,7 @@ export const snapCenterToCursor: Modifier = ({
     activeNodeRect &&
     activatorEvent &&
     (isTouchEvent(activatorEvent) ||
-      isMouseEvent(activatorEvent) ||
-      isPointerEvent(activatorEvent))
+      hasViewportRelativeCoordinates(activatorEvent))
   ) {
     const activatorCoordinates = getEventCoordinates(activatorEvent);
     const offsetX = activatorCoordinates.x - activeNodeRect.left;

packages/utilities/src/coordinates/getEventCoordinates.ts

@@ -1,5 +1,5 @@
 import type {Coordinates} from './types';
-import {isTouchEvent} from '../event';
+import {isTouchEvent, hasViewportRelativeCoordinates} from '../event';
 
 /**
  * Returns the normalized x and y coordinates for mouse and touch events.
@@ -23,8 +23,7 @@ export function getEventCoordinates(event: Event): Coordinates {
     }
   }
 
-  // In case of MouseEvent or PointerEvent.
-  if ('clientX' in event && 'clientY' in event) {
+  if (hasViewportRelativeCoordinates(event)) {
     return {
       x: (event as MouseEvent).clientX,
       y: (event as MouseEvent).clientY,

packages/utilities/src/event/hasViewportRelativeCoordinates.ts

@@ -0,0 +1,5 @@
+export function hasViewportRelativeCoordinates(
+  event: Event
+): event is Event & Pick<PointerEvent, 'clientX' | 'clientY'> {
+  return 'clientX' in event && 'clientY' in event;
+}

packages/utilities/src/event/index.ts

@@ -1,3 +1,2 @@
-export {isMouseEvent} from './isMouseEvent';
-export {isPointerEvent} from './isPointerEvent';
+export {hasViewportRelativeCoordinates} from './hasViewportRelativeCoordinates';
 export {isTouchEvent} from './isTouchEvent';

packages/utilities/src/index.ts

@@ -12,6 +12,6 @@ export type {Coordinates} from './coordinates';
 export {getEventCoordinates} from './coordinates';
 export {CSS} from './css';
 export type {Transform, Transition} from './css';
-export {isMouseEvent, isPointerEvent, isTouchEvent} from './event';
+export {hasViewportRelativeCoordinates, isTouchEvent} from './event';
 export {canUseDOM} from './execution-context';
 export type {Arguments, FirstArgument, Without} from './types';