Skip to content

Commit b22646c

Browse files
t3dotggclaude
andauthored
fix(marketing): bring back the endorsement marquee (pingdotgg#10455)
Co-authored-by: Claude Fable 5.1 <[email protected]>
1 parent bd280de commit b22646c

3 files changed

Lines changed: 194 additions & 231 deletions

File tree

‎apps/marketing/src/lib/homeMotion.test.ts‎

Lines changed: 15 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,8 @@ class ElementStub extends EventTarget {
66
properties = new Map<string, string>();
77
style = { setProperty: (name: string, value: string) => this.properties.set(name, value) };
88
children: ElementStub[] = [];
9-
scrollLeft = 0;
10-
scrollWidth = 1_200;
11-
clientWidth = 400;
12-
matches = () => false;
13-
contains = (target: EventTarget | null) =>
14-
target === this || (target instanceof ElementStub && this.children.includes(target));
159
querySelectorAll = () => this.children;
1610
getBoundingClientRect = vi.fn(() => ({ left: 0, top: 0, width: 400, height: 600 }));
17-
scrollTo = vi.fn((options: ScrollToOptions) => {
18-
this.scrollLeft = options.left ?? this.scrollLeft;
19-
});
2011
}
2112

2213
let observers: ObserverStub[] = [];
@@ -34,29 +25,25 @@ class ObserverStub {
3425
}
3526
}
3627

37-
let page = Object.assign(new EventTarget(), { visibilityState: "visible", activeElement: null });
38-
let viewport = new EventTarget();
28+
let page = Object.assign(new EventTarget(), { visibilityState: "visible" });
3929
let reduced = Object.assign(new EventTarget(), { matches: false });
4030
let fine = Object.assign(new EventTarget(), { matches: true });
4131
let frames = new Map<number, FrameRequestCallback>();
4232
let dispose: (() => void) | undefined;
4333

