Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

fix(web): repair mobile sign-in keyboard and sensor permission (#1135)

Gustavo Ye7c574865d3f3
diff --git a/src/web/src/app/(auth)/sign-in/sign-in-client.dom.test.ts b/src/web/src/app/(auth)/sign-in/sign-in-client.dom.test.ts
index e7ef4bb3b..a8c8f0a3c 100644
--- a/src/web/src/app/(auth)/sign-in/sign-in-client.dom.test.ts
+++ b/src/web/src/app/(auth)/sign-in/sign-in-client.dom.test.ts
@@ -351,6 +351,49 @@ describe("sign-in client layout, consent-on-continue, and last-used method", ()
expect(screen.queryByTestId("mobile-typewriter-stub")).toBeNull()
})
+ it("keeps the mobile form inside the panned visual viewport and restores it after keyboard dismissal", () => {
+ window.matchMedia = vi.fn((query: string) => ({
+ matches: query.includes("max-width"),
+ addEventListener: vi.fn(),
+ removeEventListener: vi.fn(),
+ })) as never
+ Object.defineProperty(window, "innerHeight", { configurable: true, value: 844 })
+ const original = Object.getOwnPropertyDescriptor(window, "visualViewport")
+ const viewport = Object.assign(new EventTarget(), { height: 844, offsetTop: 0 })
+ Object.defineProperty(window, "visualViewport", { configurable: true, value: viewport })
+ const remove = vi.spyOn(viewport, "removeEventListener")
+ try {
+ const view = render(createElement(SignInPageClient, { isProd: true, appleEnabled: true }))
+ const root = view.container.firstElementChild as HTMLElement
+ expect(root).toHaveClass("fixed", "sm:relative")
+ act(() => {
+ viewport.height = 420
+ viewport.offsetTop = 180
+ viewport.dispatchEvent(new Event("resize"))
+ })
+ expect(root.style.height).toBe("420px")
+ expect(root.style.top).toBe("180px")
+ act(() => {
+ viewport.offsetTop = 240
+ viewport.dispatchEvent(new Event("scroll"))
+ })
+ expect(root.style.top).toBe("240px")
+ act(() => {
+ viewport.height = 844
+ viewport.offsetTop = 0
+ viewport.dispatchEvent(new Event("resize"))
+ })
+ expect(root.style.height).toBe("")
+ expect(root.style.top).toBe("")
+ view.unmount()
+ expect(remove).toHaveBeenCalledWith("scroll", expect.any(Function))
+ expect(remove).toHaveBeenCalledWith("resize", expect.any(Function))
+ } finally {
+ if (original) Object.defineProperty(window, "visualViewport", original)
+ else Reflect.deleteProperty(window, "visualViewport")
+ }
+ })
+
it("slides the mobile typewriter and login pane left into a pure centered OTP pane and focuses the OTP input on completion", async () => {
const rafQueue: FrameRequestCallback[] = []
const origRaf = window.requestAnimationFrame
diff --git a/src/web/src/app/(auth)/sign-in/sign-in-client.tsx b/src/web/src/app/(auth)/sign-in/sign-in-client.tsx
index 7dd332c21..e7cf1e83b 100644
--- a/src/web/src/app/(auth)/sign-in/sign-in-client.tsx
+++ b/src/web/src/app/(auth)/sign-in/sign-in-client.tsx
@@ -383,7 +383,7 @@ function SignInForm({
className={cn(
"flex h-full min-h-0 w-full shrink-0 flex-col sm:h-auto sm:justify-center sm:overflow-visible sm:p-8",
mobileTypewriterCollapsed
- ? "overflow-y-auto py-4"
+ ? "overflow-y-auto thin-scrollbar pt-[max(1rem,env(safe-area-inset-top))] pb-[max(1rem,env(safe-area-inset-bottom))]"
: "justify-center gap-4 overflow-hidden pt-[max(0.5rem,env(safe-area-inset-top))] pb-[max(1rem,env(safe-area-inset-bottom))] [@media(min-height:740px)]:gap-8",
)}
>
@@ -395,7 +395,7 @@ function SignInForm({
)}
>
<div className="mx-auto w-full max-w-80 sm:max-w-88">
- <FieldGroup className="gap-4 sm:gap-4 [@media(max-height:579px)]:gap-2">
+ <FieldGroup className={cn("sm:gap-4", mobileTypewriterCollapsed ? "gap-2" : "gap-4 [@media(max-height:579px)]:gap-2")}>
{accountDeleted || accountDeletionPending ? (
<div
className="flex gap-3 rounded-xl bg-muted/70 p-4 text-left"
@@ -681,6 +681,10 @@ export default function SignInPageClient({
useCreateAtom<number | null>(null),
)
+ const [mobileViewportTop, setMobileViewportTop] = useAtom(
+ useCreateAtom(0),
+ )
+
const handleSlideActiveChange = useCallback((active: boolean) => {
mobileSlideActiveRef.current = active
if (!active) {
@@ -694,6 +698,7 @@ export default function SignInPageClient({
syncViewportRef.current = null
setMobileTypewriterCollapsed(false)
setMobileViewportHeight(null)
+ setMobileViewportTop(0)
return
}
let active = true
@@ -710,6 +715,7 @@ export default function SignInPageClient({
const layoutHeight = window.innerHeight
const visualHeight = window.visualViewport?.height ?? layoutHeight
const keyboardLikelyOpen = layoutHeight - visualHeight > 80
+ setMobileViewportTop(keyboardLikelyOpen ? Math.round(window.visualViewport?.offsetTop ?? 0) : 0)
const shortSpace = visualHeight < 580 || (inputFocused && visualHeight < 700)
setMobileTypewriterCollapsed(keyboardLikelyOpen || shortSpace)
setMobileViewportHeight(
@@ -738,6 +744,7 @@ export default function SignInPageClient({
syncViewport()
window.addEventListener("resize", syncViewport)
window.visualViewport?.addEventListener("resize", syncViewport)
+ window.visualViewport?.addEventListener("scroll", syncViewport)
document.addEventListener("focusin", onFocusIn)
document.addEventListener("focusout", onFocusOut)
return () => {
@@ -746,19 +753,20 @@ export default function SignInPageClient({
syncViewportRef.current = null
window.removeEventListener("resize", syncViewport)
window.visualViewport?.removeEventListener("resize", syncViewport)
+ window.visualViewport?.removeEventListener("scroll", syncViewport)
document.removeEventListener("focusin", onFocusIn)
document.removeEventListener("focusout", onFocusOut)
}
- }, [isMobile, setMobileTypewriterCollapsed, setMobileViewportHeight])
+ }, [isMobile, setMobileTypewriterCollapsed, setMobileViewportHeight, setMobileViewportTop])
return (
<div
style={
isMobile && mobileViewportHeight !== null
- ? { height: `${mobileViewportHeight}px` }
+ ? { height: `${mobileViewportHeight}px`, top: `${mobileViewportTop}px` }
: undefined
}
- className="relative flex h-dvh flex-col overflow-hidden p-0 sm:h-auto sm:min-h-svh sm:items-center sm:justify-center sm:overflow-visible sm:p-8"
+ className="fixed inset-x-0 top-0 flex h-dvh flex-col overflow-hidden p-0 sm:relative sm:h-auto sm:min-h-svh sm:items-center sm:justify-center sm:overflow-visible sm:p-8"
>
<GradientBackground />
<div className="flex min-h-0 w-full flex-1 flex-col sm:max-w-5xl sm:flex-none">
diff --git a/src/web/src/app/(auth)/sign-in/sign-in-mobile-typewriter.dom.test.tsx b/src/web/src/app/(auth)/sign-in/sign-in-mobile-typewriter.dom.test.tsx
index b04428180..d9ab626ed 100644
--- a/src/web/src/app/(auth)/sign-in/sign-in-mobile-typewriter.dom.test.tsx
+++ b/src/web/src/app/(auth)/sign-in/sign-in-mobile-typewriter.dom.test.tsx
@@ -105,7 +105,7 @@ describe("SignInMobileTypewriter", () => {
expect(Number.parseFloat(stage.style.getPropertyValue("--tw-tx"))).toBeCloseTo(beforeTx, 1)
})
- it("defers iOS sensor permission until tapping the typewriter stage and falls back to touch drag when denied", async () => {
+ it("defers iOS sensor permission until releasing the typewriter stage and falls back to touch drag when denied", async () => {
mockMatchMedia({ mobile: true })
const requestPermission = vi.fn().mockResolvedValue("denied")
;(window as Window & { DeviceOrientationEvent?: unknown }).DeviceOrientationEvent = {
@@ -131,7 +131,7 @@ describe("SignInMobileTypewriter", () => {
fireEvent.pointerDown(stage, { pointerId: 1, clientX: 330, clientY: 120 })
await Promise.resolve()
})
- expect(requestPermission).toHaveBeenCalledOnce()
+ expect(requestPermission).not.toHaveBeenCalled()
expect(Number.parseFloat(stage.style.getPropertyValue("--tw-ry"))).toBeGreaterThan(-19)
await act(async () => {
@@ -141,6 +141,11 @@ describe("SignInMobileTypewriter", () => {
})
expect(requestPermission).toHaveBeenCalledOnce()
expect(Number.parseFloat(stage.style.getPropertyValue("--tw-ry"))).toBeLessThan(-19)
+ await act(async () => {
+ fireEvent.pointerUp(stage, { pointerId: 2 })
+ await Promise.resolve()
+ })
+ expect(requestPermission).toHaveBeenCalledOnce()
})
it("reattaches sensors when permission is granted while still active", async () => {
@@ -159,11 +164,21 @@ describe("SignInMobileTypewriter", () => {
name === "deviceorientation" || name === "devicemotion"
render(createElement(SignInMobileTypewriter, { collapsed: false }))
+ act(() => {
+ const motion = new Event("devicemotion")
+ Object.defineProperty(motion, "acceleration", { value: { x: 1, y: 1 } })
+ window.dispatchEvent(motion)
+ })
+ const stage = screen.getByTestId("sign-in-mobile-typewriter")
+ fireEvent.pointerDown(stage, { pointerId: 9 })
+ fireEvent.pointerCancel(stage, { pointerId: 9 })
+ expect(requestOrientation).not.toHaveBeenCalled()
add.mockClear()
remove.mockClear()
await act(async () => {
fireEvent.pointerDown(screen.getByTestId("sign-in-mobile-typewriter"), { pointerId: 1 })
+ fireEvent.pointerUp(screen.getByTestId("sign-in-mobile-typewriter"), { pointerId: 1 })
await Promise.resolve()
await Promise.resolve()
})
@@ -174,6 +189,30 @@ describe("SignInMobileTypewriter", () => {
expect(add.mock.calls.filter(isSensorEvent)).toHaveLength(2)
})
+ it("retries after permission throws but deduplicates an in-flight request", async () => {
+ mockMatchMedia({ mobile: true })
+ let rejectPermission!: (error: Error) => void
+ const pending = new Promise<"granted">((_resolve, reject) => { rejectPermission = reject })
+ const requestPermission = vi.fn().mockReturnValueOnce(pending).mockResolvedValue("granted")
+ ;(window as Window & { DeviceOrientationEvent?: unknown }).DeviceOrientationEvent = { requestPermission }
+ render(createElement(SignInMobileTypewriter, { collapsed: false }))
+ const stage = screen.getByTestId("sign-in-mobile-typewriter")
+ const tap = () => {
+ fireEvent.pointerDown(stage, { pointerId: 1 })
+ fireEvent.pointerUp(stage, { pointerId: 1 })
+ }
+ tap()
+ tap()
+ expect(requestPermission).toHaveBeenCalledOnce()
+ await act(async () => {
+ rejectPermission(new DOMException("Gesture required", "NotAllowedError"))
+ await Promise.resolve()
+ await Promise.resolve()
+ })
+ await act(async () => { tap(); await Promise.resolve() })
+ expect(requestPermission).toHaveBeenCalledTimes(2)
+ })
+
it("does not reattach sensors after a late permission result following unmount or collapse", async () => {
mockMatchMedia({ mobile: true })
const isSensorEvent = ([name]: readonly unknown[]) =>
@@ -188,6 +227,7 @@ describe("SignInMobileTypewriter", () => {
const add = vi.spyOn(window, "addEventListener")
const unmountedView = render(createElement(SignInMobileTypewriter, { collapsed: false }))
fireEvent.pointerDown(screen.getByTestId("sign-in-mobile-typewriter"), { pointerId: 1 })
+ fireEvent.pointerUp(screen.getByTestId("sign-in-mobile-typewriter"), { pointerId: 1 })
unmountedView.unmount()
add.mockClear()
await act(async () => {
@@ -206,6 +246,7 @@ describe("SignInMobileTypewriter", () => {
}
const collapsedView = render(createElement(SignInMobileTypewriter, { collapsed: false }))
fireEvent.pointerDown(screen.getByTestId("sign-in-mobile-typewriter"), { pointerId: 2 })
+ fireEvent.pointerUp(screen.getByTestId("sign-in-mobile-typewriter"), { pointerId: 2 })
collapsedView.rerender(createElement(SignInMobileTypewriter, { collapsed: true }))
add.mockClear()
await act(async () => {
diff --git a/src/web/src/app/(auth)/sign-in/sign-in-mobile-typewriter.module.css b/src/web/src/app/(auth)/sign-in/sign-in-mobile-typewriter.module.css
index e76eb01ba..21e02bf3e 100644
--- a/src/web/src/app/(auth)/sign-in/sign-in-mobile-typewriter.module.css
+++ b/src/web/src/app/(auth)/sign-in/sign-in-mobile-typewriter.module.css
@@ -1,8 +1,7 @@
.stage {
- --tw-blob-theme: var(--muted);
--tw-scale: 0.46;
- --tw-rx: 11deg;
- --tw-ry: -19deg;
+ --tw-rx: 10deg;
+ --tw-ry: -20deg;
--tw-tx: 0px;
--tw-ty: 0px;
}
@@ -19,38 +18,6 @@
will-change: transform;
}
-.typewriter :global(.tw-paper-track) {
- overflow: visible;
- bottom: calc(100% - 24px);
- transform: translateX(-50%) translateZ(78px);
-}
-
-.typewriter :global(.tw-paper) {
- pointer-events: none;
-}
-
-.typewriter :global(.tw-paper.tw-paper-city) {
- padding: 8px 8px 22px;
-}
-
-.typewriter :global(.tw-body-left),
-.typewriter :global(.tw-body-right),
-.typewriter :global(.tw-body-top),
-.typewriter :global(.tw-body-back),
-.typewriter :global(.tw-body-bottom) {
- display: none;
-}
-
-.typewriter :global(.tw-body-front) {
- box-shadow:
- 4px 2px 0 var(--tw-body-lo),
- 8px 4px 0 var(--tw-body-lo),
- 12px 6px 0 var(--tw-body-lo),
- 16px 8px 0 var(--tw-body-lo),
- 20px 10px 0 var(--tw-body-lo),
- 18px 22px 32px color-mix(in oklch, var(--foreground) 18%, transparent);
-}
-
.typewriter :global(.typewriter-blob) {
top: 50%;
bottom: auto;
@@ -68,16 +35,11 @@
}
.typewriter :global(.typewriter-scene) {
- perspective: 1400px;
- transform: none !important;
-}
-
-.typewriter :global(.tw-machine) {
transform-origin: 50% 15px;
transform: translate3d(0, 115px, 0)
scale3d(var(--tw-scale), var(--tw-scale), var(--tw-scale))
rotateY(var(--tw-ry))
- rotateX(var(--tw-rx));
+ rotateX(var(--tw-rx)) !important;
transition: transform 90ms ease-out;
will-change: transform;
}
@@ -85,7 +47,7 @@
@media (prefers-reduced-motion: reduce) {
.typewriter:global(.typewriter-visual),
.typewriter :global(.typewriter-blob),
- .typewriter :global(.tw-machine) {
+ .typewriter :global(.typewriter-scene) {
transition: none;
}
}
diff --git a/src/web/src/app/(auth)/sign-in/sign-in-mobile-typewriter.tsx b/src/web/src/app/(auth)/sign-in/sign-in-mobile-typewriter.tsx
index 68aed7ad9..90996342d 100644
--- a/src/web/src/app/(auth)/sign-in/sign-in-mobile-typewriter.tsx
+++ b/src/web/src/app/(auth)/sign-in/sign-in-mobile-typewriter.tsx
@@ -10,8 +10,8 @@ type PermissionCapableEvent = {
requestPermission?: () => Promise<"granted" | "denied" | "default">
}
-const REST_RX = 11
-const REST_RY = -19
+const REST_RX = 10
+const REST_RY = -20
function clamp(value: number, min: number, max: number): number {
return Math.min(max, Math.max(min, value))
@@ -22,7 +22,6 @@ export function SignInMobileTypewriter({ collapsed }: { collapsed: boolean }) {
const stageRef = useRef<HTMLDivElement>(null)
const sensorsActiveRef = useRef(false)
const sensorsAttachedRef = useRef(false)
- const receivedSensorEventRef = useRef(false)
const permissionAttemptedRef = useRef(false)
const detachSensorsRef = useRef<(() => void) | null>(null)
const poseRef = useRef({
@@ -89,7 +88,6 @@ export function SignInMobileTypewriter({ collapsed }: { collapsed: boolean }) {
const onOrientation = (event: DeviceOrientationEvent) => {
if (typeof event.beta !== "number" || typeof event.gamma !== "number") return
if (!Number.isFinite(event.beta) || !Number.isFinite(event.gamma)) return
- receivedSensorEventRef.current = true
if (dragPointerRef.current !== null) return
if (baselineBeta === null || baselineGamma === null) {
baselineBeta = event.beta
@@ -115,11 +113,9 @@ export function SignInMobileTypewriter({ collapsed }: { collapsed: boolean }) {
&& typeof linear.y === "number"
&& (Math.abs(linear.x) > 0.1 || Math.abs(linear.y) > 0.1)
) {
- receivedSensorEventRef.current = true
dx = linear.x
dy = -linear.y
} else if (gravity && typeof gravity.x === "number" && typeof gravity.y === "number") {
- receivedSensorEventRef.current = true
if (prevRawX !== null && prevRawY !== null) {
dx = gravity.x - prevRawX
dy = -(gravity.y - prevRawY)
@@ -183,7 +179,7 @@ export function SignInMobileTypewriter({ collapsed }: { collapsed: boolean }) {
const unlockSensorsOnGesture = () => {
if (!sensorsActiveRef.current || typeof window === "undefined") return
if (window.matchMedia("(prefers-reduced-motion: reduce)").matches) return
- if (receivedSensorEventRef.current || permissionAttemptedRef.current) return
+ if (permissionAttemptedRef.current) return
const orientationCtor = (
window as Window & { DeviceOrientationEvent?: PermissionCapableEvent }
).DeviceOrientationEvent
@@ -193,11 +189,12 @@ export function SignInMobileTypewriter({ collapsed }: { collapsed: boolean }) {
if (typeof orientationCtor?.requestPermission === "function") {
permissionAttemptedRef.current = true
void Promise.all([
- orientationCtor.requestPermission().catch(() => "denied" as const),
+ orientationCtor.requestPermission().catch(() => null),
typeof motionCtor?.requestPermission === "function"
- ? motionCtor.requestPermission().catch(() => "denied" as const)
+ ? motionCtor.requestPermission().catch(() => null)
: Promise.resolve("denied" as const),
]).then(([oriResult, motResult]) => {
+ permissionAttemptedRef.current = oriResult === "denied" || (oriResult === "granted" && motResult !== null)
if (!sensorsActiveRef.current) return
if (oriResult === "granted" || motResult === "granted") {
detachSensorsRef.current?.()
@@ -223,7 +220,6 @@ export function SignInMobileTypewriter({ collapsed }: { collapsed: boolean }) {
}
const handlePointerDown = (event: PointerEvent<HTMLDivElement>) => {
- unlockSensorsOnGesture()
dragPointerRef.current = event.pointerId
event.currentTarget.setPointerCapture?.(event.pointerId)
updateTouchTilt(event.clientX, event.clientY)
@@ -237,6 +233,7 @@ export function SignInMobileTypewriter({ collapsed }: { collapsed: boolean }) {
const handlePointerEnd = (event: PointerEvent<HTMLDivElement>) => {
if (dragPointerRef.current !== event.pointerId) return
dragPointerRef.current = null
+ if (event.type === "pointerup") unlockSensorsOnGesture()
if (event.currentTarget.hasPointerCapture?.(event.pointerId)) {
event.currentTarget.releasePointerCapture(event.pointerId)
}