@poolse/react-native 2.0.6 → 2.0.7

package/dist/index.cjs

@@ -511,18 +511,16 @@ function MemberList({
       style: { backgroundColor: theme.colors.paper },
       renderItem: ({ item }) => {
         if (renderItem) return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: renderItem(item) });
-        const name = labelFor?.(item.external_id) ?? item.external_id;
-        const avatarUrl = avatarFor?.(item.external_id) ?? null;
         const isOnline = effectiveOnline.has(item.external_id);
         const showRemove = canRemove?.(item) ?? false;
         return /* @__PURE__ */ jsxRuntime.jsx(
           MemberRow,
           {
-            name,
             externalId: item.external_id,
-            avatarUrl,
             role: item.role,
             online: isOnline,
+            ...labelFor ? { labelFor } : {},
+            ...avatarFor ? { avatarFor } : {},
             ...showRemove ? { onRemove: () => removeMember(item.external_id) } : {}
           }
         );
@@ -531,14 +529,17 @@ function MemberList({
   );
 }
 function MemberRow({
-  name,
   externalId,
-  avatarUrl,
   role,
   online,
+  labelFor,
+  avatarFor,
   onRemove
 }) {
   const theme = usePoolseTheme();
+  const resolved = react$1.useUser(externalId);
+  const name = labelFor?.(externalId) ?? resolved.profile?.displayName ?? externalId;
+  const avatarUrl = avatarFor?.(externalId) ?? resolved.profile?.avatarUrl ?? null;
   return /* @__PURE__ */ jsxRuntime.jsxs(reactNative.View, { style: styles2.row, children: [
     /* @__PURE__ */ jsxRuntime.jsx(Avatar, { src: avatarUrl, name, seed: externalId, online, size: "md" }),
     /* @__PURE__ */ jsxRuntime.jsxs(reactNative.View, { style: styles2.body, children: [
@@ -2872,8 +2873,9 @@ function MessageRow({
   });
   const showAvatarSlot = showAvatar && !isSelf;
   const showAvatarRender = showAvatarSlot && (groupPosition === "last" || groupPosition === "standalone");
-  const avatarUrl = avatarFor && msg.sender_external_id ? avatarFor(msg.sender_external_id) : null;
-  const senderLabel = msg.sender_external_id && labelFor ? labelFor(msg.sender_external_id) : msg.sender_external_id ?? null;
+  const rowSender = react$1.useUser(showAvatarSlot ? msg.sender_external_id : null);
+  const avatarUrl = msg.sender_external_id ? avatarFor?.(msg.sender_external_id) ?? rowSender.profile?.avatarUrl ?? null : null;
+  const senderLabel = msg.sender_external_id ? labelFor?.(msg.sender_external_id) ?? rowSender.profile?.displayName ?? msg.sender_external_id : null;
   return /* @__PURE__ */ jsxRuntime.jsxs(reactNative.View, { style: [styles17.row, { alignSelf: isSelf ? "flex-end" : "flex-start" }], children: [
     showAvatarSlot ? /* @__PURE__ */ jsxRuntime.jsx(reactNative.View, { style: styles17.avatarSlot, children: showAvatarRender ? /* @__PURE__ */ jsxRuntime.jsx(
       Avatar,
@@ -4266,8 +4268,9 @@ function DefaultConversationRow({
   const theme = usePoolseTheme();
   const isDirect = conv.type === "direct";
   const otherExtId = isDirect && meExternalId ? (conv.member_external_ids ?? []).find((x) => x !== meExternalId) : null;
-  const title = isDirect ? otherExtId ? labelFor?.(otherExtId) ?? otherExtId : "Direct chat" : conv.name ?? "Untitled group";
-  const avatarUrl = isDirect && otherExtId ? avatarFor?.(otherExtId) ?? null : null;
+  const resolvedOther = react$1.useUser(isDirect ? otherExtId ?? null : null);
+  const title = isDirect ? otherExtId ? labelFor?.(otherExtId) ?? resolvedOther.profile?.displayName ?? otherExtId : "Direct chat" : conv.name ?? "Untitled group";
+  const avatarUrl = isDirect && otherExtId ? avatarFor?.(otherExtId) ?? resolvedOther.profile?.avatarUrl ?? null : null;
   const avatarSeed = isDirect ? otherExtId ?? conv.id : conv.id;
   return /* @__PURE__ */ jsxRuntime.jsxs(
     reactNative.Pressable,