The tablet ran the phone layout with a half-finished iPad draft on top: two custom sidebars, a leftover overflow menu, split Files/Changes header buttons, and phone-width sheets stretched across a 13" screen. This brings it onto the phone's navigation model and keeps only the differences a large screen earns. - Sessions are a persistent resizable left sidebar; the overflow menu is gone and its destinations moved into that sidebar's footer (connected instance, settings, pending web update) and into the workspace drawer. - The workspace (Changes / Files / Terminal / Notes / MCP) is the phone's drawer everywhere: a resizable right sidebar where the screen can host one (up to 900px) and the full-cover drawer otherwise, with its mounted panes — an open diff, an edited file, an attached terminal — surviving rotation. - Header dropdowns are anchored popovers: the recents switcher mirrors the usage overlay on the left, and its trigger is sized to the title rather than to the free width. - App-level pages (settings, instances, update, an opened plan) render as centered dialogs instead of covering the screen. - Overlays center on the chat column through published insets, so the model and directory pickers no longer sit off-centre; the directory picker also stops overriding the shared width clamp. - Wide chat layout applies to mobile surfaces, where a tablet chat column is finally wide enough for the setting to mean anything. The layout gate is a live size class rather than a device check, so Android tablets and foldables are covered by the same code: - `enabled` when the shortest viewport side is at le sw600dp). The short side is what makes this a size question instead of a device question — a phone reports ~360-430 whichev unfolded book foldable ~600+, and folding shut drops back under it. iPads also answer on identity, since iPadOS hands out od - `roomyForPanels` when landscape and at least 1000px wide, which is what it takes to host the sidebar, the panel and a readabl foldables miss it in BOTH orientations — their long side is barely wider than a tablet's short one — so they keep the portr Every consumer re-decides instead of remembering wha open sidebar closes if the device folds shut under it. iPad behaviour is unchanged: its landscape widths all clear the panel ones do not, exactly as the previous orientation check did. Hardware keyboards are read natively. iOS reports them through GCKeyboard, published to the web layer at document start and kep disconnect and foregrounding; the layer stops inferring once that answers. A single early publish was not enough — the connect no already-attached keyboard fires before the page exists, and GameController can populate late — so the state is re-published across resume. With a keyboard attached the draft screen keeps its starter chips and the composer never collapses; tablets skip the colla Runtimes with no native answer fall back to inferring it from the keyboard bridge, and only ever conclude "hardware" from silen Also: sidebar rows no longer sit on a differently ti footer is no longer clipped by an over-tall content box, the resize handles moved above the panes' own overlays so they can actu now-unreachable overflow menu, fullscreen terminal/MCP/notes surfaces and their locale key are deleted. Device behaviour is unverified — the tablet layout, keyboard bridge and the foldable size class have not been exercised on hardware, and the 600/1000 thresholds are derived fr rather than measured on a foldable.
271 lines
11 KiB
TypeScript
271 lines
11 KiB
TypeScript
import React from 'react';
|
|
import { createPortal } from 'react-dom';
|
|
|
|
import { Icon } from '@/components/icon/Icon';
|
|
import { useI18n } from '@/lib/i18n';
|
|
import { cn } from '@/lib/utils';
|
|
|
|
const SURFACE_ROOT_ID = 'mobile-surface-root';
|
|
const ENTER_DELAY_MS = 16;
|
|
// Enter-slide duration. Heavy content is revealed when this transition actually
|
|
// ends (transitionend); this also feeds the fallback timer.
|
|
const ENTER_DURATION_MS = 200;
|
|
|
|
const ensureSurfaceRoot = (): HTMLElement | null => {
|
|
if (typeof document === 'undefined') return null;
|
|
let root = document.getElementById(SURFACE_ROOT_ID);
|
|
if (!root) {
|
|
root = document.createElement('div');
|
|
root.id = SURFACE_ROOT_ID;
|
|
document.body.appendChild(root);
|
|
}
|
|
return root;
|
|
};
|
|
|
|
export type MobileFullscreenSurfaceProps = {
|
|
open: boolean;
|
|
onClose: () => void;
|
|
title?: React.ReactNode;
|
|
subtitle?: React.ReactNode;
|
|
trailing?: React.ReactNode;
|
|
/** If true, leave Escape available to nested content instead of dismissing the surface. */
|
|
disableEscapeDismiss?: boolean;
|
|
/** If true, render no header and let the child render its own (with its own back button). */
|
|
headerless?: boolean;
|
|
/** Drop the header's bottom divider (quiet single-page surfaces). */
|
|
noHeaderBorder?: boolean;
|
|
ariaLabel?: string;
|
|
/**
|
|
* `dialog` packs the same surface into a centered card over a scrim instead
|
|
* of covering the app. Tablets use it: a settings or instances page stretched
|
|
* across a 13" screen is mostly empty space, and losing the chat entirely for
|
|
* an app-level page is a heavier context switch than the content deserves.
|
|
*/
|
|
variant?: 'fullscreen' | 'dialog';
|
|
/**
|
|
* What the dialog centers on. App-level pages (settings, instances) belong to
|
|
* the whole window; content that came out of the chat column stays with it.
|
|
*/
|
|
dialogAlign?: 'chat' | 'app';
|
|
children: React.ReactNode;
|
|
};
|
|
|
|
/** Fullscreen overlay surface for the phone layout: covers the whole app
|
|
(including the header), slides in from the right like a navigation push,
|
|
and closes via the header back arrow, Escape, or the Android back button. */
|
|
export const MobileFullscreenSurface: React.FC<MobileFullscreenSurfaceProps> = ({
|
|
open,
|
|
onClose,
|
|
title,
|
|
subtitle,
|
|
trailing,
|
|
disableEscapeDismiss = false,
|
|
headerless = false,
|
|
noHeaderBorder = false,
|
|
ariaLabel,
|
|
variant = 'fullscreen',
|
|
dialogAlign = 'chat',
|
|
children,
|
|
}) => {
|
|
const { t } = useI18n();
|
|
const rootRef = React.useRef<HTMLElement | null>(null);
|
|
const [entered, setEntered] = React.useState(false);
|
|
const [contentReady, setContentReady] = React.useState(false);
|
|
const surfaceRef = React.useRef<HTMLElement | null>(null);
|
|
const previousFocusRef = React.useRef<HTMLElement | null>(null);
|
|
// Keep onClose in a ref so the focus/keydown effect below depends only on `open`.
|
|
// The parent passes a fresh inline onClose on every render; if the effect depended
|
|
// on it, each parent re-render (e.g. an SSE store update) would re-run it and
|
|
// refocus the first element — stealing focus from whatever input the user is in
|
|
// and collapsing the keyboard mid-edit.
|
|
const onCloseRef = React.useRef(onClose);
|
|
React.useEffect(() => {
|
|
onCloseRef.current = onClose;
|
|
}, [onClose]);
|
|
|
|
if (typeof document !== 'undefined' && !rootRef.current) {
|
|
rootRef.current = ensureSurfaceRoot();
|
|
}
|
|
|
|
React.useEffect(() => {
|
|
if (!open) {
|
|
setEntered(false);
|
|
return;
|
|
}
|
|
const id = window.setTimeout(() => setEntered(true), ENTER_DELAY_MS);
|
|
return () => window.clearTimeout(id);
|
|
}, [open]);
|
|
|
|
// Defer mounting heavy children until the enter slide finishes, so the
|
|
// animation stays smooth instead of competing with a large content render.
|
|
// Primary trigger is the slide's transitionend (below); this is just a
|
|
// fallback in case it never fires (reduced motion / interrupted transition).
|
|
React.useEffect(() => {
|
|
if (!open) {
|
|
setContentReady(false);
|
|
return;
|
|
}
|
|
const id = window.setTimeout(() => setContentReady(true), ENTER_DELAY_MS + ENTER_DURATION_MS + 80);
|
|
return () => window.clearTimeout(id);
|
|
}, [open]);
|
|
|
|
React.useEffect(() => {
|
|
if (!open) return;
|
|
const previousOverflow = document.body.style.overflow;
|
|
previousFocusRef.current = document.activeElement instanceof HTMLElement ? document.activeElement : null;
|
|
document.body.style.overflow = 'hidden';
|
|
const focusFirstElement = () => {
|
|
const surface = surfaceRef.current;
|
|
if (!surface) return;
|
|
const focusable = surface.querySelector<HTMLElement>(
|
|
'button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])',
|
|
);
|
|
(focusable ?? surface).focus({ preventScroll: true });
|
|
};
|
|
const focusTimer = window.setTimeout(focusFirstElement, ENTER_DELAY_MS);
|
|
const handleKeyDown = (event: KeyboardEvent) => {
|
|
if (event.key === 'Escape' && !disableEscapeDismiss) {
|
|
onCloseRef.current();
|
|
return;
|
|
}
|
|
if (event.key !== 'Tab') return;
|
|
const surface = surfaceRef.current;
|
|
if (!surface) return;
|
|
const focusable = Array.from(surface.querySelectorAll<HTMLElement>(
|
|
'button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])',
|
|
)).filter((element) => !element.hasAttribute('disabled') && element.getAttribute('aria-hidden') !== 'true');
|
|
if (focusable.length === 0) {
|
|
event.preventDefault();
|
|
surface.focus({ preventScroll: true });
|
|
return;
|
|
}
|
|
const first = focusable[0];
|
|
const last = focusable[focusable.length - 1];
|
|
const active = document.activeElement;
|
|
if (event.shiftKey && active === first) {
|
|
event.preventDefault();
|
|
last.focus({ preventScroll: true });
|
|
} else if (!event.shiftKey && active === last) {
|
|
event.preventDefault();
|
|
first.focus({ preventScroll: true });
|
|
}
|
|
};
|
|
document.addEventListener('keydown', handleKeyDown);
|
|
return () => {
|
|
window.clearTimeout(focusTimer);
|
|
document.body.style.overflow = previousOverflow;
|
|
document.removeEventListener('keydown', handleKeyDown);
|
|
previousFocusRef.current?.focus?.({ preventScroll: true });
|
|
previousFocusRef.current = null;
|
|
};
|
|
}, [disableEscapeDismiss, open]);
|
|
|
|
if (!open || !rootRef.current) return null;
|
|
|
|
const isDialog = variant === 'dialog';
|
|
|
|
const surface = (
|
|
<section
|
|
ref={surfaceRef}
|
|
role="dialog"
|
|
aria-modal="true"
|
|
aria-label={ariaLabel}
|
|
tabIndex={-1}
|
|
className={cn(
|
|
'flex flex-col bg-background text-foreground',
|
|
isDialog
|
|
? 'h-[min(88dvh,860px)] w-full max-w-[720px] overflow-hidden rounded-2xl border border-border/70 shadow-[0_24px_64px_rgb(0_0_0_/_0.32)]'
|
|
: 'oc-keyboard-inset-surface fixed inset-0 z-50',
|
|
)}
|
|
style={isDialog ? {
|
|
// Scale/fade instead of the push slide: the card is not a navigation
|
|
// step, and a settled `transform: none` keeps it off its own
|
|
// compositing layer (iOS clips those to the safe-area viewport).
|
|
opacity: entered ? 1 : 0,
|
|
transform: entered ? 'none' : 'scale(0.97)',
|
|
transition: `opacity ${ENTER_DURATION_MS}ms ease-out, transform ${ENTER_DURATION_MS}ms cubic-bezier(0.32, 0.72, 0, 1)`,
|
|
} : {
|
|
paddingTop: 'var(--oc-safe-area-top, 0px)',
|
|
// Push-style enter: slide in from the right edge; settled state drops
|
|
// the transform entirely so the surface isn't kept on a compositing
|
|
// layer (iOS clips those to the safe-area viewport).
|
|
transform: entered ? 'none' : 'translateX(100%)',
|
|
transition: `transform ${ENTER_DURATION_MS}ms cubic-bezier(0.32, 0.72, 0, 1)`,
|
|
}}
|
|
onTransitionEnd={(event) => {
|
|
// Reveal content exactly when the enter transition ends — not on a fixed timer.
|
|
if (entered && event.target === event.currentTarget && event.propertyName === 'transform') {
|
|
setContentReady(true);
|
|
}
|
|
}}
|
|
>
|
|
{!headerless ? (
|
|
<header
|
|
className={cn(
|
|
'flex h-[var(--oc-header-height,56px)] shrink-0 items-center gap-2 px-3',
|
|
!noHeaderBorder && 'border-b border-border/70',
|
|
)}
|
|
>
|
|
<button
|
|
type="button"
|
|
className="-ml-1 flex size-10 shrink-0 items-center justify-center rounded-full text-muted-foreground transition-colors hover:bg-interactive-hover hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary"
|
|
aria-label={t('mobile.surface.closeAria')}
|
|
onClick={onClose}
|
|
style={{ touchAction: 'manipulation' }}
|
|
>
|
|
<Icon name="close" className="size-5" />
|
|
</button>
|
|
<div className="min-w-0 flex-1 px-1">
|
|
{title ? (
|
|
typeof title === 'string' ? (
|
|
<h2 className="truncate typography-ui-label text-foreground">{title}</h2>
|
|
) : (
|
|
title
|
|
)
|
|
) : null}
|
|
{subtitle ? (
|
|
typeof subtitle === 'string' ? (
|
|
<p className="truncate typography-micro text-muted-foreground">{subtitle}</p>
|
|
) : (
|
|
subtitle
|
|
)
|
|
) : null}
|
|
</div>
|
|
{trailing ? <div className="flex shrink-0 items-center gap-1.5">{trailing}</div> : null}
|
|
</header>
|
|
) : null}
|
|
<div className="min-h-0 flex-1 overflow-hidden">
|
|
{contentReady ? (
|
|
<div className="h-full" style={{ animation: 'oc-surface-content-in 200ms ease-out' }}>
|
|
{children}
|
|
</div>
|
|
) : null}
|
|
</div>
|
|
<style>{'@keyframes oc-surface-content-in { from { opacity: 0 } to { opacity: 1 } }'}</style>
|
|
</section>
|
|
);
|
|
|
|
if (!isDialog) return createPortal(surface, rootRef.current);
|
|
|
|
return createPortal(
|
|
<div
|
|
className="oc-keyboard-inset-surface fixed inset-0 z-50 flex items-center justify-center p-4 transition-opacity duration-200 ease-out"
|
|
style={{
|
|
background: 'rgb(0 0 0 / 0.45)',
|
|
opacity: entered ? 1 : 0,
|
|
// 'chat' matches every other mobile overlay (the sessions sidebar keeps
|
|
// its width); 'app' ignores the panels and centers on the window.
|
|
paddingLeft: dialogAlign === 'chat' ? 'max(1rem, var(--oc-chat-inset-left, 0px))' : '1rem',
|
|
paddingRight: dialogAlign === 'chat' ? 'max(1rem, var(--oc-chat-inset-right, 0px))' : '1rem',
|
|
paddingTop: 'max(1rem, var(--oc-safe-area-top, 0px))',
|
|
}}
|
|
onClick={onClose}
|
|
>
|
|
<div className="flex w-full max-w-[720px] justify-center" onClick={(event) => event.stopPropagation()}>
|
|
{surface}
|
|
</div>
|
|
</div>,
|
|
rootRef.current,
|
|
);
|
|
};
|