From d35e8f0cf93d4d5e40173175d3a3964a91e54176 Mon Sep 17 00:00:00 2001 From: Philip Okugbe <16838612+Philipinho@users.noreply.github.com> Date: Sun, 11 Oct 2026 14:47:18 +0100 Subject: [PATCH] feat(presentation): laser pointer and max width (#2561) * feat: add laser pointer * feat: increase slide max width to 1440px * fix: show presentation errors inside the modal --- .../public/locales/en-US/translation.json | 2 + .../presentation/laser-pointer.test.tsx | 90 ++++++++++++++ .../components/presentation/laser-pointer.tsx | 36 ++++++ .../presentation-modal.module.css | 24 +++- .../presentation/presentation-modal.tsx | 113 ++++++++++++------ 5 files changed, 229 insertions(+), 36 deletions(-) create mode 100644 apps/client/src/features/editor/components/presentation/laser-pointer.test.tsx create mode 100644 apps/client/src/features/editor/components/presentation/laser-pointer.tsx diff --git a/apps/client/public/locales/en-US/translation.json b/apps/client/public/locales/en-US/translation.json index 159a7a61..edd6458f 100644 --- a/apps/client/public/locales/en-US/translation.json +++ b/apps/client/public/locales/en-US/translation.json @@ -77,6 +77,7 @@ "Failed to fetch recent pages": "Failed to fetch recent pages", "Failed to import pages": "Failed to import pages", "Failed to load page. An error occurred.": "Failed to load page. An error occurred.", + "Failed to load presentation. An error occurred.": "Failed to load presentation. An error occurred.", "Failed to update data": "Failed to update data", "Failed to create base": "Failed to create base", "Failed to update base": "Failed to update base", @@ -167,6 +168,7 @@ "Exit presentation mode": "Exit presentation mode", "Enter fullscreen": "Enter fullscreen", "Exit fullscreen": "Exit fullscreen", + "Laser pointer": "Laser pointer", "Slide {{current}} of {{total}}": "Slide {{current}} of {{total}}", "Print PDF": "Print PDF", "Profile": "Profile", diff --git a/apps/client/src/features/editor/components/presentation/laser-pointer.test.tsx b/apps/client/src/features/editor/components/presentation/laser-pointer.test.tsx new file mode 100644 index 00000000..d4c59658 --- /dev/null +++ b/apps/client/src/features/editor/components/presentation/laser-pointer.test.tsx @@ -0,0 +1,90 @@ +import { describe, expect, it } from "vitest"; +import { render } from "@testing-library/react"; +import LaserPointer from "./laser-pointer"; + +type PointerInit = MouseEventInit & { pointerType?: string }; + +function dispatchPointer( + target: EventTarget, + type: "pointermove" | "pointerout", + init: PointerInit = {}, +) { + // jsdom has no PointerEvent + const event = new MouseEvent(type, { bubbles: true, ...init }); + Object.defineProperty(event, "pointerType", { + value: init.pointerType ?? "mouse", + }); + target.dispatchEvent(event); +} + +function renderLaserPointer(enabled = true) { + const view = render(); + return { ...view, dot: view.container.firstElementChild as HTMLElement }; +} + +describe("LaserPointer", () => { + it("follows the pointer", () => { + const { dot } = renderLaserPointer(); + + dispatchPointer(window, "pointermove", { clientX: 120, clientY: 80 }); + + expect(dot.style.transform).toBe("translate(120px, 80px)"); + expect(dot.style.visibility).toBe("visible"); + }); + + it("stays hidden while disabled", () => { + const { dot } = renderLaserPointer(false); + + dispatchPointer(window, "pointermove", { clientX: 120, clientY: 80 }); + + expect(dot.hidden).toBe(true); + }); + + it("shows at the last pointer position once enabled", () => { + const { dot, rerender } = renderLaserPointer(false); + dispatchPointer(window, "pointermove", { clientX: 120, clientY: 80 }); + + rerender(); + + expect(dot.hidden).toBe(false); + expect(dot.style.transform).toBe("translate(120px, 80px)"); + }); + + it("hides for touch input", () => { + const { dot } = renderLaserPointer(); + dispatchPointer(window, "pointermove", { clientX: 120, clientY: 80 }); + + dispatchPointer(window, "pointermove", { pointerType: "touch" }); + + expect(dot.style.visibility).toBe("hidden"); + }); + + it("hides when the pointer leaves the window", () => { + const { dot, container } = renderLaserPointer(); + dispatchPointer(window, "pointermove", { clientX: 120, clientY: 80 }); + + dispatchPointer(container, "pointerout", { relatedTarget: null }); + + expect(dot.style.visibility).toBe("hidden"); + }); + + it("hides when the pointer moves over an embed", () => { + const { dot, container } = renderLaserPointer(); + const embed = container.appendChild(document.createElement("iframe")); + dispatchPointer(window, "pointermove", { clientX: 120, clientY: 80 }); + + dispatchPointer(container, "pointerout", { relatedTarget: embed }); + + expect(dot.style.visibility).toBe("hidden"); + }); + + it("stays visible when the pointer moves onto another page element", () => { + const { dot, container } = renderLaserPointer(); + const paragraph = container.appendChild(document.createElement("p")); + dispatchPointer(window, "pointermove", { clientX: 120, clientY: 80 }); + + dispatchPointer(container, "pointerout", { relatedTarget: paragraph }); + + expect(dot.style.visibility).toBe("visible"); + }); +}); diff --git a/apps/client/src/features/editor/components/presentation/laser-pointer.tsx b/apps/client/src/features/editor/components/presentation/laser-pointer.tsx new file mode 100644 index 00000000..b35c5bc3 --- /dev/null +++ b/apps/client/src/features/editor/components/presentation/laser-pointer.tsx @@ -0,0 +1,36 @@ +import { useRef } from "react"; +import { useWindowEvent } from "@mantine/hooks"; +import classes from "./presentation-modal.module.css"; + +type LaserPointerProps = { + enabled: boolean; +}; + +export default function LaserPointer({ enabled }: LaserPointerProps) { + const dotRef = useRef(null); + + useWindowEvent("pointermove", (event) => { + const dot = dotRef.current; + if (!dot) return; + dot.style.transform = `translate(${event.clientX}px, ${event.clientY}px)`; + dot.style.visibility = event.pointerType === "touch" ? "hidden" : "visible"; + }); + + useWindowEvent("pointerout", (event) => { + // the page gets no pointer events outside the window or over an embed + const leftPage = + !event.relatedTarget || event.relatedTarget instanceof HTMLIFrameElement; + if (leftPage && dotRef.current) { + dotRef.current.style.visibility = "hidden"; + } + }); + + return ( + @@ -474,6 +517,8 @@ function PresentationDeck({ })} + + ); }