diff --git a/packages/app/component-tests/new-session-wordmark.spec.ts b/packages/app/component-tests/new-session-wordmark.spec.ts new file mode 100644 index 00000000000..6776bfe7123 --- /dev/null +++ b/packages/app/component-tests/new-session-wordmark.spec.ts @@ -0,0 +1,86 @@ +import { expect, story } from "../../storybook/playwright/story" + +for (const theme of ["light", "dark"]) { + for (const direction of ["ltr", "rtl"]) { + story(`shimmers once over the visible wordmark (${theme}, ${direction})`, async ({ mount, page }, testInfo) => { + await page.emulateMedia({ reducedMotion: "no-preference" }) + const component = await mount("app-new-session-wordmark--reveal", { globals: { theme, direction } }) + const logo = component.locator('[data-component="new-session-wordmark"]') + const reveal = logo.locator('[data-slot="wordmark-reveal"]') + const shimmer = logo.locator(".wordmark-shimmer") + const base = logo.locator("svg").first() + await expect(base).toHaveCSS("opacity", theme === "dark" ? "0.5" : "0.6") + await expect(shimmer).toHaveCSS("animation-iteration-count", "1") + await expect(logo.locator("g[mask]")).toHaveCount(0) + await expect(shimmer).toHaveCSS("color", "rgb(255, 255, 255)") + await expect(shimmer).toHaveCSS("mix-blend-mode", "screen") + await expect(base.locator("g[fill]")).toHaveAttribute("fill", "currentColor") + + await logo.evaluate((element) => { + element.getAnimations({ subtree: true }).forEach((animation) => { + animation.pause() + animation.currentTime = 0 + }) + }) + await expect(reveal).toHaveCSS("opacity", "1") + await expect(reveal).toHaveCSS("animation-name", "none") + await expect(shimmer).toHaveCSS("mask-position", "100% 0px") + + await logo.evaluate((element) => { + element.getAnimations({ subtree: true }).forEach((animation) => (animation.currentTime = 400)) + }) + await expect(shimmer).toHaveCSS("mask-position", "50% 0px") + await expect(shimmer).toHaveCSS("opacity", theme === "dark" ? "0.0672" : "0.45") + const swept = await logo.screenshot({ path: testInfo.outputPath("wordmark-shimmer.png") }) + + await logo.evaluate((element) => { + element.getAnimations({ subtree: true }).forEach((animation) => animation.finish()) + }) + await expect(reveal).toHaveCSS("opacity", "1") + await expect(shimmer).toHaveCSS("opacity", "0") + await expect(shimmer).toHaveCSS("mask-position", "0% 0px") + const settled = await logo.screenshot({ path: testInfo.outputPath("wordmark-settled.png") }) + const brightness = await page.evaluate( + async (screenshots) => { + const pixels = await Promise.all( + screenshots.map(async (screenshot) => { + const image = new Image() + image.src = `data:image/png;base64,${screenshot}` + await image.decode() + const canvas = new OffscreenCanvas(image.width, image.height) + const context = canvas.getContext("2d") + if (!context) throw new Error("Cannot read screenshot pixels") + context.drawImage(image, 0, 0) + return context.getImageData(0, 0, image.width, image.height).data + }), + ) + return { + min: pixels[0].reduce( + (min, value, index) => (index % 4 === 3 ? min : Math.min(min, value - pixels[1][index])), + 0, + ), + max: pixels[0].reduce( + (max, value, index) => (index % 4 === 3 ? max : Math.max(max, value - pixels[1][index])), + 0, + ), + } + }, + [swept.toString("base64"), settled.toString("base64")], + ) + expect(brightness.min).toBeGreaterThanOrEqual(0) + expect(brightness.max).toBeGreaterThanOrEqual(5) + }) + } + + story(`shows a static wordmark with reduced motion (${theme})`, async ({ mount, page }) => { + await page.emulateMedia({ reducedMotion: "reduce" }) + await page.setViewportSize({ width: 360, height: 640 }) + const component = await mount("app-new-session-wordmark--reveal", { globals: { theme } }) + const logo = component.locator('[data-component="new-session-wordmark"]') + await expect(logo.locator("svg").first()).toHaveCSS("opacity", theme === "dark" ? "0.5" : "0.6") + await expect(logo.locator('[data-slot="wordmark-reveal"]')).toHaveCSS("opacity", "1") + await expect(logo.locator(".wordmark-shimmer")).toHaveCSS("opacity", "0") + expect(await logo.evaluate((element) => element.getAnimations({ subtree: true }).length)).toBe(0) + expect(await logo.evaluate((element) => element.getBoundingClientRect().right <= innerWidth)).toBe(true) + }) +} diff --git a/packages/app/src/new-session/view.tsx b/packages/app/src/new-session/view.tsx index 509c71f2a53..f9f721b7c92 100644 --- a/packages/app/src/new-session/view.tsx +++ b/packages/app/src/new-session/view.tsx @@ -1,7 +1,6 @@ import { useDialog } from "@opencode-ai/ui/context/dialog" import { Tooltip } from "@opencode-ai/ui/tooltip" import { Icon } from "@opencode-ai/ui/icon" -import { Wordmark } from "@opencode-ai/ui/wordmark" import { Show, createMemo, createSignal } from "solid-js" import { Schema } from "effect" import createPresence from "solid-presence" @@ -23,6 +22,7 @@ import { NEW_SESSION_CONTENT_WIDTH } from "@/new-session/layout" import { Persist, persisted } from "@/runtime/persistence/storage" import { Persistence } from "@/runtime/persistence/schema" import type { NewSessionWorkspaceController } from "./workspace/controller" +import { NewSessionWordmark } from "./wordmark" const providerTipDismissalDuration = 30 * 24 * 60 * 60 * 1000 @@ -61,7 +61,7 @@ export function NewSessionView(props: { />
- +
diff --git a/packages/app/src/new-session/wordmark.css b/packages/app/src/new-session/wordmark.css new file mode 100644 index 00000000000..996d5d0a99a --- /dev/null +++ b/packages/app/src/new-session/wordmark.css @@ -0,0 +1,43 @@ +[data-component="new-session-wordmark"] { + --wordmark-shimmer-opacity: 0.45; + + .wordmark-shimmer { + /* Blend above the base logo's opacity so the sweep only adds light in either theme. */ + color: white; + mix-blend-mode: screen; + opacity: 0; + mask-image: linear-gradient(to right, transparent 40%, black 50%, transparent 60%); + mask-size: 300% 100%; + mask-repeat: no-repeat; + animation: new-session-wordmark-shimmer 800ms linear both; + } +} + +[data-color-scheme="dark"] [data-component="new-session-wordmark"] { + /* Preserve the previous dark highlight strength: 0.16 × 0.7 × 0.6. */ + --wordmark-shimmer-opacity: 0.0672; +} + +/* Oversizing the mask moves its highlight physically left to right, including in RTL. */ +@keyframes new-session-wordmark-shimmer { + 0% { + mask-position: 100% 0; + opacity: 0; + } + 20%, + 80% { + opacity: var(--wordmark-shimmer-opacity); + } + 100% { + mask-position: 0% 0; + opacity: 0; + } +} + +@media (prefers-reduced-motion: reduce) { + [data-component="new-session-wordmark"] { + .wordmark-shimmer { + animation: none; + } + } +} diff --git a/packages/app/src/new-session/wordmark.stories.tsx b/packages/app/src/new-session/wordmark.stories.tsx new file mode 100644 index 00000000000..f1c0017e388 --- /dev/null +++ b/packages/app/src/new-session/wordmark.stories.tsx @@ -0,0 +1,11 @@ +import { NewSessionWordmark } from "./wordmark" + +export default { + title: "App/New Session/Wordmark", + id: "app-new-session-wordmark", + component: NewSessionWordmark, +} + +export const Reveal = { + render: () => , +} diff --git a/packages/app/src/new-session/wordmark.tsx b/packages/app/src/new-session/wordmark.tsx new file mode 100644 index 00000000000..ced3c83ea62 --- /dev/null +++ b/packages/app/src/new-session/wordmark.tsx @@ -0,0 +1,17 @@ +import { Wordmark } from "@opencode-ai/ui/wordmark" +import "./wordmark.css" + +export function NewSessionWordmark() { + return ( + + ) +} diff --git a/packages/ui/src/typography/wordmark/wordmark.tsx b/packages/ui/src/typography/wordmark/wordmark.tsx index 526bc8afbf3..55dbc0f055a 100644 --- a/packages/ui/src/typography/wordmark/wordmark.tsx +++ b/packages/ui/src/typography/wordmark/wordmark.tsx @@ -1,6 +1,6 @@ import { createUniqueId, type ComponentProps } from "solid-js" -export function Wordmark(props: Pick, "class">) { +export function Wordmark(props: Pick, "class"> & { fade?: boolean; muted?: boolean }) { const mask = createUniqueId() const maskGradient = createUniqueId() @@ -11,49 +11,17 @@ export function Wordmark(props: Pick, "class">) { fill="none" classList={{ [props.class ?? ""]: !!props.class }} > - - - - - - - - - - - + + + + + + + + + + +