fix bug

Author: lxieyang

package-lock.json

@@ -3,10 +3,6 @@
   "version": "0.0.1",
   "description": "A browser extension that takes screenshots",
   "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/lxieyang/chrome-extension-boilerplate-react.git"
-  },
   "scripts": {
     "build": "node utils/build.js",
     "start": "node utils/webserver.js",

package.json

@@ -13,7 +13,7 @@
   "icons": {
     "128": "icon-128.png"
   },
-  "permissions": ["tabs", "downloads", "<all_urls>", "storage"],
+  "permissions": ["tabs", "downloads", "<all_urls>", "storage", "activeTab"],
   "content_scripts": [
     {
       "matches": ["http://*/*", "https://*/*", "<all_urls>"],

src/manifest.json

@@ -1,7 +1,11 @@
 import '../../assets/img/icon-34.png';
 import '../../assets/img/icon-128.png';
+import { defaults } from '../../shared/defaults';
 import imageClipper from './image-clipper.js';
 
+chrome.storage.sync.set({ openInTab: defaults.openInTab });
+chrome.storage.sync.set({ download: defaults.download });
+
 const getImageDimensions = (file) => {
   return new Promise(function (resolved, rejected) {
     var img = new Image();
@@ -19,6 +23,9 @@ chrome.browserAction.setTitle({
 
 chrome.browserAction.onClicked.addListener(function () {
   chrome.tabs.captureVisibleTab(function (screenshotUrl) {
+    if (!screenshotUrl) {
+      return;
+    }
     chrome.storage.sync.get(['download', 'openInTab'], (result) => {
       // download image
       if (result.download) {
@@ -43,6 +50,9 @@ chrome.runtime.onMessage.addListener(function (request, sender, sendResponse) {
     let rect = request.rect;
     let windowSize = request.windowSize;
     chrome.tabs.captureVisibleTab(function (screenshotUrl) {
+      if (!screenshotUrl) {
+        return;
+      }
       getImageDimensions(screenshotUrl).then((imageDimensions) => {
         let scale = imageDimensions.w / windowSize.width;
         let x = Math.floor(rect.x * scale);

src/pages/Background/index.js

@@ -1,22 +1,23 @@
 import React, { useState, useEffect } from 'react';
+import { defaults } from '../../shared/defaults';
 import './Options.css';
 
 const Options: React.FC = () => {
-  const [openInTab, setOpenInTab] = useState(true);
+  const [openInTab, setOpenInTab] = useState(false);
   const [download, setDownload] = useState(false);
 
   useEffect(() => {
     chrome.storage.sync.get(['openInTab'], (result) => {
       if (result.openInTab === undefined) {
-        chrome.storage.sync.set({ openInTab });
+        chrome.storage.sync.set({ openInTab: defaults.openInTab });
       } else {
         setOpenInTab(result.openInTab);
       }
     });
 
     chrome.storage.sync.get(['download'], (result) => {
       if (result.download === undefined) {
-        chrome.storage.sync.set({ download });
+        chrome.storage.sync.set({ download: defaults.download });
       } else {
         setDownload(result.download);
       }

src/pages/Options/Options.tsx

@@ -0,0 +1,4 @@
+export const defaults = {
+  openInTab: true,
+  download: false,
+};