mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-22 13:10:29 +00:00
fix(map): keep the selected place findable on the map
Selecting a place no longer spiderfies a city-sized cluster: the reveal only fans open bubbles of up to 12 stops, or stacks whose stops all share one coordinate, so a zoomed-out trip with hundreds of places stays usable (#2990). The selected pin now carries a white border inside a pulsing blue ring on both renderers (static under reduced motion), and the map measures the place card instead of assuming a fixed 320px, so the selection pans the pin above even a tall card on portrait tablets and eases it back out when the card grows over it later (#2991). Closes #2990 Closes #2991
This commit is contained in:
@@ -0,0 +1,68 @@
|
||||
import { render } from '@testing-library/react';
|
||||
import { afterEach, describe, expect, it, vi } from 'vitest';
|
||||
import { useMeasuredHeight, useReportedHeight } from './useReportedHeight';
|
||||
|
||||
function Card({ onHeight, open = true }: { onHeight?: (height: number) => void; open?: boolean }) {
|
||||
const ref = useReportedHeight(onHeight);
|
||||
return open ? <div ref={ref}>card</div> : null;
|
||||
}
|
||||
|
||||
const original = Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'offsetHeight');
|
||||
afterEach(() => {
|
||||
if (original) Object.defineProperty(HTMLElement.prototype, 'offsetHeight', original);
|
||||
vi.unstubAllGlobals();
|
||||
});
|
||||
|
||||
describe('useReportedHeight', () => {
|
||||
it('REPORTED-HEIGHT-001: reports the height on mount and 0 once the element is gone', () => {
|
||||
Object.defineProperty(HTMLElement.prototype, 'offsetHeight', { configurable: true, get: () => 412 });
|
||||
const onHeight = vi.fn();
|
||||
const { rerender } = render(<Card onHeight={onHeight} />);
|
||||
expect(onHeight).toHaveBeenLastCalledWith(412);
|
||||
|
||||
rerender(<Card onHeight={onHeight} open={false} />);
|
||||
expect(onHeight).toHaveBeenLastCalledWith(0);
|
||||
});
|
||||
|
||||
it('REPORTED-HEIGHT-002: reports again whenever the element resizes', () => {
|
||||
let height = 300;
|
||||
Object.defineProperty(HTMLElement.prototype, 'offsetHeight', { configurable: true, get: () => height });
|
||||
const observed: { resize?: () => void } = {};
|
||||
const disconnect = vi.fn();
|
||||
vi.stubGlobal(
|
||||
'ResizeObserver',
|
||||
class {
|
||||
constructor(cb: () => void) {
|
||||
observed.resize = cb;
|
||||
}
|
||||
observe() {}
|
||||
disconnect = disconnect;
|
||||
}
|
||||
);
|
||||
const onHeight = vi.fn();
|
||||
const { unmount } = render(<Card onHeight={onHeight} />);
|
||||
height = 820;
|
||||
expect(observed.resize).toBeTypeOf('function');
|
||||
observed.resize?.();
|
||||
expect(onHeight).toHaveBeenLastCalledWith(820);
|
||||
|
||||
unmount();
|
||||
expect(disconnect).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('REPORTED-HEIGHT-003: does nothing without a listener', () => {
|
||||
expect(() => render(<Card />)).not.toThrow();
|
||||
});
|
||||
});
|
||||
|
||||
describe('useMeasuredHeight', () => {
|
||||
it('REPORTED-HEIGHT-004: holds the measured height as state', () => {
|
||||
Object.defineProperty(HTMLElement.prototype, 'offsetHeight', { configurable: true, get: () => 512 });
|
||||
function Probe() {
|
||||
const { height, measure } = useMeasuredHeight();
|
||||
return <div ref={measure} data-height={height} />;
|
||||
}
|
||||
const { container } = render(<Probe />);
|
||||
expect(container.firstElementChild?.getAttribute('data-height')).toBe('512');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,42 @@
|
||||
import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
|
||||
|
||||
/**
|
||||
* A callback ref that reports its element's rendered height whenever it changes, and 0
|
||||
* once the element is gone. For a card floating over something that has to keep clear of
|
||||
* it, the way the map keeps the selected pin above the place card (#2991).
|
||||
*/
|
||||
export function useReportedHeight(onHeight: ((height: number) => void) | undefined) {
|
||||
const observer = useRef<ResizeObserver | null>(null);
|
||||
const report = useRef(onHeight);
|
||||
useLayoutEffect(() => {
|
||||
report.current = onHeight;
|
||||
}, [onHeight]);
|
||||
|
||||
const ref = useCallback((el: HTMLElement | null) => {
|
||||
observer.current?.disconnect();
|
||||
observer.current = null;
|
||||
if (!el) {
|
||||
report.current?.(0);
|
||||
return;
|
||||
}
|
||||
const publish = () => report.current?.(el.offsetHeight);
|
||||
publish();
|
||||
if (typeof ResizeObserver !== 'undefined') {
|
||||
observer.current = new ResizeObserver(publish);
|
||||
observer.current.observe(el);
|
||||
}
|
||||
}, []);
|
||||
|
||||
useEffect(() => () => observer.current?.disconnect(), []);
|
||||
return ref;
|
||||
}
|
||||
|
||||
/**
|
||||
* The element's height as state, and `measure`, the callback ref that reads it: hand
|
||||
* `measure` to the element as its `ref`.
|
||||
*/
|
||||
export function useMeasuredHeight() {
|
||||
const [height, setHeight] = useState(0);
|
||||
const measure = useReportedHeight(setHeight);
|
||||
return { height, measure };
|
||||
}
|
||||
Reference in New Issue
Block a user