@mrmeg/expo-ui 0.27.0 → 0.28.0

package/dist/components/Toggle.js

@@ -1,10 +1,15 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import React, { useState } from "react";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import React from "react";
 import { Icon } from "./Icon.js";
-import { TextClassContext, TextColorContext, TextSelectabilityContext } from "./StyledText.context";
+import { TextClassContext, TextColorContext, TextSelectabilityContext } from "./StyledText.context.js";
 import { useTheme } from "../hooks/useTheme.js";
+import { useFocusVisible } from "../hooks/useFocusVisible.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 { useScalePress } from "../hooks/useScalePress.js";
+import { useItemControlLabel } from "./Item.js";
 import * as TogglePrimitive from "@rn-primitives/toggle";
 import { Platform, StyleSheet, ActivityIndicator, Animated } from "react-native";
 import { palette } from "../constants/colors.js";
@@ -73,11 +78,12 @@ const TOGGLE_SIZES = {
  * </Toggle>
  * ```
  */
-function Toggle({ variant = "default", size = "default", shape = "default", loading = false, iconOnly = false, style: styleOverride, ...props }) {
+// Dev-only, once per session: the same unnamed toggle re-renders constantly.
+let warnedIconOnly = false;
+function Toggle({ variant = "default", size = "default", shape = "default", loading = false, iconOnly = false, style: styleOverride, onPressedChange, ...props }) {
     const { theme, getContrastingColor, getFocusRingStyle, withAlpha } = useTheme();
     const sizeConfig = TOGGLE_SIZES[size];
     const focusRingStyle = getFocusRingStyle();
-    const [focused, setFocused] = useState(false);
     // Calculate text color based on state and variant
     const getTextColor = () => {
         if (props.pressed) {
@@ -106,28 +112,33 @@ function Toggle({ variant = "default", size = "default", shape = "default", load
     const children = props.children;
     const { animatedStyle: scaleStyle, pressHandlers } = useScalePress({
         disabled: !!isDisabled,
-        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);
+    // A toggle is a selection control: its state change is the haptic moment,
+    // not the press, so it follows the `"selection"` setting like Switch does.
+    const handlePressedChange = (next) => {
+        hapticSelection();
+        onPressedChange?.(next);
     };
-    return (_jsx(TextColorContext.Provider, { value: textColor, children: _jsx(TextClassContext.Provider, { value: "", children: _jsx(Animated.View, { style: scaleStyle, children: _jsx(TogglePrimitive.Root, { ...props, disabled: isDisabled, onPressIn: pressHandlers.onPressIn, onPressOut: pressHandlers.onPressOut, onFocus: showFocusRing, onBlur: hideFocusRing, style: {
+    const { focused, onFocus: showFocusRing, onBlur: hideFocusRing } = useFocusVisible();
+    const rowLabel = useItemControlLabel(props);
+    if (process.env.NODE_ENV !== "production" &&
+        iconOnly &&
+        !warnedIconOnly &&
+        props.accessibilityLabel === undefined &&
+        props["aria-label"] === undefined &&
+        props["aria-labelledby"] === undefined &&
+        rowLabel.accessibilityLabel === undefined &&
+        rowLabel["aria-labelledby"] === undefined) {
+        warnedIconOnly = true;
+        console.warn("Toggle: an icon-only toggle (`iconOnly`) has no accessible name. Pass `accessibilityLabel` " +
+            "(what the toggle turns on, e.g. \"Bold\") so screen readers announce more than \"button\".");
+    }
+    // Web pointer target: 44pt tall through a transparent child inside the drawn
+    // box (react-native-web ignores `hitSlop`); native keeps DEFAULT_HIT_SLOP.
+    const hitTarget = (_jsx(WebHitTarget, { insets: Platform.OS === "web" ? getWebHitInsets(undefined, sizeConfig.height) : null, border: styles.root.borderWidth }));
+    return (_jsx(TextColorContext.Provider, { value: textColor, children: _jsx(TextClassContext.Provider, { value: "", children: _jsx(Animated.View, { style: scaleStyle, children: _jsx(TogglePrimitive.Root, { ...rowLabel, ...props, disabled: isDisabled, onPressedChange: handlePressedChange, onPressIn: pressHandlers.onPressIn, onPressOut: pressHandlers.onPressOut, onFocus: showFocusRing, onBlur: hideFocusRing, style: {
                         ...styles.root,
                         height: sizeConfig.height,
                         minWidth: sizeConfig.minWidth,
@@ -152,7 +163,7 @@ function Toggle({ variant = "default", size = "default", shape = "default", load
                             borderColor: theme.colors.primary,
                         }),
                         // Disabled state
-                        opacity: isDisabled ? 0.5 : 1,
+                        opacity: isDisabled ? interaction.disabledOpacity : 1,
                         // Web-specific styles
                         ...(Platform.OS === "web" && {
                             cursor: isDisabled ? "not-allowed" : "pointer",
@@ -166,13 +177,13 @@ function Toggle({ variant = "default", size = "default", shape = "default", load
                         selected: props.pressed,
                         disabled: !!isDisabled,
                         busy: loading,
-                    }, children: loading ? (_jsx(TextSelectabilityContext.Provider, { value: false, children: _jsx(ActivityIndicator, { size: "small", color: textColor }) })) : typeof children === "function" ? ((state) => (_jsx(TextSelectabilityContext.Provider, { value: false, children: children(state) }))) : (_jsx(TextSelectabilityContext.Provider, { value: false, children: children })) }) }) }) }));
+                    }, children: loading ? (_jsxs(_Fragment, { children: [_jsx(TextSelectabilityContext.Provider, { value: false, children: _jsx(ActivityIndicator, { size: "small", color: textColor }) }), hitTarget] })) : 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 ToggleIcon({ 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({
     root: {
         flexDirection: "row",
         alignItems: "center",

package/dist/components/ToggleGroup.d.ts

@@ -1,4 +1,4 @@
-import type { IconName } from "./Icon";
+import type { IconName } from "./Icon.js";
 import * as ToggleGroupPrimitive from "@rn-primitives/toggle-group";
 import * as React from "react";
 type ToggleGroupVariant = "default" | "outline";

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/bottomSheetHostSupport.d.ts

@@ -0,0 +1,46 @@
+/**
+ * Android `BottomSheet` keyboard avoidance is platform-owned, and the part the
+ * package depends on lives in the host: Material3's `ModalBottomSheet` shrinks
+ * the sheet with `imePadding()`, `@expo/ui`'s `RNHostView` re-reports its
+ * Compose size to the shadow tree (`onSizeChanged` → `ShadowNodeProxy.setViewSize`),
+ * and the `flexGrow: 1, height: 0` column the host wraps our children in
+ * follows. `expo-modules-core` <= 57.0.3 flushed that report only from a
+ * one-shot pre-draw listener on the activity window, which does not draw while
+ * the sheet's own dialog window animates the IME, so the column kept its
+ * detent height and `Footer` sat under the keyboard until the activity redrew
+ * (expo/expo#47778, fixed by expo/expo#47810 in 57.0.4 and 58.0.0; no 56.x
+ * release has it). Nothing in JS can observe a size the shadow tree never
+ * received, so the package names the floor instead: once per session, in dev,
+ * on Android, when the *native* core compiled into the app is older.
+ */
+export interface ExpoModulesCoreVersion {
+    version: string;
+    major: number;
+    minor: number;
+    patch: number;
+}
+/** First `expo-modules-core` release whose `RNHostView` size flush always lands. */
+export declare const MIN_EXPO_MODULES_CORE: Readonly<Omit<ExpoModulesCoreVersion, "version">>;
+/**
+ * The native `expo-modules-core` version compiled into the running app, as the
+ * core's own `CoreModule` publishes it on `globalThis.expo` (Android and iOS,
+ * present on every Expo release the package supports, 56 through 58).
+ * `undefined` on web, in Jest, or when the core is not loaded.
+ */
+export declare function readExpoModulesCoreVersion(): ExpoModulesCoreVersion | undefined;
+/**
+ * Whether this core drops the sheet host's size update when the keyboard opens:
+ * a defined version lexicographically below {@link MIN_EXPO_MODULES_CORE}.
+ * An unknown version is not reported as broken.
+ */
+export declare function bottomSheetHostDropsResize(version: ExpoModulesCoreVersion | undefined): boolean;
+export declare function bottomSheetHostWarning(version: ExpoModulesCoreVersion): string;
+/**
+ * Warn once per JS session, in development, on Android, when the native
+ * `expo-modules-core` is older than {@link MIN_EXPO_MODULES_CORE}. Called when a
+ * `BottomSheet.Content` mounts. Silent on iOS and web, where the sheet's
+ * avoidance does not go through `RNHostView`'s size state.
+ */
+export declare function warnIfBottomSheetHostDropsResize(): void;
+/** Test hook: forget that the warning was already shown. */
+export declare function resetBottomSheetHostWarningForTests(): void;

package/dist/components/bottomSheetHostSupport.js

@@ -0,0 +1,67 @@
+import { Platform } from "react-native";
+/** First `expo-modules-core` release whose `RNHostView` size flush always lands. */
+export const MIN_EXPO_MODULES_CORE = {
+    major: 57,
+    minor: 0,
+    patch: 4,
+};
+/**
+ * The native `expo-modules-core` version compiled into the running app, as the
+ * core's own `CoreModule` publishes it on `globalThis.expo` (Android and iOS,
+ * present on every Expo release the package supports, 56 through 58).
+ * `undefined` on web, in Jest, or when the core is not loaded.
+ */
+export function readExpoModulesCoreVersion() {
+    const expo = globalThis.expo;
+    const candidate = expo?.expoModulesCoreVersion;
+    if (typeof candidate !== "object" ||
+        candidate === null ||
+        typeof candidate.major !== "number" ||
+        typeof candidate.minor !== "number" ||
+        typeof candidate.patch !== "number") {
+        return undefined;
+    }
+    return candidate;
+}
+/**
+ * Whether this core drops the sheet host's size update when the keyboard opens:
+ * a defined version lexicographically below {@link MIN_EXPO_MODULES_CORE}.
+ * An unknown version is not reported as broken.
+ */
+export function bottomSheetHostDropsResize(version) {
+    if (!version)
+        return false;
+    const { major, minor, patch } = MIN_EXPO_MODULES_CORE;
+    if (version.major !== major)
+        return version.major < major;
+    if (version.minor !== minor)
+        return version.minor < minor;
+    return version.patch < patch;
+}
+export function bottomSheetHostWarning(version) {
+    const { major, minor, patch } = MIN_EXPO_MODULES_CORE;
+    return (`@mrmeg/expo-ui BottomSheet: expo-modules-core ${version.version} drops the sheet's ` +
+        "size update when the keyboard opens on Android, so BottomSheet.Footer and the tail " +
+        "of Body end up under the keyboard (expo/expo#47778). Update expo-modules-core to " +
+        `>= ${major}.${minor}.${patch} (fixed in 57.0.4 / 58.0.0) and rebuild the app.`);
+}
+let warned = false;
+/**
+ * Warn once per JS session, in development, on Android, when the native
+ * `expo-modules-core` is older than {@link MIN_EXPO_MODULES_CORE}. Called when a
+ * `BottomSheet.Content` mounts. Silent on iOS and web, where the sheet's
+ * avoidance does not go through `RNHostView`'s size state.
+ */
+export function warnIfBottomSheetHostDropsResize() {
+    if (warned || !__DEV__ || Platform.OS !== "android")
+        return;
+    const version = readExpoModulesCoreVersion();
+    if (!version || !bottomSheetHostDropsResize(version))
+        return;
+    warned = true;
+    console.warn(bottomSheetHostWarning(version));
+}
+/** Test hook: forget that the warning was already shown. */
+export function resetBottomSheetHostWarningForTests() {
+    warned = false;
+}

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";