@mrmeg/expo-ui 0.27.1 → 0.28.0

package/dist/components/ToggleGroup.js

@@ -1,8 +1,12 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { Icon } from "./Icon.js";
-import { TextClassContext, TextColorContext, TextSelectabilityContext } from "./StyledText.context";
+import { TextClassContext, TextColorContext, TextSelectabilityContext } from "./StyledText.context.js";
 import { spacing } from "../constants/spacing.js";
+import { getWebHitInsets, WebHitTarget } from "../lib/webHitTarget.js";
+import { interaction } from "../constants/interaction.js";
+import { hapticSelection } from "../lib/haptics.js";
 import { useTheme } from "../hooks/useTheme.js";
+import { useFocusVisible } from "../hooks/useFocusVisible.js";
 import { useScalePress } from "../hooks/useScalePress.js";
 import * as ToggleGroupPrimitive from "@rn-primitives/toggle-group";
 import * as React from "react";
@@ -67,17 +71,26 @@ function useToggleGroupContext() {
 function ToggleGroup({ variant = "default", size = "default", children, ...props }) {
     const { getShadowStyle } = useTheme();
     const contextValue = React.useMemo(() => ({ variant, size }), [variant, size]);
+    // The primitive reports a change once per user selection (single or
+    // multiple), which is the selection-haptic moment; forward it unchanged.
+    const { onValueChange } = props;
+    const handleValueChange = React.useCallback((value) => {
+        hapticSelection();
+        onValueChange?.(value);
+    }, [onValueChange]);
     // Count valid children for first/last detection
     const childrenArray = React.Children.toArray(children);
     const validChildren = childrenArray.filter((child) => React.isValidElement(child) && child.type === ToggleGroupItem);
     const childCount = validChildren.length;
-    // Clone children with position props
-    let itemIndex = 0;
+    // Clone children with position props. The running item index lives on an
+    // object: the React Compiler can't compile a reassigned `let` captured by
+    // the callback, and skipped the component.
+    const position = { itemIndex: 0 };
     const enhancedChildren = React.Children.map(children, (child) => {
         if (React.isValidElement(child) && child.type === ToggleGroupItem) {
-            const isFirst = itemIndex === 0;
-            const isLast = itemIndex === childCount - 1;
-            itemIndex++;
+            const isFirst = position.itemIndex === 0;
+            const isLast = position.itemIndex === childCount - 1;
+            position.itemIndex += 1;
             return React.cloneElement(child, {
                 isFirst,
                 isLast,
@@ -85,7 +98,12 @@ function ToggleGroup({ variant = "default", size = "default", children, ...props
         }
         return child;
     });
-    return (_jsx(ToggleGroupPrimitive.Root, { ...props, style: {
+    // The web primitive's Root/Item render generic roles (Radix's `group`, then
+    // `role='button'` on every item) while Radix still emits `aria-checked` for a
+    // single-select item — invalid on a button. Name the roles the way native
+    // already does: a radiogroup of radios, or a group of (aria-pressed) buttons.
+    const webRoles = Platform.OS === "web" ? { role: props.type === "single" ? "radiogroup" : "group" } : undefined;
+    return (_jsx(ToggleGroupPrimitive.Root, { ...props, ...webRoles, onValueChange: handleValueChange, style: {
             flexDirection: "row",
             alignItems: "center",
             borderRadius: spacing.radiusMd,
@@ -104,33 +122,17 @@ function ToggleGroup({ variant = "default", size = "default", children, ...props
 function ToggleGroupItem({ isFirst = false, isLast = false, children, ...props }) {
     const { theme, withAlpha, getContrastingColor, getFocusRingStyle } = useTheme();
     const context = useToggleGroupContext();
-    const { value: groupValue } = ToggleGroupPrimitive.useRootContext();
+    const { value: groupValue, type: groupType } = ToggleGroupPrimitive.useRootContext();
+    // See ToggleGroup: give the web item the role its aria state is valid on.
+    const webRole = Platform.OS === "web" ? { role: groupType === "single" ? "radio" : "button" } : undefined;
     const sizeConfig = TOGGLE_GROUP_SIZES[context.size];
     const focusRingStyle = getFocusRingStyle();
-    const [focused, setFocused] = React.useState(false);
     const { animatedStyle: scaleStyle, pressHandlers } = useScalePress({
         disabled: !!props.disabled,
-        scaleTo: 0.97,
+        scaleTo: interaction.pressedScale,
         haptic: false,
     });
-    const showFocusRing = (event) => {
-        let ringVisible = true;
-        if (Platform.OS === "web") {
-            const target = event?.nativeEvent?.target;
-            if (target && typeof target.matches === "function") {
-                try {
-                    ringVisible = target.matches(":focus-visible");
-                }
-                catch {
-                    ringVisible = true;
-                }
-            }
-        }
-        setFocused(ringVisible);
-    };
-    const hideFocusRing = () => {
-        setFocused(false);
-    };
+    const { focused, onFocus: showFocusRing, onBlur: hideFocusRing } = useFocusVisible();
     // Check if this item is selected
     const isSelected = ToggleGroupPrimitive.utils.getIsSelected(groupValue, props.value);
     // Determine the actual background color for this item
@@ -145,7 +147,10 @@ function ToggleGroupItem({ isFirst = false, isLast = false, children, ...props }
     const textColor = isSelected
         ? getContrastingColor(itemBgColor, theme.colors.foreground, theme.colors.background)
         : theme.colors.foreground;
-    return (_jsx(TextColorContext.Provider, { value: textColor, children: _jsx(TextClassContext.Provider, { value: "", children: _jsx(Animated.View, { style: scaleStyle, children: _jsx(ToggleGroupPrimitive.Item, { ...props, onPressIn: pressHandlers.onPressIn, onPressOut: pressHandlers.onPressOut, onFocus: showFocusRing, onBlur: hideFocusRing, style: {
+    // Web pointer target, as in Toggle: 44pt tall through a transparent child
+    // inside the drawn box; native keeps DEFAULT_HIT_SLOP.
+    const hitTarget = (_jsx(WebHitTarget, { insets: Platform.OS === "web" ? getWebHitInsets(undefined, sizeConfig.height) : null, border: styles.item.borderWidth }));
+    return (_jsx(TextColorContext.Provider, { value: textColor, children: _jsx(TextClassContext.Provider, { value: "", children: _jsx(Animated.View, { style: scaleStyle, children: _jsx(ToggleGroupPrimitive.Item, { ...props, ...webRole, onPressIn: pressHandlers.onPressIn, onPressOut: pressHandlers.onPressOut, onFocus: showFocusRing, onBlur: hideFocusRing, style: {
                         ...styles.item,
                         height: sizeConfig.height,
                         minWidth: sizeConfig.minWidth,
@@ -199,13 +204,13 @@ function ToggleGroupItem({ isFirst = false, isLast = false, children, ...props }
                             }),
                         }),
                         ...(focused && !props.disabled ? focusRingStyle : null),
-                    }, hitSlop: DEFAULT_HIT_SLOP, children: typeof children === "function" ? ((state) => (_jsx(TextSelectabilityContext.Provider, { value: false, children: children(state) }))) : (_jsx(TextSelectabilityContext.Provider, { value: false, children: children })) }) }) }) }));
+                    }, hitSlop: DEFAULT_HIT_SLOP, children: typeof children === "function" ? ((state) => (_jsxs(_Fragment, { children: [_jsx(TextSelectabilityContext.Provider, { value: false, children: children(state) }), hitTarget] }))) : (_jsxs(_Fragment, { children: [_jsx(TextSelectabilityContext.Provider, { value: false, children: children }), hitTarget] })) }) }) }) }));
 }
 function ToggleGroupIcon({ name, size, color }) {
     const contextColor = React.use(TextColorContext);
     return _jsx(Icon, { name: name, size: size || spacing.iconMd, color: color || contextColor });
 }
-const styles = StyleSheet.create({
+const styles = /*#__PURE__*/ StyleSheet.create({
     item: {
         flexDirection: "row",
         alignItems: "center",

package/dist/components/Tooltip.d.ts

@@ -73,7 +73,7 @@ interface TooltipProps extends TooltipPrimitive.RootProps {
  * // With positioning
  * <Tooltip>
  *   <TooltipTrigger asChild>
- *     <Icon as={Info} size={20} />
+ *     <Icon name="info" size={20} />
  *   </TooltipTrigger>
  *   <TooltipContent side="bottom" align="start">
  *     <StyledText>Information tooltip</StyledText>

package/dist/components/Tooltip.js

@@ -2,12 +2,18 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from "react";
 import { Platform, StyleSheet, View } from "react-native";
 import { AnimatedView } from "./AnimatedView.js";
-import { TextClassContext, TextColorContext, TextSelectabilityContext } from "./StyledText.context";
+import { TextClassContext, TextColorContext, TextSelectabilityContext } from "./StyledText.context.js";
 import { useTheme } from "../hooks/useTheme.js";
 import { spacing } from "../constants/spacing.js";
 import * as TooltipPrimitive from "@rn-primitives/tooltip";
 import { FullWindowOverlay as RNFullWindowOverlay } from "react-native-screens";
 import { palette } from "../constants/colors.js";
+// The overlay layer covers the screen but must not swallow touches around the
+// content; a style, not the deprecated `pointerEvents` prop (web warns and
+// lazily loads its warning module mid-render).
+const styles = /*#__PURE__*/ StyleSheet.create({
+    passThrough: { pointerEvents: "box-none" },
+});
 /**
  * Tooltip Trigger Component
  * The element that triggers the tooltip to appear on hover (web) or press (native)
@@ -71,7 +77,7 @@ function TooltipContent({ side = "top", align = "center", sideOffset = 4, portal
             ...getShadowStyle("soft"),
         },
     ]) ?? undefined;
-    return (_jsx(TooltipPrimitive.Portal, { hostName: portalHost, children: _jsx(FullWindowOverlay, { children: _jsx(TooltipPrimitive.Overlay, { style: Platform.select({ native: StyleSheet.absoluteFill }), children: _jsx(AnimatedView, { type: "fade", enterDuration: 150, style: StyleSheet.absoluteFill, pointerEvents: "box-none", children: _jsx(TextColorContext.Provider, { value: colors.text, children: _jsx(TextClassContext.Provider, { value: "", children: _jsx(TextSelectabilityContext.Provider, { value: false, children: _jsx(TooltipPrimitive.Content, { side: side, align: align, sideOffset: sideOffset, style: contentStyle, ...props }) }) }) }) }) }) }) }));
+    return (_jsx(TooltipPrimitive.Portal, { hostName: portalHost, children: _jsx(FullWindowOverlay, { children: _jsx(TooltipPrimitive.Overlay, { style: Platform.select({ native: StyleSheet.absoluteFill }), children: _jsx(AnimatedView, { type: "fade", enterDuration: 150, style: [StyleSheet.absoluteFill, styles.passThrough], children: _jsx(TextColorContext.Provider, { value: colors.text, children: _jsx(TextClassContext.Provider, { value: "", children: _jsx(TextSelectabilityContext.Provider, { value: false, children: _jsx(TooltipPrimitive.Content, { side: side, align: align, sideOffset: sideOffset, style: contentStyle, ...props }) }) }) }) }) }) }) }));
 }
 function TooltipBody({ children, style, ...props }) {
     return (_jsx(View, { style: [
@@ -101,7 +107,7 @@ function TooltipBody({ children, style, ...props }) {
  * // With positioning
  * <Tooltip>
  *   <TooltipTrigger asChild>
- *     <Icon as={Info} size={20} />
+ *     <Icon name="info" size={20} />
  *   </TooltipTrigger>
  *   <TooltipContent side="bottom" align="start">
  *     <StyledText>Information tooltip</StyledText>

package/dist/components/UIProvider.d.ts

@@ -1,5 +1,7 @@
 import * as React from "react";
-import { type KeyboardAvoidingViewProps } from "./KeyboardAvoidingView";
+import { type HapticsSetting } from "../state/feedbackStore.js";
+import type { ResolvedTheme } from "../state/themeStore.js";
+import { type KeyboardAvoidingViewProps } from "./KeyboardAvoidingView.js";
 export interface UIProviderProps {
     children: React.ReactNode;
     /**
@@ -30,5 +32,23 @@ export interface UIProviderProps {
      * Props forwarded to the keyboard-avoiding root when enabled.
      */
     keyboardAvoidingProps?: Omit<KeyboardAvoidingViewProps, "children">;
+    /**
+     * Which interactions may vibrate on native: `"off"`, `"selection"` (state
+     * changes on Switch, Checkbox, Toggle, ToggleGroup, SegmentedControl) or
+     * `"all"` (selection plus a light tap on press for Button, pressable Card
+     * and Item). Written to the feedback store on mount and whenever it changes;
+     * omit it to leave the store as it is. Web never vibrates.
+     *
+     * @default "selection"
+     */
+    haptics?: HapticsSetting;
+    /**
+     * The scheme the first render should use before the persisted preference
+     * has been read (a web SSR hint — see `InitialSchemeProvider` in
+     * `@mrmeg/expo-ui/state`). Only reaches `useTheme()` calls BELOW this
+     * provider; a root layout that reads the theme above it should wrap itself
+     * in `InitialSchemeProvider` instead. Native ignores it.
+     */
+    initialScheme?: ResolvedTheme;
 }
-export declare function UIProvider({ children, notification, portalHost, statusBar, keyboardAvoiding, keyboardAvoidingProps, }: UIProviderProps): React.JSX.Element;
+export declare function UIProvider({ children, notification, portalHost, statusBar, keyboardAvoiding: keyboardAvoidingProp, keyboardAvoidingProps, haptics, initialScheme, }: UIProviderProps): React.JSX.Element;

package/dist/components/UIProvider.js

@@ -1,11 +1,23 @@
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import * as React from "react";
 import { Platform } from "react-native";
+import { useFeedbackStore } from "../state/feedbackStore.js";
+import { InitialSchemeProvider } from "../state/initialScheme.js";
 import { PortalHost } from "@rn-primitives/portal";
 import { Notification } from "./Notification.js";
 import { StatusBar } from "./StatusBar.js";
 import { KeyboardAvoidingView, } from "./KeyboardAvoidingView.js";
-export function UIProvider({ children, notification = true, portalHost = true, statusBar = true, keyboardAvoiding = Platform.OS !== "web", keyboardAvoidingProps, }) {
+export function UIProvider({ children, notification = true, portalHost = true, statusBar = true, keyboardAvoiding: keyboardAvoidingProp, keyboardAvoidingProps, haptics, initialScheme, }) {
+    // Controls read the setting at event time (`hapticPress` / `hapticSelection`),
+    // so an effect is early enough; no child renders differently because of it.
+    React.useEffect(() => {
+        if (haptics !== undefined)
+            useFeedbackStore.getState().setHaptics(haptics);
+    }, [haptics]);
+    // Resolved in the body rather than as a default parameter: the React
+    // Compiler can't reorder a computed default, and skipped the component.
+    const keyboardAvoiding = keyboardAvoidingProp === undefined ? Platform.OS !== "web" : keyboardAvoidingProp;
     const { style: keyboardAvoidingStyle, ...restKeyboardAvoidingProps } = keyboardAvoidingProps ?? {};
     const content = keyboardAvoiding ? (_jsx(KeyboardAvoidingView, { style: [{ flex: 1 }, keyboardAvoidingStyle], ...restKeyboardAvoidingProps, children: children })) : (children);
-    return (_jsxs(_Fragment, { children: [content, notification ? _jsx(Notification, {}) : null, portalHost ? _jsx(PortalHost, {}) : null, statusBar ? _jsx(StatusBar, {}) : null] }));
+    return (_jsxs(InitialSchemeProvider, { scheme: initialScheme, children: [content, notification ? _jsx(Notification, {}) : null, portalHost ? _jsx(PortalHost, {}) : null, statusBar ? _jsx(StatusBar, {}) : null] }));
 }

package/dist/components/bottomSheetDismiss.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Dismiss-complete detection for `BottomSheet.onDismissed` on web.
+ *
+ * `@expo/ui`'s web sheet is an HTML `<dialog>`. When the sheet's `index` goes
+ * to -1 it fires `onClose` synchronously, then plays its exit animation and
+ * calls `dialog.close()` on `animationend` (a 400 ms fallback timer covers a
+ * missed event; `prefers-reduced-motion` closes at once). The hosted RN column
+ * is a descendant of that element and stays mounted through the exit, so the
+ * element's standard `close` event is the moment the sheet is gone. iOS and
+ * Android need none of this: there `@expo/ui`'s close callback is already
+ * post-dismissal (see `BottomSheet.tsx`).
+ */
+/**
+ * Call `callback` once the `<dialog>` enclosing `node` has closed. Fires on the
+ * same tick when there is no enclosing dialog (or no DOM node) or the dialog
+ * is already closed. Returns a cancel function that removes the pending
+ * listener without firing.
+ */
+export declare function awaitDialogClose(node: unknown, callback: () => void): () => void;

package/dist/components/bottomSheetDismiss.js

@@ -0,0 +1,44 @@
+/**
+ * Dismiss-complete detection for `BottomSheet.onDismissed` on web.
+ *
+ * `@expo/ui`'s web sheet is an HTML `<dialog>`. When the sheet's `index` goes
+ * to -1 it fires `onClose` synchronously, then plays its exit animation and
+ * calls `dialog.close()` on `animationend` (a 400 ms fallback timer covers a
+ * missed event; `prefers-reduced-motion` closes at once). The hosted RN column
+ * is a descendant of that element and stays mounted through the exit, so the
+ * element's standard `close` event is the moment the sheet is gone. iOS and
+ * Android need none of this: there `@expo/ui`'s close callback is already
+ * post-dismissal (see `BottomSheet.tsx`).
+ */
+function findEnclosingDialog(node) {
+    const closest = node
+        ?.closest;
+    if (typeof closest !== "function")
+        return null;
+    const dialog = closest.call(node, "dialog");
+    if (!dialog ||
+        typeof dialog.addEventListener !== "function" ||
+        typeof dialog.removeEventListener !== "function") {
+        return null;
+    }
+    return dialog;
+}
+/**
+ * Call `callback` once the `<dialog>` enclosing `node` has closed. Fires on the
+ * same tick when there is no enclosing dialog (or no DOM node) or the dialog
+ * is already closed. Returns a cancel function that removes the pending
+ * listener without firing.
+ */
+export function awaitDialogClose(node, callback) {
+    const dialog = findEnclosingDialog(node);
+    if (!dialog || !dialog.open) {
+        callback();
+        return () => { };
+    }
+    const onClose = () => {
+        dialog.removeEventListener("close", onClose);
+        callback();
+    };
+    dialog.addEventListener("close", onClose);
+    return () => dialog.removeEventListener("close", onClose);
+}

package/dist/components/index.d.ts

@@ -1,44 +1,46 @@
-export * from "./Accordion";
-export * from "./Alert";
-export * from "./AnimatedView";
-export * from "./Avatar";
-export * from "./Badge";
-export * from "./BottomSheet";
-export * from "./Button";
-export * from "./Card";
-export * from "./Carousel";
-export * from "./Checkbox";
-export * from "./Collapsible";
-export * from "./Dialog";
-export * from "./DismissKeyboard";
-export * from "./keyboardDismiss";
-export * from "./Drawer";
-export * from "./DropdownMenu";
-export * from "./EmptyState";
-export * from "./ErrorBoundary";
-export * from "./Icon";
-export * from "./InputOTP";
-export * from "./Item";
-export * from "./KeyboardAvoidingView";
-export * from "./Label";
-export * from "./MaxWidthContainer";
-export * from "./Notification";
-export * from "./Popover";
-export * from "./Progress";
-export * from "./RadioGroup";
-export * from "./SectionHeader";
-export * from "./SegmentedControl";
-export * from "./Select";
-export * from "./Separator";
-export * from "./Skeleton";
-export * from "./Slider";
-export * from "./StatCard";
-export * from "./StatusBar";
-export * from "./StyledText";
-export * from "./Switch";
-export * from "./Tabs";
-export * from "./TextInput";
-export * from "./Toggle";
-export * from "./ToggleGroup";
-export * from "./Tooltip";
-export * from "./UIProvider";
+export * from "./Accordion.js";
+export * from "./Alert.js";
+export * from "./AnimatedView.js";
+export * from "./Avatar.js";
+export * from "./Badge.js";
+export * from "./BottomSheet.js";
+export * from "./Button.js";
+export * from "./Card.js";
+export * from "./Carousel.js";
+export * from "./Checkbox.js";
+export * from "./Collapsible.js";
+export * from "./Dialog.js";
+export * from "./DismissKeyboard.js";
+export * from "./keyboardDismiss.js";
+export * from "./Drawer.js";
+export * from "./DropdownMenu.js";
+export * from "./EmptyState.js";
+export * from "./ErrorBoundary.js";
+export * from "./Hydrated.js";
+export * from "./Icon.js";
+export * from "./InputOTP.js";
+export * from "./Item.js";
+export * from "./KeyboardAvoidingView.js";
+export * from "./Label.js";
+export * from "./MaxWidthContainer.js";
+export * from "./Notification.js";
+export * from "./Screen.js";
+export * from "./Popover.js";
+export * from "./Progress.js";
+export * from "./RadioGroup.js";
+export * from "./SectionHeader.js";
+export * from "./SegmentedControl.js";
+export * from "./Select.js";
+export * from "./Separator.js";
+export * from "./Skeleton.js";
+export * from "./Slider.js";
+export * from "./StatCard.js";
+export * from "./StatusBar.js";
+export * from "./StyledText.js";
+export * from "./Switch.js";
+export * from "./Tabs.js";
+export * from "./TextInput.js";
+export * from "./Toggle.js";
+export * from "./ToggleGroup.js";
+export * from "./Tooltip.js";
+export * from "./UIProvider.js";

package/dist/components/index.js

@@ -16,6 +16,7 @@ export * from "./Drawer.js";
 export * from "./DropdownMenu.js";
 export * from "./EmptyState.js";
 export * from "./ErrorBoundary.js";
+export * from "./Hydrated.js";
 export * from "./Icon.js";
 export * from "./InputOTP.js";
 export * from "./Item.js";
@@ -23,6 +24,7 @@ export * from "./KeyboardAvoidingView.js";
 export * from "./Label.js";
 export * from "./MaxWidthContainer.js";
 export * from "./Notification.js";
+export * from "./Screen.js";
 export * from "./Popover.js";
 export * from "./Progress.js";
 export * from "./RadioGroup.js";

package/dist/components/keyboardDismiss.js

@@ -28,7 +28,7 @@
  * slop; release coordinates also enforce it when move delivery was missed.
  * Cancellation and multitouch drop the tap without rearming another finger.
  */
-import { useMemo, useRef } from "react";
+import { useLayoutEffect, useMemo, useRef } from "react";
 import { Platform } from "react-native";
 import { KeyboardController, useKeyboardState } from "./keyboardController";
 import { dismissKeyboardFocusedInput, hasKeyboardFocusedInput } from "./keyboardFocusRegistry.js";
@@ -164,8 +164,12 @@ function createTapTracker() {
  * for that.
  */
 export function useTextInputSurfaceResponder(focus) {
+    // Latest `focus` for the memoized handlers, synced after each commit (before
+    // any touch can be dispatched) instead of written during render.
     const focusRef = useRef(focus);
-    focusRef.current = focus;
+    useLayoutEffect(() => {
+        focusRef.current = focus;
+    });
     return useMemo(() => {
         const tap = createTapTracker();
         return {
@@ -219,7 +223,9 @@ export function resetAncestorClaimWarningForTests() {
  */
 export function useAncestorClaimWarning(inner, message) {
     const messageRef = useRef(message);
-    messageRef.current = message;
+    useLayoutEffect(() => {
+        messageRef.current = message;
+    });
     return useMemo(() => {
         if (!__DEV__ || Platform.OS !== "android")
             return inner;
@@ -249,7 +255,9 @@ export function useAncestorClaimWarning(inner, message) {
 export function useKeyboardDismissResponder() {
     const isVisible = useKeyboardState((state) => state.isVisible);
     const isVisibleRef = useRef(isVisible);
-    isVisibleRef.current = isVisible;
+    useLayoutEffect(() => {
+        isVisibleRef.current = isVisible;
+    });
     return useMemo(() => {
         if (Platform.OS === "web")
             return {};

package/dist/components/nativeTextField.android.js

@@ -34,7 +34,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * Only `@expo/ui/jetpack-compose` and `@expo/ui/jetpack-compose/modifiers` are
  * imported, both in the peer's export map since SDK 56.
  */
-import { useImperativeHandle, useRef } from "react";
+import { useImperativeHandle, useRef, useState } from "react";
 import { BasicTextField, Box, Text, useNativeState, } from "@expo/ui/jetpack-compose";
 import { fillMaxWidth, onSizeChanged, padding, paddingAll, semantics, testID as testIDModifier, } from "@expo/ui/jetpack-compose/modifiers";
 // region Prop mapping (ported verbatim from @expo/ui's TextInput/utils.ts)
@@ -145,8 +145,10 @@ export function NativeTextField({ ref, value, onChangeText, placeholder, autoFoc
     const numberOfLines = numberOfLinesProp ?? rows;
     const keyboardType = keyboardTypeProp ?? inputModeToKeyboardType(inputMode);
     const returnKeyType = returnKeyTypeProp ?? enterKeyHintToReturnKeyType(enterKeyHint);
-    const initialFallbackRef = useRef(defaultValue ?? "");
-    const fallback = useNativeState(initialFallbackRef.current);
+    // Pinned to the first render's `defaultValue`, as an uncontrolled default
+    // is, whatever `useNativeState` does with a later argument.
+    const [initialFallback] = useState(defaultValue ?? "");
+    const fallback = useNativeState(initialFallback);
     const state = (value ?? fallback);
     const innerRef = useRef(null);
     const isFocusedRef = useRef(false);
@@ -176,12 +178,14 @@ export function NativeTextField({ ref, value, onChangeText, placeholder, autoFoc
     // Sticky for the life of the mounted field: revealing a password
     // (`secureTextEntry` -> false on the same element) must keep the password
     // keyboard options unchanged so the IME neither restarts nor starts
-    // suggesting/learning the now-visible text. Written during render like the
-    // wrapper's own `activeSecureRef`; a fresh mount starts from the prop.
-    const everSecureRef = useRef(!!secureTextEntry);
-    if (secureTextEntry)
-        everSecureRef.current = true;
-    const passwordField = everSecureRef.current;
+    // suggesting/learning the now-visible text. The latch is state adjusted
+    // during render (React re-runs this render before committing it), and the
+    // `||` makes the very render that turns secure on already read as a password
+    // field; a fresh mount starts from the prop.
+    const [everSecure, setEverSecure] = useState(!!secureTextEntry);
+    if (secureTextEntry && !everSecure)
+        setEverSecure(true);
+    const passwordField = everSecure || !!secureTextEntry;
     const mappedKeyboardType = keyboardType ? mapKeyboardType(keyboardType) : undefined;
     const resolvedKeyboardType = passwordField
         ? passwordKeyboardType(mappedKeyboardType)

package/dist/constants/colors.d.ts

@@ -1,4 +1,4 @@
-import { navigationFonts } from "./fonts";
+import { navigationFonts } from "./fonts.js";
 /**
  * Raw color palette - use semantic colors in components instead
  *
@@ -38,10 +38,36 @@ declare const palette: {
     readonly red500: "#EF4444";
     readonly red400: "#F87171";
 };
+/**
+ * Extra color tokens an app declares for itself, so it stops keeping a side
+ * palette. Empty here; an app augments it once and the keys become part of
+ * `ThemeColors` everywhere — `setColors`, `ThemeColorScope`,
+ * `useTheme().theme.colors`, `getThemeCssVariables`:
+ *
+ * ```ts
+ * declare module "@mrmeg/expo-ui/constants" {
+ *   interface ThemeColorExtensions {
+ *     brandGold: string;
+ *   }
+ * }
+ * useThemeStore.getState().setColors({
+ *   light: { brandGold: "#c9a227" },
+ *   dark: { brandGold: "#ffe066" },
+ * });
+ * ```
+ *
+ * The package ships no value for an extension key: provide it in both schemes
+ * or the token is `undefined` at runtime in the scheme that lacks it. On web
+ * the built-in tokens are `var(--c-*)` references and extension values are
+ * literals per scheme, so with any override `theme.colors` is a new object
+ * when the scheme changes (the identity caveat every override already has).
+ */
+export interface ThemeColorExtensions {
+}
 /**
  * Semantic color interface - what colors mean in the UI
  */
-export interface ThemeColors {
+export interface ThemeColors extends ThemeColorExtensions {
     surfaceSunken: string;
     background: string;
     foreground: string;
@@ -86,14 +112,21 @@ export interface Colors {
     light: Theme;
     dark: Theme;
 }
+/**
+ * The package's own tokens: `ThemeColors` minus whatever an app added through
+ * `ThemeColorExtensions`. The default palettes, the CSS-variable table and
+ * `resolveRawColor` are typed on this, because the package has no value for an
+ * extension key.
+ */
+export type ThemeColorTokens = Omit<ThemeColors, keyof ThemeColorExtensions>;
 /**
  * Raw hex/rgba theme colors, always literal strings on every platform. Use
  * these for sinks that cannot take CSS `var()` — e.g. `<meta name="theme-color">`,
  * color parsing/math — and for generating the CSS variable definitions below.
  */
 export declare const rawThemeColors: {
-    light: ThemeColors;
-    dark: ThemeColors;
+    light: ThemeColorTokens;
+    dark: ThemeColorTokens;
 };
 /**
  * Resolves a theme color value to a literal color string. On web, theme
@@ -114,7 +147,9 @@ export declare function resolveRawColor(color: string, scheme: "light" | "dark")
  * paint before any theme script stamps `data-theme`.
  *
  * Apps that override brand colors can pass those overrides so the emitted
- * CSS matches their theme.
+ * CSS matches their theme. Extension tokens (`ThemeColorExtensions`) present
+ * in the overrides get a variable too, per scheme that names them; the
+ * package has no default to fall back to for those.
  */
 export declare function getThemeCssVariables(overrides?: {
     light?: Partial<ThemeColors>;

package/dist/constants/colors.js

@@ -139,6 +139,7 @@ const themeColorTokens = Object.keys(lightTheme.colors);
 function cssVarName(token) {
     return `--c-${token.replace(/[A-Z]/g, (c) => `-${c.toLowerCase()}`)}`;
 }
+const themeColorTokenSet = new Set(themeColorTokens);
 // Reverse lookup: "var(--c-surface-sunken)" → "surfaceSunken"
 const varToToken = new Map(themeColorTokens.map((token) => [`var(${cssVarName(token)})`, token]));
 /**
@@ -176,17 +177,27 @@ function toRgbTriplet(value) {
  * paint before any theme script stamps `data-theme`.
  *
  * Apps that override brand colors can pass those overrides so the emitted
- * CSS matches their theme.
+ * CSS matches their theme. Extension tokens (`ThemeColorExtensions`) present
+ * in the overrides get a variable too, per scheme that names them; the
+ * package has no default to fall back to for those.
  */
 export function getThemeCssVariables(overrides) {
-    const declarations = (scheme) => themeColorTokens
-        .map((token) => {
-        const value = overrides?.[scheme]?.[token] ?? rawThemeColors[scheme][token];
+    const extensionTokens = [
+        ...Object.keys(overrides?.light ?? {}),
+        ...Object.keys(overrides?.dark ?? {}),
+    ].filter((token, index, all) => !themeColorTokenSet.has(token) && all.indexOf(token) === index);
+    const declaration = (token, value) => {
         const name = cssVarName(token);
         const rgb = toRgbTriplet(value);
         return `${name}: ${value};${rgb ? ` ${name}-rgb: ${rgb};` : ""}`;
-    })
-        .join("\n      ");
+    };
+    const declarations = (scheme) => [
+        ...themeColorTokens.map((token) => declaration(token, overrides?.[scheme]?.[token] ?? rawThemeColors[scheme][token])),
+        ...extensionTokens.flatMap((token) => {
+            const value = overrides?.[scheme]?.[token];
+            return typeof value === "string" ? [declaration(token, value)] : [];
+        }),
+    ].join("\n      ");
     return `
     :root {
       ${declarations("light")}
@@ -209,10 +220,17 @@ export function getThemeCssVariables(overrides) {
 // values (no CSS engine). The `navigation` maps stay literal on both
 // platforms: @react-navigation internals color-parse their theme values.
 const webVarColors = Object.fromEntries(themeColorTokens.map((token) => [token, `var(${cssVarName(token)})`]));
+// Web: both schemes hold the same `var(--c-*)` references, so they share ONE
+// `colors` object. A scheme switch then keeps `theme.colors` identical, so
+// anything memoized on it keeps its result; the CSS variables do the
+// re-theming. `colors.light` and `colors.dark` stay distinct objects:
+// `dark`, `navigation`, and `fonts` differ per scheme.
+// The base themes carry the package tokens only; extension keys (typed on
+// `ThemeColors` once an app augments it) arrive through `setColors`.
 export const colors = Platform.OS === "web"
     ? {
-        light: { ...lightTheme, colors: { ...webVarColors } },
-        dark: { ...darkTheme, colors: { ...webVarColors } },
+        light: { ...lightTheme, colors: webVarColors },
+        dark: { ...darkTheme, colors: webVarColors },
     }
     : {
         light: lightTheme,