diff --git a/craft/src/panels/right/styles/NavStylePanel.logo.test.tsx b/craft/src/panels/right/styles/NavStylePanel.logo.test.tsx new file mode 100644 index 0000000..61f91b5 --- /dev/null +++ b/craft/src/panels/right/styles/NavStylePanel.logo.test.tsx @@ -0,0 +1,73 @@ +import { describe, test, expect, vi, beforeEach, afterEach } from 'vitest'; +import React from 'react'; +import { createRoot, Root } from 'react-dom/client'; +import { act } from 'react-dom/test-utils'; + +/* Navbar logo: the Navbar only renders logoImage when logoType === 'image', so + the panel must expose the type and picking an image must switch to it + (olsdigital.com: a picked logo sat in logoImage while the site said "MySite"). */ +let lastProps: any; +const setPropSpy = vi.fn((_id: string, updater: (p: any) => void) => { updater(lastProps); }); +vi.mock('@craftjs/core', () => ({ + useEditor: () => ({ actions: { setProp: setPropSpy, history: { merge: () => ({ setProp: setPropSpy }) } } }), +})); +vi.mock('../../../state/PageContext', () => ({ usePages: () => ({ pages: [] }) })); +let pickerOnChange: ((url: string) => void) | null = null; +vi.mock('../../../ui/AssetPicker', () => ({ + AssetPicker: ({ onChange }: { onChange: (url: string) => void }) => { pickerOnChange = onChange; return null; }, +})); + +import { NavStylePanel } from './NavStylePanel'; +import { Navbar } from '../../../components/basic/Navbar'; +import { closeContinuousBurst } from './shared'; + +let container: HTMLDivElement; +let root: Root; +function render(ui: React.ReactElement) { + container = document.createElement('div'); + document.body.appendChild(container); + act(() => { root = createRoot(container); root.render(ui); }); +} +const q = (id: string) => container.querySelector(`[data-testid="${id}"]`) as HTMLButtonElement | null; +const click = (el: Element | null) => act(() => { (el as HTMLElement).dispatchEvent(new MouseEvent('click', { bubbles: true })); }); + +const navProps = () => ({ logoType: 'text', logoText: '', logoImage: '', logoUrl: '/', links: [], style: {} }); + +beforeEach(() => { setPropSpy.mockClear(); closeContinuousBurst(); pickerOnChange = null; lastProps = navProps(); }); +afterEach(() => { act(() => root.unmount()); container.remove(); }); + +describe('NavStylePanel navbar logo type', () => { + test('shows a Text/Image toggle reflecting logoType, and Image sets logoType', () => { + render(); + expect(q('navbar-logo-type-text')?.getAttribute('aria-pressed')).toBe('true'); + expect(q('navbar-logo-type-image')?.getAttribute('aria-pressed')).toBe('false'); + click(q('navbar-logo-type-image')); + expect(lastProps.logoType).toBe('image'); + }); + + test('picking a logo image switches logoType to image in one setProp (one undo step)', () => { + render(); + act(() => pickerOnChange!('/api/assets-proxy/?site_id=1&filename=logo.webp')); + expect(setPropSpy).toHaveBeenCalledTimes(1); + expect(lastProps).toMatchObject({ logoType: 'image', logoImage: '/api/assets-proxy/?site_id=1&filename=logo.webp' }); + }); + + test('clearing the image does not force logoType', () => { + lastProps = { ...navProps(), logoType: 'image', logoImage: '/x.webp' }; + render(); + act(() => pickerOnChange!('')); + expect(lastProps).toMatchObject({ logoType: 'image', logoImage: '' }); + }); + + test('no toggle for components without logoImage (e.g. Footer-style logoText only)', () => { + lastProps = { logoText: 'Acme', links: [], style: {} }; + render(); + expect(q('navbar-logo-type-text')).toBeNull(); + }); + + test('export: logoType image + logoImage renders the , not "MySite"', () => { + const html = (Navbar as any).toHtml({ ...Navbar.craft!.props, logoType: 'image', logoImage: '/logo.webp', logoText: '' }, '').html as string; + expect(html).toContain(' = ({ selectedId, nodeProps }) => { const { actions } = useEditor(); - const { setProp, setPropStyle, setPropContinuous, setPropStyleContinuous } = useNodeProp(selectedId); + const { setProp, setProps, setPropStyle, setPropContinuous, setPropStyleContinuous } = useNodeProp(selectedId); const { pages, updatePageNav, isEditingHeader } = usePages(); const links: NavLink[] = nodeProps.links || []; @@ -405,14 +405,38 @@ export const NavStylePanel: React.FC = ({ selectedId, nodeProps {/* Navbar Logo settings */} {nodeProps.logoText !== undefined && ( + {/* The Navbar only renders logoImage when logoType is 'image'; without + this toggle a picked image was stored but never shown. */} + {nodeProps.logoImage !== undefined && ( +
+ +
+ {(['text', 'image'] as const).map((t) => { + const active = (nodeProps.logoType ?? 'text') === t; + return ( + + ); + })} +
+
+ )}
- + setPropContinuous('logoText', e.target.value)} style={inputStyle} />
{nodeProps.logoImage !== undefined && (
- setProp('logoImage', url)} variant="full" /> + setProps(url ? { logoImage: url, logoType: 'image' } : { logoImage: url })} variant="full" />
)} {nodeProps.logoUrl !== undefined && (