@dynatrace/react-native-plugin 2.271.2 → 2.271.3

package/README.md

@@ -1169,9 +1169,11 @@ If you are struggling with a problem, submit a support ticket to Dynatrace (supp
 <br/><br/>
 ## Changelog
 
-2.271.2
+2.271.3
 * Update Android (8.271.1.1003) & iOS Agent (8.271.2.1007)
 * Fixed createElement logic for older React Native versions
+* Fixed asynchronous handler for Touchables
+* Updated instrumentation of RefreshControl
 
 2.269.1
 * Update Android (8.269.1.1009) & iOS Agent (8.269.1.1007)

package/lib/instrumentor/base/ElementHelper.js

@@ -7,6 +7,7 @@ const Logger_1 = require("./Logger");
 const Picker_1 = require("./Picker");
 const Touchable_1 = require("./Touchable");
 const Dynatrace_1 = require("./Dynatrace");
+const RefreshControl_1 = require("./RefreshControl");
 const instrumentCreateElement = (reactModule) => {
     if (reactModule != null && reactModule.createElement != null) {
         const reactCreateElement = reactModule.createElement;
@@ -30,7 +31,10 @@ const instrumentCreateElement = (reactModule) => {
 exports.instrumentCreateElement = instrumentCreateElement;
 const modifyElement = (type, props, ...children) => {
     if (props != null) {
-        if (type._dtInfo.type === Types_1.Types.Button ||
+        if (type._dtInfo.type === Types_1.Types.RefreshControl && props.onRefresh != null) {
+            (0, RefreshControl_1.RefreshControlHelper)(Dynatrace_1.Dynatrace, Logger_1.Logger).attachOnRefresh(props);
+        }
+        else if (type._dtInfo.type === Types_1.Types.Button ||
             type._dtInfo.type === Types_1.Types.Text ||
             type._dtInfo.type === Types_1.Types.Pressable ||
             (0, Types_1.isTypeTouchable)(type._dtInfo.type)) {

package/lib/instrumentor/base/Picker.js

@@ -1,20 +1,29 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PickerHelper = void 0;
 const PickerHelper = (Dynatrace, Logger) => ({
     attachToOnValueChange(onValueChange, children) {
-        return (itemValue, itemNumber) => {
+        return (itemValue, itemNumber) => __awaiter(this, void 0, void 0, function* () {
             const value = this.getPickerItemValue(children, itemNumber, itemValue);
             if (value !== undefined) {
                 const action = Dynatrace.enterAutoAction(`Picked Value: ${value}`);
                 if (onValueChange !== undefined) {
-                    onValueChange(itemValue, itemNumber);
+                    yield onValueChange(itemValue, itemNumber);
                 }
                 if (action != null) {
                     action.leaveAction();
                 }
             }
-        };
+        });
     },
     getPickerItemValue: (children, index, value) => {
         if (children != null && index >= 0) {

package/lib/instrumentor/base/RefreshControl.js

@@ -1,32 +1,25 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RefreshControlHelper = void 0;
 const RefreshControlHelper = (Dynatrace, Logger) => ({
-    attachToRender(refreshControl) {
-        if (refreshControl.render !== undefined) {
-            const renderOrig = refreshControl.render.bind(refreshControl);
-            refreshControl.render = () => this.renderRefreshControl(renderOrig);
-        }
-    },
-    renderRefreshControl(renderOrig) {
-        const refreshControlRender = renderOrig();
-        if (refreshControlRender != null &&
-            refreshControlRender.props != null &&
-            refreshControlRender.props.onRefresh) {
-            return Object.assign(Object.assign({}, refreshControlRender), { props: Object.assign(Object.assign({}, refreshControlRender.props), { onRefresh: () => {
-                        this.onRefresh(refreshControlRender);
-                    } }) });
-        }
-        else {
-            return refreshControlRender;
-        }
-    },
-    onRefresh: (refreshControl) => {
-        const action = Dynatrace.enterAutoAction('Swipe to Refesh');
-        if (refreshControl.props.onRefresh !== undefined) {
-            refreshControl.props.onRefresh();
-        }
-        action.leaveAction();
+    attachOnRefresh: (refreshControlProps) => {
+        const origOnRefresh = refreshControlProps.onRefresh;
+        refreshControlProps.onRefresh = () => __awaiter(void 0, void 0, void 0, function* () {
+            const action = Dynatrace.enterAutoAction('Swipe to Refesh');
+            if (origOnRefresh != null) {
+                yield origOnRefresh();
+            }
+            action.leaveAction();
+        });
     },
 });
 exports.RefreshControlHelper = RefreshControlHelper;

package/lib/instrumentor/base/Touchable.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TouchableHelper = void 0;
 const Configuration_1 = require("./configuration/Configuration");
@@ -9,17 +18,17 @@ const TouchableHelper = (Dynatrace, Logger) => ({
             : props.onPress;
         const nameOfAction = this._findActionName(props, children);
         const isButton = this._isPropsButton(props);
-        return (event) => {
+        return (event) => __awaiter(this, void 0, void 0, function* () {
             if (nameOfAction == null) {
                 Logger.logDebug('TouchableHelper: Skipping creation of action as no name was found!');
                 if (origFunction != null) {
-                    origFunction(event);
+                    yield origFunction(event);
                 }
             }
             else if (!Configuration_1.Configuration.isConfigurationAvailable()) {
                 Logger.logInfo('TouchableHelper: React Native plugin has not been started yet! Touch will not be reported!');
                 if (origFunction != null) {
-                    origFunction(event);
+                    yield origFunction(event);
                 }
             }
             else {
@@ -29,11 +38,11 @@ const TouchableHelper = (Dynatrace, Logger) => ({
                 }
                 const action = Dynatrace.enterAutoAction(`Touch on ${finalNameOfAction}`);
                 if (origFunction != null) {
-                    origFunction(event);
+                    yield origFunction(event);
                 }
                 action.leaveAction();
             }
-        };
+        });
     },
     _findActionName(props, children) {
         if (this._isDynatraceProperties(props)) {

package/lib/instrumentor/model/Types.js

@@ -18,6 +18,7 @@ var Types;
     Types[Types["TouchableNativeFeedbackGestureHandler"] = 12] = "TouchableNativeFeedbackGestureHandler";
     Types[Types["TouchableWithoutFeedbackGestureHandler"] = 13] = "TouchableWithoutFeedbackGestureHandler";
     Types[Types["RectButtonGestureHandler"] = 14] = "RectButtonGestureHandler";
+    Types[Types["RefreshControl"] = 15] = "RefreshControl";
 })(Types = exports.Types || (exports.Types = {}));
 const isTypeReactNativeTouchable = (type) => type === Types.TouchableHighlight
     || type === Types.TouchableNativeFeedback

package/lib/react-native/RefreshControl.js

@@ -1,14 +1,15 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RefreshControl = void 0;
 const ReactNative = require("react-native");
-const Dynatrace_1 = require("../instrumentor/base/Dynatrace");
-const Logger_1 = require("../instrumentor/base/Logger");
-const RefreshControl_1 = require("../instrumentor/base/RefreshControl");
-class RefreshControl extends ReactNative.RefreshControl {
-    constructor(props, context) {
-        super(props, context);
-        (0, RefreshControl_1.RefreshControlHelper)(Dynatrace_1.Dynatrace, Logger_1.Logger).attachToRender(this);
-    }
+const Types_1 = require("../instrumentor/model/Types");
+if (typeof ReactNative.RefreshControl === 'object') {
+    exports.RefreshControl = Object.assign({ _dtInfo: { type: Types_1.Types.RefreshControl } }, ReactNative.RefreshControl);
+}
+else {
+    exports.RefreshControl = (_a = class RefreshControl extends ReactNative.RefreshControl {
+        },
+        _a._dtInfo = { type: Types_1.Types.RefreshControl },
+        _a);
 }
-exports.RefreshControl = RefreshControl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynatrace/react-native-plugin",
-  "version": "2.271.2",
+  "version": "2.271.3",
   "description": "This plugin gives you the ability to use the Dynatrace Mobile agent in your react native application.",
   "main": "index.js",
   "types": "typings/react-native-dynatrace.d.ts",