4434
beforeEach(() => {
45-
vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
4635
observers = [];
4736
frames = new Map();
48-
page = Object.assign(new EventTarget(), { visibilityState: "visible", activeElement: null });
49-
viewport = new EventTarget();
37+
page = Object.assign(new EventTarget(), { visibilityState: "visible" });
5038
reduced = Object.assign(new EventTarget(), { matches: false });
5139
fine = Object.assign(new EventTarget(), { matches: true });
5240
vi.stubGlobal("document", page);
5341
vi.stubGlobal(
5442
"window",
55-
Object.assign(viewport, {
43+
Object.assign(new EventTarget(), {
5644
matchMedia: (query: string) => (query.includes("reduced-motion") ? reduced : fine),
5745
}),
5846
);
59-
vi.stubGlobal("Node", ElementStub);
6047
vi.stubGlobal("IntersectionObserver", ObserverStub);
6148
let frameId = 0;
6249
vi.stubGlobal("requestAnimationFrame", (callback: FrameRequestCallback) => {
@@ -69,7 +56,6 @@ beforeEach(() => {
6956
afterEach(() => {
7057
dispose?.();
7158
dispose = undefined;
72-
vi.useRealTimers();
7359
vi.unstubAllGlobals();
7460
});
7561

@@ -79,26 +65,29 @@ function fixture() {
7965
const mark = new ElementStub();
8066
const otherMark = new ElementStub();
8167
field.children = [mark, otherMark];
82-
const endorsements = new ElementStub();
68+
const track = new ElementStub();
8369
const caret = new ElementStub();
84-
dispose = startHomeMotion({ hero, field, endorsements, caret } as unknown as Parameters<
70+
dispose = startHomeMotion({ hero, field, tracks: [track], caret } as unknown as Parameters<
8571
typeof startHomeMotion
8672
>[0]);
87-
return { hero, field, mark, otherMark, endorsements, caret, observer: observers[0]! };
73+
return { hero, field, mark, otherMark, track, caret, observer: observers[0]! };
8874
}
8975

9076
function movePointer(hero: ElementStub, x = 400, y = 600) {
9177
hero.dispatchEvent(Object.assign(new Event("pointermove"), { clientX: x, clientY: y }));
9278
}
9379

9480
describe("homepage motion", () => {
95-
it("gates each mark and caret and batches pointer input into one frame", () => {
96-
const { hero, field, mark, otherMark, caret, observer } = fixture();
81+
it("gates each mark, marquee track, and caret and batches pointer input into one frame", () => {
82+
const { hero, field, mark, otherMark, track, caret, observer } = fixture();
9783
expect(mark.properties.get("--home-motion-state")).toBe("paused");
84+
expect(track.properties.get("--home-motion-state")).toBe("paused");
9885
observer.report(mark, true);
86+
observer.report(track, true);
9987
observer.report(caret, true);
10088
expect(mark.properties.get("--home-motion-state")).toBe("running");
10189
expect(otherMark.properties.get("--home-motion-state")).toBe("paused");
90+
expect(track.properties.get("--home-motion-state")).toBe("running");
10291
expect(caret.properties.get("--home-motion-state")).toBe("running");
10392

10493
movePointer(hero, 100, 100);
@@ -117,6 +106,7 @@ describe("homepage motion", () => {
117106
expect(frames.size).toBe(0);
118107
expect(field.properties.get("--px")).toBe("0px");
119108
expect(mark.properties.get("--home-motion-state")).toBe("paused");
109+
expect(track.properties.get("--home-motion-state")).toBe("paused");
120110
expect(caret.properties.get("--home-motion-state")).toBe("paused");
121111
page.visibilityState = "visible";
122112
page.dispatchEvent(new Event("visibilitychange"));
@@ -133,94 +123,18 @@ describe("homepage motion", () => {
133123
expect(mark.properties.get("--home-motion-state")).toBe("running");
134124
});
135125

136-
it("pages every eight seconds, reverses at the end, and has no timer without overflow", () => {
137-
const { endorsements, observer } = fixture();
138-
expect(vi.getTimerCount()).toBe(0);
139-
observer.report(endorsements, true);
140-
vi.advanceTimersByTime(7_999);
141-
expect(endorsements.scrollTo).not.toHaveBeenCalled();
142-
vi.advanceTimersByTime(16_001);
143-
expect(endorsements.scrollTo.mock.calls.map(([options]) => options.left)).toEqual([
144-
400, 800, 400,
145-
]);
146-
expect(
147-
endorsements.scrollTo.mock.calls.every(([options]) => options.behavior === "smooth"),
148-
).toBe(true);
149-
150-
endorsements.clientWidth = endorsements.scrollWidth;
151-
viewport.dispatchEvent(new Event("resize"));
152-
expect(vi.getTimerCount()).toBe(0);
153-
expect(endorsements.scrollTo).toHaveBeenLastCalledWith({ left: 400, behavior: "instant" });
154-
endorsements.clientWidth = 400;
155-
viewport.dispatchEvent(new Event("resize"));
156-
expect(vi.getTimerCount()).toBe(1);
157-
});
158-
159-
it("pauses paging for hover, focus, hidden content, and reduced motion", () => {
160-
const { endorsements, observer } = fixture();
161-
observer.report(endorsements, true);
162-
const changeVisibility = (visible: boolean) => {
163-
page.visibilityState = visible ? "visible" : "hidden";
164-
page.dispatchEvent(new Event("visibilitychange"));
165-
};
166-
const changeMotion = (matches: boolean) => {
167-
reduced.matches = matches;
168-
reduced.dispatchEvent(new Event("change"));
169-
};
170-
const pauses = [
171-
[
172-
() => endorsements.dispatchEvent(new Event("pointerenter")),
173-
() => endorsements.dispatchEvent(new Event("pointerleave")),
174-
],
175-
[
176-
() => endorsements.dispatchEvent(new Event("focusin")),
177-
() =>
178-
endorsements.dispatchEvent(Object.assign(new Event("focusout"), { relatedTarget: null })),
179-
],
180-
[() => changeVisibility(false), () => changeVisibility(true)],
181-
[() => observer.report(endorsements, false), () => observer.report(endorsements, true)],
182-
[() => changeMotion(true), () => changeMotion(false)],
183-
] as const;
184-
for (const [pause, resume] of pauses) {
185-
pause();
186-
expect(vi.getTimerCount()).toBe(0);
187-
vi.advanceTimersByTime(16_000);
188-
resume();
189-
expect(vi.getTimerCount()).toBe(1);
190-
}
191-
expect(endorsements.scrollTo).not.toHaveBeenCalled();
192-
vi.advanceTimersByTime(8_000);
193-
expect(endorsements.scrollTo).toHaveBeenCalledWith({ left: 400, behavior: "smooth" });
194-
endorsements.dispatchEvent(new Event("pointerenter"));
195-
expect(endorsements.scrollTo).toHaveBeenLastCalledWith({ left: 400, behavior: "instant" });
196-
expect(vi.getTimerCount()).toBe(0);
197-
});
198-
199-
it.each(["wheel", "pointerdown", "keydown"])("hands control to the user after %s", (event) => {
200-
const { endorsements, observer } = fixture();
201-
observer.report(endorsements, true);
202-
endorsements.dispatchEvent(new Event(event));
203-
observer.report(endorsements, false);
204-
observer.report(endorsements, true);
205-
endorsements.dispatchEvent(new Event("pointerleave"));
206-
viewport.dispatchEvent(new Event("resize"));
207-
vi.advanceTimersByTime(60_000);
208-
expect(vi.getTimerCount()).toBe(0);
209-
expect(endorsements.scrollTo).not.toHaveBeenCalled();
210-
});
211-
212126
it("cancels pending work and ignores events after cleanup", () => {
213-
const { hero, mark, endorsements, observer } = fixture();
127+
const { hero, mark, track, observer } = fixture();
214128
observer.report(mark, true);
215-
observer.report(endorsements, true);
129+
observer.report(track, true);
216130
movePointer(hero);
217131
dispose?.();
218132
observer.report(mark, true);
219133
movePointer(hero);
220134
reduced.dispatchEvent(new Event("change"));
221135
expect(observer.disconnect).toHaveBeenCalledTimes(1);
222136
expect(frames.size).toBe(0);
223-
expect(vi.getTimerCount()).toBe(0);
224137
expect(mark.properties.get("--home-motion-state")).toBe("paused");
138+
expect(track.properties.get("--home-motion-state")).toBe("paused");
225139
});
226140
});

‎apps/marketing/src/lib/homeMotion.ts‎

Lines changed: 7 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,25 @@
1-
/** Runs homepage motion only while its content is visible. Manual scrolling stops paging. */
1+
/** Runs homepage motion (marquee, mark drift, caret, parallax) only while its content is visible. */
22
export function startHomeMotion({
33
hero,
44
field,
5-
endorsements,
5+
tracks,
66
caret,
77
}: {
88
hero: HTMLElement;
99
field: HTMLElement;
10-
endorsements: HTMLElement;
10+
tracks: HTMLElement[];
1111
caret: HTMLElement;
1212
}) {
1313
if (typeof IntersectionObserver === "undefined") return () => {};
1414

1515
const marks = Array.from(field.querySelectorAll<HTMLElement>(".hero-float-mark"));
16+
const gated = [...marks, ...tracks, caret];
1617
const visible = new Set<Element>();
1718
const reducedMotion = window.matchMedia("(prefers-reduced-motion: reduce)");
1819
const finePointer = window.matchMedia("(pointer: fine)");
1920
const events = new AbortController();
2021
const eventOptions = { signal: events.signal };
2122
let disposed = false;
22-
let hovered = endorsements.matches(":hover");
23-
let focused = endorsements.contains(document.activeElement);
24-
let userControlled = false;
25-
let direction = 1;
26-
let automaticScroll = false;
27-
let pageTimer: ReturnType<typeof setTimeout> | undefined;
2823
let pointerFrame: number | undefined;
2924
let pointer: { x: number; y: number } | null = null;
3025

@@ -34,12 +29,6 @@ export function startHomeMotion({
3429
document.visibilityState === "visible" &&
3530
!reducedMotion.matches;
3631
const canParallax = () => finePointer.matches && marks.some(canMove);
37-
const canPage = () =>
38-
canMove(endorsements) &&
39-
!hovered &&
40-
!focused &&
41-
!userControlled &&
42-
endorsements.scrollWidth > endorsements.clientWidth;
4332

4433
function resetPointer() {
4534
if (pointerFrame !== undefined) cancelAnimationFrame(pointerFrame);
@@ -49,43 +38,13 @@ export function startHomeMotion({
4938
field.style.setProperty("--py", "0px");
5039
}
5140

52-
function updatePaging() {
53-
if (canPage()) {
54-
pageTimer ??= setTimeout(advancePage, 8_000);
55-
return;
56-
}
57-
if (pageTimer !== undefined) clearTimeout(pageTimer);
58-
pageTimer = undefined;
59-
if (automaticScroll) {
60-
automaticScroll = false;
61-
endorsements.scrollTo({ left: endorsements.scrollLeft, behavior: "instant" });
62-
}
63-
}
64-
65-
function advancePage() {
66-
pageTimer = undefined;
67-
if (!canPage()) return;
68-
const end = endorsements.scrollWidth - endorsements.clientWidth;
69-
const current = endorsements.scrollLeft;
70-
if (current >= end - 1) direction = -1;
71-
else if (current <= 1) direction = 1;
72-
automaticScroll = true;
73-
endorsements.scrollTo({
74-
left: Math.max(0, Math.min(end, current + direction * endorsements.clientWidth)),
75-
behavior: "smooth",
76-
});
77-
updatePaging();
78-
}
79-
8041
function update() {
81-
for (const mark of marks) {
82-
mark.style.setProperty("--home-motion-state", canMove(mark) ? "running" : "paused");
42+
for (const element of gated) {
43+
element.style.setProperty("--home-motion-state", canMove(element) ? "running" : "paused");
8344
}
84-
caret.style.setProperty("--home-motion-state", canMove(caret) ? "running" : "paused");
8545
const parallax = canParallax();
8646
field.style.setProperty("--parallax-duration", parallax ? "0.7s" : "0s");
8747
if (!parallax) resetPointer();
88-
updatePaging();
8948
}
9049

9150
const observer = new IntersectionObserver((entries) => {
@@ -96,7 +55,7 @@ export function startHomeMotion({
9655
}
9756
update();
9857
});
99-
for (const element of [...marks, endorsements, caret]) observer.observe(element);
58+
for (const element of gated) observer.observe(element);
10059

10160
hero.addEventListener(
10261
"pointermove",
@@ -121,47 +80,7 @@ export function startHomeMotion({
12180
eventOptions,
12281
);
12382
hero.addEventListener("pointerleave", resetPointer, eventOptions);
124-
endorsements.addEventListener(
125-
"pointerenter",
126-
() => {
127-
hovered = true;
128-
updatePaging();
129-
},
130-
eventOptions,
131-
);
132-
endorsements.addEventListener(
133-
"pointerleave",
134-
() => {
135-
hovered = false;
136-
updatePaging();
137-
},
138-
eventOptions,
139-
);
140-
endorsements.addEventListener(
141-
"focusin",
142-
() => {
143-
focused = true;
144-
updatePaging();
145-
},
146-
eventOptions,
147-
);
148-
endorsements.addEventListener(
149-
"focusout",
150-
(event) => {
151-
focused = event.relatedTarget instanceof Node && endorsements.contains(event.relatedTarget);
152-
updatePaging();
153-
},
154-
eventOptions,
155-
);
156-
const takeControl = () => {
157-
userControlled = true;
158-
updatePaging();
159-
};
160-
endorsements.addEventListener("wheel", takeControl, { ...eventOptions, passive: true });
161-
endorsements.addEventListener("pointerdown", takeControl, eventOptions);
162-
endorsements.addEventListener("keydown", takeControl, eventOptions);
16383
document.addEventListener("visibilitychange", update, eventOptions);
164-
window.addEventListener("resize", update, eventOptions);
16584
reducedMotion.addEventListener("change", update, eventOptions);
16685
finePointer.addEventListener("change", update, eventOptions);
16786
update();

0 commit comments

Comments
 (0)