v3.1.8

index.d.ts

@@ -17,6 +17,7 @@ declare module "bugbattle" {
     function setAppVersionCode(versionCode: string): void;
     function enablePoweredByBugbattle(hide: boolean): void;
     function setMainColor(color: string): void;
+    function disableConsoleLogOverwrite(): void;
   }
   export default BugBattle;
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bugbattle",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "main": "build/index.js",
   "types": "index.d.ts",
   "scripts": {
@@ -27,15 +27,15 @@
   "licenseFilename": "LICENSE",
   "devDependencies": {
     "@babel/core": "7.3.3",
-    "@babel/plugin-proposal-class-properties": "^7.10.4",
-    "@babel/preset-env": "^7.11.5",
-    "@babel/preset-react": "^7.10.4",
+    "@babel/plugin-proposal-class-properties": "^7.12.1",
+    "@babel/preset-env": "^7.12.11",
+    "@babel/preset-react": "^7.12.10",
     "@svgr/webpack": "4.1.0",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "10.0.1",
     "babel-jest": "23.6.0",
     "babel-loader": "8.0.5",
-    "babel-plugin-named-asset-import": "^0.3.6",
+    "babel-plugin-named-asset-import": "^0.3.7",
     "babel-preset-react-app": "^7.0.2",
     "bfj": "6.1.1",
     "case-sensitive-paths-webpack-plugin": "2.2.0",
@@ -65,19 +65,19 @@
     "postcss-loader": "3.0.0",
     "postcss-preset-env": "6.5.0",
     "postcss-safe-parser": "4.0.1",
-    "react": "^16.13.1",
+    "react": "^16.14.0",
     "react-app-polyfill": "^0.2.2",
     "react-dev-utils": "^7.0.5",
-    "react-dom": "^16.13.1",
+    "react-dom": "^16.14.0",
     "resolve": "1.10.0",
     "sass-loader": "7.1.0",
     "style-loader": "0.23.1",
-    "terser-webpack-plugin": "^1.2.2",
-    "uglify-js": "^3.11.1",
+    "terser-webpack-plugin": "^1.4.5",
+    "uglify-js": "^3.12.4",
     "uglifyjs-webpack-plugin": "^2.2.0",
     "url-loader": "1.1.2",
     "webpack": "4.29.5",
-    "webpack-dev-server": "^3.11.0",
+    "webpack-dev-server": "^3.11.1",
     "webpack-manifest-plugin": "2.0.4",
     "workbox-webpack-plugin": "3.6.3"
   },
@@ -152,4 +152,4 @@
   "dependencies": {
     "html2canvas": "^1.0.0-rc.7"
   }
-}
+}

src/lib/BugBattle.js

@@ -18,12 +18,17 @@ class BugBattle {
   sessionStart = new Date();
   bugReportingRunning = false;
   poweredByHidden = false;
+  originalConsoleLog;
   description = "";
   severity = "LOW";
   appVersionCode = "";
   appBuildNumber = "";
   mainColor = "#398CFE";
   previousBodyOverflow;
+  snapshotPosition = {
+    x: 0,
+    y: 0,
+  };
 
   // Activation methods
   static FEEDBACK_BUTTON = "FEEDBACK_BUTTON";
@@ -170,6 +175,12 @@ class BugBattle {
       feedbackBtn.style.display = "none";
     }
 
+    // Set snapshot position
+    this.instance.snapshotPosition = {
+      x: window.scrollX,
+      y: window.scrollY,
+    };
+
     if (this.instance.crashDetected) {
       this.instance.askForCrashReport();
     } else {
@@ -219,13 +230,19 @@ class BugBattle {
     });
   }
 
+  static disableConsoleLogOverwrite() {
+    window.console = this.instance.originalConsoleLog;
+  }
+
   overwriteConsoleLog() {
     const self = this;
     window.console = (function (origConsole) {
       if (!window.console || !origConsole) {
         origConsole = {};
       }
 
+      self.originalConsoleLog = origConsole;
+
       return {
         log: function () {
           self.addLog(arguments, "log");
@@ -454,12 +471,15 @@ class BugBattle {
       self.toggleLoading(true);
 
       if (!self.sdkKey) {
-        console.log("BUGBATTLE: Please provide a valid API key!");
+        return alert("BUGBATTLE: Please provide a valid API key!");
       }
 
+      self.preScreenshotCleanup();
+
+      window.scrollTo(self.snapshotPosition.x, self.snapshotPosition.y);
       html2canvas(document.body, {
-        x: window.scrollX,
-        y: window.scrollY,
+        x: self.snapshotPosition.x,
+        y: self.snapshotPosition.y,
         width: window.innerWidth,
         height: window.innerHeight,
         letterRendering: 1,
@@ -468,16 +488,27 @@ class BugBattle {
         logging: false,
         imageTimeout: 15000,
         proxy: "https://jsproxy.bugbattle.io/",
-      }).then(function (canvas) {
-        if (canvas) {
-          self.screenshot = canvas.toDataURL();
-          self.prepareScreenshot();
-        }
-      });
-
+      })
+        .then(function (canvas) {
+          if (canvas) {
+            self.screenshot = canvas.toDataURL();
+            self.prepareScreenshot();
+          }
+        })
+        .catch(function () {
+          self.showError();
+        });
     };
   }
 
+  preScreenshotCleanup() {
+    const imgElements = document.body.querySelectorAll("img, svg, video");
+    imgElements.forEach(function (item) {
+      item.setAttribute("width", item.getBoundingClientRect().width);
+      item.setAttribute("height", item.getBoundingClientRect().height);
+    });
+  }
+
   hide() {
     const editorContainer = document.querySelector(
       ".bugbattle-screenshot-editor-container"
@@ -618,12 +649,14 @@ class BugBattle {
         context.lineWidth = 3 * pixelRatio;
         context.strokeStyle = self.mainColor;
         context.stroke();
-        context.strokeRect(
-          editorRectangle.offsetLeft * pixelRatio,
-          editorRectangle.offsetTop * pixelRatio,
-          editorRectangle.offsetWidth * pixelRatio,
-          editorRectangle.offsetHeight * pixelRatio
-        );
+        if (editorRectangle.offsetTop > 0 || editorRectangle.offsetLeft) {
+          context.strokeRect(
+            editorRectangle.offsetLeft * pixelRatio,
+            editorRectangle.offsetTop * pixelRatio,
+            editorRectangle.offsetWidth * pixelRatio,
+            editorRectangle.offsetHeight * pixelRatio
+          );
+        }
       }
 
       // Upload screenshot