Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

fix(web): keep positioning aurora aligned with composer (#790)

Genera05599a5c7c5
diff --git a/src/web/src/app/globals.css b/src/web/src/app/globals.css
index e0441a72b..2306b57cf 100644
--- a/src/web/src/app/globals.css
+++ b/src/web/src/app/globals.css
@@ -436,6 +436,9 @@ body.driver-active .community-ws-reconnect-overlay * {
--app-safe-area-right: env(safe-area-inset-right, 0px);
--app-safe-area-bottom: env(safe-area-inset-bottom, 0px);
--app-safe-area-left: env(safe-area-inset-left, 0px);
+ --community-composer-inline-start: max(0.75rem, var(--app-safe-area-left));
+ --community-composer-inline-end: max(0.75rem, var(--app-safe-area-right));
+ --community-composer-top-radius: 1.5rem;
--guide-flight-ease: cubic-bezier(0.45, 0, 0.2, 1);
--ease-out: cubic-bezier(0.2, 0.8, 0.2, 1);
--ease-in: cubic-bezier(0.8, 0, 0.8, 0.2);
@@ -567,6 +570,19 @@ body.driver-active .community-ws-reconnect-overlay * {
--sidebar-ring: oklch(0.55 0.01 60);
}
+@media (hover: hover) and (pointer: fine) {
+ :root {
+ --community-composer-top-radius: 0.75rem;
+ }
+}
+
+@media (min-width: 40rem) {
+ :root {
+ --community-composer-inline-start: 0.75rem;
+ --community-composer-inline-end: 0.75rem;
+ }
+}
+
.forum-tag-color {
color: oklch(var(--forum-tag-text-l) var(--forum-tag-text-c) var(--forum-tag-hue));
background-color: oklch(var(--forum-tag-bg-l) var(--forum-tag-bg-c) var(--forum-tag-hue));
diff --git a/src/web/src/components/community/messages/composer-view.dom.test.ts b/src/web/src/components/community/messages/composer-view.dom.test.ts
index a28c08694..3239d42d9 100644
--- a/src/web/src/components/community/messages/composer-view.dom.test.ts
+++ b/src/web/src/components/community/messages/composer-view.dom.test.ts
@@ -245,7 +245,7 @@ describe("ComposerView", () => {
expect(onEmojiPick).toHaveBeenCalledWith("🌱")
expect(
renderer.container.querySelector('[class*="focus-within:ring-2"]')?.className,
- ).toContain("rounded-xl")
+ ).toContain("rounded-(--community-composer-top-radius)")
renderer.rerender(createElement(
ComposerView,
@@ -302,7 +302,9 @@ describe("ComposerView", () => {
))
const input = renderer.container.querySelector(`[data-testid="${tid.composerInput}"]`)!
expect(input.className).toContain("px-12")
- expect(input.parentElement?.className).toContain("rounded-[24px]")
+ expect(input.parentElement?.className).toContain(
+ "rounded-(--community-composer-top-radius)",
+ )
expect(renderer.container.querySelector("[data-emoji-picker]")).toBeNull()
const send = renderer.container.querySelector<HTMLButtonElement>(
`[data-testid="${tid.composerSend}"]`,
@@ -367,10 +369,10 @@ describe("ComposerView", () => {
])
expect(renderer.container.firstElementChild?.tagName).toBe("DIV")
expect(renderer.container.firstElementChild?.className).toBe(
- "relative pl-[max(0.75rem,var(--app-safe-area-left))] pr-[max(0.75rem,var(--app-safe-area-right))] pb-[calc(0.75rem+var(--app-safe-area-bottom))] pt-0 sm:px-3 sm:pb-3",
+ "relative pl-[var(--community-composer-inline-start)] pr-[var(--community-composer-inline-end)] pb-[calc(0.75rem+var(--app-safe-area-bottom))] pt-0 sm:pb-3",
)
expect(renderer.container.innerHTML).toContain(
- "relative rounded-xl [@media(hover:none)]:rounded-[24px] bg-muted py-3 px-12 shadow-(--e1) ring-1 ring-border/40",
+ "relative rounded-(--community-composer-top-radius) bg-muted py-3 px-12 shadow-(--e1) ring-1 ring-border/40",
)
})
})
diff --git a/src/web/src/components/community/messages/composer-view.tsx b/src/web/src/components/community/messages/composer-view.tsx
index fe2d9a051..950530dbe 100644
--- a/src/web/src/components/community/messages/composer-view.tsx
+++ b/src/web/src/components/community/messages/composer-view.tsx
@@ -32,7 +32,7 @@ import type { ComposerReplyTarget } from "./composer-types"
import { SendStrokeRoundedIcon } from "./send-stroke-rounded-icon"
const COMPOSER_OUTER_CLASS =
- "relative pl-[max(0.75rem,var(--app-safe-area-left))] pr-[max(0.75rem,var(--app-safe-area-right))] pb-[calc(0.75rem+var(--app-safe-area-bottom))] pt-0 sm:px-3 sm:pb-3"
+ "relative pl-[var(--community-composer-inline-start)] pr-[var(--community-composer-inline-end)] pb-[calc(0.75rem+var(--app-safe-area-bottom))] pt-0 sm:pb-3"
export type ComposerViewProps = {
isForumThreadBody: boolean
@@ -93,7 +93,7 @@ export function ComposerView({
const composerRadius = replyingTo || pendingFiles.length > 0
? showSend ? "rounded-b-[24px]" : "rounded-b-xl"
- : showSend ? "rounded-[24px]" : "rounded-xl"
+ : "rounded-(--community-composer-top-radius)"
return (
<div
@@ -252,7 +252,7 @@ export function ComposerView({
export function ComposerSkeleton() {
return (
<div className={COMPOSER_OUTER_CLASS}>
- <div className="relative rounded-xl [@media(hover:none)]:rounded-[24px] bg-muted py-3 px-12 shadow-(--e1) ring-1 ring-border/40">
+ <div className="relative rounded-(--community-composer-top-radius) bg-muted py-3 px-12 shadow-(--e1) ring-1 ring-border/40">
<Skeleton className="h-6 w-2/5 rounded" />
<Skeleton className="absolute left-2 bottom-2 size-8 rounded-full" />
<Skeleton className="absolute right-2 bottom-2 size-8 rounded-full" />
diff --git a/src/web/src/components/community/messages/initial-position-aurora.dom.test.tsx b/src/web/src/components/community/messages/initial-position-aurora.dom.test.tsx
index c10364692..e0d63f6ef 100644
--- a/src/web/src/components/community/messages/initial-position-aurora.dom.test.tsx
+++ b/src/web/src/components/community/messages/initial-position-aurora.dom.test.tsx
@@ -16,6 +16,10 @@ const styles = readFileSync(
resolve(dirname(fileURLToPath(import.meta.url)), "initial-position-aurora.module.css"),
"utf8",
)
+const componentSource = readFileSync(
+ resolve(dirname(fileURLToPath(import.meta.url)), "initial-position-aurora.tsx"),
+ "utf8",
+)
const globals = readFileSync(
resolve(dirname(fileURLToPath(import.meta.url)), "../../../app/globals.css"),
"utf8",
@@ -45,9 +49,59 @@ describe("InitialPositionAurora", () => {
expect(renderer.queryByTestId(tid.initialPositionAurora)).toBeNull()
})
- it("keeps non-layout overlay geometry, semantic aurora paint, reduced-motion static layers, and a linear 300ms exit", () => {
+ it("keeps Composer-bound geometry, deterministic bottom-anchored bars, and a linear 300ms exit", () => {
+ const renderer = render(React.createElement(InitialPositionAurora, { phase: "aurora" }))
+ const bars = Array.from(
+ renderer.container.querySelectorAll<HTMLElement>("[data-aurora-bar]"),
+ )
+ const numberProperty = (bar: HTMLElement, property: string) =>
+ Number.parseFloat(bar.style.getPropertyValue(property))
+ const signature = () => Array.from(
+ renderer.container.querySelectorAll<HTMLElement>("[data-aurora-bar]"),
+ (bar) => [
+ bar.dataset.layer,
+ bar.dataset.tone,
+ bar.dataset.motion,
+ bar.getAttribute("style"),
+ ],
+ )
+
+ expect(bars).toHaveLength(52)
+ const layers = Array.from(
+ renderer.container.querySelectorAll<HTMLElement>("[data-aurora-layer]"),
+ )
+ expect(layers).toHaveLength(2)
+ expect(layers.map((layer) => [
+ layer.dataset.auroraLayer,
+ layer.querySelectorAll("[data-aurora-bar]").length,
+ ])).toEqual([["fine", 39], ["broad", 13]])
+ const firstSignature = signature()
+ renderer.rerender(React.createElement(InitialPositionAurora, { phase: "aurora" }))
+ expect(signature()).toEqual(firstSignature)
+ expect(componentSource).not.toMatch(/Math\.random|\brandom\s*\(/)
+
expect(styles).toMatch(/position:\s*absolute/)
expect(styles).toMatch(/pointer-events:\s*none/)
+ expect(styles).toContain(
+ "left: calc(var(--community-composer-inline-start) + var(--community-composer-top-radius));",
+ )
+ expect(styles).toContain(
+ "right: calc(var(--community-composer-inline-end) + var(--community-composer-top-radius));",
+ )
+ expect(globals).toContain(
+ "--community-composer-inline-start: max(0.75rem, var(--app-safe-area-left));",
+ )
+ expect(globals).toContain(
+ "--community-composer-inline-end: max(0.75rem, var(--app-safe-area-right));",
+ )
+ expect(globals).toMatch(
+ /@media \(hover: hover\) and \(pointer: fine\)[\s\S]*?--community-composer-top-radius:\s*0\.75rem;/,
+ )
+ expect(globals).toMatch(
+ /@media \(min-width: 40rem\)[\s\S]*?--community-composer-inline-start:\s*0\.75rem;[\s\S]*?--community-composer-inline-end:\s*0\.75rem;/,
+ )
+ expect(globals).toContain("--community-composer-top-radius: 1.5rem;")
+
expect(styles).toContain(`animation: aurora-enter ${INITIAL_POSITION_CROSSFADE_MS}ms var(--ease-out) both`)
expect(styles).toContain(`animation: aurora-leave ${INITIAL_POSITION_CROSSFADE_MS}ms linear both`)
expect(styles).toMatch(/@keyframes aurora-enter\s*\{\s*from \{ opacity: 0; \}\s*to \{ opacity: var\(--aurora-opacity\); \}/)
@@ -56,9 +110,15 @@ describe("InitialPositionAurora", () => {
expect(styles).toContain("calc(var(--initial-position-aurora-reduced-opacity) * 0.5)")
expect(styles).toMatch(/\.aurora\s*\{[^}]*z-index: 0;/)
expect(styles.match(/\.peaks\s*\{([^}]+)\}/)?.[1]).not.toMatch(/background:/)
- expect(styles).toMatch(/animation: aurora-drift [\d.]+s var\(--ease-in-out\) -[\d.]+s infinite alternate/)
- expect(styles).toContain("translateX(-4%)")
- expect(styles).toContain("translateX(4%)")
+ expect(styles).toContain("left: var(--bar-x);")
+ expect(styles).toContain("transform-origin: center bottom;")
+ expect(styles).toContain(
+ "animation: aurora-bar-length var(--bar-duration) var(--ease-in-out) var(--bar-delay) infinite alternate both;",
+ )
+ expect(styles).toMatch(
+ /@keyframes aurora-bar-length\s*\{\s*from\s*\{\s*transform:\s*scaleY\(var\(--bar-min-scale\)\);\s*\}\s*to\s*\{\s*transform:\s*scaleY\(1\);/,
+ )
+ expect(styles).not.toMatch(/translate(?:X|3d)?\s*\(/)
expect(styles).toMatch(/\.aurora\s*\{[\s\S]*?height:\s*3\.5rem;/)
expect(styles).toMatch(
/@media \(max-width: 40rem\)[\s\S]*?\.aurora\s*\{[\s\S]*?height:\s*3rem;/,
@@ -77,23 +137,21 @@ describe("InitialPositionAurora", () => {
expect(styles).toContain(`var(${token})`)
expect(globals.match(new RegExp(`${token}:`, "g"))).toHaveLength(2)
}
- expect(styles).toContain(".peaks::before")
- expect(styles).toContain(".peaks::after")
+ expect(styles).toMatch(/\.fineBars\s*\{[^}]*filter:\s*blur\(1px\)/)
+ expect(styles).toMatch(/\.broadBars\s*\{[^}]*opacity:\s*0\.72;[^}]*filter:\s*blur\(5px\)/)
+ const barRule = styles.match(/\.bar\s*\{([^}]+)\}/)?.[1] ?? ""
+ expect(barRule).not.toContain("filter:")
+ expect(barRule).not.toContain("will-change:")
expect(styles).toContain(".haze::before")
expect(styles).not.toContain("clip-path")
expect(styles).not.toContain("repeating-linear-gradient")
- expect(styles).not.toMatch(/\brandom\s*\(/)
- const peakProfiles = ["before", "after"].map((pseudo) => {
- const block = styles.match(new RegExp(`\\.peaks::${pseudo}\\s*\\{([\\s\\S]*?)\\n\\}`))?.[1]
- expect(block).toBeTruthy()
- return Array.from(
- block!.matchAll(
- /transparent\)\s+([\d.]+)%\s+100%\s*\/\s*[\d.]+rem\s+([\d.]+)%\s+no-repeat/g,
- ),
- ([, position, height]) => ({ position: Number(position), height: Number(height) }),
- )
- })
+ const peakProfiles = ["fine", "broad"].map((layer) => bars
+ .filter((bar) => bar.dataset.layer === layer)
+ .map((bar) => ({
+ position: numberProperty(bar, "--bar-x"),
+ height: numberProperty(bar, "--bar-height"),
+ })))
const meanHeight = (profile: Array<{ height: number }>) =>
profile.reduce((sum, peak) => sum + peak.height, 0) / profile.length
const hasRiseAndFall = (profile: Array<{ height: number }>) => {
@@ -115,8 +173,30 @@ describe("InitialPositionAurora", () => {
expect(hasRiseAndFall(profile.filter(({ position }) => position <= 25))).toBe(true)
expect(hasRiseAndFall(profile.filter(({ position }) => position >= 75).reverse())).toBe(true)
}
+
+ expect(new Set(bars.map((bar) => numberProperty(bar, "--bar-duration"))).size)
+ .toBeGreaterThan(12)
+ expect(new Set(bars.map((bar) => numberProperty(bar, "--bar-min-scale"))).size)
+ .toBeGreaterThan(10)
+ expect(new Set(bars.map((bar) => bar.dataset.motion)).size).toBe(bars.length)
+ expect(new Set(bars.map((bar) => [
+ bar.style.getPropertyValue("--bar-min-scale"),
+ bar.style.getPropertyValue("--bar-duration"),
+ bar.style.getPropertyValue("--bar-delay"),
+ ].join("/"))).size).toBe(bars.length)
+ const directionsAtStart = new Set(bars
+ .filter((bar) => numberProperty(bar, "--bar-height") > 0)
+ .map((bar) => {
+ const duration = numberProperty(bar, "--bar-duration")
+ const delay = numberProperty(bar, "--bar-delay")
+ expect(delay).toBeLessThan(0)
+ const phase = (-delay) % (duration * 2)
+ return phase < duration ? "rising" : "falling"
+ }))
+ expect(directionsAtStart).toEqual(new Set(["rising", "falling"]))
+
expect(styles).toMatch(
- /@media \(prefers-reduced-motion: reduce\)[\s\S]*?\.drift,[\s\S]*?\.peaks::before,[\s\S]*?\.peaks::after,[\s\S]*?\.haze,[\s\S]*?\.haze::before[\s\S]*?animation:\s*none/,
+ /@media \(prefers-reduced-motion: reduce\)[\s\S]*?\.bar,[\s\S]*?\.haze,[\s\S]*?\.haze::before[\s\S]*?animation:\s*none/,
)
expect(styles).not.toMatch(/#[\da-f]{3,8}\b/i)
expect(styles).not.toMatch(/oklch\(/)
diff --git a/src/web/src/components/community/messages/initial-position-aurora.module.css b/src/web/src/components/community/messages/initial-position-aurora.module.css
index 525105ead..e6f13439f 100644
--- a/src/web/src/components/community/messages/initial-position-aurora.module.css
+++ b/src/web/src/components/community/messages/initial-position-aurora.module.css
@@ -1,9 +1,9 @@
.aurora {
--aurora-opacity: calc(var(--initial-position-aurora-opacity) * 0.5);
position: absolute;
- right: 1rem;
+ right: calc(var(--community-composer-inline-end) + var(--community-composer-top-radius));
bottom: 0;
- left: 1rem;
+ left: calc(var(--community-composer-inline-start) + var(--community-composer-top-radius));
z-index: 0;
height: 3.5rem;
overflow: hidden;
@@ -22,14 +22,6 @@
animation: aurora-leave 300ms linear both;
}
-.drift {
- position: absolute;
- inset: 0;
- transform-origin: center bottom;
- will-change: transform;
- animation: aurora-drift 2.4s var(--ease-in-out) -0.6s infinite alternate;
-}
-
.peaks,
.haze {
position: absolute;
@@ -45,79 +37,48 @@
drop-shadow(0 -1px 3px color-mix(in oklab, var(--initial-position-aurora-magenta) 38%, transparent));
}
-.peaks::before,
-.peaks::after,
-.haze::before {
+.fineBars,
+.broadBars {
position: absolute;
inset: 0;
- content: "";
- transform-origin: center bottom;
- will-change: transform, opacity;
}
-.peaks::before {
- background:
- linear-gradient(to top, var(--initial-position-aurora-cyan), transparent) 0% 100% / 0.08rem 0% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-cyan), transparent) 2% 100% / 0.16rem 5% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-cyan), transparent) 3.4% 100% / 0.1rem 12% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-cyan), transparent) 5.5% 100% / 0.24rem 8% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-cyan), transparent) 6.8% 100% / 0.12rem 19% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-cyan), transparent) 8.4% 100% / 0.12rem 14% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-blue), transparent) 10.1% 100% / 0.1rem 26% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-cyan), transparent) 12.3% 100% / 0.14rem 21% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-blue), transparent) 17% 100% / 0.18rem 36% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-violet), transparent) 22.5% 100% / 0.14rem 55% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-blue), transparent) 24.2% 100% / 0.1rem 34% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-blue), transparent) 27% 100% / 0.28rem 84% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-blue), transparent) 28.4% 100% / 0.12rem 46% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-violet), transparent) 30.6% 100% / 0.14rem 61% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-magenta), transparent) 34.8% 100% / 0.1rem 31% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-magenta), transparent) 36% 100% / 0.17rem 43% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-violet), transparent) 38.2% 100% / 0.11rem 58% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-violet), transparent) 40.5% 100% / 0.22rem 67% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-blue), transparent) 42.1% 100% / 0.1rem 39% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-magenta), transparent) 45.5% 100% / 0.3rem 91% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-violet), transparent) 47.1% 100% / 0.12rem 48% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-blue), transparent) 55% 100% / 0.13rem 38% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-violet), transparent) 57.3% 100% / 0.1rem 50% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-violet), transparent) 60.5% 100% / 0.2rem 58% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-magenta), transparent) 62.2% 100% / 0.1rem 35% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-magenta), transparent) 64% 100% / 0.26rem 78% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-violet), transparent) 65.7% 100% / 0.12rem 45% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-blue), transparent) 68.2% 100% / 0.1rem 27% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-cyan), transparent) 73.5% 100% / 0.16rem 45% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-cyan), transparent) 75.1% 100% / 0.1rem 63% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-blue), transparent) 77% 100% / 0.12rem 32% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-violet), transparent) 82.1% 100% / 0.11rem 42% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-magenta), transparent) 84.2% 100% / 0.12rem 33% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-magenta), transparent) 86% 100% / 0.28rem 46% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-magenta), transparent) 88.2% 100% / 0.1rem 27% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-violet), transparent) 90% 100% / 0.16rem 34% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-blue), transparent) 92.4% 100% / 0.1rem 15% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-cyan), transparent) 96.5% 100% / 0.22rem 6% no-repeat,
- linear-gradient(to top, var(--initial-position-aurora-cyan), transparent) 100% 100% / 0.08rem 0% no-repeat;
+.fineBars {
filter: blur(1px);
- animation: aurora-fine-peaks 2.2s var(--ease-in-out) -0.55s infinite alternate;
}
-.peaks::after {
- background:
- linear-gradient(to top, color-mix(in oklab, var(--initial-position-aurora-cyan) 68%, transparent), transparent) 0% 100% / 0.5rem 0% no-repeat,
- linear-gradient(to top, color-mix(in oklab, var(--initial-position-aurora-cyan) 78%, transparent), transparent) 4.5% 100% / 1.15rem 11% no-repeat,
- linear-gradient(to top, color-mix(in oklab, var(--initial-position-aurora-cyan) 68%, transparent), transparent) 11% 100% / 0.7rem 7% no-repeat,
- linear-gradient(to top, color-mix(in oklab, var(--initial-position-aurora-blue) 70%, transparent), transparent) 18% 100% / 1rem 32% no-repeat,
- linear-gradient(to top, color-mix(in oklab, var(--initial-position-aurora-blue) 76%, transparent), transparent) 27.5% 100% / 1.2rem 79% no-repeat,
- linear-gradient(to top, color-mix(in oklab, var(--initial-position-aurora-violet) 74%, transparent), transparent) 39% 100% / 1.65rem 61% no-repeat,
- linear-gradient(to top, color-mix(in oklab, var(--initial-position-aurora-magenta) 82%, transparent), transparent) 46% 100% / 1.05rem 88% no-repeat,
- linear-gradient(to top, color-mix(in oklab, var(--initial-position-aurora-violet) 70%, transparent), transparent) 62% 100% / 1.8rem 70% no-repeat,
- linear-gradient(to top, color-mix(in oklab, var(--initial-position-aurora-cyan) 72%, transparent), transparent) 74% 100% / 0.85rem 47% no-repeat,
- linear-gradient(to top, color-mix(in oklab, var(--initial-position-aurora-violet) 72%, transparent), transparent) 82% 100% / 1rem 19% no-repeat,
- linear-gradient(to top, color-mix(in oklab, var(--initial-position-aurora-magenta) 78%, transparent), transparent) 87% 100% / 1.5rem 25% no-repeat,
- linear-gradient(to top, color-mix(in oklab, var(--initial-position-aurora-cyan) 68%, transparent), transparent) 96% 100% / 0.75rem 8% no-repeat,
- linear-gradient(to top, color-mix(in oklab, var(--initial-position-aurora-cyan) 68%, transparent), transparent) 100% 100% / 0.5rem 0% no-repeat;
+.broadBars {
opacity: 0.72;
filter: blur(5px);
- animation: aurora-broad-peaks 2.7s var(--ease-in-out) -1.7s infinite alternate;
+}
+
+.bar {
+ --bar-color: var(--initial-position-aurora-cyan);
+ position: absolute;
+ bottom: 0;
+ left: var(--bar-x);
+ width: var(--bar-width);
+ height: var(--bar-height);
+ transform: scaleY(var(--bar-min-scale));
+ transform-origin: center bottom;
+ background: linear-gradient(
+ to top,
+ color-mix(in oklab, var(--bar-color) var(--bar-strength), transparent),
+ transparent
+ );
+ animation: aurora-bar-length var(--bar-duration) var(--ease-in-out) var(--bar-delay) infinite alternate both;
+}
+
+.bar[data-tone="blue"] {
+ --bar-color: var(--initial-position-aurora-blue);
+}
+
+.bar[data-tone="violet"] {
+ --bar-color: var(--initial-position-aurora-violet);
+}
+
+.bar[data-tone="magenta"] {
+ --bar-color: var(--initial-position-aurora-magenta);
}
.haze {
@@ -155,12 +116,17 @@
}
.haze::before {
+ position: absolute;
+ inset: 0;
+ content: "";
+ transform-origin: center bottom;
background:
radial-gradient(14% 54% at 18% 100%, color-mix(in oklab, var(--initial-position-aurora-cyan) 58%, transparent), transparent 66%),
radial-gradient(18% 82% at 45% 100%, color-mix(in oklab, var(--initial-position-aurora-magenta) 54%, transparent), transparent 64%),
radial-gradient(20% 76% at 72% 100%, color-mix(in oklab, var(--initial-position-aurora-violet) 52%, transparent), transparent 66%),
radial-gradient(10% 44% at 92% 100%, color-mix(in oklab, var(--initial-position-aurora-cyan) 46%, transparent), transparent 64%);
filter: blur(9px);
+ will-change: transform, opacity;
animation: aurora-secondary-haze 3.7s var(--ease-in-out) -0.9s infinite alternate;
}
@@ -174,56 +140,34 @@
to { opacity: 0; }
}
-@keyframes aurora-drift {
+@keyframes aurora-bar-length {
from {
- transform: translateX(-4%);
- }
-
- to {
- transform: translateX(4%);
- }
-}
-
-@keyframes aurora-fine-peaks {
- from {
- transform: scaleY(0.78);
- opacity: 0.72;
+ transform: scaleY(var(--bar-min-scale));
}
to {
transform: scaleY(1);
- opacity: 1;
- }
-}
-
-@keyframes aurora-broad-peaks {
- from {
- transform: scaleY(0.92) translateX(4%);
- }
-
- to {
- transform: scaleY(1.08) translateX(-4%);
}
}
@keyframes aurora-haze {
from {
- transform: scaleY(0.88) translateX(-3%);
+ transform: scaleY(0.88);
}
to {
- transform: scaleY(1.04) translateX(3%);
+ transform: scaleY(1.04);
}
}
@keyframes aurora-secondary-haze {
from {
- transform: scaleY(1.02) translateX(2%);
+ transform: scaleY(1.02);
opacity: 0.7;
}
to {
- transform: scaleY(0.86) translateX(-2%);
+ transform: scaleY(0.86);
opacity: 1;
}
}
@@ -239,9 +183,7 @@
--aurora-opacity: calc(var(--initial-position-aurora-reduced-opacity) * 0.5);
}
- .drift,
- .peaks::before,
- .peaks::after,
+ .bar,
.haze,
.haze::before {
animation: none;
diff --git a/src/web/src/components/community/messages/initial-position-aurora.tsx b/src/web/src/components/community/messages/initial-position-aurora.tsx
index 195cbae0a..2f59bb400 100644
--- a/src/web/src/components/community/messages/initial-position-aurora.tsx
+++ b/src/web/src/components/community/messages/initial-position-aurora.tsx
@@ -1,7 +1,138 @@
+import type { CSSProperties } from "react"
import { tid } from "@/lib/community/testids"
import type { InitialPositionPhase } from "./initial-position-transition"
import styles from "./initial-position-aurora.module.css"
+type AuroraTone = "cyan" | "blue" | "violet" | "magenta"
+type AuroraLayer = "fine" | "broad"
+type AuroraBarShape = readonly [
+ x: number,
+ widthRem: number,
+ maxHeight: number,
+ tone: AuroraTone,
+ strength?: number,
+]
+
+type AuroraBarStyle = CSSProperties & {
+ "--bar-x": string
+ "--bar-width": string
+ "--bar-height": string
+ "--bar-min-scale": string
+ "--bar-duration": string
+ "--bar-delay": string
+ "--bar-strength": string
+}
+
+const BAR_MIN_SCALES = [
+ 0.42, 0.68, 0.52, 0.73, 0.46, 0.63, 0.57, 0.71, 0.49, 0.65, 0.54, 0.75, 0.6,
+] as const
+const BAR_DURATIONS_MS = [
+ 1_780, 2_230, 1_960, 2_410, 2_110, 1_840, 2_320, 2_050, 2_170,
+ 1_890, 2_470, 1_990, 2_280, 1_760, 2_380, 2_080, 2_210,
+] as const
+const BAR_PHASE_CYCLES = [
+ 0.15, 1.28, 0.39, 1.61, 0.72, 1.9, 0.06, 1.43, 0.84, 1.13,
+ 0.52, 1.77, 0.26, 1.55, 0.95, 1.04, 0.63, 1.87, 0.31,
+] as const
+
+const FINE_BAR_SHAPES = [
+ [0, 0.08, 0, "cyan"],
+ [2, 0.16, 5, "cyan"],
+ [3.4, 0.1, 12, "cyan"],
+ [5.5, 0.24, 8, "cyan"],
+ [6.8, 0.12, 19, "cyan"],
+ [8.4, 0.12, 14, "cyan"],
+ [10.1, 0.1, 26, "blue"],
+ [12.3, 0.14, 21, "cyan"],
+ [17, 0.18, 36, "blue"],
+ [22.5, 0.14, 55, "violet"],
+ [24.2, 0.1, 34, "blue"],
+ [27, 0.28, 84, "blue"],
+ [28.4, 0.12, 46, "blue"],
+ [30.6, 0.14, 61, "violet"],
+ [34.8, 0.1, 31, "magenta"],
+ [36, 0.17, 43, "magenta"],
+ [38.2, 0.11, 58, "violet"],
+ [40.5, 0.22, 67, "violet"],
+ [42.1, 0.1, 39, "blue"],
+ [45.5, 0.3, 91, "magenta"],
+ [47.1, 0.12, 48, "violet"],
+ [55, 0.13, 38, "blue"],
+ [57.3, 0.1, 50, "violet"],
+ [60.5, 0.2, 58, "violet"],
+ [62.2, 0.1, 35, "magenta"],
+ [64, 0.26, 78, "magenta"],
+ [65.7, 0.12, 45, "violet"],
+ [68.2, 0.1, 27, "blue"],
+ [73.5, 0.16, 45, "cyan"],
+ [75.1, 0.1, 63, "cyan"],
+ [77, 0.12, 32, "blue"],
+ [82.1, 0.11, 42, "violet"],
+ [84.2, 0.12, 33, "magenta"],
+ [86, 0.28, 46, "magenta"],
+ [88.2, 0.1, 27, "magenta"],
+ [90, 0.16, 34, "violet"],
+ [92.4, 0.1, 15, "blue"],
+ [96.5, 0.22, 6, "cyan"],
+ [100, 0.08, 0, "cyan"],
+] satisfies readonly AuroraBarShape[]
+
+const BROAD_BAR_SHAPES = [
+ [0, 0.5, 0, "cyan", 68],
+ [4.5, 1.15, 11, "cyan", 78],
+ [11, 0.7, 7, "cyan", 68],
+ [18, 1, 32, "blue", 70],
+ [27.5, 1.2, 79, "blue", 76],
+ [39, 1.65, 61, "violet", 74],
+ [46, 1.05, 88, "magenta", 82],
+ [62, 1.8, 70, "violet", 70],
+ [74, 0.85, 47, "cyan", 72],
+ [82, 1, 19, "violet", 72],
+ [87, 1.5, 25, "magenta", 78],
+ [96, 0.75, 8, "cyan", 68],
+ [100, 0.5, 0, "cyan", 68],
+] satisfies readonly AuroraBarShape[]
+
+function buildBars(layer: AuroraLayer, shapes: readonly AuroraBarShape[], motionOffset: number) {
+ return shapes.map(([x, widthRem, maxHeight, tone, strength = 100], index) => {
+ const motionIndex = index + motionOffset
+ const minScale = BAR_MIN_SCALES[motionIndex % BAR_MIN_SCALES.length]!
+ const durationMs = BAR_DURATIONS_MS[motionIndex % BAR_DURATIONS_MS.length]!
+ const phaseCycles = BAR_PHASE_CYCLES[motionIndex % BAR_PHASE_CYCLES.length]!
+ return {
+ layer,
+ x,
+ widthRem,
+ maxHeight,
+ tone,
+ strength,
+ motionIndex,
+ minScale,
+ durationMs,
+ delayMs: -Math.round(durationMs * phaseCycles),
+ }
+ })
+}
+
+const FINE_BARS = buildBars("fine", FINE_BAR_SHAPES, 0)
+const BROAD_BARS = buildBars("broad", BROAD_BAR_SHAPES, FINE_BAR_SHAPES.length)
+const AURORA_LAYERS = [
+ { layer: "fine", className: styles.fineBars, bars: FINE_BARS },
+ { layer: "broad", className: styles.broadBars, bars: BROAD_BARS },
+] as const
+
+function barStyle(bar: ReturnType<typeof buildBars>[number]): AuroraBarStyle {
+ return {
+ "--bar-x": `${bar.x}%`,
+ "--bar-width": `${bar.widthRem}rem`,
+ "--bar-height": `${bar.maxHeight}%`,
+ "--bar-min-scale": String(bar.minScale),
+ "--bar-duration": `${bar.durationMs}ms`,
+ "--bar-delay": `${bar.delayMs}ms`,
+ "--bar-strength": `${bar.strength}%`,
+ }
+}
+
export function InitialPositionAurora({ phase }: { phase: InitialPositionPhase }) {
if (phase !== "aurora" && phase !== "revealing") return null
@@ -12,10 +143,24 @@ export function InitialPositionAurora({ phase }: { phase: InitialPositionPhase }
data-phase={phase}
className={`${styles.aurora} ${phase === "aurora" ? styles.visible : styles.leaving}`}
>
- <div className={styles.drift}>
- <div className={styles.peaks} />
- <div className={styles.haze} />
+ <div className={styles.peaks}>
+ {AURORA_LAYERS.map(({ layer, className, bars }) => (
+ <div key={layer} data-aurora-layer={layer} className={className}>
+ {bars.map((bar) => (
+ <span
+ key={bar.x}
+ data-aurora-bar
+ data-layer={bar.layer}
+ data-motion={bar.motionIndex}
+ data-tone={bar.tone}
+ className={styles.bar}
+ style={barStyle(bar)}
+ />
+ ))}
+ </div>
+ ))}
</div>
+ <div className={styles.haze} />
</div>
)
}
diff --git a/src/web/src/test/e2e-ui/39-mobile-composer-send.spec.ts b/src/web/src/test/e2e-ui/39-mobile-composer-send.spec.ts
index 5a644f793..be8619c2c 100644
--- a/src/web/src/test/e2e-ui/39-mobile-composer-send.spec.ts
+++ b/src/web/src/test/e2e-ui/39-mobile-composer-send.spec.ts
@@ -260,7 +260,7 @@ test.describe.serial("composer send by input capability", () => {
})
test("touch channel keeps multiline Enter and the explicit button sends once", async ({ asUser }, testInfo) => {
- const { page, context } = await asUser("alice")
+ const { page, context } = await asUser("alice", { hasTouch: true })
await installInputCapability(page, false)
const proxy = await proxyCommunityWebSockets(context)
await expectExplicitTouchSend({
@@ -275,7 +275,7 @@ test.describe.serial("composer send by input capability", () => {
})
test("touch child thread button targets the child", async ({ asUser }) => {
- const { page, context } = await asUser("alice")
+ const { page, context } = await asUser("alice", { hasTouch: true })
await installInputCapability(page, false)
const proxy = await proxyCommunityWebSockets(context)
await expectExplicitTouchSend({
@@ -288,7 +288,7 @@ test.describe.serial("composer send by input capability", () => {
})
test("touch DM button targets the DM channel", async ({ asUser }) => {
- const { page, context } = await asUser("alice")
+ const { page, context } = await asUser("alice", { hasTouch: true })
await installInputCapability(page, false)
const proxy = await proxyCommunityWebSockets(context)
await expectExplicitTouchSend({