shields: ensure event target exist before blur happens

fix brave/brave-browser#5338
brave · Jul 26, 2019 · 07586e7 · 07586e7
1 parent 79e5321
commit 07586e7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/...tension/extension/brave_extension/components/advancedView/controls/adsTrackersControl.tsx b/...tension/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/...n/extension/brave_extension/components/advancedView/controls/deviceRecognitionControl.tsx b/...n/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/...nsion/extension/brave_extension/components/advancedView/controls/httpsUpgradesControl.tsx b/...nsion/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/...e_extension/extension/brave_extension/components/advancedView/controls/scriptsControl.tsx b/...e_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 })
   }