@mrmeg/expo-ui 0.27.0 → 0.28.0

package/dist/components/Switch.js

@@ -2,60 +2,51 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { palette } from "../constants/colors.js";
 import { spacing } from "../constants/spacing.js";
 import { useTheme } from "../hooks/useTheme.js";
-import { hapticLight } from "../lib/haptics.js";
+import { useFocusVisible } from "../hooks/useFocusVisible.js";
+import { hapticSelection } from "../lib/haptics.js";
+import { interaction } from "../constants/interaction.js";
+import { stateSurfaceProps } from "../lib/stateSurface.js";
+import { useAnimatedValue } from "../lib/useAnimatedValue.js";
 import * as SwitchPrimitives from "@rn-primitives/switch";
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useRef } from "react";
 import { ActivityIndicator, Platform, StyleSheet, View, Animated } from "react-native";
 import { StyledText } from "./StyledText.js";
 import { useReducedMotion } from "../hooks/useReduceMotion.js";
 import { useScalePress } from "../hooks/useScalePress.js";
+import { shouldUseNativeDriver } from "../lib/animations.js";
+import { useItemControlLabel } from "./Item.js";
 const DEFAULT_HIT_SLOP = 8;
-function Switch({ variant = "default", labelOn, labelOff, size = { width: 44, height: 24 }, thumbSize = 20, loading = false, style: styleOverride, ...props }) {
+function Switch({ variant = "default", labelOn, labelOff, size = { width: 44, height: 24 }, thumbSize = 20, loading = false, style: styleOverride, onCheckedChange, ...props }) {
     const { theme, getContrastingColor, getShadowStyle, getFocusRingStyle, withAlpha } = useTheme();
     const reduceMotion = useReducedMotion();
     const hasMounted = useRef(false);
-    const [focused, setFocused] = useState(false);
     const focusRingStyle = getFocusRingStyle();
     const { animatedStyle: scaleStyle, pressHandlers } = useScalePress({
         disabled: !!props.disabled,
-        scaleTo: 0.92,
+        scaleTo: interaction.controlPressedScale,
         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();
+    // Inside an Item row with no label of its own, the switch is named by the
+    // row title (aria-labelledby on web, accessibilityLabel on native).
+    const rowLabel = useItemControlLabel(props);
     // Fire haptic on user-initiated toggles (skip initial mount)
     const wrappedOnCheckedChange = useCallback((checked) => {
         if (hasMounted.current)
-            hapticLight();
-        props.onCheckedChange?.(checked);
-    }, [props.onCheckedChange]);
+            hapticSelection();
+        onCheckedChange?.(checked);
+    }, [onCheckedChange]);
     useEffect(() => {
         hasMounted.current = true;
     }, []);
     // Single animated value drives everything: 0 = off, 1 = on
-    const progress = useRef(new Animated.Value(props.checked ? 1 : 0)).current;
+    const progress = useAnimatedValue(props.checked ? 1 : 0);
     useEffect(() => {
         const target = props.checked ? 1 : 0;
         Animated.timing(progress, {
             toValue: target,
             duration: reduceMotion ? 0 : 120,
-            useNativeDriver: true,
+            useNativeDriver: shouldUseNativeDriver,
         }).start();
     }, [props.checked, reduceMotion, progress]);
     // Thumb slides from left to right with equal inset on every side.
@@ -92,7 +83,7 @@ function Switch({ variant = "default", labelOn, labelOff, size = { width: 44, he
     const labelFontSize = size.height / 3;
     // Flatten style override for web compatibility
     const flattenedStyle = styleOverride ? StyleSheet.flatten(styleOverride) : undefined;
-    return (_jsx(Animated.View, { style: scaleStyle, children: _jsxs(SwitchPrimitives.Root, { ...props, onCheckedChange: wrappedOnCheckedChange, onPressIn: pressHandlers.onPressIn, onPressOut: pressHandlers.onPressOut, onFocus: showFocusRing, onBlur: hideFocusRing, style: {
+    return (_jsx(Animated.View, { style: scaleStyle, children: _jsxs(SwitchPrimitives.Root, { ...rowLabel, ...props, onCheckedChange: wrappedOnCheckedChange, onPressIn: pressHandlers.onPressIn, onPressOut: pressHandlers.onPressOut, onFocus: showFocusRing, onBlur: hideFocusRing, style: {
                 position: "relative",
                 width: size.width,
                 height: size.height,
@@ -113,7 +104,7 @@ function Switch({ variant = "default", labelOn, labelOff, size = { width: 44, he
                         borderWidth: 1,
                         borderColor: trackBorderColor,
                         pointerEvents: "none",
-                    } }), labelOn && !isIOS && (_jsx(View, { style: {
+                    } }), labelOn && !isIOS && (_jsx(View, { ...stateSurfaceProps(), style: {
                         ...styles.label,
                         left: labelHorizontalInset,
                         right: thumbInset + thumbSize + labelGap,
@@ -136,7 +127,7 @@ function Switch({ variant = "default", labelOn, labelOff, size = { width: 44, he
                                 ...getShadowStyle("subtle"),
                             },
                             thumbAnimatedStyle,
-                        ], children: loading && (_jsx(ActivityIndicator, { size: "small", color: thumbIndicatorColor })) }) }), labelOff && !isIOS && (_jsx(View, { style: {
+                        ], children: loading && (_jsx(ActivityIndicator, { size: "small", color: thumbIndicatorColor })) }) }), labelOff && !isIOS && (_jsx(View, { ...stateSurfaceProps(), style: {
                         ...styles.label,
                         left: thumbInset + thumbSize + labelGap,
                         right: labelHorizontalInset,
@@ -147,7 +138,7 @@ function Switch({ variant = "default", labelOn, labelOff, size = { width: 44, he
                             userSelect: "none",
                         }, children: labelOff }) }))] }) }));
 }
-const styles = StyleSheet.create({
+const styles = /*#__PURE__*/ StyleSheet.create({
     label: {
         position: "absolute",
         top: 0,

package/dist/components/Tabs.d.ts

@@ -1,8 +1,8 @@
 import * as React from "react";
 import { type StyleProp, type ViewStyle } from "react-native";
 import * as TabsPrimitive from "@rn-primitives/tabs";
-import { StyledText } from "./StyledText";
-import { type IconName } from "./Icon";
+import { StyledText } from "./StyledText.js";
+import { type IconName } from "./Icon.js";
 type TabsVariant = "underline" | "pill";
 type TabsSize = "sm" | "md";
 export interface TabsProps extends TabsPrimitive.RootProps {

package/dist/components/Tabs.js

@@ -3,12 +3,15 @@ import * as React from "react";
 import { Animated, Platform, StyleSheet, View } from "react-native";
 import * as TabsPrimitive from "@rn-primitives/tabs";
 import { StyledText } from "./StyledText.js";
-import { TextClassContext, TextColorContext } from "./StyledText.context";
+import { TextClassContext, TextColorContext } from "./StyledText.context.js";
 import { Icon } from "./Icon.js";
 import { useTheme } from "../hooks/useTheme.js";
+import { useFocusVisible } from "../hooks/useFocusVisible.js";
 import { useReducedMotion } from "../hooks/useReduceMotion.js";
 import { useScalePress } from "../hooks/useScalePress.js";
+import { useAnimatedValue } from "../lib/useAnimatedValue.js";
 import { spacing } from "../constants/spacing.js";
+import { shouldUseNativeDriver } from "../lib/animations.js";
 // ============================================================================
 // Size configs
 // ============================================================================
@@ -65,12 +68,12 @@ function TabsTriggerInner({ icon, style, children, value, ...props }) {
     // Determine selected state by comparing trigger value with root value
     const rootContext = TabsPrimitive.useRootContext();
     const isSelected = rootContext.value === value;
-    const activeOpacity = React.useRef(new Animated.Value(isSelected ? 1 : 0)).current;
+    const activeOpacity = useAnimatedValue(isSelected ? 1 : 0);
     React.useEffect(() => {
         Animated.timing(activeOpacity, {
             toValue: isSelected ? 1 : 0,
             duration: reduceMotion ? 0 : 200,
-            useNativeDriver: true,
+            useNativeDriver: shouldUseNativeDriver,
         }).start();
     }, [isSelected, reduceMotion, activeOpacity]);
     const textColor = isDisabled
@@ -79,32 +82,18 @@ function TabsTriggerInner({ icon, style, children, value, ...props }) {
             ? theme.colors.foreground
             : theme.colors.mutedForeground;
     const focusRingStyle = getFocusRingStyle();
-    const [focused, setFocused] = React.useState(false);
     const { animatedStyle: scaleStyle, pressHandlers } = useScalePress({
         disabled: isDisabled,
         scaleTo: 0.97,
         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();
     const triggerBaseStyle = {
-        flex: 1,
+        // The wrapper below shares the list's width (`flex: 1` on the row axis);
+        // the trigger only fills it. `flex: 1` here would act on the wrapper's
+        // column axis, where a 0% basis in an indefinite-height parent collapses
+        // the trigger to its text (16px tall on web, under the 36px it declares).
+        alignSelf: "stretch",
         // Allow the trigger to shrink below its content's intrinsic width so long
         // labels are constrained to the trigger's flex share (and can ellipsize)
         // instead of overflowing and clipping at the screen edge.
@@ -165,7 +154,7 @@ function TabsContent({ style, children, ...props }) {
 // ============================================================================
 // Styles
 // ============================================================================
-const triggerContentStyles = StyleSheet.create({
+const triggerContentStyles = /*#__PURE__*/ StyleSheet.create({
     container: {
         flexDirection: "row",
         alignItems: "center",

package/dist/components/TextInput.d.ts

@@ -120,7 +120,7 @@ interface TextInputCustomProps extends TextInputProps {
  * // With custom elements
  * <TextInput
  *   label="Search"
- *   leftElement={<Icon as={Search} size={20} />}
+ *   leftElement={<Icon name="search" size={20} />}
  * />
  * ```
  */

package/dist/components/TextInput.js

@@ -1,19 +1,37 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useEffect, useCallback, useImperativeHandle, useMemo, useRef, useState, } from "react";
+import { useEffect, useCallback, useImperativeHandle, useLayoutEffect, useMemo, useRef, useState, } from "react";
 import { StyleSheet, TextInput as RNTextInput, Platform, View, Pressable, } from "react-native";
 import { Host, useNativeState, } from "@expo/ui";
 import { NativeTextField } from "./nativeTextField";
 import { useTheme } from "../hooks/useTheme.js";
+import { shapeRadius, useShape } from "../hooks/useShape.js";
 import { spacing } from "../constants/spacing.js";
+import { interaction } from "../constants/interaction.js";
 import { useFontStyle } from "../hooks/useFontStyle.js";
 import { StyledText } from "./StyledText.js";
 import { Icon } from "./Icon.js";
 import { hapticLight } from "../lib/haptics.js";
 import { createThemedStyles } from "../lib/themedStyles.js";
+import { stateSurfaceProps } from "../lib/stateSurface.js";
 import { palette } from "../constants/colors.js";
 import { clearKeyboardFocusedInput, setKeyboardFocusedInput, } from "./keyboardFocusRegistry.js";
 import { useTextInputSurfaceResponder } from "./keyboardDismiss.js";
 const NUMERIC_REGEX = /^[0-9]*$/;
+/**
+ * Write the `@expo/ui` observable text buffer. `set()` is the React
+ * Compiler-friendly writer (`@expo/ui` >= 56.0.17); earlier releases in the
+ * peer range only have the `value` setter, which calls the same native
+ * `setValue`. Kept outside the component so the compiler doesn't see a hook
+ * result being mutated, which made it skip `NativeTextInput` entirely.
+ */
+function writeNativeText(state, text) {
+    if (typeof state.set === "function") {
+        state.set(text);
+    }
+    else {
+        state.value = text;
+    }
+}
 /** Platform touch-target guideline (pt); the compact fields sit below it. */
 const MIN_TOUCH_TARGET = 44;
 const SIZE_CONFIGS = {
@@ -76,7 +94,7 @@ const SIZE_CONFIGS = {
  * // With custom elements
  * <TextInput
  *   label="Search"
- *   leftElement={<Icon as={Search} size={20} />}
+ *   leftElement={<Icon name="search" size={20} />}
  * />
  * ```
  */
@@ -96,6 +114,8 @@ export function TextInput(props) {
  */
 function WebTextInput({ variant = "outline", size = "md", label, helperText, errorText, error, required, rows, showSecureEntryToggle, leftElement, rightElement, clearable = false, wrapperStyle, focusedStyle, forceLight, secureTextEntry, inputMode, style, onChangeText, onFocus, onBlur, value, multiline, editable = true, ref, ...rest }) {
     const { theme, getContrastingColor, getFocusRingStyle } = useTheme();
+    // Host-app `setShape({ input })`; the underlined variant stays square.
+    const inputRadius = variant === "underlined" ? undefined : shapeRadius(useShape("input"));
     const styles = themedStyles(theme)[variant][size];
     const inputFont = useFontStyle("regular");
     const [focused, setFocused] = useState(false);
@@ -152,8 +172,9 @@ function WebTextInput({ variant = "outline", size = "md", label, helperText, err
     const togglePasswordVisible = () => {
         setPasswordVisible(v => !v);
     };
-    return (_jsxs(View, { style: wrapperStyle, children: [!!label && (_jsx(View, { style: styles.labelContainer, children: _jsxs(StyledText, { selectable: false, size: "base", fontWeight: "medium", style: styles.label, children: [label, required && _jsx(StyledText, { selectable: false, fontWeight: "bold", style: styles.required, children: " *" })] }) })), _jsxs(View, { style: [styles.wrapper, focused && getFocusRingStyle()], children: [leftElement && _jsx(View, { style: styles.leftElement, children: leftElement }), _jsx(RNTextInput, { ref: ref, ...rest, editable: editable, inputMode: inputMode || "text", multiline: multiline, numberOfLines: rows, secureTextEntry: secureTextEntry && !passwordVisible, onChangeText: inputMode === "numeric" ? handleNumericChange : handleTextChange, onFocus: showInputFocusRing, onBlur: hideInputFocusRing, onContentSizeChange: (e) => setContentHeight(e.nativeEvent.contentSize.height), scrollEnabled: shouldScroll, placeholderTextColor: theme.colors.textDim, style: [
+    return (_jsxs(View, { style: wrapperStyle, children: [!!label && (_jsx(View, { style: styles.labelContainer, children: _jsxs(StyledText, { selectable: false, size: "base", fontWeight: "medium", style: styles.label, children: [label, required && _jsx(StyledText, { selectable: false, fontWeight: "bold", style: styles.required, children: " *" })] }) })), _jsxs(View, { style: [styles.wrapper, inputRadius, focused && getFocusRingStyle()], children: [leftElement && _jsx(View, { style: styles.leftElement, children: leftElement }), _jsx(RNTextInput, { ref: ref, ...rest, editable: editable, inputMode: inputMode || "text", multiline: multiline, numberOfLines: rows, secureTextEntry: secureTextEntry && !passwordVisible, onChangeText: inputMode === "numeric" ? handleNumericChange : handleTextChange, onFocus: showInputFocusRing, onBlur: hideInputFocusRing, onContentSizeChange: (e) => setContentHeight(e.nativeEvent.contentSize.height), scrollEnabled: shouldScroll, placeholderTextColor: theme.colors.textDim, style: [
                             styles.input,
+                            inputRadius,
                             // Resolved through the theme store so `setFonts` overrides apply;
                             // identical to the old hardcoded regular family by default.
                             inputFont,
@@ -180,7 +201,7 @@ function WebTextInput({ variant = "outline", size = "md", label, helperText, err
                         }, accessibilityLabel: "Clear input", accessibilityRole: "button", children: _jsx(Icon, { name: "x", size: spacing.iconSm, color: "textDim", decorative: true }) })), showClearButton && rightElement && !hasSecureToggle && (_jsxs(View, { style: styles.rightElements, children: [_jsx(Pressable, { onPress: () => {
                                     hapticLight();
                                     onChangeText?.("");
-                                }, accessibilityLabel: "Clear input", accessibilityRole: "button", children: _jsx(Icon, { name: "x", size: spacing.iconSm, color: "textDim", decorative: true }) }), rightElement] })), !showClearButton && rightElement && !hasSecureToggle && (_jsx(View, { style: styles.rightElement, children: rightElement })), secureTextEntry && showSecureEntryToggle && (_jsx(Pressable, { style: styles.passwordToggle, onPress: togglePasswordVisible, accessibilityLabel: passwordVisible ? "Hide password" : "Show password", accessibilityRole: "button", children: _jsx(Icon, { name: passwordVisible ? "eye-off" : "eye", size: spacing.iconSm + 4, color: "textDim" }) })), showErrorIcon && (_jsx(View, { style: [styles.errorIcon, { pointerEvents: "none" }], accessibilityLabel: "Error", children: _jsx(Icon, { name: "circle-alert", size: spacing.iconSm, color: "destructive", decorative: true }) }))] }), !!(helperText || errorText) && (_jsx(StyledText, { selectable: false, size: "sm", style: [
+                                }, accessibilityLabel: "Clear input", accessibilityRole: "button", children: _jsx(Icon, { name: "x", size: spacing.iconSm, color: "textDim", decorative: true }) }), rightElement] })), !showClearButton && rightElement && !hasSecureToggle && (_jsx(View, { style: styles.rightElement, children: rightElement })), secureTextEntry && showSecureEntryToggle && (_jsx(Pressable, { style: styles.passwordToggle, onPress: togglePasswordVisible, accessibilityLabel: passwordVisible ? "Hide password" : "Show password", accessibilityRole: "button", children: _jsx(Icon, { name: passwordVisible ? "eye-off" : "eye", size: spacing.iconSm + 4, color: "textDim", decorative: true }) })), showErrorIcon && (_jsx(View, { style: [styles.errorIcon, { pointerEvents: "none" }], accessibilityLabel: "Error", children: _jsx(Icon, { name: "circle-alert", size: spacing.iconSm, color: "destructive", decorative: true }) }))] }), !!(helperText || errorText) && (_jsx(StyledText, { selectable: false, size: "sm", style: [
                     styles.helperText,
                     hasError && styles.errorText,
                 ], children: errorText || helperText }))] }));
@@ -220,6 +241,7 @@ function NativeTextInput({ variant = "outline", size = "md", label, helperText,
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 leftElement, rightElement, clearable, focusedStyle, style, ...rest }) {
     const { theme, getContrastingColor } = useTheme();
+    const inputShape = useShape("input");
     const styles = themedStyles(theme)[variant][size];
     const inputFont = useFontStyle("regular");
     const [passwordVisible, setPasswordVisible] = useState(false);
@@ -240,8 +262,13 @@ leftElement, rightElement, clearable, focusedStyle, style, ...rest }) {
     const [handoff, setHandoff] = useState(null);
     const handoffRef = useRef(null);
     const isFocusedRef = useRef(false);
+    // Latest flavour for the focus/blur/toggle handlers and the handoff timer,
+    // synced after each commit (before any native event can be dispatched)
+    // instead of written during render.
     const activeSecureRef = useRef(effectiveSecureTextEntry);
-    activeSecureRef.current = effectiveSecureTextEntry;
+    useLayoutEffect(() => {
+        activeSecureRef.current = effectiveSecureTextEntry;
+    });
     // Taps that land while a handoff is in flight are counted and applied (by
     // parity) once it settles.
     const queuedTogglesRef = useRef(0);
@@ -249,7 +276,9 @@ leftElement, rightElement, clearable, focusedStyle, style, ...rest }) {
     // iOS-only per-flavour mount generation. Bumped whenever a flavour becomes
     // the incoming view so React mounts a FRESH native view (whose `autoFocus`
     // will run) instead of reusing one still unmounting from the previous handoff.
-    const generationRef = useRef({ secure: 0, plain: 0 });
+    // State, not a ref: it keys the rendered Host, and the bump lands in the same
+    // batch as the `passwordVisible` flip that makes that flavour incoming.
+    const [generation, setGeneration] = useState({ secure: 0, plain: 0 });
     // Last text the JS side knows about; see handleChangeText.
     const lastTextRef = useRef(value ?? defaultValue ?? "");
     // Armed when the hide toggle hands focus to the SecureField (iOS); see
@@ -262,7 +291,7 @@ leftElement, rightElement, clearable, focusedStyle, style, ...rest }) {
     // programmatic sets); typing already updated `state` natively.
     useEffect(() => {
         if (value !== undefined && value !== state.value) {
-            state.value = value;
+            writeNativeText(state, value);
         }
         if (value !== undefined)
             lastTextRef.current = value;
@@ -347,10 +376,9 @@ leftElement, rightElement, clearable, focusedStyle, style, ...rest }) {
         restoreAfterSecureHandoffRef.current = false;
         const outgoingSecure = activeSecureRef.current;
         if (Platform.OS === "ios") {
-            if (outgoingSecure)
-                generationRef.current.plain += 1;
-            else
-                generationRef.current.secure += 1;
+            setGeneration((current) => outgoingSecure
+                ? { ...current, plain: current.plain + 1 }
+                : { ...current, secure: current.secure + 1 });
         }
         if (Platform.OS === "ios" && isFocusedRef.current) {
             const timer = setTimeout(() => {
@@ -376,7 +404,11 @@ leftElement, rightElement, clearable, focusedStyle, style, ...rest }) {
         }
         setPasswordVisible((v) => !v);
     }, [activeInput, finishHandoff, focusRegistryToken, parentOnBlur]);
-    toggleRef.current = togglePasswordVisible;
+    // `finishHandoff` replays queued taps through this ref (it is declared
+    // before the toggle it calls). Synced after commit, like `activeSecureRef`.
+    useLayoutEffect(() => {
+        toggleRef.current = togglePasswordVisible;
+    }, [togglePasswordVisible]);
     // iOS clears a secure field's existing text on the first keystroke after it
     // becomes first responder (text it did not see typed). Right after the hide
     // toggle hands focus to the SecureField that reads as "type one character,
@@ -395,7 +427,7 @@ leftElement, rightElement, clearable, focusedStyle, style, ...rest }) {
         const next = wipedByKey ? previous + text : wipedByBackspace ? previous.slice(0, -1) : text;
         lastTextRef.current = next;
         if (wiped)
-            state.value = next;
+            writeNativeText(state, next);
         onChangeText?.(next);
     }, [onChangeText, state]);
     useEffect(() => {
@@ -418,13 +450,13 @@ leftElement, rightElement, clearable, focusedStyle, style, ...rest }) {
         focus: () => activeInput()?.focus(),
         blur: () => blurAll(),
         clear: () => {
-            state.value = "";
+            writeNativeText(state, "");
             lastTextRef.current = "";
         },
         isFocused: () => activeInput()?.isFocused() ?? false,
         setNativeProps: (props) => {
             if (typeof props?.text === "string") {
-                state.value = props.text;
+                writeNativeText(state, props.text);
                 lastTextRef.current = props.text;
             }
         },
@@ -451,9 +483,9 @@ leftElement, rightElement, clearable, focusedStyle, style, ...rest }) {
     const surfaceStyle = {
         backgroundColor,
         borderColor,
-        borderRadius: variant === "underlined" ? 0 : spacing.radiusMd,
+        borderRadius: variant === "underlined" ? 0 : inputShape?.borderRadius ?? spacing.radiusMd,
         borderWidth: variant === "outline" ? 1 : 0,
-        opacity: editable === false ? 0.6 : 1,
+        opacity: editable === false ? interaction.disabledOpacity : 1,
         overflow: "hidden",
     };
     // Native field: transparent, padding only. The visible surface is drawn by
@@ -487,7 +519,7 @@ leftElement, rightElement, clearable, focusedStyle, style, ...rest }) {
         fontSize: sizeConfig.fontSize,
         ...(nativeFontFamily ? { fontFamily: nativeFontFamily } : null),
     };
-    return (_jsxs(View, { style: wrapperStyle, children: [!!label && (_jsx(View, { style: styles.labelContainer, children: _jsxs(StyledText, { selectable: false, size: "base", fontWeight: "medium", style: styles.label, children: [label, required && _jsx(StyledText, { selectable: false, fontWeight: "bold", style: styles.required, children: " *" })] }) })), _jsxs(View, { style: [surfaceStyle, hasSecureToggle && styles.nativeRow], hitSlop: { top: surfaceHitSlop, bottom: surfaceHitSlop }, ...surfaceResponderProps, children: [(Platform.OS === "android" ? [effectiveSecureTextEntry] : [true, false]).map((secure) => {
+    return (_jsxs(View, { style: wrapperStyle, children: [!!label && (_jsx(View, { style: styles.labelContainer, children: _jsxs(StyledText, { selectable: false, size: "base", fontWeight: "medium", style: styles.label, children: [label, required && _jsx(StyledText, { selectable: false, fontWeight: "bold", style: styles.required, children: " *" })] }) })), _jsxs(View, { ...stateSurfaceProps(), style: [surfaceStyle, hasSecureToggle && styles.nativeRow], hitSlop: { top: surfaceHitSlop, bottom: surfaceHitSlop }, ...surfaceResponderProps, children: [(Platform.OS === "android" ? [effectiveSecureTextEntry] : [true, false]).map((secure) => {
                         const active = secure === effectiveSecureTextEntry;
                         const outgoing = handoff != null && secure === handoff.outgoingSecure;
                         if (!active && !outgoing)
@@ -502,9 +534,9 @@ leftElement, rightElement, clearable, focusedStyle, style, ...rest }) {
                                 : styles.nativeHostHandoff, pointerEvents: inLayout ? "auto" : "none", accessibilityElementsHidden: !inLayout, importantForAccessibility: inLayout ? "auto" : "no-hide-descendants", children: _jsx(NativeTextField, { ...rest, autoFocus: rest.autoFocus || (handoff != null && active), ref: Platform.OS === "android" ? androidRef : secure ? secureRef : plainRef, value: state, defaultValue: defaultValue, onChangeText: handleChangeText, onFocus: () => handleFocus(secure), onBlur: () => handleBlur(secure), editable: editable, multiline: multiline, rows: rows, inputMode: inputMode, secureTextEntry: secure, placeholderTextColor: theme.colors.textDim, style: boxStyle, textStyle: textStyle }) }, Platform.OS === "android"
                             ? "android"
                             : secure
-                                ? `secure-${generationRef.current.secure}`
-                                : `plain-${generationRef.current.plain}`));
-                    }), hasSecureToggle && (_jsx(Pressable, { style: styles.nativePasswordToggle, onPress: togglePasswordVisible, accessibilityLabel: passwordVisible ? "Hide password" : "Show password", accessibilityRole: "button", children: _jsx(Icon, { name: passwordVisible ? "eye-off" : "eye", size: spacing.iconSm + 4, color: "textDim" }) }))] }), !!(helperText || errorText) && (_jsx(StyledText, { selectable: false, size: "sm", style: [styles.helperText, hasError && styles.errorText], children: errorText || helperText }))] }));
+                                ? `secure-${generation.secure}`
+                                : `plain-${generation.plain}`));
+                    }), hasSecureToggle && (_jsx(Pressable, { style: styles.nativePasswordToggle, onPress: togglePasswordVisible, accessibilityLabel: passwordVisible ? "Hide password" : "Show password", accessibilityRole: "button", children: _jsx(Icon, { name: passwordVisible ? "eye-off" : "eye", size: spacing.iconSm + 4, color: "textDim", decorative: true }) }))] }), !!(helperText || errorText) && (_jsx(StyledText, { selectable: false, size: "sm", style: [styles.helperText, hasError && styles.errorText], children: errorText || helperText }))] }));
 }
 const createStyles = (theme, variant, size) => StyleSheet.create({
     nativeHost: {
@@ -529,6 +561,10 @@ const createStyles = (theme, variant, size) => StyleSheet.create({
     },
     nativePasswordToggle: {
         paddingHorizontal: spacing.xs,
+        minWidth: spacing.minTarget,
+        minHeight: spacing.minTarget,
+        alignItems: "center",
+        justifyContent: "center",
     },
     wrapper: {
         width: "100%",
@@ -554,7 +590,7 @@ const createStyles = (theme, variant, size) => StyleSheet.create({
         borderBottomWidth: 2,
     },
     disabled: {
-        opacity: 0.6,
+        opacity: interaction.disabledOpacity,
         ...(Platform.OS === "web" && { cursor: "not-allowed" }),
     },
     error: {
@@ -596,11 +632,17 @@ const createStyles = (theme, variant, size) => StyleSheet.create({
         transform: [{ translateY: -10 }],
         zIndex: 1,
     },
+    // The eye/clear buttons draw a 16-20px glyph; the pressable itself is at
+    // least `spacing.minTarget` square (WCAG 2.5.8 — `hitSlop` is inert on web).
     passwordToggle: {
         position: "absolute",
-        right: spacing.sm,
+        right: spacing.sm - (spacing.minTarget - 20) / 2,
         top: "50%",
-        transform: [{ translateY: Platform.OS === "web" ? -10 : -12 }],
+        minWidth: spacing.minTarget,
+        minHeight: spacing.minTarget,
+        alignItems: "center",
+        justifyContent: "center",
+        transform: [{ translateY: -spacing.minTarget / 2 }],
         zIndex: 1,
         ...(Platform.OS === "web" && { cursor: "pointer" }),
     },
@@ -613,9 +655,13 @@ const createStyles = (theme, variant, size) => StyleSheet.create({
     },
     clearButton: {
         position: "absolute",
-        right: spacing.sm,
+        right: spacing.sm - (spacing.minTarget - 20) / 2,
         top: "50%",
-        transform: [{ translateY: Platform.OS === "web" ? -10 : -12 }],
+        minWidth: spacing.minTarget,
+        minHeight: spacing.minTarget,
+        alignItems: "center",
+        justifyContent: "center",
+        transform: [{ translateY: -spacing.minTarget / 2 }],
         zIndex: 1,
         ...(Platform.OS === "web" && { cursor: "pointer" }),
     },
@@ -632,7 +678,7 @@ const createStyles = (theme, variant, size) => StyleSheet.create({
 });
 const VARIANT_KEYS = ["outline", "filled", "underlined"];
 const SIZE_KEYS = ["sm", "md", "lg"];
-const themedStyles = createThemedStyles((theme) => Object.fromEntries(VARIANT_KEYS.map((variant) => [
+const themedStyles = /*#__PURE__*/ createThemedStyles((theme) => Object.fromEntries(VARIANT_KEYS.map((variant) => [
     variant,
     Object.fromEntries(SIZE_KEYS.map((size) => [size, createStyles(theme, variant, size)])),
 ])));

package/dist/components/Toggle.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
 import * as TogglePrimitive from "@rn-primitives/toggle";
 import { ViewStyle, StyleProp } from "react-native";
-import type { IconName } from "./Icon";
+import type { IconName } from "./Icon.js";
 export type ToggleVariant = "default" | "outline";
 export type ToggleSize = "sm" | "default" | "lg";
 export type ToggleShape = "default" | "square" | "circle";
@@ -44,47 +44,7 @@ interface ToggleProps extends Omit<TogglePrimitive.RootProps, "style"> {
      */
     style?: StyleProp<ViewStyle>;
 }
-/**
- * Enhanced Toggle Component
- *
- * Features:
- * - 2 variants (default, outline)
- * - 3 sizes (sm, default, lg)
- * - 3 shapes (default, square, circle)
- * - Loading state with spinner
- * - Icon-only optimization
- * - Style prop support
- * - Full accessibility
- *
- * Usage:
- * ```tsx
- * // Basic
- * const [pressed, setPressed] = useState(false);
- * <Toggle pressed={pressed} onPressedChange={setPressed}>
- *   <SansSerifText>Toggle Me</SansSerifText>
- * </Toggle>
- *
- * // With icon
- * <Toggle pressed={pressed} onPressedChange={setPressed} iconOnly>
- *   <ToggleIcon name="bold" />
- * </Toggle>
- *
- * // Different shapes
- * <Toggle shape="square" pressed={pressed} onPressedChange={setPressed}>
- *   <SansSerifText>Square</SansSerifText>
- * </Toggle>
- *
- * <Toggle shape="circle" iconOnly pressed={pressed} onPressedChange={setPressed}>
- *   <ToggleIcon name="bold" />
- * </Toggle>
- *
- * // Loading state
- * <Toggle loading pressed={pressed} onPressedChange={setPressed}>
- *   <SansSerifText>Loading...</SansSerifText>
- * </Toggle>
- * ```
- */
-declare function Toggle({ variant, size, shape, loading, iconOnly, style: styleOverride, ...props }: ToggleProps): React.JSX.Element;
+declare function Toggle({ variant, size, shape, loading, iconOnly, style: styleOverride, onPressedChange, ...props }: ToggleProps): React.JSX.Element;
 /**
  * ToggleIcon Component
  * Icon wrapper for use inside Toggle buttons