@brightspot/ui 6.0.7-pr.245 → 6.0.7-pr.248

package/src/legacy/tool-ui/src/v5.ts

@@ -2052,12 +2052,32 @@ onFind('.ActionBar', (actionBar) => {
   const widgetTitle = widget.querySelector<HTMLElement>('.Widget-title')
 
   let lastPointerType = ''
+
+  // The browser refocuses whatever was focused before when the window regains focus. That
+  // arrives as a focusin with no preceding pointerdown, so the pointer guard below never
+  // catches it, and the scroll drags the editor away from wherever they had deliberately
+  // scrolled to — most visibly with a rich text field taller than the pane.
+  // Seeded from hasFocus() because binding can happen while the window is already blurred —
+  // a background tab, or form content that mounts lazily while the user is away — in which
+  // case the blur has already fired and there is nothing left to listen for.
+  let isRestoringFocus = !document.hasFocus()
+  const handleWindowBlur = () => {
+    isRestoringFocus = true
+  }
+
+  // Any deliberate input means we are no longer restoring, so the flag cannot go stale if
+  // focus happens to return to something outside this widget.
+  const clearRestoringFocus = () => {
+    isRestoringFocus = false
+  }
+
   const handlePointerdown = (event: Event) => {
     lastPointerType = (event as PointerEvent).pointerType
     // Reset after current task so only the immediately following focusin is affected.
     setTimeout(() => {
       lastPointerType = ''
     }, 0)
+    clearRestoringFocus()
   }
 
   const handleFocusin = (event: Event) => {
@@ -2065,6 +2085,13 @@ onFind('.ActionBar', (actionBar) => {
     // smooth scrolling mid-click disrupts dropdown positioning and button actions.
     if (lastPointerType) return
 
+    // Skip the single focusin the browser fires when restoring focus on window re-entry.
+    // Keyboard navigation afterwards still scrolls, which is what this handler is for.
+    if (isRestoringFocus) {
+      isRestoringFocus = false
+      return
+    }
+
     const target = event.target
     if (!(target instanceof HTMLElement)) return
 
@@ -2081,8 +2108,13 @@ onFind('.ActionBar', (actionBar) => {
 
   widget.addEventListener('pointerdown', handlePointerdown, { passive: true })
   widget.addEventListener('focusin', handleFocusin, { passive: true })
+  // Bound on window without capture — capture would also pick up element blur events.
+  window.addEventListener('blur', handleWindowBlur)
+  window.addEventListener('keydown', clearRestoringFocus, { passive: true })
   onRemove(widget, () => {
     widget.removeEventListener('pointerdown', handlePointerdown)
     widget.removeEventListener('focusin', handleFocusin)
+    window.removeEventListener('blur', handleWindowBlur)
+    window.removeEventListener('keydown', clearRestoringFocus)
   })
 })