fix me for real??

Author: mydea

packages/utils/src/instrument.ts

@@ -408,7 +408,7 @@ let debounceTimerID: number | undefined;
 let lastCapturedEventType: string | undefined;
 let lastCapturedEventTargetId: string | undefined;
 
-type SentryWrappedTarget = EventTarget & { _sentryId?: string };
+type SentryWrappedTarget = HTMLElement & { _sentryId?: string };
 
 /**
  * Check whether the event is similar to the last captured one. For example, two click events on the same button.
@@ -440,30 +440,33 @@ function isSimilarToLastCapturedEvent(event: Event): boolean {
  * Decide whether an event should be captured.
  * @param event event to be captured
  */
-function shouldSkipDOMEvent(event: Event): boolean {
+function shouldSkipDOMEvent(eventType: string, target: SentryWrappedTarget | null): boolean {
   // We are only interested in filtering `keypress` events for now.
-  if (event.type !== 'keypress') {
+  if (eventType !== 'keypress') {
     return false;
   }
 
-  try {
-    const target = event.target as HTMLElement;
+  if (!target || !target.tagName) {
+    return true;
+  }
 
-    if (!target || !target.tagName) {
-      return true;
-    }
+  // Only consider keypress events on actual input elements. This will disregard keypresses targeting body
+  // e.g.tabbing through elements, hotkeys, etc.
+  if (target.tagName === 'INPUT' || target.tagName === 'TEXTAREA' || target.isContentEditable) {
+    return false;
+  }
 
-    // Only consider keypress events on actual input elements. This will disregard keypresses targeting body
-    // e.g.tabbing through elements, hotkeys, etc.
-    if (target.tagName === 'INPUT' || target.tagName === 'TEXTAREA' || target.isContentEditable) {
-      return false;
-    }
+  return true;
+}
+
+function getEventTarget(event: Event): SentryWrappedTarget | null {
+  try {
+    return event.target as SentryWrappedTarget | null;
   } catch (e) {
     // just accessing `target` property can throw an exception in some rare circumstances
     // see: https://github.com/getsentry/sentry-javascript/issues/838
+    return null;
   }
-
-  return true;
 }
 
 /**
@@ -482,17 +485,19 @@ function makeDOMEventHandler(handler: Function, globalListener: boolean = false)
       return;
     }
 
+    const target = getEventTarget(event);
+
     // We always want to skip _some_ events.
-    if (shouldSkipDOMEvent(event)) {
+    if (shouldSkipDOMEvent(event.type, target)) {
       return;
     }
 
     // Mark event as "seen"
     addNonEnumerableProperty(event, '_sentryCaptured', true);
 
-    if (event.target && !(event.target as SentryWrappedTarget)._sentryId) {
+    if (target && !target._sentryId) {
       // Add UUID to event target so we can identify if
-      addNonEnumerableProperty(event.target, '_sentryId', uuid4());
+      addNonEnumerableProperty(target, '_sentryId', uuid4());
     }
 
     const name = event.type === 'keypress' ? 'input' : event.type;
@@ -507,7 +512,7 @@ function makeDOMEventHandler(handler: Function, globalListener: boolean = false)
         global: globalListener,
       });
       lastCapturedEventType = event.type;
-      lastCapturedEventTargetId = event.target ? (event.target as SentryWrappedTarget)._sentryId : undefined;
+      lastCapturedEventTargetId = target ? target._sentryId : undefined;
     }
 
     // Start a new debounce timer that will prevent us from capturing multiple events that should be grouped together.