feat: Remove wrap-events usage from soft nav (#1244)

ellisong · web-flow · commit 911d8d1d78b4 · 2024-11-08T10:57:28.000-08:00
diff --git a/src/features/soft_navigations/instrument/index.js b/src/features/soft_navigations/instrument/index.js
@@ -3,7 +3,6 @@ import { isBrowserScope } from '../../../common/constants/runtime'
 import { handle } from '../../../common/event-emitter/handle'
 import { windowAddEventListener } from '../../../common/event-listener/event-listener-opts'
 import { debounce } from '../../../common/util/invoke'
-import { wrapEvents } from '../../../common/wrap/wrap-events'
 import { wrapHistory } from '../../../common/wrap/wrap-history'
 import { InstrumentBase } from '../../utils/instrument-base'
 import { FEATURE_NAME, INTERACTION_TRIGGERS } from '../constants'
@@ -23,7 +22,12 @@ export class Instrument extends InstrumentBase {
     if (!isBrowserScope || !gosNREUMOriginals().o.MO) return // soft navigations is not supported outside web env or browsers without the mutation observer API
 
     const historyEE = wrapHistory(this.ee)
-    const eventsEE = wrapEvents(this.ee)
+
+    INTERACTION_TRIGGERS.forEach((trigger) => {
+      windowAddEventListener(trigger, (evt) => {
+        processUserInteraction(evt)
+      }, true)
+    })
 
     const trackURLChange = () => handle('newURL', [now(), '' + window.location], undefined, this.featureName, this.ee)
     historyEE.on('pushState-end', trackURLChange)
@@ -50,13 +54,6 @@ export class Instrument extends InstrumentBase {
       domObserver.observe(document.body, { attributes: true, childList: true, subtree: true, characterData: true })
     }, UI_WAIT_INTERVAL, { leading: true })
 
-    eventsEE.on('fn-start', ([evt]) => { // set up a new user ixn before the callback for the triggering event executes
-      if (INTERACTION_TRIGGERS.includes(evt?.type)) {
-        processUserInteraction(evt)
-      }
-    })
-    for (let eventType of INTERACTION_TRIGGERS) document.addEventListener(eventType, () => { /* no-op, this ensures the UI events are monitored by our callback above */ })
-
     this.abortHandler = abort
     this.importAggregator(agentRef, { domObserver })
 
diff --git a/tests/assets/soft-nav-interaction-on-click.html b/tests/assets/soft-nav-interaction-on-click.html
@@ -4,6 +4,9 @@
     <title>RUM Unit Test</title>
     {init}
     {config}
+    <script>
+      NREUM.init.feature_flags = ['soft_nav']
+    </script>
     {loader}
   </head>
   <body>
