@oxyhq/services 5.21.5 → 5.21.6

package/src/ui/components/OxyProvider.tsx

@@ -16,20 +16,26 @@ setupFonts();
 // Detect if running on web
 const isWeb = Platform.OS === 'web';
 
-// Conditionally import native-only components
+// Conditionally import components
 let KeyboardProvider: any = ({ children }: any) => children;
-let BottomSheetRouter: any = () => null;
+let BottomSheetRouter: any = null;
 
+// KeyboardProvider only on native
 if (!isWeb) {
     try {
-        // Only import on native platforms
         KeyboardProvider = require('react-native-keyboard-controller').KeyboardProvider;
-        BottomSheetRouter = require('./BottomSheetRouter').default;
     } catch {
-        // Fallback if imports fail
+        // KeyboardProvider not available
     }
 }
 
+// BottomSheetRouter works on all platforms
+try {
+    BottomSheetRouter = require('./BottomSheetRouter').default;
+} catch {
+    // BottomSheetRouter not available
+}
+
 /**
  * OxyProvider - Universal provider for Expo apps (native + web)
  *
@@ -199,24 +205,13 @@ const OxyProvider: FC<OxyProviderProps> = ({
             >
                 {children}
                 {/* Only render bottom sheet router on native */}
-                {!isWeb && <BottomSheetRouter />}
+                {BottomSheetRouter && <BottomSheetRouter />}
                 <Toaster />
             </OxyContextProvider>
         </QueryClientProvider>
     );
 
