ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-12 15:01:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

landscape: mentions avoid passing entire contacts

Browse Source 
We don't need 2,000 objects inside each mention.
This commit is contained in:
Matilde Park 2020-12-11 14:04:16 -05:00
parent 4530b59dd9
commit 38c66dc06a
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/interface/src/views/apps/chat/components/ChatMessage.tsx
View File

@ -325,7 +325,7 @@ export const MessageContent = ({ content, contacts, remoteContentPolicy, measure
} else if ('text' in content) {
return <TextContent fontSize={fontSize} content={content} />;
} else if ('mention' in content) {
return <Mention group={group} ship={content.mention} contacts={contacts} hideNicknames={hideNicknames} hideAvatars={hideAvatars} />
return <Mention group={group} ship={content.mention} contact={contacts?.[content.mention]} hideNicknames={hideNicknames} hideAvatars={hideAvatars} />
} else {
return null;
}

16
pkg/interface/src/views/components/MentionText.tsx
View File

@ -2,6 +2,7 @@ import React, { useState, useCallback } from "react";
import _ from "lodash";
import { Text, Box } from "@tlon/indigo-react";
import {
Contact,
Contacts,
Content,
LocalUpdateRemoteContentPolicy,
@ -13,7 +14,8 @@ import { ProfileOverlay } from "./ProfileOverlay";
import {useHistory} from "react-router-dom";
interface MentionTextProps {
contacts: Contacts;
contact?: Contact;
contacts?: Contacts;
content: Content[];
group: Group;
remoteContentPolicy: LocalUpdateRemoteContentPolicy;
@ -21,7 +23,7 @@ interface MentionTextProps {
hideAvatars: boolean;
}
export function MentionText(props: MentionTextProps) {
const { content, contacts, group, hideNicknames } = props;
const { content, contacts, contact, group, hideNicknames, hideAvatars } = props;
return (
<>
@ -38,7 +40,7 @@ export function MentionText(props: MentionTextProps) {
);
} else if ("mention" in c) {
return (
<Mention key={idx} contacts={contacts || {}} group={group} ship={c.mention} hideNicknames={hideNicknames} hideAvatars={hideAvatars} />
<Mention key={idx} contacts={contacts || {}} contact={contact || {}} group={group} ship={c.mention} hideNicknames={hideNicknames} hideAvatars={hideAvatars} />
);
}
return null;
@ -49,13 +51,17 @@ export function MentionText(props: MentionTextProps) {
export function Mention(props: {
ship: string;
contacts: Contacts;
contact: Contact;
contacts?: Contacts;
group: Group;
hideNicknames: boolean;
hideAvatars: boolean;
}) {
const { contacts, ship, hideNicknames, hideAvatars } = props;
const contact = contacts[ship];
let { contact } = props;
contact = (contact?.nickname) ? contact : contacts?.[ship];
const showNickname = (Boolean(contact?.nickname) && !hideNicknames);
const name = showNickname ? contact?.nickname : cite(ship);
const [showOverlay, setShowOverlay] = useState(false);