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.
456 lines
14 KiB
TypeScript
456 lines
14 KiB
TypeScript
import React from 'react';
|
|
import { isDesktopShell, isVSCodeRuntime } from '@/lib/desktop';
|
|
import { isIPadApp } from '@/lib/platform';
|
|
import { isMobileSurfaceRuntime } from '@/lib/runtimeSurface';
|
|
|
|
type DeviceType = 'desktop' | 'mobile' | 'tablet';
|
|
|
|
export interface DeviceInfo {
|
|
isMobile: boolean;
|
|
isTablet: boolean;
|
|
isDesktop: boolean;
|
|
deviceType: DeviceType;
|
|
screenWidth: number;
|
|
breakpoint: 'xs' | 'sm' | 'md' | 'lg' | 'xl' | '2xl';
|
|
hasTouchInput: boolean;
|
|
hasTouchOnlyPointer: boolean;
|
|
}
|
|
|
|
const BREAKPOINTS = {
|
|
xs: 0,
|
|
sm: 640,
|
|
md: 768,
|
|
lg: 1024,
|
|
xl: 1280,
|
|
'2xl': 1536,
|
|
} as const;
|
|
|
|
const DEFAULT_DEVICE_INFO: DeviceInfo = {
|
|
isMobile: false,
|
|
isTablet: false,
|
|
isDesktop: true,
|
|
deviceType: 'desktop',
|
|
screenWidth: 1024,
|
|
breakpoint: 'lg',
|
|
hasTouchInput: false,
|
|
hasTouchOnlyPointer: false,
|
|
};
|
|
|
|
const hasDesktopSurfaceOverride = (): boolean => {
|
|
if (typeof window === 'undefined') return false;
|
|
return new URLSearchParams(window.location.search).get('surface') === 'desktop';
|
|
};
|
|
|
|
const getNavigatorDeviceHints = (maxTouchPoints: number) => {
|
|
if (typeof navigator === 'undefined') {
|
|
return { isExplicitTablet: false };
|
|
}
|
|
|
|
const userAgent = navigator.userAgent || '';
|
|
const platform = navigator.platform || '';
|
|
const isIPad = /iPad/i.test(userAgent)
|
|
|| ((/Macintosh|MacIntel/i.test(userAgent) || /MacIntel/i.test(platform)) && maxTouchPoints > 1);
|
|
const isAndroidTablet = /Android/i.test(userAgent) && !/Mobile/i.test(userAgent);
|
|
const isGenericTablet = /Tablet/i.test(userAgent);
|
|
|
|
return { isExplicitTablet: isIPad || isAndroidTablet || isGenericTablet };
|
|
};
|
|
|
|
const setRootDeviceAttributes = (
|
|
isDesktopShellRuntime: boolean,
|
|
deviceType: DeviceType,
|
|
hasTouchInput: boolean,
|
|
) => {
|
|
if (typeof window === 'undefined') {
|
|
return;
|
|
}
|
|
|
|
const root = document.documentElement;
|
|
|
|
root.classList.remove('device-mobile', 'device-tablet', 'device-desktop');
|
|
root.classList.add(
|
|
deviceType === 'mobile'
|
|
? 'device-mobile'
|
|
: deviceType === 'tablet'
|
|
? 'device-tablet'
|
|
: 'device-desktop'
|
|
);
|
|
|
|
if (isDesktopShellRuntime) {
|
|
root.classList.add('desktop-runtime');
|
|
root.classList.remove('mobile-pointer');
|
|
} else {
|
|
root.classList.remove('desktop-runtime');
|
|
if (hasTouchInput) {
|
|
root.classList.add('mobile-pointer');
|
|
} else {
|
|
root.classList.remove('mobile-pointer');
|
|
}
|
|
}
|
|
};
|
|
|
|
export function getDeviceInfo(): DeviceInfo {
|
|
const width = window.innerWidth;
|
|
const supportsMatchMedia = typeof window.matchMedia === 'function';
|
|
const pointerQuery = supportsMatchMedia ? window.matchMedia('(pointer: coarse)') : null;
|
|
const hoverQuery = supportsMatchMedia ? window.matchMedia('(hover: none)') : null;
|
|
const prefersCoarsePointer = pointerQuery?.matches ?? false;
|
|
const noHover = hoverQuery?.matches ?? false;
|
|
const maxTouchPoints = typeof navigator !== 'undefined' ? navigator.maxTouchPoints ?? 0 : 0;
|
|
// Desktop panels are desktop surfaces even when their viewport is narrow.
|
|
const isDesktopShellRuntime = isDesktopShell() || isVSCodeRuntime() || hasDesktopSurfaceOverride();
|
|
const { isExplicitTablet } = getNavigatorDeviceHints(maxTouchPoints);
|
|
|
|
const hasTouchInput = prefersCoarsePointer || noHover || maxTouchPoints > 0;
|
|
const hasTouchOnlyPointer = prefersCoarsePointer || noHover;
|
|
|
|
const isTabletWidth = width > BREAKPOINTS.md && width <= BREAKPOINTS.lg;
|
|
const isMobileWidth = width <= BREAKPOINTS.md;
|
|
|
|
let isMobile = hasTouchInput && isMobileWidth;
|
|
let isTablet = hasTouchInput && !isMobile && (isTabletWidth || isExplicitTablet);
|
|
let isDesktop = !hasTouchInput || (!isTablet && width > BREAKPOINTS.lg);
|
|
let deviceType: DeviceType = 'desktop';
|
|
|
|
if (isDesktopShellRuntime) {
|
|
isMobile = false;
|
|
isTablet = false;
|
|
isDesktop = true;
|
|
deviceType = 'desktop';
|
|
} else if (isMobileSurfaceRuntime()) {
|
|
// The mobile surface (Capacitor shell or hosted MobileApp) IS the phone
|
|
// UI: every component in that tree is built mobile-first, so wide devices
|
|
// (iPad, Android tablets, rotated phones) must not fall into
|
|
// tablet/desktop branches scattered across shared components.
|
|
// Tablet layout upgrades gate on useTabletLayout() (a size class) instead.
|
|
isMobile = true;
|
|
isTablet = false;
|
|
isDesktop = false;
|
|
deviceType = 'mobile';
|
|
} else if (isMobile) {
|
|
deviceType = 'mobile';
|
|
} else if (isTablet) {
|
|
deviceType = 'tablet';
|
|
} else {
|
|
isDesktop = true;
|
|
deviceType = 'desktop';
|
|
}
|
|
|
|
setRootDeviceAttributes(isDesktopShellRuntime, deviceType, hasTouchInput);
|
|
|
|
let breakpoint: keyof typeof BREAKPOINTS = 'xs';
|
|
for (const [key, value] of Object.entries(BREAKPOINTS)) {
|
|
if (width >= value) {
|
|
breakpoint = key as keyof typeof BREAKPOINTS;
|
|
}
|
|
}
|
|
|
|
return {
|
|
isMobile,
|
|
isTablet,
|
|
isDesktop,
|
|
deviceType,
|
|
screenWidth: width,
|
|
breakpoint,
|
|
hasTouchInput,
|
|
hasTouchOnlyPointer,
|
|
};
|
|
}
|
|
|
|
const isSameDeviceInfo = (left: DeviceInfo, right: DeviceInfo): boolean => (
|
|
left.isMobile === right.isMobile
|
|
&& left.isTablet === right.isTablet
|
|
&& left.isDesktop === right.isDesktop
|
|
&& left.deviceType === right.deviceType
|
|
&& left.screenWidth === right.screenWidth
|
|
&& left.breakpoint === right.breakpoint
|
|
&& left.hasTouchInput === right.hasTouchInput
|
|
&& left.hasTouchOnlyPointer === right.hasTouchOnlyPointer
|
|
);
|
|
|
|
const deviceInfoSubscribers = new Set<() => void>();
|
|
let deviceInfoSnapshot: DeviceInfo | null = null;
|
|
let deviceInfoFrameId: number | undefined;
|
|
let cleanupDeviceInfoSource: (() => void) | null = null;
|
|
|
|
const readDeviceInfoSnapshot = (): DeviceInfo => {
|
|
if (typeof window === 'undefined') {
|
|
return DEFAULT_DEVICE_INFO;
|
|
}
|
|
|
|
if (!deviceInfoSnapshot) {
|
|
deviceInfoSnapshot = getDeviceInfo();
|
|
}
|
|
|
|
return deviceInfoSnapshot;
|
|
};
|
|
|
|
const notifyDeviceInfoSubscribers = () => {
|
|
for (const listener of deviceInfoSubscribers) {
|
|
listener();
|
|
}
|
|
};
|
|
|
|
const updateDeviceInfoSnapshot = () => {
|
|
deviceInfoFrameId = undefined;
|
|
const next = getDeviceInfo();
|
|
if (deviceInfoSnapshot && isSameDeviceInfo(deviceInfoSnapshot, next)) {
|
|
return;
|
|
}
|
|
|
|
deviceInfoSnapshot = next;
|
|
notifyDeviceInfoSubscribers();
|
|
};
|
|
|
|
const scheduleDeviceInfoUpdate = () => {
|
|
if (typeof window === 'undefined' || deviceInfoFrameId !== undefined) {
|
|
return;
|
|
}
|
|
|
|
deviceInfoFrameId = window.requestAnimationFrame(updateDeviceInfoSnapshot);
|
|
};
|
|
|
|
const attachMediaQueryListener = (query: MediaQueryList | null, listener: () => void): (() => void) => {
|
|
if (!query) {
|
|
return () => {};
|
|
}
|
|
|
|
if (typeof query.addEventListener === 'function') {
|
|
query.addEventListener('change', listener);
|
|
return () => query.removeEventListener('change', listener);
|
|
}
|
|
|
|
if (typeof query.addListener === 'function') {
|
|
query.addListener(listener);
|
|
return () => query.removeListener(listener);
|
|
}
|
|
|
|
return () => {};
|
|
};
|
|
|
|
const startDeviceInfoSource = (): (() => void) => {
|
|
if (typeof window === 'undefined') {
|
|
return () => {};
|
|
}
|
|
|
|
deviceInfoSnapshot = getDeviceInfo();
|
|
window.addEventListener('resize', scheduleDeviceInfoUpdate);
|
|
|
|
const pointerQuery = typeof window.matchMedia === 'function'
|
|
? window.matchMedia('(pointer: coarse)')
|
|
: null;
|
|
const hoverQuery = typeof window.matchMedia === 'function'
|
|
? window.matchMedia('(hover: none)')
|
|
: null;
|
|
const cleanupPointer = attachMediaQueryListener(pointerQuery, scheduleDeviceInfoUpdate);
|
|
const cleanupHover = attachMediaQueryListener(hoverQuery, scheduleDeviceInfoUpdate);
|
|
|
|
return () => {
|
|
window.removeEventListener('resize', scheduleDeviceInfoUpdate);
|
|
cleanupPointer();
|
|
cleanupHover();
|
|
if (deviceInfoFrameId !== undefined) {
|
|
window.cancelAnimationFrame(deviceInfoFrameId);
|
|
deviceInfoFrameId = undefined;
|
|
}
|
|
};
|
|
};
|
|
|
|
const subscribeDeviceInfo = (listener: () => void): (() => void) => {
|
|
if (typeof window === 'undefined') {
|
|
return () => {};
|
|
}
|
|
|
|
deviceInfoSubscribers.add(listener);
|
|
if (!cleanupDeviceInfoSource) {
|
|
cleanupDeviceInfoSource = startDeviceInfoSource();
|
|
}
|
|
|
|
return () => {
|
|
deviceInfoSubscribers.delete(listener);
|
|
if (deviceInfoSubscribers.size === 0 && cleanupDeviceInfoSource) {
|
|
cleanupDeviceInfoSource();
|
|
cleanupDeviceInfoSource = null;
|
|
deviceInfoSnapshot = null;
|
|
}
|
|
};
|
|
};
|
|
|
|
export function isMobileDeviceViaCSS(): boolean {
|
|
if (typeof window === 'undefined') return false;
|
|
return readDeviceInfoSnapshot().isMobile;
|
|
}
|
|
|
|
const isStandalonePwaRuntime = (): boolean => {
|
|
if (typeof window === 'undefined') return false;
|
|
|
|
const standaloneNavigator = navigator as Navigator & { standalone?: boolean };
|
|
return Boolean(
|
|
standaloneNavigator.standalone === true
|
|
|| window.matchMedia?.('(display-mode: standalone)')?.matches
|
|
|| window.matchMedia?.('(display-mode: fullscreen)')?.matches
|
|
);
|
|
};
|
|
|
|
const isTabletStandalonePwaRuntime = (): boolean => {
|
|
if (typeof window === 'undefined' || isDesktopShell()) return false;
|
|
|
|
const maxTouchPoints = typeof navigator !== 'undefined' ? navigator.maxTouchPoints ?? 0 : 0;
|
|
return isStandalonePwaRuntime() && maxTouchPoints > 0 && window.innerWidth > BREAKPOINTS.md;
|
|
};
|
|
|
|
export function useTabletStandalonePwaRuntime(): boolean {
|
|
const [value, setValue] = React.useState<boolean>(() => isTabletStandalonePwaRuntime());
|
|
|
|
React.useEffect(() => {
|
|
if (typeof window === 'undefined') return;
|
|
|
|
const update = () => setValue(isTabletStandalonePwaRuntime());
|
|
const standaloneQuery = window.matchMedia?.('(display-mode: standalone)');
|
|
const fullscreenQuery = window.matchMedia?.('(display-mode: fullscreen)');
|
|
|
|
update();
|
|
window.addEventListener('resize', update);
|
|
window.addEventListener('focus', update);
|
|
|
|
const addQueryListener = (query: MediaQueryList | undefined) => {
|
|
if (!query) return;
|
|
if (typeof query.addEventListener === 'function') {
|
|
query.addEventListener('change', update);
|
|
} else if (typeof query.addListener === 'function') {
|
|
query.addListener(update);
|
|
}
|
|
};
|
|
const removeQueryListener = (query: MediaQueryList | undefined) => {
|
|
if (!query) return;
|
|
if (typeof query.removeEventListener === 'function') {
|
|
query.removeEventListener('change', update);
|
|
} else if (typeof query.removeListener === 'function') {
|
|
query.removeListener(update);
|
|
}
|
|
};
|
|
|
|
addQueryListener(standaloneQuery);
|
|
addQueryListener(fullscreenQuery);
|
|
|
|
return () => {
|
|
window.removeEventListener('resize', update);
|
|
window.removeEventListener('focus', update);
|
|
removeQueryListener(standaloneQuery);
|
|
removeQueryListener(fullscreenQuery);
|
|
};
|
|
}, []);
|
|
|
|
return value;
|
|
}
|
|
|
|
export type Orientation = 'portrait' | 'landscape';
|
|
|
|
const getOrientation = (): Orientation => {
|
|
if (typeof window === 'undefined') return 'portrait';
|
|
return window.matchMedia?.('(orientation: landscape)')?.matches ? 'landscape' : 'portrait';
|
|
};
|
|
|
|
export function useOrientation(): Orientation {
|
|
const [orientation, setOrientation] = React.useState<Orientation>(getOrientation);
|
|
|
|
React.useEffect(() => {
|
|
if (typeof window === 'undefined' || typeof window.matchMedia !== 'function') return;
|
|
const query = window.matchMedia('(orientation: landscape)');
|
|
const update = () => setOrientation(query.matches ? 'landscape' : 'portrait');
|
|
update();
|
|
return attachMediaQueryListener(query, update);
|
|
}, []);
|
|
|
|
return orientation;
|
|
}
|
|
|
|
/**
|
|
* Smallest viewport side that earns the tablet layout, following Android's
|
|
* long-standing `sw600dp` size class. The SHORT side is what makes this a size
|
|
* question rather than a device question: a phone reports ~360-430 whichever
|
|
* way it is held, a 7"+ tablet or an unfolded book foldable reports ~600+, and
|
|
* a foldable folded shut drops back under it. So a fold is just a resize, and
|
|
* nothing here has to know what a foldable is.
|
|
*/
|
|
const TABLET_LAYOUT_MIN_SHORT_SIDE_PX = 600;
|
|
/**
|
|
* Width below which the workspace cannot become a side panel: the sessions
|
|
* sidebar (~320) plus the panel (~380) plus a chat column that is still worth
|
|
* reading. Unfolded book foldables land under this even "landscape", so they
|
|
* keep the full-cover drawer in both orientations — which is the whole point,
|
|
* their wide side is barely wider than a tablet's narrow one.
|
|
*/
|
|
const WORKSPACE_PANEL_MIN_WIDTH_PX = 1000;
|
|
|
|
export interface TabletLayout {
|
|
/** Sessions become a persistent sidebar, dropdowns become anchored popovers. */
|
|
enabled: boolean;
|
|
/** There is room for the workspace beside the chat instead of over it. */
|
|
roomyForPanels: boolean;
|
|
}
|
|
|
|
export const readTabletLayout = (): TabletLayout => {
|
|
if (typeof window === 'undefined') return { enabled: false, roomyForPanels: false };
|
|
const width = window.innerWidth;
|
|
const height = window.innerHeight;
|
|
// iPads answer this on identity too: iPadOS reports odd viewports in Slide
|
|
// Over / Split View, and a device we KNOW is a tablet should not flip to the
|
|
// phone layout because it was given a narrow slice.
|
|
const enabled = isIPadApp() || Math.min(width, height) >= TABLET_LAYOUT_MIN_SHORT_SIDE_PX;
|
|
return {
|
|
enabled,
|
|
roomyForPanels: enabled && width > height && width >= WORKSPACE_PANEL_MIN_WIDTH_PX,
|
|
};
|
|
};
|
|
|
|
/**
|
|
* The tablet layout decision, live.
|
|
*
|
|
* Deliberately a hook over a one-shot check: foldables change size class while
|
|
* the app runs, and the Android shell keeps the WebView alive across the fold
|
|
* (`configChanges` covers screenSize), so every consumer has to re-decide
|
|
* rather than remember what it saw at mount.
|
|
*/
|
|
export function useTabletLayout(): TabletLayout {
|
|
const [layout, setLayout] = React.useState<TabletLayout>(readTabletLayout);
|
|
|
|
React.useEffect(() => {
|
|
if (typeof window === 'undefined') return;
|
|
let frame: number | undefined;
|
|
const update = () => {
|
|
frame = undefined;
|
|
const next = readTabletLayout();
|
|
setLayout((current) => (
|
|
current.enabled === next.enabled && current.roomyForPanels === next.roomyForPanels
|
|
? current
|
|
: next
|
|
));
|
|
};
|
|
const schedule = () => {
|
|
if (frame !== undefined) return;
|
|
frame = window.requestAnimationFrame(update);
|
|
};
|
|
|
|
update();
|
|
window.addEventListener('resize', schedule);
|
|
const orientationQuery = window.matchMedia?.('(orientation: landscape)') ?? null;
|
|
const detachOrientation = attachMediaQueryListener(orientationQuery, schedule);
|
|
return () => {
|
|
window.removeEventListener('resize', schedule);
|
|
detachOrientation();
|
|
if (frame !== undefined) window.cancelAnimationFrame(frame);
|
|
};
|
|
}, []);
|
|
|
|
return layout;
|
|
}
|
|
|
|
export function useDeviceInfo(): DeviceInfo {
|
|
return React.useSyncExternalStore(
|
|
subscribeDeviceInfo,
|
|
readDeviceInfoSnapshot,
|
|
() => DEFAULT_DEVICE_INFO,
|
|
);
|
|
}
|