@datadog/mobile-react-native 2.14.2 → 2.14.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt +1 -1
- package/ios/Sources/SdkVersion.swift +1 -1
- package/lib/commonjs/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js +2 -2
- package/lib/commonjs/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js.map +1 -1
- package/lib/commonjs/rum/instrumentation/interactionTracking/DdEventsInterceptor.js +25 -3
- package/lib/commonjs/rum/instrumentation/interactionTracking/DdEventsInterceptor.js.map +1 -1
- package/lib/commonjs/version.js +1 -1
- package/lib/module/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js +2 -2
- package/lib/module/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js.map +1 -1
- package/lib/module/rum/instrumentation/interactionTracking/DdEventsInterceptor.js +25 -3
- package/lib/module/rum/instrumentation/interactionTracking/DdEventsInterceptor.js.map +1 -1
- package/lib/module/version.js +1 -1
- package/lib/typescript/rum/instrumentation/interactionTracking/DdEventsInterceptor.d.ts +9 -0
- package/lib/typescript/rum/instrumentation/interactionTracking/DdEventsInterceptor.d.ts.map +1 -1
- package/lib/typescript/version.d.ts +1 -1
- package/package.json +2 -2
- package/src/__tests__/rum/instrumentation/DdEventsInterceptor.test.tsx +89 -0
- package/src/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts +3 -3
- package/src/rum/instrumentation/interactionTracking/DdEventsInterceptor.tsx +25 -3
- package/src/version.ts +1 -1
|
@@ -74,8 +74,8 @@ class DdBabelInteractionTracking {
|
|
|
74
74
|
const getAccessibilityLabel = () => useAccessibilityLabel && accessibilityLabel ? accessibilityLabel : null;
|
|
75
75
|
const index = handlerArgs ? handlerArgs.find(x => typeof x === 'number') || 0 : 0;
|
|
76
76
|
|
|
77
|
-
// Order:
|
|
78
|
-
const selectedContent =
|
|
77
|
+
// Order: actionName → actionNameAttribute → accessibilityLabel → content
|
|
78
|
+
const selectedContent = actionName || Object.values(attrs)[0] || getAccessibilityLabel() || tryContent();
|
|
79
79
|
if (!selectedContent) {
|
|
80
80
|
return componentName;
|
|
81
81
|
}
|
package/lib/commonjs/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_NativeDdSdk","_interopRequireDefault","require","_DefaultTimeProvider","_constants","_types","e","__esModule","default","StateErrors","ALREADY_INITIALIZED","DdBabelInteractionTracking","instance","config","trackInteractions","useAccessibilityLabel","timeProvider","DefaultTimeProvider","telemetrySent","ddRum","isInitialized","constructor","Error","getInstance","getTelemetryConfig","babel_plugin","enabled","globalThis","__DD_RN_BABEL_PLUGIN_ENABLED__","track_interactions","getTargetName","targetObject","getContent","options","handlerArgs","componentName","actionName","accessibilityLabel","attrs","tryContent","content","length","getAccessibilityLabel","index","find","x","selectedContent","Object","values","output","useNamePrefix","wrapRumAction","func","action","args","DdSdk","sendTelemetryLog","BABEL_PLUGIN_TELEMETRY","onlyOnce","targetName","addAction","ActionSource","BABEL","now","catch","telemetryError","message","stack","exports"],"sourceRoot":"../../../../../src","sources":["rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts"],"mappings":";;;;;;AAMA,IAAAA,YAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,oBAAA,GAAAD,OAAA;AAGA,IAAAE,UAAA,GAAAF,OAAA;AAEA,IAAAG,MAAA,GAAAH,OAAA;AAA2C,SAAAD,uBAAAK,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAZ3C;AACA;AACA;AACA;AACA;;AAUA,MAAMG,WAAW,GAAG;EAChBC,mBAAmB,EACf;AACR,CAAU;AAiBH,MAAMC,0BAA0B,CAAC;EACpC,OAAeC,QAAQ,GAAsC,IAAI;EAEjE,OAAOC,MAAM,GAAgB;IACzBC,iBAAiB,EAAE,KAAK;IACxBC,qBAAqB,EAAE;EAC3B,CAAC;EAEOC,YAAY,GAAiB,IAAIC,wCAAmB,CAAC,CAAC;EAEtDC,aAAa,GAAY,KAAK;EAE9BC,KAAK,GAAwB,IAAI;EAEzCC,aAAa,GAAY,KAAK;EAEtBC,WAAWA,CAACF,KAAoB,EAAE;IACtC,IAAIR,0BAA0B,CAACC,QAAQ,EAAE;MACrC,MAAM,IAAIU,KAAK,CAACb,WAAW,CAACC,mBAAmB,CAAC;IACpD;IAEA,IAAIS,KAAK,EAAE;MACP,IAAI,CAACA,KAAK,GAAGA,KAAK;IACtB;IAEAR,0BAA0B,CAACC,QAAQ,GAAG,IAAI;EAC9C;EAEA,OAAOW,WAAWA,CAACJ,KAAoB,EAAE;IACrC,IAAI,CAACR,0BAA0B,CAACC,QAAQ,EAAE;MACtCD,0BAA0B,CAACC,QAAQ,GAAG,IAAID,0BAA0B,CAChEQ,KACJ,CAAC;IACL;IAEA,OAAOR,0BAA0B,CAACC,QAAQ;EAC9C;EAEA,OAAOY,kBAAkBA,CAAA,EAAG;IACxB,OAAO;MACHC,YAAY,EAAE;QACVC,OAAO,EAAE,CAAC,CAACC,UAAU,CAACC,8BAA8B;QACpDC,kBAAkB,EAAE,CAAC,CAAClB,0BAA0B,CAACE,MAAM,CAClDC;MACT;IACJ,CAAC;EACL;EAEQgB,aAAaA,CAACC,YAA0B,EAAE;IAC9C,MAAM;MACFC,UAAU;MACVC,OAAO;MACPC,WAAW;MACXC,aAAa;MACb,gBAAgB,EAAEC,UAAU;MAC5BC,kBAAkB;MAClB,GAAGC;IACP,CAAC,GAAGP,YAAY;IAEhB,MAAM;MAAEhB;IAAsB,CAAC,GAAGJ,0BAA0B,CAACE,MAAM;IAEnE,MAAM0B,UAAU,GAAGA,CAAA,KAAM;MACrB,MAAMC,OAAO,GAAGR,UAAU,GAAG,CAAC;MAC9B,IAAIQ,OAAO,IAAIA,OAAO,CAACC,MAAM,GAAG,CAAC,EAAE;QAC/B,OAAOD,OAAO;MAClB;MAEA,OAAO,IAAI;IACf,CAAC;IAED,MAAME,qBAAqB,GAAGA,CAAA,KAC1B3B,qBAAqB,IAAIsB,kBAAkB,GACrCA,kBAAkB,GAClB,IAAI;IAEd,MAAMM,KAAK,GAAGT,WAAW,GACnBA,WAAW,CAACU,IAAI,CAACC,CAAC,IAAI,OAAOA,CAAC,KAAK,QAAQ,CAAC,IAAI,CAAC,GACjD,CAAC;;IAEP;IACA,MAAMC,eAAe,
|
|
1
|
+
{"version":3,"names":["_NativeDdSdk","_interopRequireDefault","require","_DefaultTimeProvider","_constants","_types","e","__esModule","default","StateErrors","ALREADY_INITIALIZED","DdBabelInteractionTracking","instance","config","trackInteractions","useAccessibilityLabel","timeProvider","DefaultTimeProvider","telemetrySent","ddRum","isInitialized","constructor","Error","getInstance","getTelemetryConfig","babel_plugin","enabled","globalThis","__DD_RN_BABEL_PLUGIN_ENABLED__","track_interactions","getTargetName","targetObject","getContent","options","handlerArgs","componentName","actionName","accessibilityLabel","attrs","tryContent","content","length","getAccessibilityLabel","index","find","x","selectedContent","Object","values","output","useNamePrefix","wrapRumAction","func","action","args","DdSdk","sendTelemetryLog","BABEL_PLUGIN_TELEMETRY","onlyOnce","targetName","addAction","ActionSource","BABEL","now","catch","telemetryError","message","stack","exports"],"sourceRoot":"../../../../../src","sources":["rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -26,12 +26,13 @@ class DdEventsInterceptor {
|
|
|
26
26
|
this.useAccessibilityLabel = options.useAccessibilityLabel ?? true;
|
|
27
27
|
}
|
|
28
28
|
interceptOnPress(...args) {
|
|
29
|
-
|
|
29
|
+
const event = this.resolveNativeEvent(args);
|
|
30
|
+
if (event) {
|
|
30
31
|
const currentTime = Date.now();
|
|
31
32
|
const timestampDifference = Math.abs(Date.now() - this.debouncingStartedTimestamp);
|
|
32
33
|
if (timestampDifference > DEBOUNCE_EVENT_THRESHOLD_IN_MS) {
|
|
33
|
-
const targetNode =
|
|
34
|
-
this.handleTargetEvent(targetNode,
|
|
34
|
+
const targetNode = event._targetInst;
|
|
35
|
+
this.handleTargetEvent(targetNode, event);
|
|
35
36
|
// we add an approximated 1 millisecond for the execution time of the `handleTargetEvent` function
|
|
36
37
|
this.debouncingStartedTimestamp = currentTime + HANDLE_EVENT_APP_EXECUTION_TIME_IN_MS;
|
|
37
38
|
}
|
|
@@ -39,6 +40,27 @@ class DdEventsInterceptor {
|
|
|
39
40
|
_InternalLog.InternalLog.log(DdEventsInterceptor.ACTION_EVENT_DROPPED_DEBUG_MESSAGE, _SdkVerbosity.SdkVerbosity.DEBUG);
|
|
40
41
|
}
|
|
41
42
|
}
|
|
43
|
+
|
|
44
|
+
/**
|
|
45
|
+
* Resolves the native GestureResponderEvent from the onPress arguments.
|
|
46
|
+
*
|
|
47
|
+
* Some third-party libraries (e.g. react-native-ui-lib) wrap the native
|
|
48
|
+
* event inside a props object: `onPress({...componentProps, event})`.
|
|
49
|
+
* This method checks for `_targetInst` on `args[0]` first (standard RN),
|
|
50
|
+
* then falls back to `args[0].event` for the wrapped pattern.
|
|
51
|
+
*/
|
|
52
|
+
resolveNativeEvent(args) {
|
|
53
|
+
if (args.length === 0 || !args[0]) {
|
|
54
|
+
return null;
|
|
55
|
+
}
|
|
56
|
+
if (args[0]._targetInst) {
|
|
57
|
+
return args[0];
|
|
58
|
+
}
|
|
59
|
+
if (args[0].event && args[0].event._targetInst) {
|
|
60
|
+
return args[0].event;
|
|
61
|
+
}
|
|
62
|
+
return null;
|
|
63
|
+
}
|
|
42
64
|
handleTargetEvent(targetNode, event) {
|
|
43
65
|
if (targetNode) {
|
|
44
66
|
const resolvedTargetName = this.resolveTargetName(targetNode);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_InternalLog","require","_SdkVerbosity","_DdRum","_types","UNKNOWN_TARGET_NAME","exports","DEBOUNCE_EVENT_THRESHOLD_IN_MS","HANDLE_EVENT_APP_EXECUTION_TIME_IN_MS","DD_ACTION_NAME_PROP","DdEventsInterceptor","ACTION_EVENT_DROPPED_DEBUG_MESSAGE","debouncingStartedTimestamp","Number","MIN_VALUE","constructor","options","actionNameAttribute","useAccessibilityLabel","interceptOnPress","args","
|
|
1
|
+
{"version":3,"names":["_InternalLog","require","_SdkVerbosity","_DdRum","_types","UNKNOWN_TARGET_NAME","exports","DEBOUNCE_EVENT_THRESHOLD_IN_MS","HANDLE_EVENT_APP_EXECUTION_TIME_IN_MS","DD_ACTION_NAME_PROP","DdEventsInterceptor","ACTION_EVENT_DROPPED_DEBUG_MESSAGE","debouncingStartedTimestamp","Number","MIN_VALUE","constructor","options","actionNameAttribute","useAccessibilityLabel","interceptOnPress","args","event","resolveNativeEvent","currentTime","Date","now","timestampDifference","Math","abs","targetNode","_targetInst","handleTargetEvent","InternalLog","log","SdkVerbosity","DEBUG","length","resolvedTargetName","resolveTargetName","DdRum","addAction","RumActionType","TAP","undefined","closestActionLabel","findClosestActionLabel","accessibilityLabel","memoizedProps","elementTypeName","resolveElementTypeName","elementType","name","currentNode","props","return"],"sourceRoot":"../../../../../src","sources":["rum/instrumentation/interactionTracking/DdEventsInterceptor.tsx"],"mappings":"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","ignoreList":[]}
|
package/lib/commonjs/version.js
CHANGED
|
@@ -67,8 +67,8 @@ export class DdBabelInteractionTracking {
|
|
|
67
67
|
const getAccessibilityLabel = () => useAccessibilityLabel && accessibilityLabel ? accessibilityLabel : null;
|
|
68
68
|
const index = handlerArgs ? handlerArgs.find(x => typeof x === 'number') || 0 : 0;
|
|
69
69
|
|
|
70
|
-
// Order:
|
|
71
|
-
const selectedContent =
|
|
70
|
+
// Order: actionName → actionNameAttribute → accessibilityLabel → content
|
|
71
|
+
const selectedContent = actionName || Object.values(attrs)[0] || getAccessibilityLabel() || tryContent();
|
|
72
72
|
if (!selectedContent) {
|
|
73
73
|
return componentName;
|
|
74
74
|
}
|
package/lib/module/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["DdSdk","DefaultTimeProvider","BABEL_PLUGIN_TELEMETRY","ActionSource","StateErrors","ALREADY_INITIALIZED","DdBabelInteractionTracking","instance","config","trackInteractions","useAccessibilityLabel","timeProvider","telemetrySent","ddRum","isInitialized","constructor","Error","getInstance","getTelemetryConfig","babel_plugin","enabled","globalThis","__DD_RN_BABEL_PLUGIN_ENABLED__","track_interactions","getTargetName","targetObject","getContent","options","handlerArgs","componentName","actionName","accessibilityLabel","attrs","tryContent","content","length","getAccessibilityLabel","index","find","x","selectedContent","Object","values","output","useNamePrefix","wrapRumAction","func","action","args","sendTelemetryLog","onlyOnce","targetName","addAction","BABEL","now","catch","e","telemetryError","message","stack"],"sourceRoot":"../../../../../src","sources":["rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA,OAAOA,KAAK,MAAM,4BAA4B;AAC9C,SAASC,mBAAmB,QAAQ,kDAAkD;AAGtF,SAASC,sBAAsB,QAAQ,iBAAiB;AAExD,SAASC,YAAY,QAAQ,aAAa;AAE1C,MAAMC,WAAW,GAAG;EAChBC,mBAAmB,EACf;AACR,CAAU;AAiBV,OAAO,MAAMC,0BAA0B,CAAC;EACpC,OAAeC,QAAQ,GAAsC,IAAI;EAEjE,OAAOC,MAAM,GAAgB;IACzBC,iBAAiB,EAAE,KAAK;IACxBC,qBAAqB,EAAE;EAC3B,CAAC;EAEOC,YAAY,GAAiB,IAAIV,mBAAmB,CAAC,CAAC;EAEtDW,aAAa,GAAY,KAAK;EAE9BC,KAAK,GAAwB,IAAI;EAEzCC,aAAa,GAAY,KAAK;EAEtBC,WAAWA,CAACF,KAAoB,EAAE;IACtC,IAAIP,0BAA0B,CAACC,QAAQ,EAAE;MACrC,MAAM,IAAIS,KAAK,CAACZ,WAAW,CAACC,mBAAmB,CAAC;IACpD;IAEA,IAAIQ,KAAK,EAAE;MACP,IAAI,CAACA,KAAK,GAAGA,KAAK;IACtB;IAEAP,0BAA0B,CAACC,QAAQ,GAAG,IAAI;EAC9C;EAEA,OAAOU,WAAWA,CAACJ,KAAoB,EAAE;IACrC,IAAI,CAACP,0BAA0B,CAACC,QAAQ,EAAE;MACtCD,0BAA0B,CAACC,QAAQ,GAAG,IAAID,0BAA0B,CAChEO,KACJ,CAAC;IACL;IAEA,OAAOP,0BAA0B,CAACC,QAAQ;EAC9C;EAEA,OAAOW,kBAAkBA,CAAA,EAAG;IACxB,OAAO;MACHC,YAAY,EAAE;QACVC,OAAO,EAAE,CAAC,CAACC,UAAU,CAACC,8BAA8B;QACpDC,kBAAkB,EAAE,CAAC,CAACjB,0BAA0B,CAACE,MAAM,CAClDC;MACT;IACJ,CAAC;EACL;EAEQe,aAAaA,CAACC,YAA0B,EAAE;IAC9C,MAAM;MACFC,UAAU;MACVC,OAAO;MACPC,WAAW;MACXC,aAAa;MACb,gBAAgB,EAAEC,UAAU;MAC5BC,kBAAkB;MAClB,GAAGC;IACP,CAAC,GAAGP,YAAY;IAEhB,MAAM;MAAEf;IAAsB,CAAC,GAAGJ,0BAA0B,CAACE,MAAM;IAEnE,MAAMyB,UAAU,GAAGA,CAAA,KAAM;MACrB,MAAMC,OAAO,GAAGR,UAAU,GAAG,CAAC;MAC9B,IAAIQ,OAAO,IAAIA,OAAO,CAACC,MAAM,GAAG,CAAC,EAAE;QAC/B,OAAOD,OAAO;MAClB;MAEA,OAAO,IAAI;IACf,CAAC;IAED,MAAME,qBAAqB,GAAGA,CAAA,KAC1B1B,qBAAqB,IAAIqB,kBAAkB,GACrCA,kBAAkB,GAClB,IAAI;IAEd,MAAMM,KAAK,GAAGT,WAAW,GACnBA,WAAW,CAACU,IAAI,CAACC,CAAC,IAAI,OAAOA,CAAC,KAAK,QAAQ,CAAC,IAAI,CAAC,GACjD,CAAC;;IAEP;IACA,MAAMC,eAAe,
|
|
1
|
+
{"version":3,"names":["DdSdk","DefaultTimeProvider","BABEL_PLUGIN_TELEMETRY","ActionSource","StateErrors","ALREADY_INITIALIZED","DdBabelInteractionTracking","instance","config","trackInteractions","useAccessibilityLabel","timeProvider","telemetrySent","ddRum","isInitialized","constructor","Error","getInstance","getTelemetryConfig","babel_plugin","enabled","globalThis","__DD_RN_BABEL_PLUGIN_ENABLED__","track_interactions","getTargetName","targetObject","getContent","options","handlerArgs","componentName","actionName","accessibilityLabel","attrs","tryContent","content","length","getAccessibilityLabel","index","find","x","selectedContent","Object","values","output","useNamePrefix","wrapRumAction","func","action","args","sendTelemetryLog","onlyOnce","targetName","addAction","BABEL","now","catch","e","telemetryError","message","stack"],"sourceRoot":"../../../../../src","sources":["rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA,OAAOA,KAAK,MAAM,4BAA4B;AAC9C,SAASC,mBAAmB,QAAQ,kDAAkD;AAGtF,SAASC,sBAAsB,QAAQ,iBAAiB;AAExD,SAASC,YAAY,QAAQ,aAAa;AAE1C,MAAMC,WAAW,GAAG;EAChBC,mBAAmB,EACf;AACR,CAAU;AAiBV,OAAO,MAAMC,0BAA0B,CAAC;EACpC,OAAeC,QAAQ,GAAsC,IAAI;EAEjE,OAAOC,MAAM,GAAgB;IACzBC,iBAAiB,EAAE,KAAK;IACxBC,qBAAqB,EAAE;EAC3B,CAAC;EAEOC,YAAY,GAAiB,IAAIV,mBAAmB,CAAC,CAAC;EAEtDW,aAAa,GAAY,KAAK;EAE9BC,KAAK,GAAwB,IAAI;EAEzCC,aAAa,GAAY,KAAK;EAEtBC,WAAWA,CAACF,KAAoB,EAAE;IACtC,IAAIP,0BAA0B,CAACC,QAAQ,EAAE;MACrC,MAAM,IAAIS,KAAK,CAACZ,WAAW,CAACC,mBAAmB,CAAC;IACpD;IAEA,IAAIQ,KAAK,EAAE;MACP,IAAI,CAACA,KAAK,GAAGA,KAAK;IACtB;IAEAP,0BAA0B,CAACC,QAAQ,GAAG,IAAI;EAC9C;EAEA,OAAOU,WAAWA,CAACJ,KAAoB,EAAE;IACrC,IAAI,CAACP,0BAA0B,CAACC,QAAQ,EAAE;MACtCD,0BAA0B,CAACC,QAAQ,GAAG,IAAID,0BAA0B,CAChEO,KACJ,CAAC;IACL;IAEA,OAAOP,0BAA0B,CAACC,QAAQ;EAC9C;EAEA,OAAOW,kBAAkBA,CAAA,EAAG;IACxB,OAAO;MACHC,YAAY,EAAE;QACVC,OAAO,EAAE,CAAC,CAACC,UAAU,CAACC,8BAA8B;QACpDC,kBAAkB,EAAE,CAAC,CAACjB,0BAA0B,CAACE,MAAM,CAClDC;MACT;IACJ,CAAC;EACL;EAEQe,aAAaA,CAACC,YAA0B,EAAE;IAC9C,MAAM;MACFC,UAAU;MACVC,OAAO;MACPC,WAAW;MACXC,aAAa;MACb,gBAAgB,EAAEC,UAAU;MAC5BC,kBAAkB;MAClB,GAAGC;IACP,CAAC,GAAGP,YAAY;IAEhB,MAAM;MAAEf;IAAsB,CAAC,GAAGJ,0BAA0B,CAACE,MAAM;IAEnE,MAAMyB,UAAU,GAAGA,CAAA,KAAM;MACrB,MAAMC,OAAO,GAAGR,UAAU,GAAG,CAAC;MAC9B,IAAIQ,OAAO,IAAIA,OAAO,CAACC,MAAM,GAAG,CAAC,EAAE;QAC/B,OAAOD,OAAO;MAClB;MAEA,OAAO,IAAI;IACf,CAAC;IAED,MAAME,qBAAqB,GAAGA,CAAA,KAC1B1B,qBAAqB,IAAIqB,kBAAkB,GACrCA,kBAAkB,GAClB,IAAI;IAEd,MAAMM,KAAK,GAAGT,WAAW,GACnBA,WAAW,CAACU,IAAI,CAACC,CAAC,IAAI,OAAOA,CAAC,KAAK,QAAQ,CAAC,IAAI,CAAC,GACjD,CAAC;;IAEP;IACA,MAAMC,eAAe,GACjBV,UAAU,IACVW,MAAM,CAACC,MAAM,CAACV,KAAK,CAAC,CAAC,CAAC,CAAC,IACvBI,qBAAqB,CAAC,CAAC,IACvBH,UAAU,CAAC,CAAC;IAEhB,IAAI,CAACO,eAAe,EAAE;MAClB,OAAOX,aAAa;IACxB;;IAEA;IACA,MAAMc,MAAM,GACRN,KAAK,GAAG,CAAC,GAAGG,eAAe,CAACL,MAAM,IAAIE,KAAK,GAAG,CAAC,GACzCG,eAAe,CAAC,CAAC,CAAC,GAClBA,eAAe,CAACH,KAAK,CAAC;IAEhC,OAAOV,OAAO,CAACiB,aAAa,GACtB,GAAGf,aAAa,MAAMc,MAAM,IAAI,GAChCA,MAAM;EAChB;EAEAE,aAAaA,CACTC,IAA6B,EAC7BC,MAAqB,EACrBtB,YAA0B,EACH;IACvB,OAAO,CAAC,GAAGuB,IAAW,KAAK;MACvB,IAAI,CAAC,IAAI,CAACpC,aAAa,EAAE;QACrBZ,KAAK,EAAEiD,gBAAgB,CACnB/C,sBAAsB,EACtBI,0BAA0B,CAACY,kBAAkB,CAAC,CAAC,EAC/C;UAAEgC,QAAQ,EAAE;QAAK,CACrB,CAAC;QAED,IAAI,CAACtC,aAAa,GAAG,IAAI;MAC7B;MAEA,MAAMuC,UAAU,GAAG,IAAI,CAAC3B,aAAa,CAACC,YAAY,CAAC;MAEnD,MAAM;QAAEhB;MAAkB,CAAC,GAAGH,0BAA0B,CAACE,MAAM;MAE/D,IAAIC,iBAAiB,EAAE;QACnB,IAAI,CAACI,KAAK,EACJuC,SAAS,CACPL,MAAM,EACNI,UAAU,EACV;UAAE,oBAAoB,EAAEhD,YAAY,CAACkD;QAAM,CAAC,EAC5C,IAAI,CAAC1C,YAAY,CAAC2C,GAAG,CAAC,CAC1B,CAAC,CACAC,KAAK,CAACC,CAAC,IAAI;UACR,IAAIA,CAAC,YAAYxC,KAAK,EAAE;YACpBhB,KAAK,EAAEyD,cAAc,CACjBD,CAAC,CAACE,OAAO,EACTF,CAAC,CAACG,KAAK,IAAI,EAAE,EACb,kBACJ,CAAC;UACL;QACJ,CAAC,CAAC;MACV;MAEA,OAAOb,IAAI,CAAC,GAAGE,IAAI,CAAC;IACxB,CAAC;EACL;AACJ","ignoreList":[]}
|
|
@@ -20,12 +20,13 @@ export class DdEventsInterceptor {
|
|
|
20
20
|
this.useAccessibilityLabel = options.useAccessibilityLabel ?? true;
|
|
21
21
|
}
|
|
22
22
|
interceptOnPress(...args) {
|
|
23
|
-
|
|
23
|
+
const event = this.resolveNativeEvent(args);
|
|
24
|
+
if (event) {
|
|
24
25
|
const currentTime = Date.now();
|
|
25
26
|
const timestampDifference = Math.abs(Date.now() - this.debouncingStartedTimestamp);
|
|
26
27
|
if (timestampDifference > DEBOUNCE_EVENT_THRESHOLD_IN_MS) {
|
|
27
|
-
const targetNode =
|
|
28
|
-
this.handleTargetEvent(targetNode,
|
|
28
|
+
const targetNode = event._targetInst;
|
|
29
|
+
this.handleTargetEvent(targetNode, event);
|
|
29
30
|
// we add an approximated 1 millisecond for the execution time of the `handleTargetEvent` function
|
|
30
31
|
this.debouncingStartedTimestamp = currentTime + HANDLE_EVENT_APP_EXECUTION_TIME_IN_MS;
|
|
31
32
|
}
|
|
@@ -33,6 +34,27 @@ export class DdEventsInterceptor {
|
|
|
33
34
|
InternalLog.log(DdEventsInterceptor.ACTION_EVENT_DROPPED_DEBUG_MESSAGE, SdkVerbosity.DEBUG);
|
|
34
35
|
}
|
|
35
36
|
}
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* Resolves the native GestureResponderEvent from the onPress arguments.
|
|
40
|
+
*
|
|
41
|
+
* Some third-party libraries (e.g. react-native-ui-lib) wrap the native
|
|
42
|
+
* event inside a props object: `onPress({...componentProps, event})`.
|
|
43
|
+
* This method checks for `_targetInst` on `args[0]` first (standard RN),
|
|
44
|
+
* then falls back to `args[0].event` for the wrapped pattern.
|
|
45
|
+
*/
|
|
46
|
+
resolveNativeEvent(args) {
|
|
47
|
+
if (args.length === 0 || !args[0]) {
|
|
48
|
+
return null;
|
|
49
|
+
}
|
|
50
|
+
if (args[0]._targetInst) {
|
|
51
|
+
return args[0];
|
|
52
|
+
}
|
|
53
|
+
if (args[0].event && args[0].event._targetInst) {
|
|
54
|
+
return args[0].event;
|
|
55
|
+
}
|
|
56
|
+
return null;
|
|
57
|
+
}
|
|
36
58
|
handleTargetEvent(targetNode, event) {
|
|
37
59
|
if (targetNode) {
|
|
38
60
|
const resolvedTargetName = this.resolveTargetName(targetNode);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["InternalLog","SdkVerbosity","DdRum","RumActionType","UNKNOWN_TARGET_NAME","DEBOUNCE_EVENT_THRESHOLD_IN_MS","HANDLE_EVENT_APP_EXECUTION_TIME_IN_MS","DD_ACTION_NAME_PROP","DdEventsInterceptor","ACTION_EVENT_DROPPED_DEBUG_MESSAGE","debouncingStartedTimestamp","Number","MIN_VALUE","constructor","options","actionNameAttribute","useAccessibilityLabel","interceptOnPress","args","
|
|
1
|
+
{"version":3,"names":["InternalLog","SdkVerbosity","DdRum","RumActionType","UNKNOWN_TARGET_NAME","DEBOUNCE_EVENT_THRESHOLD_IN_MS","HANDLE_EVENT_APP_EXECUTION_TIME_IN_MS","DD_ACTION_NAME_PROP","DdEventsInterceptor","ACTION_EVENT_DROPPED_DEBUG_MESSAGE","debouncingStartedTimestamp","Number","MIN_VALUE","constructor","options","actionNameAttribute","useAccessibilityLabel","interceptOnPress","args","event","resolveNativeEvent","currentTime","Date","now","timestampDifference","Math","abs","targetNode","_targetInst","handleTargetEvent","log","DEBUG","length","resolvedTargetName","resolveTargetName","addAction","TAP","undefined","closestActionLabel","findClosestActionLabel","accessibilityLabel","memoizedProps","elementTypeName","resolveElementTypeName","elementType","name","currentNode","props","return"],"sourceRoot":"../../../../../src","sources":["rum/instrumentation/interactionTracking/DdEventsInterceptor.tsx"],"mappings":"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","ignoreList":[]}
|
package/lib/module/version.js
CHANGED
|
@@ -17,6 +17,15 @@ export declare class DdEventsInterceptor implements EventsInterceptor {
|
|
|
17
17
|
private useAccessibilityLabel;
|
|
18
18
|
constructor(options?: DdEventsInterceptorOptions);
|
|
19
19
|
interceptOnPress(...args: any[]): void;
|
|
20
|
+
/**
|
|
21
|
+
* Resolves the native GestureResponderEvent from the onPress arguments.
|
|
22
|
+
*
|
|
23
|
+
* Some third-party libraries (e.g. react-native-ui-lib) wrap the native
|
|
24
|
+
* event inside a props object: `onPress({...componentProps, event})`.
|
|
25
|
+
* This method checks for `_targetInst` on `args[0]` first (standard RN),
|
|
26
|
+
* then falls back to `args[0].event` for the wrapped pattern.
|
|
27
|
+
*/
|
|
28
|
+
private resolveNativeEvent;
|
|
20
29
|
private handleTargetEvent;
|
|
21
30
|
private resolveTargetName;
|
|
22
31
|
private resolveElementTypeName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DdEventsInterceptor.d.ts","sourceRoot":"","sources":["../../../../../src/rum/instrumentation/interactionTracking/DdEventsInterceptor.tsx"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,eAAO,MAAM,mBAAmB,mBAAmB,CAAC;AAKpD,MAAM,MAAM,0BAA0B,GAAG;IACrC;;SAEK;IACL,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;SAEK;IACL,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACnC,CAAC;AAEF,qBAAa,mBAAoB,YAAW,iBAAiB;IACzD,MAAM,CAAC,kCAAkC,SAKK;IAE9C,OAAO,CAAC,0BAA0B,CAAoB;IAEtD,OAAO,CAAC,mBAAmB,CAAC,CAAS;IACrC,OAAO,CAAC,qBAAqB,CAAU;gBAE3B,OAAO,GAAE,0BAA+B;IAKpD,gBAAgB,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"DdEventsInterceptor.d.ts","sourceRoot":"","sources":["../../../../../src/rum/instrumentation/interactionTracking/DdEventsInterceptor.tsx"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,eAAO,MAAM,mBAAmB,mBAAmB,CAAC;AAKpD,MAAM,MAAM,0BAA0B,GAAG;IACrC;;SAEK;IACL,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;SAEK;IACL,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACnC,CAAC;AAEF,qBAAa,mBAAoB,YAAW,iBAAiB;IACzD,MAAM,CAAC,kCAAkC,SAKK;IAE9C,OAAO,CAAC,0BAA0B,CAAoB;IAEtD,OAAO,CAAC,mBAAmB,CAAC,CAAS;IACrC,OAAO,CAAC,qBAAqB,CAAU;gBAE3B,OAAO,GAAE,0BAA+B;IAKpD,gBAAgB,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAsBtC;;;;;;;OAOG;IACH,OAAO,CAAC,kBAAkB;IAa1B,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,iBAAiB;IAoBzB,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,sBAAsB;CAkBjC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "2.14.
|
|
1
|
+
export declare const version = "2.14.4";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@datadog/mobile-react-native",
|
|
3
|
-
"version": "2.14.
|
|
3
|
+
"version": "2.14.4",
|
|
4
4
|
"description": "A client-side React Native module to interact with Datadog",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"datadog",
|
|
@@ -118,5 +118,5 @@
|
|
|
118
118
|
"dependencies": {
|
|
119
119
|
"big-integer": "^1.6.52"
|
|
120
120
|
},
|
|
121
|
-
"gitHead": "
|
|
121
|
+
"gitHead": "5300009fecab8f74298c3346d921befc83edfc3c"
|
|
122
122
|
}
|
|
@@ -229,6 +229,95 @@ it('M send a RUM Action event W interceptOnPress { no accessibilityLabel, no ele
|
|
|
229
229
|
expect(DdRum.addAction.mock.calls[0][1]).toBe(UNKNOWN_TARGET_NAME);
|
|
230
230
|
});
|
|
231
231
|
|
|
232
|
+
it('M send a RUM Action event W interceptOnPress { event nested in props wrapper (react-native-ui-lib pattern) } ', async () => {
|
|
233
|
+
// GIVEN
|
|
234
|
+
const fakeAccessibilityLabel = 'wrapped_target';
|
|
235
|
+
const fakeEvent = {
|
|
236
|
+
_targetInst: {
|
|
237
|
+
memoizedProps: {
|
|
238
|
+
accessibilityLabel: fakeAccessibilityLabel
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
};
|
|
242
|
+
const fakeArguments = {
|
|
243
|
+
onPress: jest.fn(),
|
|
244
|
+
someOtherProp: 'value',
|
|
245
|
+
event: fakeEvent
|
|
246
|
+
};
|
|
247
|
+
|
|
248
|
+
// WHEN
|
|
249
|
+
testedEventsInterceptor.interceptOnPress(fakeArguments);
|
|
250
|
+
|
|
251
|
+
// THEN
|
|
252
|
+
expect(DdRum.addAction.mock.calls.length).toBe(1);
|
|
253
|
+
expect(DdRum.addAction.mock.calls[0][0]).toBe(RumActionType.TAP);
|
|
254
|
+
expect(DdRum.addAction.mock.calls[0][1]).toBe(fakeAccessibilityLabel);
|
|
255
|
+
expect(DdRum.addAction.mock.calls[0][4]).toBe(fakeEvent);
|
|
256
|
+
});
|
|
257
|
+
|
|
258
|
+
it('M send a RUM Action event W interceptOnPress { event nested in props wrapper with dd-action-name } ', async () => {
|
|
259
|
+
// GIVEN
|
|
260
|
+
const fakeDdActionLabel = 'WrappedDdActionLabel';
|
|
261
|
+
const fakeEvent = {
|
|
262
|
+
_targetInst: {
|
|
263
|
+
memoizedProps: {
|
|
264
|
+
'dd-action-name': fakeDdActionLabel
|
|
265
|
+
}
|
|
266
|
+
}
|
|
267
|
+
};
|
|
268
|
+
const fakeArguments = {
|
|
269
|
+
onPress: jest.fn(),
|
|
270
|
+
event: fakeEvent
|
|
271
|
+
};
|
|
272
|
+
|
|
273
|
+
// WHEN
|
|
274
|
+
testedEventsInterceptor.interceptOnPress(fakeArguments);
|
|
275
|
+
|
|
276
|
+
// THEN
|
|
277
|
+
expect(DdRum.addAction.mock.calls.length).toBe(1);
|
|
278
|
+
expect(DdRum.addAction.mock.calls[0][0]).toBe(RumActionType.TAP);
|
|
279
|
+
expect(DdRum.addAction.mock.calls[0][1]).toBe(fakeDdActionLabel);
|
|
280
|
+
expect(DdRum.addAction.mock.calls[0][4]).toBe(fakeEvent);
|
|
281
|
+
});
|
|
282
|
+
|
|
283
|
+
it('M do nothing W interceptOnPress { props wrapper without nested event (incubator pattern) } ', async () => {
|
|
284
|
+
// GIVEN - react-native-ui-lib Incubator passes props without event
|
|
285
|
+
const fakeArguments = {
|
|
286
|
+
onPress: jest.fn(),
|
|
287
|
+
someOtherProp: 'value'
|
|
288
|
+
};
|
|
289
|
+
|
|
290
|
+
// WHEN
|
|
291
|
+
testedEventsInterceptor.interceptOnPress(fakeArguments);
|
|
292
|
+
|
|
293
|
+
// THEN
|
|
294
|
+
expect(DdRum.addAction.mock.calls.length).toBe(0);
|
|
295
|
+
expect(InternalLog.log.mock.calls.length).toBe(1);
|
|
296
|
+
expect(InternalLog.log.mock.calls[0][0]).toBe(
|
|
297
|
+
DdEventsInterceptor.ACTION_EVENT_DROPPED_DEBUG_MESSAGE
|
|
298
|
+
);
|
|
299
|
+
expect(InternalLog.log.mock.calls[0][1]).toBe(SdkVerbosity.DEBUG);
|
|
300
|
+
});
|
|
301
|
+
|
|
302
|
+
it('M do nothing W interceptOnPress { props wrapper with event that has no _targetInst } ', async () => {
|
|
303
|
+
// GIVEN - event property exists but is not a valid native event
|
|
304
|
+
const fakeArguments = {
|
|
305
|
+
onPress: jest.fn(),
|
|
306
|
+
event: { nativeEvent: { pageX: 0, pageY: 0 } }
|
|
307
|
+
};
|
|
308
|
+
|
|
309
|
+
// WHEN
|
|
310
|
+
testedEventsInterceptor.interceptOnPress(fakeArguments);
|
|
311
|
+
|
|
312
|
+
// THEN
|
|
313
|
+
expect(DdRum.addAction.mock.calls.length).toBe(0);
|
|
314
|
+
expect(InternalLog.log.mock.calls.length).toBe(1);
|
|
315
|
+
expect(InternalLog.log.mock.calls[0][0]).toBe(
|
|
316
|
+
DdEventsInterceptor.ACTION_EVENT_DROPPED_DEBUG_MESSAGE
|
|
317
|
+
);
|
|
318
|
+
expect(InternalLog.log.mock.calls[0][1]).toBe(SdkVerbosity.DEBUG);
|
|
319
|
+
});
|
|
320
|
+
|
|
232
321
|
it('M do nothing W interceptOnPress { invalid arguments - empty object } ', async () => {
|
|
233
322
|
// GIVEN
|
|
234
323
|
const fakeArguments = {};
|
|
@@ -111,12 +111,12 @@ export class DdBabelInteractionTracking {
|
|
|
111
111
|
? handlerArgs.find(x => typeof x === 'number') || 0
|
|
112
112
|
: 0;
|
|
113
113
|
|
|
114
|
-
// Order:
|
|
114
|
+
// Order: actionName → actionNameAttribute → accessibilityLabel → content
|
|
115
115
|
const selectedContent =
|
|
116
|
-
tryContent() ||
|
|
117
116
|
actionName ||
|
|
118
117
|
Object.values(attrs)[0] ||
|
|
119
|
-
getAccessibilityLabel()
|
|
118
|
+
getAccessibilityLabel() ||
|
|
119
|
+
tryContent();
|
|
120
120
|
|
|
121
121
|
if (!selectedContent) {
|
|
122
122
|
return componentName;
|
|
@@ -48,14 +48,15 @@ export class DdEventsInterceptor implements EventsInterceptor {
|
|
|
48
48
|
}
|
|
49
49
|
|
|
50
50
|
interceptOnPress(...args: any[]): void {
|
|
51
|
-
|
|
51
|
+
const event = this.resolveNativeEvent(args);
|
|
52
|
+
if (event) {
|
|
52
53
|
const currentTime = Date.now();
|
|
53
54
|
const timestampDifference = Math.abs(
|
|
54
55
|
Date.now() - this.debouncingStartedTimestamp
|
|
55
56
|
);
|
|
56
57
|
if (timestampDifference > DEBOUNCE_EVENT_THRESHOLD_IN_MS) {
|
|
57
|
-
const targetNode =
|
|
58
|
-
this.handleTargetEvent(targetNode,
|
|
58
|
+
const targetNode = event._targetInst;
|
|
59
|
+
this.handleTargetEvent(targetNode, event);
|
|
59
60
|
// we add an approximated 1 millisecond for the execution time of the `handleTargetEvent` function
|
|
60
61
|
this.debouncingStartedTimestamp =
|
|
61
62
|
currentTime + HANDLE_EVENT_APP_EXECUTION_TIME_IN_MS;
|
|
@@ -68,6 +69,27 @@ export class DdEventsInterceptor implements EventsInterceptor {
|
|
|
68
69
|
}
|
|
69
70
|
}
|
|
70
71
|
|
|
72
|
+
/**
|
|
73
|
+
* Resolves the native GestureResponderEvent from the onPress arguments.
|
|
74
|
+
*
|
|
75
|
+
* Some third-party libraries (e.g. react-native-ui-lib) wrap the native
|
|
76
|
+
* event inside a props object: `onPress({...componentProps, event})`.
|
|
77
|
+
* This method checks for `_targetInst` on `args[0]` first (standard RN),
|
|
78
|
+
* then falls back to `args[0].event` for the wrapped pattern.
|
|
79
|
+
*/
|
|
80
|
+
private resolveNativeEvent(args: any[]): any | null {
|
|
81
|
+
if (args.length === 0 || !args[0]) {
|
|
82
|
+
return null;
|
|
83
|
+
}
|
|
84
|
+
if (args[0]._targetInst) {
|
|
85
|
+
return args[0];
|
|
86
|
+
}
|
|
87
|
+
if (args[0].event && args[0].event._targetInst) {
|
|
88
|
+
return args[0].event;
|
|
89
|
+
}
|
|
90
|
+
return null;
|
|
91
|
+
}
|
|
92
|
+
|
|
71
93
|
private handleTargetEvent(targetNode: any, event: unknown) {
|
|
72
94
|
if (targetNode) {
|
|
73
95
|
const resolvedTargetName = this.resolveTargetName(targetNode);
|
package/src/version.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
// generated by genversion
|
|
2
|
-
export const version = '2.14.
|
|
2
|
+
export const version = '2.14.4';
|