From 07586e7d0fd7931db14b14dc8320ff278f604945 Mon Sep 17 00:00:00 2001
From: Cezar Augusto <boss@cezaraugusto.net>
Date: Fri, 26 Jul 2019 19:46:20 -0300
Subject: [PATCH] shields: ensure event target exist before blur happens fix
 https://github.com/brave/brave-browser/issues/5338

---
 .../components/advancedView/controls/adsTrackersControl.tsx   | 4 +++-
 .../advancedView/controls/deviceRecognitionControl.tsx        | 4 +++-
 .../components/advancedView/controls/httpsUpgradesControl.tsx | 4 +++-
 .../components/advancedView/controls/scriptsControl.tsx       | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/components/brave_extension/extension/brave_extension/components/advancedView/controls/adsTrackersControl.tsx b/components/brave_extension/extension/brave_extension/components/advancedView/controls/adsTrackersControl.tsx
index e429291bc7b5..cec8545db4dd 100644
--- a/components/brave_extension/extension/brave_extension/components/advancedView/controls/adsTrackersControl.tsx
+++ b/components/brave_extension/extension/brave_extension/components/advancedView/controls/adsTrackersControl.tsx
@@ -95,7 +95,9 @@ export default class AdsTrackersControl extends React.PureComponent<Props, State
   triggerOpen3rdPartyTrackersBlocked = (
     event: React.MouseEvent<HTMLDivElement> | React.KeyboardEvent<HTMLDivElement>
   ) => {
-    event.currentTarget.blur()
+    if (event) {
+      event.currentTarget.blur()
+    }
     this.props.setBlockedListOpen()
     this.setState({ trackersBlockedOpen: !this.state.trackersBlockedOpen })
   }
diff --git a/components/brave_extension/extension/brave_extension/components/advancedView/controls/deviceRecognitionControl.tsx b/components/brave_extension/extension/brave_extension/components/advancedView/controls/deviceRecognitionControl.tsx
index 448336c457b3..caee6049fd64 100644
--- a/components/brave_extension/extension/brave_extension/components/advancedView/controls/deviceRecognitionControl.tsx
+++ b/components/brave_extension/extension/brave_extension/components/advancedView/controls/deviceRecognitionControl.tsx
@@ -75,7 +75,9 @@ export default class DeviceRecognitionControl extends React.PureComponent<Props,
   triggerOpenDeviceRecognition = (
     event: React.MouseEvent<HTMLDivElement> | React.KeyboardEvent<HTMLDivElement>
   ) => {
-    event.currentTarget.blur()
+    if (event) {
+      event.currentTarget.blur()
+    }
     this.props.setBlockedListOpen()
     this.setState({ deviceRecognitionOpen: !this.state.deviceRecognitionOpen })
   }
diff --git a/components/brave_extension/extension/brave_extension/components/advancedView/controls/httpsUpgradesControl.tsx b/components/brave_extension/extension/brave_extension/components/advancedView/controls/httpsUpgradesControl.tsx
index 6673ee747ce1..f4849744d724 100644
--- a/components/brave_extension/extension/brave_extension/components/advancedView/controls/httpsUpgradesControl.tsx
+++ b/components/brave_extension/extension/brave_extension/components/advancedView/controls/httpsUpgradesControl.tsx
@@ -82,7 +82,9 @@ export default class HTTPSUpgradesControl extends React.PureComponent<Props, Sta
   triggerConnectionsUpgradedToHTTPS = (
     event: React.MouseEvent<HTMLDivElement> | React.KeyboardEvent<HTMLDivElement>
   ) => {
-    event.currentTarget.blur()
+    if (event) {
+      event.currentTarget.blur()
+    }
     this.props.setBlockedListOpen()
     this.setState({ connectionsUpgradedOpen: !this.state.connectionsUpgradedOpen })
   }
diff --git a/components/brave_extension/extension/brave_extension/components/advancedView/controls/scriptsControl.tsx b/components/brave_extension/extension/brave_extension/components/advancedView/controls/scriptsControl.tsx
index b7e4b7104d85..5bb33ac792cd 100644
--- a/components/brave_extension/extension/brave_extension/components/advancedView/controls/scriptsControl.tsx
+++ b/components/brave_extension/extension/brave_extension/components/advancedView/controls/scriptsControl.tsx
@@ -99,7 +99,9 @@ export default class ScriptsControls extends React.PureComponent<Props, State> {
   triggerOpenScriptsBlocked = (
     event: React.MouseEvent<HTMLDivElement> | React.KeyboardEvent<HTMLDivElement>
   ) => {
-    event.currentTarget.blur()
+    if (event) {
+      event.currentTarget.blur()
+    }
     this.props.setBlockedListOpen()
     this.setState({ scriptsBlockedOpen: !this.state.scriptsBlockedOpen })
   }