-    // On web, minimal wrappers (GestureHandler and SafeArea work via react-native-web)
-    if (isWeb) {
-        return (
-            <SafeAreaProvider>
-                <GestureHandlerRootView style={{ flex: 1 }}>
-                    {coreContent}
-                </GestureHandlerRootView>
-            </SafeAreaProvider>
-        );
-    }
-
-    // On native, full wrappers including KeyboardProvider
+    // All platforms use same wrapper (KeyboardProvider is passthrough on web)
     return (
         <SafeAreaProvider>
             <GestureHandlerRootView style={{ flex: 1 }}>

package/src/ui/navigation/bottomSheetManager.ts

@@ -3,189 +3,82 @@ import { isValidRoute } from './routes';
 import { createStore } from 'zustand/vanilla';
 
 /**
- * Bottom Sheet Manager - Pure state management module
- * 
- * Uses Zustand (vanilla) for robust state management without React dependencies.
- * This ensures the manager can be imported safely anywhere.
+ * Bottom Sheet State Manager
  */
 
-export interface NavigationHistoryEntry {
-    screen: RouteName;
-    props: Record<string, unknown>;
-    step?: number; // For step-based screens
-}
-
-export interface BottomSheetRouterState {
+export interface BottomSheetState {
     currentScreen: RouteName | null;
     screenProps: Record<string, unknown>;
-    currentStep?: number; // Current step in step-based screen
-    navigationHistory: NavigationHistoryEntry[];
+    currentStep?: number;
+    history: Array<{ screen: RouteName; props: Record<string, unknown>; step?: number }>;
     isOpen: boolean;
 }
 
-// Initial state
-const initialState: BottomSheetRouterState = {
+const initialState: BottomSheetState = {
     currentScreen: null,
     screenProps: {},
     currentStep: undefined,
-    navigationHistory: [],
+    history: [],
     isOpen: false,
 };
 
-// Create vanilla store
-export const bottomSheetStore = createStore<BottomSheetRouterState>(() => initialState);
+export const bottomSheetStore = createStore<BottomSheetState>(() => initialState);
 
-// Use a generic ref type to avoid importing React types
-type BottomSheetRefObject = { current: { present: () => void; dismiss: () => void } | null } | null;
-let bottomSheetRef: BottomSheetRefObject = null;
-
-/**
- * Set the bottom sheet ref so showBottomSheet can control it
- */
-export const setBottomSheetRef = (ref: BottomSheetRefObject) => {
-    bottomSheetRef = ref;
-};
+export const getState = () => bottomSheetStore.getState();
 
-/**
- * Update the bottom sheet state
- * (Kept for backward compatibility, but prefer using store directly if possible)
- */
-export const updateBottomSheetState = (updates: Partial<BottomSheetRouterState>) => {
-    bottomSheetStore.setState((state) => ({ ...state, ...updates }));
-};
+export const showBottomSheet = (
+    screenOrConfig: RouteName | { screen: RouteName; props?: Record<string, unknown> },
+): void => {
+    const screen = typeof screenOrConfig === 'string' ? screenOrConfig : screenOrConfig.screen;
+    const props = typeof screenOrConfig === 'string' ? {} : (screenOrConfig.props || {});
 
-/**
- * Subscribe to bottom sheet state changes
- * (Wrapper around store.subscribe for backward compatibility)
- */
-export const subscribeToBottomSheetState = (listener: (state: BottomSheetRouterState) => void) => {
-    return bottomSheetStore.subscribe(listener);
-};
+    if (!isValidRoute(screen)) {
+        if (__DEV__) console.warn(`[BottomSheet] Invalid route: ${screen}`);
+        return;
+    }
 
-/**
- * Get the current bottom sheet state
- * (Wrapper around store.getState for backward compatibility)
- */
-export const getBottomSheetState = (): BottomSheetRouterState => {
-    return bottomSheetStore.getState();
-};
+    const state = bottomSheetStore.getState();
 
-/**
- * Show the bottom sheet with a specific screen (internal - no route validation)
- */
-export const managerShowBottomSheet = (
-    screen: RouteName,
-    props?: Record<string, unknown>,
-    options?: { addToHistory?: boolean; step?: number },
-): void => {
-    const currentState = bottomSheetStore.getState();
-    const addToHistory = options?.addToHistory !== false; // Default to true
-    
-    // If adding to history and there's a current screen, push it to history
-    if (addToHistory && currentState.currentScreen) {
-        const historyEntry: NavigationHistoryEntry = {
-            screen: currentState.currentScreen,
-            props: { ...currentState.screenProps },
-            step: currentState.currentStep,
-        };
-        
-        // We need to create a new array for immutability
-        const newHistory = [...currentState.navigationHistory, historyEntry];
-        bottomSheetStore.setState({ navigationHistory: newHistory });
+    // Push current screen to history if navigating to different screen
+    if (state.currentScreen && state.currentScreen !== screen) {
+        bottomSheetStore.setState({
+            history: [...state.history, {
+                screen: state.currentScreen,
+                props: state.screenProps,
+                step: state.currentStep,
+            }],
+        });
     }
-    
-    // Determine the new step
-    const newStep = options?.step ?? 
-        (props?.initialStep !== undefined ? props.initialStep : 
-         (addToHistory ? undefined : currentState.currentStep));
-    
+
     bottomSheetStore.setState({
         currentScreen: screen,
-        screenProps: props || {},
-        currentStep: newStep !== null && newStep !== undefined ? (newStep as number) : undefined,
+        screenProps: props,
+        currentStep: typeof props.initialStep === 'number' ? props.initialStep : undefined,
         isOpen: true,
     });
-
-    // Present the sheet after state update
-    if (bottomSheetRef?.current) {
-        bottomSheetRef.current.present();
-    }
 };
 
-/**
- * Close the bottom sheet (internal)
- */
-export const managerCloseBottomSheet = (): void => {
-    bottomSheetStore.setState({
-        currentScreen: null,
-        screenProps: {},
-        currentStep: undefined,
-        navigationHistory: [],
-        isOpen: false,
-    });
-
-    if (bottomSheetRef?.current) {
-        bottomSheetRef.current.dismiss();
-    }
+export const closeBottomSheet = (): void => {
+    bottomSheetStore.setState(initialState);
 };
 
-/**
- * Go back in navigation history
- * Returns true if back navigation was successful, false if history is empty
- */
-export const managerGoBack = (): boolean => {
-    const currentState = bottomSheetStore.getState();
+export const goBack = (): boolean => {
+    const { history } = bottomSheetStore.getState();
 
-    // If there's history, pop and navigate to previous screen
-    if (currentState.navigationHistory.length > 0) {
-        const previous = currentState.navigationHistory[currentState.navigationHistory.length - 1];
-        const newHistory = currentState.navigationHistory.slice(0, -1);
-        
+    if (history.length > 0) {
+        const prev = history[history.length - 1];
         bottomSheetStore.setState({
-            currentScreen: previous.screen,
-            screenProps: previous.props,
-            currentStep: previous.step,
-            navigationHistory: newHistory,
-            isOpen: true,
+            currentScreen: prev.screen,
+            screenProps: prev.props,
+            currentStep: prev.step,
+            history: history.slice(0, -1),
         });
-        
         return true;
     }
-    
-    return false;
-};
-
-/**
- * Public API for showing bottom sheets
- */
-export const showBottomSheet = (
-    screenOrConfig: RouteName | { screen: RouteName; props?: Record<string, unknown> },
-): void => {
-    let screen: RouteName;
-    let props: Record<string, unknown> = {};
-
-    if (typeof screenOrConfig === 'string') {
-        screen = screenOrConfig;
-    } else {
-        screen = screenOrConfig.screen;
-        props = screenOrConfig.props || {};
-    }
-
-    if (!isValidRoute(screen)) {
-        if (__DEV__) {
-            console.warn(`[BottomSheetAPI] Invalid route: ${screen}`);
-        }
-        return;
-    }
 
-    managerShowBottomSheet(screen, props);
+    return false;
 };
 
-/**
- * Public API for closing bottom sheets
- */
-export const closeBottomSheet = (): void => {
-    managerCloseBottomSheet();
+export const updateState = (updates: Partial<BottomSheetState>) => {
+    bottomSheetStore.setState((state) => ({ ...state, ...updates }));
 };
-
-

package/src/ui/screens/AccountSettingsScreen.tsx

@@ -29,7 +29,6 @@ import { useThemeStyles } from '../hooks/useThemeStyles';
 import { useColorScheme } from '../hooks/use-color-scheme';
 import { Colors } from '../constants/theme';
 import { normalizeColorScheme, normalizeTheme } from '../utils/themeUtils';
-import { useHapticPress } from '../hooks/use-haptic-press';
 import { EditDisplayNameModal } from '../components/profile/EditDisplayNameModal';
 import { EditUsernameModal } from '../components/profile/EditUsernameModal';
 import { EditEmailModal } from '../components/profile/EditEmailModal';
@@ -176,7 +175,6 @@ const AccountSettingsScreen: React.FC<BaseScreenProps & { initialField?: string;
     // Get theme colors using centralized hook
     const colorScheme = useColorScheme();
     const themeStyles = useThemeStyles(theme || 'light', colorScheme);
-    const handlePressIn = useHapticPress();
 
     // Extract colors for convenience - ensure it's always defined
     // useThemeStyles always returns colors, but add safety check for edge cases

package/lib/commonjs/ui/hooks/use-haptic-press.js

@@ -1,21 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.useHapticPress = useHapticPress;
-var _react = require("react");
-var Haptics = _interopRequireWildcard(require("expo-haptics"));
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
-/**
- * Hook that returns a memoized callback for haptic feedback on press.
- * Provides consistent light haptic feedback across the app.
- * 
- * @returns A stable callback function that triggers haptic feedback
- */
-function useHapticPress() {
-  return (0, _react.useCallback)(() => {
-    Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
-  }, []);
-}
-//# sourceMappingURL=use-haptic-press.js.map

package/lib/commonjs/ui/hooks/use-haptic-press.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_react","require","Haptics","_interopRequireWildcard","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","useHapticPress","useCallback","impactAsync","ImpactFeedbackStyle","Light"],"sourceRoot":"../../../../src","sources":["ui/hooks/use-haptic-press.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAC,uBAAA,CAAAF,OAAA;AAAwC,SAAAE,wBAAAC,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAH,uBAAA,YAAAA,CAAAC,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAExC;AACA;AACA;AACA;AACA;AACA;AACO,SAASkB,cAAcA,CAAA,EAAG;EAC/B,OAAO,IAAAC,kBAAW,EAAC,MAAM;IACvBtB,OAAO,CAACuB,WAAW,CAACvB,OAAO,CAACwB,mBAAmB,CAACC,KAAK,CAAC;EACxD,CAAC,EAAE,EAAE,CAAC;AACR","ignoreList":[]}

package/lib/module/ui/hooks/use-haptic-press.js

@@ -1,17 +0,0 @@
-"use strict";
-
-import { useCallback } from 'react';
-import * as Haptics from 'expo-haptics';
-
-/**
- * Hook that returns a memoized callback for haptic feedback on press.
- * Provides consistent light haptic feedback across the app.
- * 
- * @returns A stable callback function that triggers haptic feedback
- */
-export function useHapticPress() {
-  return useCallback(() => {
-    Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
-  }, []);
-}
-//# sourceMappingURL=use-haptic-press.js.map

package/lib/module/ui/hooks/use-haptic-press.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["useCallback","Haptics","useHapticPress","impactAsync","ImpactFeedbackStyle","Light"],"sourceRoot":"../../../../src","sources":["ui/hooks/use-haptic-press.ts"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,OAAO;AACnC,OAAO,KAAKC,OAAO,MAAM,cAAc;;AAEvC;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,cAAcA,CAAA,EAAG;EAC/B,OAAOF,WAAW,CAAC,MAAM;IACvBC,OAAO,CAACE,WAAW,CAACF,OAAO,CAACG,mBAAmB,CAACC,KAAK,CAAC;EACxD,CAAC,EAAE,EAAE,CAAC;AACR","ignoreList":[]}

package/lib/typescript/commonjs/ui/hooks/use-haptic-press.d.ts

@@ -1,8 +0,0 @@
-/**
- * Hook that returns a memoized callback for haptic feedback on press.
- * Provides consistent light haptic feedback across the app.
- *
- * @returns A stable callback function that triggers haptic feedback
- */
-export declare function useHapticPress(): () => void;
-//# sourceMappingURL=use-haptic-press.d.ts.map

package/lib/typescript/commonjs/ui/hooks/use-haptic-press.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"use-haptic-press.d.ts","sourceRoot":"","sources":["../../../../../src/ui/hooks/use-haptic-press.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,wBAAgB,cAAc,eAI7B"}

package/lib/typescript/module/ui/hooks/use-haptic-press.d.ts

@@ -1,8 +0,0 @@
-/**
- * Hook that returns a memoized callback for haptic feedback on press.
- * Provides consistent light haptic feedback across the app.
- *
- * @returns A stable callback function that triggers haptic feedback
- */
-export declare function useHapticPress(): () => void;
-//# sourceMappingURL=use-haptic-press.d.ts.map

package/lib/typescript/module/ui/hooks/use-haptic-press.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"use-haptic-press.d.ts","sourceRoot":"","sources":["../../../../../src/ui/hooks/use-haptic-press.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,wBAAgB,cAAc,eAI7B"}

package/src/ui/hooks/use-haptic-press.ts

@@ -1,15 +0,0 @@
-import { useCallback } from 'react';
-import * as Haptics from 'expo-haptics';
-
-/**
- * Hook that returns a memoized callback for haptic feedback on press.
- * Provides consistent light haptic feedback across the app.
- * 
- * @returns A stable callback function that triggers haptic feedback
- */
-export function useHapticPress() {
-  return useCallback(() => {
-    Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
-  }, []);
-}
-