@oxyhq/services 22.8.2 → 22.8.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxyhq/services",
-  "version": "22.8.2",
+  "version": "22.8.3",
   "description": "OxyHQ Expo/React Native SDK — UI components, screens, and native features",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -136,7 +136,7 @@
     "@commitlint/cli": "^17.6.5",
     "@commitlint/config-conventional": "^17.6.5",
     "@expo/vector-icons": "^15.0.3",
-    "@oxyhq/core": "12.9.1",
+    "@oxyhq/core": "12.10.0",
     "@react-native-async-storage/async-storage": "^2.0.0",
     "@react-native-community/netinfo": "^11.4.1",
     "@react-native/babel-preset": "^0.86.0",
@@ -176,7 +176,7 @@
   },
   "peerDependencies": {
     "@expo/vector-icons": "^15.0.3",
-    "@oxyhq/bloom": ">=0.16.0",
+    "@oxyhq/bloom": ">=0.43.0",
     "@oxyhq/core": "^12.9.0",
     "@react-native-async-storage/async-storage": "^2.0.0",
     "@react-native-community/netinfo": "^11.4.1",

package/src/ui/hooks/queries/__tests__/userCache.test.ts

@@ -374,11 +374,43 @@ describe('patchCachedUserRelationship', () => {
       'viewer-1',
     );
 
-    patchCachedUserRelationship(qc, 'u1', true, 'viewer-1');
+    patchCachedUserRelationship(qc, 'u1', true);
 
     expect(readByUsername(qc, 'alice', 'viewer-1')?.relationship).toEqual({
       isFollowing: true,
       followsYou: true,
     });
   });
+
+  it('never writes relationship onto the viewer-independent by-id key', () => {
+    const qc = makeClient();
+    upsertCachedUser(
+      qc,
+      {
+        id: 'u1',
+        username: 'alice',
+        relationship: { isFollowing: false, followsYou: true },
+      },
+      'viewer-1',
+    );
+
+    patchCachedUserRelationship(qc, 'u1', true);
+
+    expect(readById(qc, 'u1')?.relationship).toBeUndefined();
+  });
+
+  it('updates viewer-scoped detailForViewer keys', () => {
+    const qc = makeClient();
+    qc.setQueryData(queryKeys.users.detailForViewer('u1', 'viewer-1'), {
+      id: 'u1',
+      username: 'alice',
+      relationship: { isFollowing: false, followsYou: false },
+    });
+
+    patchCachedUserRelationship(qc, 'u1', true);
+
+    expect(
+      qc.getQueryData<CacheableUser>(queryKeys.users.detailForViewer('u1', 'viewer-1'))?.relationship,
+    ).toEqual({ isFollowing: true, followsYou: false });
+  });
 });

package/src/ui/hooks/queries/userCacheRelationship.ts

