Merge pull request #4736 from brave/ksmith-tip-dialog-esc

Escape key should always close the tip dialog
brave · Feb 28, 2020 · af9e381 · af9e381
2 parents c0fac90 + 033e60b
commit af9e381
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/components/brave_rewards/resources/tip/brave_rewards_tip.tsx b/components/brave_rewards/resources/tip/brave_rewards_tip.tsx
@@ -40,6 +40,12 @@ window.cr.define('brave_rewards_tip', function () {
       console.error('Error parsing incoming dialog args', dialogArgsRaw, e)
     }
 
+    document.body.addEventListener('keyup', (evt) => {
+      if (evt.key.toLowerCase() === 'escape') {
+        getActions().onCloseDialog()
+      }
+    })
+
     render(
       <Provider store={store}>
         <ThemeProvider theme={Theme}>

diff --git a/components/brave_rewards/resources/ui/components/siteBanner/index.tsx b/components/brave_rewards/resources/ui/components/siteBanner/index.tsx
@@ -233,12 +233,6 @@ export default class SiteBanner extends React.PureComponent<Props, {}> {
     }
   }
 
-  onKeyUp = (e: React.KeyboardEvent<HTMLDivElement>) => {
-    if (e.key.toLowerCase() === 'escape' && this.props.onClose) {
-      this.props.onClose()
-    }
-  }
-
   renderConfirmation = () => {
     const { type, onTweet, onlyAnonWallet, monthlyDate, amount } = this.props
 
@@ -286,11 +280,7 @@ export default class SiteBanner extends React.PureComponent<Props, {}> {
     const batFormatString = onlyAnonWallet ? 'bap' : 'bat'
 
     return (
-      <StyledWrapper
-        id={id}
-        onKeyUp={this.onKeyUp}
-        tabIndex={0}
-      >
+      <StyledWrapper id={id} tabIndex={0}>
         <StyledBanner>
           <StyledClose onClick={onClose}>
             <CloseCircleOIcon />