@ethora/chat-component-rn 26.7.3 → 26.7.5

package/src/roomStore/roomsSlice.ts

@@ -317,8 +317,6 @@ const reducers = {
         : [];
       state.rooms[roomData.jid] = {
         ...roomData,
-        icon: roomData.icon !== undefined ? roomData.icon : existing?.icon,
-        roomBg: roomData.roomBg !== undefined ? roomData.roomBg : existing?.roomBg,
         messages:
           existingMessages.length > 0 ? existingMessages : incomingMessages,
         lastViewedTimestamp: lastViewed,
@@ -545,6 +543,25 @@ const reducers = {
     ) => {
       state.isUnreadSyncing = action.payload;
     },
+    /**
+     * Records how far the user has actually read in a room: the timestamp
+     * of the newest message they had reached when they scrolled away from
+     * the bottom, or `null` while they are at the bottom.
+     *
+     * Written only by MessageList as the user scrolls. Deliberately does
+     * NOT touch `unreadMessages` or `lastViewedTimestamp` — it only tells
+     * the various "mark this room read" paths what value to stamp instead
+     * of `Date.now()`. Customer-reported #33.
+     */
+    setReadBoundary: (
+      state: WritableDraft<RoomMessagesState>,
+      action: PayloadAction<{ chatJID: string; boundaryTs: number | null }>
+    ) => {
+      const { chatJID, boundaryTs } = action.payload;
+      if (state.rooms[chatJID]) {
+        state.rooms[chatJID].readBoundaryTs = boundaryTs;
+      }
+    },
     setLastViewedTimestamp: (
       state: WritableDraft<RoomMessagesState>,
       action: PayloadAction<{ chatJID: string; timestamp: number }>
@@ -901,6 +918,7 @@ export const {
   setIsLoading,
   setUnreadSyncing,
   setLastViewedTimestamp,
+  setReadBoundary,
   applyPrivateStoreMarkers,
   setRoomNoMessages,
   setCurrentRoom,

package/src/types/models/room.model.ts

@@ -50,6 +50,21 @@ export interface IRoom {
   composingList?: string[];
   lastViewedTimestamp?: number;
   unreadMessages?: number;
+  /**
+   * Timestamp of the newest message the user had actually reached when
+   * they scrolled away from the bottom of this room, or null/undefined
+   * while they are at the bottom (everything on screen is read).
+   *
+   * Lives in the store rather than in ChatRoom's local state because
+   * several code paths outside the component mark a room read — the
+   * AppState background handler, the `isVisible` consumer signal, the
+   * visible-room auto-advance, `useChatRoomFocus` — and all of them must
+   * stamp what the user actually saw instead of `Date.now()`. Stamping
+   * "now" while they are scrolled up silently destroys unread messages,
+   * and because those paths also flush to the server-side private store
+   * the loss survives an app restart. Customer-reported #33.
+   */
+  readBoundaryTs?: number | null;
   noMessages?: boolean;
   role?: string;
 

package/src/types/types.ts

@@ -33,6 +33,21 @@ export interface IRoom {
   composingList?: string[];
   lastViewedTimestamp?: number;
   unreadMessages?: number;
+  /**
+   * Timestamp of the newest message the user had actually reached when
+   * they scrolled away from the bottom of this room; null/undefined while
+   * they are at the bottom (everything on screen is read).
+   *
+   * Written only by MessageList as the user scrolls. Every path that marks
+   * a room read must prefer this over `Date.now()` — the AppState
+   * background handler, the `isVisible` consumer signal, the visible-room
+   * auto-advance, `useChatRoomFocus` and logout all flush to the
+   * server-side private store, so stamping "now" while the user is
+   * scrolled up destroys unread messages permanently (survives an app
+   * restart, because the bad marker comes back from the server).
+   * Customer-reported #33.
+   */
+  readBoundaryTs?: number | null;
   noMessages?: boolean;
   role?: string;
   createdAt?: string | number | Date;
@@ -454,20 +469,6 @@ export interface IConfig {
     loginFunction: () => Promise<User | null>;
   };
   defaultLogin?: boolean;
-  logout?: {
-    enabled: boolean;
-    label?: string;
-    confirm?:
-      | boolean
-      | {
-          title?: string;
-          message?: string;
-          confirmText?: string;
-          cancelText?: string;
-        };
-    onBeforeLogout?: () => Promise<boolean | void> | boolean | void;
-    onAfterLogout?: () => Promise<void> | void;
-  };
   refreshTokens?: {
     enabled: boolean;
     /**

package/lib/commonjs/helpers/pickImageAsset.js

@@ -1,68 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.pickImageAsset = void 0;
-var _reactNative = require("react-native");
-var ImagePicker = _interopRequireWildcard(require("expo-image-picker"));
-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); }
-/**
- * A picked image in the shape React Native's FormData understands.
- *
- * NOT a web `File`: RN streams a multipart part straight from a `file://`
- * uri and has no usable Blob/File/atob path. Screens ported from the web
- * client used to carry base64 -> Blob -> File helpers that could never
- * have run here.
- */
-
-/**
- * Ask for library permission, open the picker, and normalise the result.
- *
- * Returns `null` for every non-error outcome — permission refused, user
- * cancelled — so call sites can simply keep their current value.
- *
- * Exists because the avatar pickers are wired to `onPress`, which hands
- * the callback a SyntheticEvent. Storing that event as "the image" (what
- * two screens used to do) rendered a pooled event as an <Image source>
- * and then crashed with "Property is not configurable" when React tried
- * to release it — on top of never letting the user pick anything.
- */
-const pickImageAsset = async () => {
-  try {
-    // expo-image-picker owns the permission prompt internally and
-    // returns a `granted` flag.
-    const perm = await ImagePicker.requestMediaLibraryPermissionsAsync();
-    if (!perm.granted) {
-      _reactNative.Alert.alert('Permission required', 'Photo library permission is needed to select images.', [{
-        text: 'Cancel',
-        style: 'cancel'
-      }, {
-        text: 'Open Settings',
-        onPress: () => _reactNative.Linking.openSettings()
-      }]);
-      return null;
-    }
-    const result = await ImagePicker.launchImageLibraryAsync({
-      mediaTypes: ['images'],
-      allowsEditing: true,
-      aspect: [1, 1],
-      quality: 0.8
-    });
-    if (result.canceled || !result.assets?.[0]) {
-      return null;
-    }
-    const asset = result.assets[0];
-    const originalName = asset.fileName || asset.uri.split('/').pop();
-    return {
-      uri: asset.uri,
-      type: asset.mimeType || 'image/jpeg',
-      name: originalName || `image_${Date.now()}.jpg`
-    };
-  } catch (error) {
-    console.error('Failed to pick an image:', error);
-    return null;
-  }
-};
-exports.pickImageAsset = pickImageAsset;
-//# sourceMappingURL=pickImageAsset.js.map

package/lib/commonjs/helpers/pickImageAsset.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_reactNative","require","ImagePicker","_interopRequireWildcard","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","pickImageAsset","perm","requestMediaLibraryPermissionsAsync","granted","Alert","alert","text","style","onPress","Linking","openSettings","result","launchImageLibraryAsync","mediaTypes","allowsEditing","aspect","quality","canceled","assets","asset","originalName","fileName","uri","split","pop","type","mimeType","name","Date","now","error","console","exports"],"sourceRoot":"../../../src","sources":["helpers/pickImageAsset.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/helpers/pickImageAsset.js

@@ -1,63 +0,0 @@
-"use strict";
-
-import { Alert, Linking } from 'react-native';
-import * as ImagePicker from 'expo-image-picker';
-
-/**
- * A picked image in the shape React Native's FormData understands.
- *
- * NOT a web `File`: RN streams a multipart part straight from a `file://`
- * uri and has no usable Blob/File/atob path. Screens ported from the web
- * client used to carry base64 -> Blob -> File helpers that could never
- * have run here.
- */
-
-/**
- * Ask for library permission, open the picker, and normalise the result.
- *
- * Returns `null` for every non-error outcome — permission refused, user
- * cancelled — so call sites can simply keep their current value.
- *
- * Exists because the avatar pickers are wired to `onPress`, which hands
- * the callback a SyntheticEvent. Storing that event as "the image" (what
- * two screens used to do) rendered a pooled event as an <Image source>
- * and then crashed with "Property is not configurable" when React tried
- * to release it — on top of never letting the user pick anything.
- */
-export const pickImageAsset = async () => {
-  try {
-    // expo-image-picker owns the permission prompt internally and
-    // returns a `granted` flag.
-    const perm = await ImagePicker.requestMediaLibraryPermissionsAsync();
-    if (!perm.granted) {
-      Alert.alert('Permission required', 'Photo library permission is needed to select images.', [{
-        text: 'Cancel',
-        style: 'cancel'
-      }, {
-        text: 'Open Settings',
-        onPress: () => Linking.openSettings()
-      }]);
-      return null;
-    }
-    const result = await ImagePicker.launchImageLibraryAsync({
-      mediaTypes: ['images'],
-      allowsEditing: true,
-      aspect: [1, 1],
-      quality: 0.8
-    });
-    if (result.canceled || !result.assets?.[0]) {
-      return null;
-    }
-    const asset = result.assets[0];
-    const originalName = asset.fileName || asset.uri.split('/').pop();
-    return {
-      uri: asset.uri,
-      type: asset.mimeType || 'image/jpeg',
-      name: originalName || `image_${Date.now()}.jpg`
-    };
-  } catch (error) {
-    console.error('Failed to pick an image:', error);
-    return null;
-  }
-};
-//# sourceMappingURL=pickImageAsset.js.map

package/lib/module/helpers/pickImageAsset.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["Alert","Linking","ImagePicker","pickImageAsset","perm","requestMediaLibraryPermissionsAsync","granted","alert","text","style","onPress","openSettings","result","launchImageLibraryAsync","mediaTypes","allowsEditing","aspect","quality","canceled","assets","asset","originalName","fileName","uri","split","pop","type","mimeType","name","Date","now","error","console"],"sourceRoot":"../../../src","sources":["helpers/pickImageAsset.ts"],"mappings":";;AAAA,SAASA,KAAK,EAAEC,OAAO,QAAQ,cAAc;AAC7C,OAAO,KAAKC,WAAW,MAAM,mBAAmB;;AAEhD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,cAAc,GAAG,MAAAA,CAAA,KAAyC;EACrE,IAAI;IACF;IACA;IACA,MAAMC,IAAI,GAAG,MAAMF,WAAW,CAACG,mCAAmC,CAAC,CAAC;IACpE,IAAI,CAACD,IAAI,CAACE,OAAO,EAAE;MACjBN,KAAK,CAACO,KAAK,CACT,qBAAqB,EACrB,sDAAsD,EACtD,CACE;QAAEC,IAAI,EAAE,QAAQ;QAAEC,KAAK,EAAE;MAAS,CAAC,EACnC;QAAED,IAAI,EAAE,eAAe;QAAEE,OAAO,EAAEA,CAAA,KAAMT,OAAO,CAACU,YAAY,CAAC;MAAE,CAAC,CAEpE,CAAC;MACD,OAAO,IAAI;IACb;IAEA,MAAMC,MAAM,GAAG,MAAMV,WAAW,CAACW,uBAAuB,CAAC;MACvDC,UAAU,EAAE,CAAC,QAAQ,CAAC;MACtBC,aAAa,EAAE,IAAI;MACnBC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;MACdC,OAAO,EAAE;IACX,CAAC,CAAC;IACF,IAAIL,MAAM,CAACM,QAAQ,IAAI,CAACN,MAAM,CAACO,MAAM,GAAG,CAAC,CAAC,EAAE;MAC1C,OAAO,IAAI;IACb;IAEA,MAAMC,KAAK,GAAGR,MAAM,CAACO,MAAM,CAAC,CAAC,CAAC;IAC9B,MAAME,YAAY,GAAGD,KAAK,CAACE,QAAQ,IAAIF,KAAK,CAACG,GAAG,CAACC,KAAK,CAAC,GAAG,CAAC,CAACC,GAAG,CAAC,CAAC;IACjE,OAAO;MACLF,GAAG,EAAEH,KAAK,CAACG,GAAG;MACdG,IAAI,EAAEN,KAAK,CAACO,QAAQ,IAAI,YAAY;MACpCC,IAAI,EAAEP,YAAY,IAAI,SAASQ,IAAI,CAACC,GAAG,CAAC,CAAC;IAC3C,CAAC;EACH,CAAC,CAAC,OAAOC,KAAK,EAAE;IACdC,OAAO,CAACD,KAAK,CAAC,0BAA0B,EAAEA,KAAK,CAAC;IAChD,OAAO,IAAI;EACb;AACF,CAAC","ignoreList":[]}

package/lib/typescript/helpers/pickImageAsset.d.ts

@@ -1,27 +0,0 @@
-/**
- * A picked image in the shape React Native's FormData understands.
- *
- * NOT a web `File`: RN streams a multipart part straight from a `file://`
- * uri and has no usable Blob/File/atob path. Screens ported from the web
- * client used to carry base64 -> Blob -> File helpers that could never
- * have run here.
- */
-export interface PickedImage {
-    uri: string;
-    type: string;
-    name: string;
-}
-/**
- * Ask for library permission, open the picker, and normalise the result.
- *
- * Returns `null` for every non-error outcome — permission refused, user
- * cancelled — so call sites can simply keep their current value.
- *
- * Exists because the avatar pickers are wired to `onPress`, which hands
- * the callback a SyntheticEvent. Storing that event as "the image" (what
- * two screens used to do) rendered a pooled event as an <Image source>
- * and then crashed with "Property is not configurable" when React tried
- * to release it — on top of never letting the user pick anything.
- */
-export declare const pickImageAsset: () => Promise<PickedImage | null>;
-//# sourceMappingURL=pickImageAsset.d.ts.map

package/lib/typescript/helpers/pickImageAsset.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"pickImageAsset.d.ts","sourceRoot":"","sources":["../../../src/helpers/pickImageAsset.ts"],"names":[],"mappings":"AAGA;;;;;;;GAOG;AACH,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,cAAc,QAAa,OAAO,CAAC,WAAW,GAAG,IAAI,CAsCjE,CAAC"}

package/src/helpers/pickImageAsset.ts

@@ -1,68 +0,0 @@
-import { Alert, Linking } from 'react-native';
-import * as ImagePicker from 'expo-image-picker';
-
-/**
- * A picked image in the shape React Native's FormData understands.
- *
- * NOT a web `File`: RN streams a multipart part straight from a `file://`
- * uri and has no usable Blob/File/atob path. Screens ported from the web
- * client used to carry base64 -> Blob -> File helpers that could never
- * have run here.
- */
-export interface PickedImage {
-  uri: string;
-  type: string;
-  name: string;
-}
-
-/**
- * Ask for library permission, open the picker, and normalise the result.
- *
- * Returns `null` for every non-error outcome — permission refused, user
- * cancelled — so call sites can simply keep their current value.
- *
- * Exists because the avatar pickers are wired to `onPress`, which hands
- * the callback a SyntheticEvent. Storing that event as "the image" (what
- * two screens used to do) rendered a pooled event as an <Image source>
- * and then crashed with "Property is not configurable" when React tried
- * to release it — on top of never letting the user pick anything.
- */
-export const pickImageAsset = async (): Promise<PickedImage | null> => {
-  try {
-    // expo-image-picker owns the permission prompt internally and
-    // returns a `granted` flag.
-    const perm = await ImagePicker.requestMediaLibraryPermissionsAsync();
-    if (!perm.granted) {
-      Alert.alert(
-        'Permission required',
-        'Photo library permission is needed to select images.',
-        [
-          { text: 'Cancel', style: 'cancel' },
-          { text: 'Open Settings', onPress: () => Linking.openSettings() },
-        ]
-      );
-      return null;
-    }
-
-    const result = await ImagePicker.launchImageLibraryAsync({
-      mediaTypes: ['images'],
-      allowsEditing: true,
-      aspect: [1, 1],
-      quality: 0.8,
-    });
-    if (result.canceled || !result.assets?.[0]) {
-      return null;
-    }
-
-    const asset = result.assets[0];
-    const originalName = asset.fileName || asset.uri.split('/').pop();
-    return {
-      uri: asset.uri,
-      type: asset.mimeType || 'image/jpeg',
-      name: originalName || `image_${Date.now()}.jpg`,
-    };
-  } catch (error) {
-    console.error('Failed to pick an image:', error);
-    return null;
-  }
-};