Bug 1902683 - Early return on keydown when screenshots button is focused. r=sfoster

Differential Revision: https://phabricator.services.mozilla.com/D213811

UltraBlame original commit: 805b6d6eda9f1b74056e5eb23f3057a122d7b32d

Author: marco-c

browser/components/screenshots/ScreenshotsOverlayChild.sys.mjs

@@ -3835,6 +3835,19 @@ if
 (
 this
 .
+handleKeyDownOnButton
+(
+event
+)
+)
+{
+return
+;
+}
+if
+(
+this
+.
 hoverElementRegion
 .
 isRegionValid
@@ -3872,13 +3885,19 @@ case
 "
 :
 {
+if
+(
 this
 .
 handleKeyDownOnButton
 (
 event
 )
+)
+{
+return
 ;
+}
 if
 (
 Services
@@ -7165,7 +7184,15 @@ downloadSelectedRegion
 ;
 break
 ;
+default
+:
+return
+false
+;
 }
+return
+true
+;
 }
 /
 *

browser/components/screenshots/tests/browser/browser_keyboard_tests.js

@@ -2752,6 +2752,13 @@ waitForOverlay
 )
 ;
 await
+helper
+.
+hoverTestPageElement
+(
+)
+;
+await
 SpecialPowers
 .
 spawn

browser/components/screenshots/tests/browser/head.js

@@ -3712,6 +3712,103 @@ textContent
 ;
 }
 async
+hoverTestPageElement
+(
+elementId
+=
+"
+testPageElement
+"
+)
+{
+let
+rect
+=
+await
+this
+.
+getTestPageElementRect
+(
+elementId
+)
+;
+let
+dims
+=
+await
+this
+.
+getContentDimensions
+(
+)
+;
+let
+x
+=
+Math
+.
+floor
+(
+rect
+.
+x
++
+dims
+.
+scrollX
++
+rect
+.
+width
+/
+2
+)
+;
+let
+y
+=
+Math
+.
+floor
+(
+rect
+.
+y
++
+dims
+.
+scrollY
++
+rect
+.
+height
+/
+2
+)
+;
+mouse
+.
+move
+(
+x
+y
+)
+;
+await
+this
+.
+waitForHoverElementRect
+(
+rect
+.
+width
+rect
+.
+height
+)
+;
+}
+async
 clickTestPageElement
 (
 elementId