Files
orca/mobile/src/theme/themed-styles.ts
NeilandKelvin Amoaba 5d61e00c6d build(mobile): upgrade to Expo SDK 58 and React Native 0.88 (#37935)
* build(mobile): upgrade to Expo SDK 58 and React Native 0.88

Expo 58 drops Zod from @expo/cli, which clears the last Zod 3 advisory
(GHSA-mrhx-c7xc-m3w5) in mobile along with its local patch and override.

- Expo 55 -> 58, React Native 0.83 -> 0.88, React 19.3, gesture-handler 3,
  webview 14, reanimated 4.7, worklets 0.13 (SDK 58 bundled versions,
  pinned below today's batch to respect minimumReleaseAge).
- Port the react-native and react-native-webview patches unchanged; drop
  expo-constants, expo-notifications, @expo/cli, expo-router, zod and
  query-string patches plus the zod/query-string/xcode>uuid overrides,
  which upstream fixed or no longer need.
- iOS minimum rises to 16.4 (Expo 58 / RN 0.88 requirement).
- Migrate to RN 0.88 strict types: instance ref types, NamedStyles,
  AppState.currentState, list header/footer nulls.
- Replace removed runtime APIs: InteractionManager -> idle callback with a
  macrotask fallback; StyleSheet.absoluteFillObject -> absoluteFill;
  FileHandle.readBytes -> readBytesSync (it became async).
- Resolve react-native/asset-registry for shared assets in Metro and alias
  the old registry path for react-native-svg in the desktop mobile-web bundle.
- Reduce the iOS scene plugin to the reconnect override; Expo 58's template
  now ships the scene delegate itself.

* fix(mobile): bridge react-native-svg web imports and libsodium runtime for RN 0.88

- Share react-native-svg web shims between the mobile-web build and its render
  checks: map the old asset-registry path to react-native-web's registry and stub
  the Android-only touch-sound TurboModule.
- Patch react-native-libsodium 1.7.0 to read the JSI runtime from the bridge proxy;
  RN 0.88 removed RCTCxxBridge.runtime.

* fix(mobile): use Expo 58's legacy promise resolver for audio permissions

* fix(mobile): skip null handles in the RPC recording timer shims for RN 0.88 types

* style(mobile): format MobilePRSidebar after rebase

* fix(mobile): name RN 0.88 text input refs for declarations; allow queued back in stack render check

- Type text input refs with an exported interface so declaration emit can name hook results
  (RN 0.88 aliases TextInputInstance to an unexported class).
- Expo Router 58 drains back() after a commit; check the interrupted push's exit from the
  frame it starts, bounded to three frames of lag.

* chore(mobile): justify the text input handle interface for React Doctor

* chore(mobile): use a nameable intersection alias for text input refs

* fix(mobile): use sync expo-file-system writes, copies and moves on Expo 58

Expo 58 made File.write/copy/move and FileHandle.writeBytes return promises.
Our callers never awaited them, so failures escaped their try/catch and the
store's tmp-then-move and PDF writes could race their close or rename.

* build(mobile): raise the page bundle budget to 10 MiB for Expo 58

Expo 58 adds about 310 KB to the page: expo-router (+258 KB, now carrying
React Navigation, net about +110 KB) and Reanimated 4.7 (+152 KB). Main had
85 KB of headroom left. 10 MiB still stays within the 10 MiB per-asset contract.

* fix(mobile): drop the window-metrics seed RN 0.88 removed from Android

RN 0.88 no longer holds window metrics: DeviceInfoModule reads the activity's
WindowMetrics on demand and setWindowDisplayMetrics is gone, so MainActivity
no longer compiled. Layout scale still comes from the screen metrics we reseed.

---------

Co-authored-by: Kelvin Amoaba <97001695+AmoabaKelvin@users.noreply.github.com>
2026-11-11 23:30:02 +00:00

94 lines
3.1 KiB
TypeScript

import { StyleSheet, type ImageStyle, type TextStyle, type ViewStyle } from 'react-native'
import { getMobileColorScheme, radii, type MobileColorScheme } from './mobile-theme'
// RN 0.88's generated types dropped StyleSheet.NamedStyles; this mapped constraint keeps literal inference.
type NamedStyles<T> = { [P in keyof T]: ViewStyle | TextStyle | ImageStyle }
// Module-scope styles that read `colors`: built once per scheme, and every key reads the current scheme's copy.
export function themedStyles<T extends Record<string, unknown>>(create: () => T): T {
const built = new Map<MobileColorScheme, T>()
const current = (): T => {
const scheme = getMobileColorScheme()
let styles = built.get(scheme)
if (styles === undefined) {
styles = create()
built.set(scheme, styles)
}
return styles
}
const live = { ...current() }
for (const key of Object.keys(live)) {
Object.defineProperty(live, key, { enumerable: true, get: () => current()[key] })
}
return live
}
const CORNER_RADIUS_KEYS = [
'borderRadius',
'borderTopLeftRadius',
'borderTopRightRadius',
'borderBottomLeftRadius',
'borderBottomRightRadius'
] as const
const BORDER_WIDTH_KEYS = [
'borderWidth',
'borderTopWidth',
'borderRightWidth',
'borderBottomWidth',
'borderLeftWidth'
] as const
type CornerStyle = {
borderRadius?: unknown
width?: unknown
height?: unknown
overflow?: unknown
} & Partial<Record<(typeof BORDER_WIDTH_KEYS)[number], unknown>>
// Styles that must keep the circular curve: a continuous curve squares off circles and pills, and
// React Native strokes an unclipped visible border on a circular path while filling the background
// with the continuous one, so their edges would not line up.
function keepsCircularCurve(style: CornerStyle): boolean {
const { borderRadius, width, height } = style
if (typeof borderRadius === 'number') {
if (borderRadius >= radii.pill) {
return true
}
if (
typeof width === 'number' &&
typeof height === 'number' &&
borderRadius * 2 >= Math.min(width, height)
) {
return true
}
}
const hasVisibleBorder = BORDER_WIDTH_KEYS.some((key) => {
const value = style[key]
return typeof value === 'number' && value > 0
})
return hasVisibleBorder && style.overflow !== 'hidden'
}
// Every rounded style asks for Apple's continuous corner curve; iOS draws it, Android and the web ignore the key.
// Mutates the fresh objects `create()` just built.
function withContinuousCorners<T extends NamedStyles<T>>(styles: T): T {
for (const style of Object.values<ViewStyle | TextStyle | ImageStyle>(styles)) {
if (
style &&
typeof style === 'object' &&
!('borderCurve' in style) &&
CORNER_RADIUS_KEYS.some((key) => key in style) &&
!keepsCircularCurve(style)
) {
Object.assign(style, { borderCurve: 'continuous' })
}
}
return styles
}
// Drop-in for a module-scope `StyleSheet.create` that reads `colors`.
export function themedStyleSheet<T extends NamedStyles<T>>(create: () => T): T {
return themedStyles(() => StyleSheet.create(withContinuousCorners(create())))
}