integration: collapse the mobile nav after hydration and keep fragment targets clear of the sticky header
SSR still ships the expanded menu, but phones collapse it after render, stop sticking the header below md, and use the header-offset token so case anchors no longer sit underneath the bar. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -1,28 +1,67 @@
|
||||
import { ApplicationRef } from '@angular/core';
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { provideRouter, TitleStrategy } from '@angular/router';
|
||||
import { App } from './app';
|
||||
import { ApplicationRef, PLATFORM_ID } from '@angular/core';
|
||||
import { TestBed, type ComponentFixture } from '@angular/core/testing';
|
||||
import { provideRouter, Router, TitleStrategy } from '@angular/router';
|
||||
import { App, WIDE_NAV_QUERY } from './app';
|
||||
import { routes } from './app.routes';
|
||||
import { SITE_CONTENT } from './core/content/content.token';
|
||||
import { SITE_CONTENT_DATA } from './core/content/site-content';
|
||||
import { SeoTitleStrategy } from './core/seo/seo-title.strategy';
|
||||
|
||||
function mockViewport(wide: boolean): void {
|
||||
Object.defineProperty(window, 'matchMedia', {
|
||||
configurable: true,
|
||||
writable: true,
|
||||
value: (query: string): MediaQueryList =>
|
||||
({
|
||||
matches: wide && query === WIDE_NAV_QUERY,
|
||||
media: query,
|
||||
onchange: null,
|
||||
addListener: vi.fn(),
|
||||
removeListener: vi.fn(),
|
||||
addEventListener: vi.fn(),
|
||||
removeEventListener: vi.fn(),
|
||||
dispatchEvent: vi.fn(),
|
||||
}) as MediaQueryList,
|
||||
});
|
||||
}
|
||||
|
||||
async function configureApp(
|
||||
extraProviders: { provide: unknown; useValue: unknown }[] = [],
|
||||
): Promise<void> {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [App],
|
||||
providers: [
|
||||
provideRouter(routes),
|
||||
{ provide: SITE_CONTENT, useValue: SITE_CONTENT_DATA },
|
||||
{ provide: TitleStrategy, useClass: SeoTitleStrategy },
|
||||
...extraProviders,
|
||||
],
|
||||
}).compileComponents();
|
||||
}
|
||||
|
||||
async function flush(fixture: ComponentFixture<App>): Promise<void> {
|
||||
fixture.detectChanges();
|
||||
await fixture.whenStable();
|
||||
TestBed.inject(ApplicationRef).tick();
|
||||
fixture.detectChanges();
|
||||
await fixture.whenStable();
|
||||
}
|
||||
|
||||
function toggle(root: HTMLElement): HTMLButtonElement {
|
||||
return root.querySelector('.nav-toggle') as HTMLButtonElement;
|
||||
}
|
||||
|
||||
describe('App', () => {
|
||||
beforeEach(async () => {
|
||||
vi.spyOn(HTMLCanvasElement.prototype, 'getContext').mockReturnValue(null);
|
||||
mockViewport(true);
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [App],
|
||||
providers: [
|
||||
provideRouter(routes),
|
||||
{ provide: SITE_CONTENT, useValue: SITE_CONTENT_DATA },
|
||||
{ provide: TitleStrategy, useClass: SeoTitleStrategy },
|
||||
],
|
||||
}).compileComponents();
|
||||
await configureApp();
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
vi.restoreAllMocks();
|
||||
Reflect.deleteProperty(window, 'matchMedia');
|
||||
});
|
||||
|
||||
it('should create the shell', async () => {
|
||||
@@ -72,4 +111,60 @@ describe('App', () => {
|
||||
expect(site?.contains(dialog)).toBe(false);
|
||||
expect(site?.hasAttribute('inert')).toBe(true);
|
||||
});
|
||||
|
||||
it('keeps the server-rendered nav expanded and collapses after hydration on a narrow viewport', async () => {
|
||||
TestBed.resetTestingModule();
|
||||
vi.spyOn(HTMLCanvasElement.prototype, 'getContext').mockReturnValue(null);
|
||||
mockViewport(false);
|
||||
await configureApp();
|
||||
|
||||
const fixture = TestBed.createComponent(App);
|
||||
const shell = fixture.componentInstance as unknown as { navOpen: () => boolean };
|
||||
expect(shell.navOpen()).toBe(true);
|
||||
|
||||
await flush(fixture);
|
||||
const button = toggle(fixture.nativeElement);
|
||||
expect(button.getAttribute('aria-expanded')).toBe('false');
|
||||
expect(button.getAttribute('aria-controls')).toBe('primary-nav');
|
||||
expect(button.getAttribute('aria-label')).toBeTruthy();
|
||||
expect(fixture.nativeElement.querySelector('.site')?.classList.contains('nav-collapsed')).toBe(
|
||||
true,
|
||||
);
|
||||
});
|
||||
|
||||
it('does not collapse the nav on the server even when the viewport helper would be narrow', async () => {
|
||||
TestBed.resetTestingModule();
|
||||
vi.spyOn(HTMLCanvasElement.prototype, 'getContext').mockReturnValue(null);
|
||||
mockViewport(false);
|
||||
await configureApp([{ provide: PLATFORM_ID, useValue: 'server' }]);
|
||||
|
||||
const fixture = TestBed.createComponent(App);
|
||||
await flush(fixture);
|
||||
|
||||
expect(toggle(fixture.nativeElement).getAttribute('aria-expanded')).toBe('true');
|
||||
expect(fixture.nativeElement.querySelector('.site')?.classList.contains('nav-collapsed')).toBe(
|
||||
false,
|
||||
);
|
||||
});
|
||||
|
||||
it('closes the nav on navigation when the viewport is narrow', async () => {
|
||||
TestBed.resetTestingModule();
|
||||
vi.spyOn(HTMLCanvasElement.prototype, 'getContext').mockReturnValue(null);
|
||||
mockViewport(false);
|
||||
await configureApp();
|
||||
|
||||
const fixture = TestBed.createComponent(App);
|
||||
await flush(fixture);
|
||||
|
||||
const button = toggle(fixture.nativeElement);
|
||||
expect(button.getAttribute('aria-expanded')).toBe('false');
|
||||
button.click();
|
||||
fixture.detectChanges();
|
||||
expect(button.getAttribute('aria-expanded')).toBe('true');
|
||||
|
||||
await TestBed.inject(Router).navigateByUrl('/projekte');
|
||||
await flush(fixture);
|
||||
|
||||
expect(toggle(fixture.nativeElement).getAttribute('aria-expanded')).toBe('false');
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user