diff --git a/src/renderer/src/components/ExpandableText.tsx b/src/renderer/src/components/ExpandableText.tsx index 2d98dd08fa..a48054509a 100644 --- a/src/renderer/src/components/ExpandableText.tsx +++ b/src/renderer/src/components/ExpandableText.tsx @@ -1,5 +1,5 @@ import { Button } from '@cherrystudio/ui' -import { memo, useCallback, useMemo, useState } from 'react' +import { useCallback, useState } from 'react' import { useTranslation } from 'react-i18next' import styled from 'styled-components' @@ -20,18 +20,12 @@ const ExpandableText = ({ setIsExpanded((prev) => !prev) }, []) - const button = useMemo(() => { - return ( - - ) - }, [isExpanded, t, toggleExpand]) - return ( {text} - {button} + ) } @@ -48,4 +42,4 @@ const TextContainer = styled.div<{ $expanded?: boolean }>` line-height: ${(props) => (props.$expanded ? 'unset' : '30px')}; ` -export default memo(ExpandableText) +export default ExpandableText diff --git a/src/renderer/src/components/Preview/__tests__/ImageToolbar.test.tsx b/src/renderer/src/components/Preview/__tests__/ImageToolbar.test.tsx index 102bd10c61..a64076e3a4 100644 --- a/src/renderer/src/components/Preview/__tests__/ImageToolbar.test.tsx +++ b/src/renderer/src/components/Preview/__tests__/ImageToolbar.test.tsx @@ -12,8 +12,8 @@ vi.mock('react-i18next', () => ({ // Mock ImageToolButton vi.mock('../ImageToolButton', () => ({ - default: vi.fn(({ tooltip, onPress, icon }) => ( - )) diff --git a/src/renderer/src/components/__tests__/ExpandableText.test.tsx b/src/renderer/src/components/__tests__/ExpandableText.test.tsx index b2f5a64d76..212439ca7d 100644 --- a/src/renderer/src/components/__tests__/ExpandableText.test.tsx +++ b/src/renderer/src/components/__tests__/ExpandableText.test.tsx @@ -9,6 +9,15 @@ vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: (k: string) => k }) })) +// mock @cherrystudio/ui Button component +vi.mock('@cherrystudio/ui', () => ({ + Button: ({ children, onPress, ...props }: any) => ( + + ) +})) + describe('ExpandableText', () => { const TEXT = 'This is a long text for testing.' diff --git a/src/renderer/src/pages/minapps/components/WebviewSearch.tsx b/src/renderer/src/pages/minapps/components/WebviewSearch.tsx index 8494040e78..975fc21f19 100644 --- a/src/renderer/src/pages/minapps/components/WebviewSearch.tsx +++ b/src/renderer/src/pages/minapps/components/WebviewSearch.tsx @@ -120,7 +120,7 @@ const WebviewSearch: FC = ({ webviewRef, isWebviewReady, app return } try { - target.findInPage(text, options) + target.findInPage(text, options || {}) } catch (error) { logger.error('findInPage failed', { error }) window.toast?.error(t('common.error')) diff --git a/src/renderer/src/pages/minapps/components/__tests__/WebviewSearch.test.tsx b/src/renderer/src/pages/minapps/components/__tests__/WebviewSearch.test.tsx index 4deee62ad5..bb074199c6 100644 --- a/src/renderer/src/pages/minapps/components/__tests__/WebviewSearch.test.tsx +++ b/src/renderer/src/pages/minapps/components/__tests__/WebviewSearch.test.tsx @@ -19,6 +19,15 @@ vi.mock('react-i18next', () => ({ }) })) +// mock @cherrystudio/ui Button component to handle onClick +vi.mock('@cherrystudio/ui', () => ({ + Button: ({ children, onClick, disabled, ...props }: any) => ( + + ) +})) + const createWebviewMock = () => { const listeners = new Map void>>() const findInPageMock = vi.fn() @@ -255,7 +264,7 @@ describe('WebviewSearch', () => { await user.type(input, 'Cherry') await waitFor(() => { - expect(findInPageMock).toHaveBeenCalledWith('Cherry', undefined) + expect(findInPageMock).toHaveBeenCalledWith('Cherry', {}) }) await act(async () => { @@ -307,7 +316,7 @@ describe('WebviewSearch', () => { await user.type(input, 'Cherry') await waitFor(() => { - expect(findInPageMock).toHaveBeenCalledWith('Cherry', undefined) + expect(findInPageMock).toHaveBeenCalledWith('Cherry', {}) }) findInPageMock.mockClear()