fix(desktop): enhance error handling and focus management in components

Innei · Innei · commit 51d9328f71a1 · 2025-05-14T22:02:01.000+08:00
- Updated PageError component to allow pointer events for better user interaction.
- Refactored FeedColumn to utilize useFocusable for improved keyboard navigation and removed unnecessary focus state management.
- Enhanced highlightElement function to support customizable highlight colors and optimized canvas usage.

These changes improve accessibility and user experience by refining error handling and focus management across components.

Signed-off-by: Innei &lt;tukon479@gmail.com&gt;
diff --git a/apps/desktop/layer/renderer/src/components/errors/PageError.tsx b/apps/desktop/layer/renderer/src/components/errors/PageError.tsx
@@ -11,7 +11,7 @@ const PageErrorFallback: FC<AppErrorFallbackProps> = (props) => {
   const { message, stack } = parseError(props.error)
   useResetErrorWhenRouteChange(props.resetError)
   return (
-    <div className="bg-theme-background flex w-full flex-col items-center justify-center rounded-md p-2">
+    <div className="bg-theme-background pointer-events-auto flex w-full flex-col items-center justify-center rounded-md p-2">
       <div className="m-auto max-w-prose text-center">
         <div className="mb-4">
           <i className="i-mgc-bug-cute-re text-4xl text-red-500" />
diff --git a/apps/desktop/layer/renderer/src/modules/timeline-column/index.tsx b/apps/desktop/layer/renderer/src/modules/timeline-column/index.tsx
@@ -1,3 +1,4 @@
+import { useFocusable } from "@follow/components/common/Focusable/hooks.js"
 import { ActionButton } from "@follow/components/ui/button/index.js"
 import { RootPortal } from "@follow/components/ui/portal/index.js"
 import { Routes } from "@follow/constants"
@@ -105,17 +106,9 @@ export function FeedColumn({ children, className }: PropsWithChildren<{ classNam
   const feedColumnShow = useTimelineColumnShow()
   const rootContainerElement = useRootContainerElement()
 
-  const { setIsFocus } = useRegisterCommands({ setActive, timelineList })
-
   return (
     <WindowUnderBlur
       data-hide-in-print
-      onFocus={useCallback(() => {
-        setIsFocus(true)
-      }, [setIsFocus])}
-      onBlur={useCallback(() => {
-        setIsFocus(false)
-      }, [setIsFocus])}
       className={cn(
         "relative flex h-full flex-col pt-2.5",
 
@@ -128,6 +121,7 @@ export function FeedColumn({ children, className }: PropsWithChildren<{ classNam
         }
       }, [navigateBackHome])}
     >
+      <CommandsHandler setActive={setActive} timelineList={timelineList} />
       <TimelineColumnHeader />
       {!feedColumnShow && (
         <RootPortal to={rootContainerElement}>
@@ -234,7 +228,7 @@ const SwipeWrapper: FC<{ active: string; children: React.JSX.Element[] }> = memo
   },
 )
 
-const useRegisterCommands = ({
+const CommandsHandler = ({
   setActive,
   timelineList,
 }: {
@@ -266,10 +260,8 @@ const useRegisterCommands = ({
     })
   }, [activeScope, setActive, timelineList])
 
-  const [isFocus, setIsFocus] = useState(false)
+  const focus = useFocusable()
 
-  useConditionalHotkeyScope(HotkeyScope.SubscriptionList, isFocus, true)
-  return {
-    setIsFocus,
-  }
+  useConditionalHotkeyScope(HotkeyScope.SubscriptionList, focus, true)
+  return null
 }
diff --git a/packages/internal/components/src/common/Focusable/Focusable.tsx b/packages/internal/components/src/common/Focusable/Focusable.tsx
@@ -27,7 +27,7 @@ export const Focusable: Component<
       setIsFocusWithIn(true)
       focusTargetRef.current = e.target as HTMLElement
       if (import.meta.env.DEV) {
-        highlightElement(containerRef.current!)
+        highlightElement(containerRef.current!, "14, 165, 233")
       }
     } else {
       setIsFocusWithIn(false)
diff --git a/packages/internal/components/src/common/Focusable/utils.ts b/packages/internal/components/src/common/Focusable/utils.ts
@@ -36,28 +36,41 @@ function cubicBezier(t: number, p1x: number, p1y: number, p2x: number, p2y: numb
   return sampleCurveY(solveCurveX(t))
 }
 
-export function highlightElement(element: HTMLElement | null): void {
+// Shared canvas element for all highlight operations
+let sharedCanvas: HTMLCanvasElement | null = null
+let currentAnimationId: number | null = null
+
+export function highlightElement(element: HTMLElement | null, colorString = "255, 165, 0"): void {
   if (!element) return
 
+  // Cancel any ongoing animation
+  if (currentAnimationId !== null) {
+    cancelAnimationFrame(currentAnimationId)
+    currentAnimationId = null
+  }
+
   // Get element's bounding rectangle
   const rect: DOMRect = element.getBoundingClientRect()
   const padding = 10 // Extra space for shadow effect
 
-  // Create canvas
-  const canvas: HTMLCanvasElement = document.createElement("canvas")
-  canvas.style.position = "absolute"
-  canvas.style.top = `${rect.top + window.scrollY - padding}px`
-  canvas.style.left = `${rect.left + window.scrollX - padding}px`
-  canvas.width = rect.width + padding * 2
-  canvas.height = rect.height + padding * 2
+  // Create or reuse canvas
+  if (!sharedCanvas) {
+    sharedCanvas = document.createElement("canvas")
+    sharedCanvas.style.position = "absolute"
+    sharedCanvas.style.pointerEvents = "none"
+    sharedCanvas.style.zIndex = "999999"
+    sharedCanvas.id = "follow-highlight-canvas"
+    document.body.append(sharedCanvas)
+  }
 
-  canvas.style.pointerEvents = "none"
-  canvas.style.zIndex = "999999"
-  document.body.append(canvas)
+  // Update canvas position and size
+  sharedCanvas.style.top = `${rect.top + window.scrollY - padding}px`
+  sharedCanvas.style.left = `${rect.left + window.scrollX - padding}px`
+  sharedCanvas.width = rect.width + padding * 2
+  sharedCanvas.height = rect.height + padding * 2
 
-  const ctx: CanvasRenderingContext2D = canvas.getContext("2d")!
+  const ctx: CanvasRenderingContext2D = sharedCanvas.getContext("2d")!
   if (!ctx) {
-    canvas.remove()
     return
   }
 
@@ -105,8 +118,11 @@ export function highlightElement(element: HTMLElement | null): void {
     const segmentT: number = (t - segmentIndex * segmentDuration) / segmentDuration
 
     if (segmentIndex >= keyframes.length - 1) {
-      // Animation complete, remove canvas
-      canvas.remove()
+      // Animation complete, hide canvas
+      if (sharedCanvas) {
+        sharedCanvas.style.display = "none"
+      }
+      currentAnimationId = null
       return
     }
 
@@ -132,11 +148,11 @@ export function highlightElement(element: HTMLElement | null): void {
     )
 
     // Clear canvas
-    ctx.clearRect(0, 0, canvas.width, canvas.height)
+    ctx.clearRect(0, 0, sharedCanvas!.width, sharedCanvas!.height)
 
     // Draw shadow (approximated as thick border with rounded corners)
     if (shadowWidth > 0) {
-      ctx.strokeStyle = `rgba(255, 165, 0, ${shadowOpacity})` // Orange color
+      ctx.strokeStyle = `rgba(${colorString}, ${shadowOpacity})` // Orange color
       ctx.lineWidth = shadowWidth
       ctx.beginPath()
       ctx.roundRect(
@@ -151,7 +167,7 @@ export function highlightElement(element: HTMLElement | null): void {
 
     // Draw outline (with rounded corners)
     if (outlineWidth > 0) {
-      ctx.strokeStyle = `rgba(255, 165, 0, ${outlineOpacity})`
+      ctx.strokeStyle = `rgba(${colorString}, ${outlineOpacity})`
       ctx.lineWidth = outlineWidth
       ctx.beginPath()
       ctx.roundRect(
@@ -165,11 +181,19 @@ export function highlightElement(element: HTMLElement | null): void {
     }
 
     if (t < 1) {
-      requestAnimationFrame(animate)
+      currentAnimationId = requestAnimationFrame(animate)
     } else {
-      canvas.remove()
+      if (sharedCanvas) {
+        sharedCanvas.style.display = "none"
+      }
+      currentAnimationId = null
     }
   }
 
-  requestAnimationFrame(animate)
+  // Show canvas before starting animation
+  if (sharedCanvas) {
+    sharedCanvas.style.display = "block"
+  }
+
+  currentAnimationId = requestAnimationFrame(animate)
 }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ export const Focusable: Component<`
`27`	`27`	`setIsFocusWithIn(true)`
`28`	`28`	`focusTargetRef.current = e.target as HTMLElement`
`29`	`29`	`if (import.meta.env.DEV) {`
`30`		`- highlightElement(containerRef.current!)`
	`30`	`+ highlightElement(containerRef.current!, "14, 165, 233")`
`31`	`31`	`}`
`32`	`32`	`} else {`
`33`	`33`	`setIsFocusWithIn(false)`