Core(Events): remove m_ prefix from the pointer observer & address review notes

packages/devextreme/js/__internal/events/core/keyboard_processor.ts

@@ -9,6 +9,10 @@ const COMPOSITION_END_EVENT = 'compositionend';
 const KEYDOWN_EVENT = 'keydown';
 const NAMESPACE = 'KeyboardProcessor';
 
+const KEYDOWN_NAMESPACED_EVENT = addNamespace(KEYDOWN_EVENT, NAMESPACE);
+const COMPOSITION_START_NAMESPACED_EVENT = addNamespace(COMPOSITION_START_EVENT, NAMESPACE);
+const COMPOSITION_END_NAMESPACED_EVENT = addNamespace(COMPOSITION_END_EVENT, NAMESPACE);
+
 export interface KeyboardKeyDownEvent {
   keyName: string;
   key: string;
@@ -42,12 +46,6 @@ const createKeyDownOptions = (e: DxEvent<KeyboardEvent>): KeyboardKeyDownEvent =
 });
 
 class KeyboardProcessor {
-  _keydown = addNamespace(KEYDOWN_EVENT, NAMESPACE);
-
-  _compositionStart = addNamespace(COMPOSITION_START_EVENT, NAMESPACE);
-
-  _compositionEnd = addNamespace(COMPOSITION_END_EVENT, NAMESPACE);
-
   _element?: dxElementWrapper;
 
   _focusTarget?: Element | Element[] | dxElementWrapper | null;
@@ -64,14 +62,16 @@ class KeyboardProcessor {
 
   static createKeyDownOptions = createKeyDownOptions;
 
-  constructor(options: KeyboardProcessorOptions = {}) {
-    if (options.element) {
-      this._element = $(options.element);
+  constructor(options?: KeyboardProcessorOptions | null) {
+    const config = options ?? {};
+
+    if (config.element) {
+      this._element = $(config.element);
     }
-    if (options.focusTarget) {
-      this._focusTarget = options.focusTarget;
+    if (config.focusTarget) {
+      this._focusTarget = config.focusTarget;
     }
-    this._handler = options.handler;
+    this._handler = config.handler;
 
     if (this._element) {
       this._processFunction = (e: DxEvent<KeyboardEvent>): void => {
@@ -90,17 +90,33 @@ class KeyboardProcessor {
       };
       this._toggleProcessingWithContext = this.toggleProcessing.bind(this);
 
-      eventsEngine.on(this._element, this._keydown, this._processFunction);
-      eventsEngine.on(this._element, this._compositionStart, this._toggleProcessingWithContext);
-      eventsEngine.on(this._element, this._compositionEnd, this._toggleProcessingWithContext);
+      eventsEngine.on(this._element, KEYDOWN_NAMESPACED_EVENT, this._processFunction);
+      eventsEngine.on(
+        this._element,
+        COMPOSITION_START_NAMESPACED_EVENT,
+        this._toggleProcessingWithContext,
+      );
+      eventsEngine.on(
+        this._element,
+        COMPOSITION_END_NAMESPACED_EVENT,
+        this._toggleProcessingWithContext,
+      );
     }
   }
 
   dispose(): void {
     if (this._element) {
-      eventsEngine.off(this._element, this._keydown, this._processFunction);
-      eventsEngine.off(this._element, this._compositionStart, this._toggleProcessingWithContext);
-      eventsEngine.off(this._element, this._compositionEnd, this._toggleProcessingWithContext);
+      eventsEngine.off(this._element, KEYDOWN_NAMESPACED_EVENT, this._processFunction);
+      eventsEngine.off(
+        this._element,
+        COMPOSITION_START_NAMESPACED_EVENT,
+        this._toggleProcessingWithContext,
+      );
+      eventsEngine.off(
+        this._element,
+        COMPOSITION_END_NAMESPACED_EVENT,
+        this._toggleProcessingWithContext,
+      );
     }
     this._element = undefined;
     this._handler = undefined;

packages/devextreme/js/__internal/events/pointer/base.ts

@@ -13,7 +13,7 @@ export interface PointerEventHandleObj {
   data?: Record<string, unknown>;
 }
 
-export interface PointerEventInit {
+export interface PointerStrategyEventArgs {
   type: string;
   pointerType: string;
   originalEvent: EmitterEvent;
@@ -50,7 +50,7 @@ class BaseStrategy {
   _handler(e: EmitterEvent): EmitterEvent | undefined {
     const delegateTarget = this._getDelegateTarget(e);
 
-    const event: PointerEventInit = {
+    const event: PointerStrategyEventArgs = {
       type: this._eventName,
       pointerType: e.pointerType || eventSource(e),
       originalEvent: e,
@@ -76,7 +76,7 @@ class BaseStrategy {
     return delegateTarget;
   }
 
-  _fireEvent(args: PointerEventInit): EmitterEvent {
+  _fireEvent(args: PointerStrategyEventArgs): EmitterEvent {
     const event: EmitterEvent = fireEvent(args);
 
     return event;
@@ -109,8 +109,8 @@ class BaseStrategy {
     }
   }
 
-  remove(handleObj: PointerEventHandleObj): void {
-    this._setSelector(handleObj);
+  remove(): void {
+    this._selector = null;
 
     if (!this.noBubble) {
       this._handlerCount -= 1;

packages/devextreme/js/__internal/events/pointer/mouse.ts

@@ -1,10 +1,10 @@
 import browser from '@js/core/utils/browser';
 import { extend } from '@js/core/utils/extend';
 import type { EmitterEvent } from '@ts/events/core/emitter';
-import type { PointerEventInit } from '@ts/events/pointer/base';
+import type { PointerStrategyEventArgs } from '@ts/events/pointer/base';
 import BaseStrategy from '@ts/events/pointer/base';
-import type { PointerEventMap } from '@ts/events/pointer/m_observer';
-import Observer from '@ts/events/pointer/m_observer';
+import type { PointerEventMap } from '@ts/events/pointer/observer';
+import Observer from '@ts/events/pointer/observer';
 
 /* eslint-disable spellcheck/spell-checker */
 const eventMap: PointerEventMap = {
@@ -71,7 +71,7 @@ class MouseStrategy extends BaseStrategy {
     observer.reset();
   };
 
-  _fireEvent(args: PointerEventInit): EmitterEvent {
+  _fireEvent(args: PointerStrategyEventArgs): EmitterEvent {
     return super._fireEvent(extend(normalizeMouseEvent(args.originalEvent), args));
   }
 }

packages/devextreme/js/__internal/events/pointer/mouse_and_touch.ts

@@ -1,10 +1,10 @@
 import { isMouseEvent } from '@js/common/core/events/utils/index';
 import { extend } from '@js/core/utils/extend';
 import type { EmitterEvent } from '@ts/events/core/emitter';
-import type { PointerEventInit } from '@ts/events/pointer/base';
+import type { PointerStrategyEventArgs } from '@ts/events/pointer/base';
 import BaseStrategy from '@ts/events/pointer/base';
-import type { PointerEventMap } from '@ts/events/pointer/m_observer';
 import MouseStrategy from '@ts/events/pointer/mouse';
+import type { PointerEventMap } from '@ts/events/pointer/observer';
 import TouchStrategy from '@ts/events/pointer/touch';
 
 /* eslint-disable spellcheck/spell-checker */
@@ -75,7 +75,7 @@ class MouseAndTouchStrategy extends BaseStrategy {
     return super._handler(e);
   }
 
-  _fireEvent(args: PointerEventInit): EmitterEvent {
+  _fireEvent(args: PointerStrategyEventArgs): EmitterEvent {
     const normalizer = isMouseEvent(args.originalEvent)
       ? MouseStrategy.normalize
       : TouchStrategy.normalize;

packages/devextreme/js/__internal/events/pointer/m_observer.ts → packages/devextreme/js/__internal/events/pointer/observer.ts

@@ -27,7 +27,7 @@ class Observer {
     onPointerAdding?: (e: Event) => void,
   ) {
     this._pointerEquals = pointerEquals;
-    this._onPointerAdding = onPointerAdding ?? function () { };
+    this._onPointerAdding = onPointerAdding ?? ((): void => {});
     this._pointers = [];
 
     /* eslint-disable spellcheck/spell-checker */

packages/devextreme/js/__internal/events/pointer/touch.ts

@@ -2,9 +2,9 @@ import { extend } from '@js/core/utils/extend';
 import { each } from '@js/core/utils/iterator';
 import devices from '@ts/core/m_devices';
 import type { EmitterEvent, EmitterEventPointer } from '@ts/events/core/emitter';
-import type { PointerEventInit } from '@ts/events/pointer/base';
+import type { PointerStrategyEventArgs } from '@ts/events/pointer/base';
 import BaseStrategy from '@ts/events/pointer/base';
-import type { PointerEventMap } from '@ts/events/pointer/m_observer';
+import type { PointerEventMap } from '@ts/events/pointer/observer';
 
 /* eslint-disable spellcheck/spell-checker */
 const eventMap: PointerEventMap = {
@@ -74,7 +74,7 @@ class TouchStrategy extends BaseStrategy {
     return super._handler(e);
   }
 
-  _fireEvent(args: PointerEventInit): EmitterEvent {
+  _fireEvent(args: PointerStrategyEventArgs): EmitterEvent {
     const touchEvent = args.originalEvent as TouchPointerEvent;
 
     return super._fireEvent(extend(normalizeTouchEvent(touchEvent), args));

packages/devextreme/js/common/core/events/pointer/observer.js

@@ -1 +1 @@
-export { default } from '../../../../__internal/events/pointer/m_observer';
+export { default } from '../../../../__internal/events/pointer/observer';