@ateam-ai-mobile/ui 0.1.1 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ateam-ai-mobile/ui",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Prebuilt ADAS chat experience for React Native \u2014 full-screen chat, chips, widget views. Built on @ateam-ai-mobile/core + @ateam-ai-mobile/plugin-runtime.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -9,8 +9,8 @@
     "build": "tsup"
   },
   "dependencies": {
-    "@ateam-ai-mobile/core": "0.1.1",
-    "@ateam-ai-mobile/plugin-runtime": "0.1.1",
+    "@ateam-ai-mobile/core": "0.1.2",
+    "@ateam-ai-mobile/plugin-runtime": "0.1.2",
     "zustand": "^5.0.0"
   },
   "peerDependencies": {

package/src/TenantPicker.tsx

@@ -1,28 +1,35 @@
 /**
- * TenantPicker — optional prebuilt team switcher.
+ * TenantPicker — prebuilt team switcher, fully SDK-driven.
  *
- * Lists the user's REAL tenant memberships via core's listMyTenants() and
- * calls onSelect when one is tapped. The host owns what "switching" means
- * (mint a new tenant-scoped JWT, then re-init) — this component only picks.
- * Single-tenant hosts simply never render it.
+ * Lists the user's REAL memberships via core's listMyTenants() and, on tap,
+ * re-scopes the whole session with core's switchTenant() (which mints the new
+ * tenant JWT, persists it through config.onSession, and reconnects chat). The
+ * host only reacts via onSwitched (e.g. navigate home). Single-tenant hosts
+ * simply never render it.
+ *
+ * For custom flows, pass `onSelect` to intercept the tap instead of switching.
  */
 import { useEffect, useState } from 'react';
 import { View, Text, Pressable, ActivityIndicator, StyleSheet, Platform } from 'react-native';
-import { ada, fontSize, borderRadius, listMyTenants, getTenant } from '@ateam-ai-mobile/core';
-import type { TenantMembership } from '@ateam-ai-mobile/core';
+import { ada, fontSize, borderRadius, listMyTenants, switchTenant, getTenant } from '@ateam-ai-mobile/core';
+import type { TenantMembership, AdasSession } from '@ateam-ai-mobile/core';
 
 const fontFam = Platform.OS === 'ios' ? 'SF Pro Rounded' : undefined;
 
 export interface TenantPickerProps {
-  /** Called with the picked tenant. Host mints a JWT for it and re-inits. */
-  onSelect: (tenant: TenantMembership) => void;
+  /** Called after a successful SDK-driven switch (host navigates/refreshes). */
+  onSwitched?: (session: AdasSession) => void;
+  /** Intercept the tap instead of switching — for fully custom host flows.
+   *  When provided, the SDK does NOT call switchTenant(). */
+  onSelect?: (tenant: TenantMembership) => void;
   /** Highlight the active tenant. Defaults to the SDK config's tenant. */
   currentTenantId?: string;
 }
 
-export default function TenantPicker({ onSelect, currentTenantId }: TenantPickerProps) {
+export default function TenantPicker({ onSwitched, onSelect, currentTenantId }: TenantPickerProps) {
   const [tenants, setTenants] = useState<TenantMembership[] | null>(null);
   const [error, setError] = useState<string | null>(null);
+  const [switching, setSwitching] = useState<string | null>(null);
   const active = currentTenantId ?? getTenant();
 
   useEffect(() => {
@@ -33,6 +40,21 @@ export default function TenantPicker({ onSelect, currentTenantId }: TenantPicker
     return () => { cancelled = true; };
   }, []);
 
+  const handlePress = async (t: TenantMembership) => {
+    if (t.id === active || switching) return;
+    if (onSelect) { onSelect(t); return; }
+    setError(null);
+    setSwitching(t.id);
+    try {
+      const session = await switchTenant(t.id);
+      onSwitched?.(session);
+    } catch (e: any) {
+      setError(e?.message || 'Could not switch team');
+    } finally {
+      setSwitching(null);
+    }
+  };
+
   if (error) return <Text style={styles.error}>{error}</Text>;
   if (!tenants) {
     return (
@@ -47,12 +69,14 @@ export default function TenantPicker({ onSelect, currentTenantId }: TenantPicker
     <View style={styles.list}>
       {tenants.map(t => {
         const isActive = t.id === active;
+        const isSwitching = switching === t.id;
         return (
           <Pressable
             key={t.id}
             accessibilityRole="button"
             accessibilityLabel={`Team ${t.name}${isActive ? ', current' : ''}`}
-            onPress={() => onSelect(t)}
+            disabled={!!switching}
+            onPress={() => handlePress(t)}
             style={[styles.row, isActive && styles.rowActive]}
           >
             <View style={styles.dot} />
@@ -60,7 +84,7 @@ export default function TenantPicker({ onSelect, currentTenantId }: TenantPicker
               <Text style={styles.name}>{t.name}</Text>
               <Text style={styles.slug}>{t.id}</Text>
             </View>
-            {isActive && <Text style={styles.check}>✓</Text>}
+            {isSwitching ? <ActivityIndicator color={ada.orange} /> : isActive ? <Text style={styles.check}>✓</Text> : null}
           </Pressable>
         );
       })}