fix(desktop): reset highlightMotion state after switching entry

hyoban · hyoban · commit 25d1f06fd50e · 2025-05-20T22:07:40.000+08:00
diff --git a/apps/desktop/layer/renderer/src/hooks/biz/useEntryActions.tsx b/apps/desktop/layer/renderer/src/hooks/biz/useEntryActions.tsx
@@ -1,6 +1,7 @@
 import { isMobile } from "@follow/components/hooks/useMobile.js"
 import { FeedViewType, UserRole, views } from "@follow/constants"
 import { IN_ELECTRON } from "@follow/shared/constants"
+import { doesTextContainHTML } from "@follow/utils/utils"
 import { useMemo } from "react"
 
 import { useShowAISummaryAuto, useShowAISummaryOnce } from "~/atoms/ai-summary"
@@ -130,10 +131,6 @@ export class EntryActionMenuItem extends MenuItemText {
 }
 export type EntryActionItem = EntryActionMenuItem | MenuItemSeparator
 
-function hasHTMLTags(text?: string | null): boolean {
-  return /<[^>]+>/.test(text || "")
-}
-
 export const useEntryActions = ({
   entryId,
   view,
@@ -158,7 +155,7 @@ export const useEntryActions = ({
   const inList = !!listId
   const inbox = useInboxById(entry?.inboxId)
   const isInbox = !!inbox
-  const isContentContainsHTMLTags = hasHTMLTags(entry?.entries.content)
+  const isContentContainsHTMLTags = doesTextContainHTML(entry?.entries.content)
 
   const isShowSourceContent = useShowSourceContent()
   const isShowAISummaryAuto = useShowAISummaryAuto(entry)
diff --git a/packages/internal/components/src/ui/button/action-button.tsx b/packages/internal/components/src/ui/button/action-button.tsx
@@ -73,6 +73,10 @@ export const ActionButton = ({
   React.useImperativeHandle(ref, () => buttonRef.current!)
 
   const [shouldHighlightMotion, setShouldHighlightMotion] = useState(highlightMotion)
+  React.useEffect(() => {
+    setShouldHighlightMotion(highlightMotion)
+  }, [highlightMotion])
+
   const [loading, setLoading] = useState(false)
 
   const Trigger = (
diff --git a/packages/internal/utils/src/utils.spec.ts b/packages/internal/utils/src/utils.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "vitest"
 
-import { isBizId, omitShallow, toScientificNotation } from "./utils"
+import { doesTextContainHTML, isBizId, omitShallow, toScientificNotation } from "./utils"
 
 describe("utils", () => {
   test("isBizId", () => {
@@ -85,4 +85,12 @@ describe("utils", () => {
     expect(omitShallow(void 0)).toEqual(void 0)
     expect(omitShallow([1, 2])).toEqual([1, 2])
   })
+
+  test("does text contain html", () => {
+    expect(doesTextContainHTML("a<div>b</div>")).toBe(true)
+    expect(doesTextContainHTML("Test")).toBe(false)
+    expect(doesTextContainHTML("<p> </p>")).toBe(false)
+    expect(doesTextContainHTML("Test <p> </p>")).toBe(false)
+    expect(doesTextContainHTML("Test <br/>")).toBe(false)
+  })
 })
diff --git a/packages/internal/utils/src/utils.ts b/packages/internal/utils/src/utils.ts
@@ -417,3 +417,8 @@ export function combineCleanupFunctions(...fns: Array<Nullable<(() => void) | vo
     })
   }
 }
+
+export function doesTextContainHTML(text?: string | null): boolean {
+  if (!text) return false
+  return /<([a-z][a-z0-9]*)\b[^>]*>\s*[^<>\s].*<\/\1>/i.test(text)
+}

Original file line number	Diff line number	Diff line change
`@@ -417,3 +417,8 @@ export function combineCleanupFunctions(...fns: Array<Nullable<(() => void) \| vo`
`417`	`417`	`})`
`418`	`418`	`}`
`419`	`419`	`}`
	`420`	`+`
	`421`	`+export function doesTextContainHTML(text?: string \| null): boolean {`
	`422`	`+ if (!text) return false`
	`423`	`+ return /<([a-z][a-z0-9])\b[^>]>\s[^<>\s].<\/\1>/i.test(text)`
	`424`	`+}`