Hydrate body ranges for story replies

This commit is contained in:
Fedor Indutny 2022-11-09 20:59:36 -08:00 committed by GitHub
parent 9f85db3fd8
commit be6e988a95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 221 additions and 172 deletions

View file

@ -4,10 +4,14 @@
import React from 'react';
import { sortBy } from 'lodash';
import { Emojify } from './Emojify';
import type { BodyRangesType } from '../../types/Util';
import type {
BodyRangesType,
HydratedBodyRangeType,
HydratedBodyRangesType,
} from '../../types/Util';
export type Props = {
bodyRanges?: BodyRangesType;
bodyRanges?: HydratedBodyRangesType;
direction?: 'incoming' | 'outgoing';
openConversation?: (conversationId: string, messageId?: string) => void;
text: string;
@ -28,7 +32,7 @@ export const AtMentionify = ({
let match = MENTIONS_REGEX.exec(text);
let last = 0;
const rangeStarts = new Map();
const rangeStarts = new Map<number, HydratedBodyRangeType>();
bodyRanges.forEach(range => {
rangeStarts.set(range.start, range);
});
@ -49,7 +53,7 @@ export const AtMentionify = ({
className={`MessageBody__at-mention MessageBody__at-mention--${direction}`}
key={range.start}
onClick={() => {
if (openConversation && range.conversationID) {
if (openConversation) {
openConversation(range.conversationID);
}
}}
@ -57,8 +61,7 @@ export const AtMentionify = ({
if (
e.target === e.currentTarget &&
e.keyCode === 13 &&
openConversation &&
range.conversationID
openConversation
) {
openConversation(range.conversationID);
}