@@ -16,7 +16,12 @@ export function patchCachedUserRelationship(
   isFollowing: boolean,
 ): void {
   queryClient.setQueriesData<CachedUser>(
-    { queryKey: queryKeys.users.details() },
+    {
+      queryKey: queryKeys.users.details(),
+      // Viewer-relative `relationship` must never be written on the viewer-
+      // independent by-id key — only viewer-scoped detail / by-username keys.
+      predicate: (query) => (query.queryKey as readonly unknown[]).includes('viewer'),
+    },
     (existing) => {
       if (!existing || existing.id !== targetUserId) return existing;
       return {

package/src/ui/screens/FileManagementScreen.tsx

@@ -206,6 +206,8 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
         return sorted;
     }, [files, searchQuery, viewMode, sortBy, sortOrder]);
     const [photoDimensions, setPhotoDimensions] = useState<{ [key: string]: { width: number, height: number } }>({});
+    const photoDimensionsRef = useRef(photoDimensions);
+    photoDimensionsRef.current = photoDimensions;
     const [loadingDimensions, setLoadingDimensions] = useState(false);
     // Selection state
     const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set(initialSelectedIds));
@@ -441,11 +443,10 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
         if (photos.length === 0) return;
 
         setLoadingDimensions(true);
-        const newDimensions: { [key: string]: { width: number, height: number } } = { ...photoDimensions };
-        let hasNewDimensions = false;
 
-        // Only load dimensions for photos we don't have yet
-        const photosToLoad = photos.filter(photo => !newDimensions[photo.id]);
+        // Snapshot ids missing from the cache at kick-off; concurrent runs may
+        // overlap but each merge is applied via a functional updater.
+        const photosToLoad = photos.filter((photo) => !photoDimensionsRef.current[photo.id]);
 
         if (photosToLoad.length === 0) {
             setLoadingDimensions(false);
@@ -453,6 +454,8 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
         }
 
         try {
+            const measured: { [key: string]: { width: number; height: number } } = {};
+
             await Promise.all(
                 photosToLoad.map(async (photo) => {
                     try {
@@ -470,35 +473,32 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
                             Image.getSize(
                                 downloadUrl,
                                 (width: number, height: number) => {
-                                    newDimensions[photo.id] = { width, height };
-                                    hasNewDimensions = true;
+                                    measured[photo.id] = { width, height };
                                     resolve();
                                 },
                                 () => {
                                     // Fallback dimensions
-                                    newDimensions[photo.id] = { width: 1, height: 1 };
-                                    hasNewDimensions = true;
+                                    measured[photo.id] = { width: 1, height: 1 };
                                     resolve();
                                 }
                             );
                         });
                     } catch (error) {
                         // Fallback dimensions for any errors
-                        newDimensions[photo.id] = { width: 1, height: 1 };
-                        hasNewDimensions = true;
+                        measured[photo.id] = { width: 1, height: 1 };
                     }
                 })
             );
 
-            if (hasNewDimensions) {
-                setPhotoDimensions(newDimensions);
+            if (Object.keys(measured).length > 0) {
+                setPhotoDimensions((prev) => ({ ...prev, ...measured }));
             }
         } catch (error) {
             // Photo dimensions loading failed, continue without dimensions
         } finally {
             setLoadingDimensions(false);
         }
-    }, [thumbSourceFor, photoDimensions]);
+    }, [thumbSourceFor]);
 
     // Re-measure photo dimensions when their private-safe URLs resolve. The
     // justified grid's own trigger fires on the photo SET, not on URL

package/src/ui/screens/fileManagement/PhotoPickerSection.tsx

@@ -571,8 +571,14 @@ const PhotoPickerView: React.FC<PhotoPickerViewProps> = ({
 
     return (
         // Measured wrapper: `style`-only (no className) so RN-Web fires onLayout.
-        <View style={{ flex: 1 }} onLayout={onRootLayout}>
-            <View className="flex-1 bg-black">
+        // `minHeight: 0` down the whole flex chain: the sheet is `scrollable=false`
+        // (the FlatList owns scrolling) and clamped by its `maxHeight`, but on web a
+        // flex child defaults to `min-height: auto` and grows to its content, so the
+        // list overflows the clamp and is clipped (renders "half", no scroll). Letting
+        // each flex link shrink to the clamped height gives the FlatList a bounded
+        // scroll area. Native (Yoga) already defaults min to 0, so this is web-only.
+        <View style={{ flex: 1, minHeight: 0 }} onLayout={onRootLayout}>
+            <View className="flex-1 bg-black" style={{ minHeight: 0 }}>
                 {/* Photo grid (renders behind translucent header) */}
                 {isEmpty ? (
                     <View className="flex-1 items-center justify-center px-space-32 pt-[88px]">
@@ -616,6 +622,7 @@ const PhotoPickerView: React.FC<PhotoPickerViewProps> = ({
                             keyExtractor={keyExtractor}
                             numColumns={columns}
                             className="flex-1"
+                            style={{ minHeight: 0 }}
                             contentContainerClassName="pt-[88px] pb-space-24"
                             showsVerticalScrollIndicator={false}
                             refreshControl={
@@ -630,7 +637,7 @@ const PhotoPickerView: React.FC<PhotoPickerViewProps> = ({
                             onEndReached={handleEndReached}
                             onEndReachedThreshold={0.4}
                             ListFooterComponent={listFooter}
-                            removeClippedSubviews
+                            removeClippedSubviews={Platform.OS !== 'web'}
                             initialNumToRender={Math.max(12, columns * 6)}
                             windowSize={9}
                         />