mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

do not spit url between Read More chunks by expanding chunk to end of url

Browse source
This commit is contained in:
Patrick Demers 2022-04-16 18:40:22 -05:00 • committed by Josh Perez
parent 6ca3452488
commit 5df5cde48c
5 changed files with 142 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ts/components/StoryViewer.tsx
View file

@ -44,9 +44,9 @@ import { ToastType } from '../state/ducks/toast';
import { getAvatarColor } from '../types/Colors';
import { getStoryBackground } from '../util/getStoryBackground';
import { getStoryDuration } from '../util/getStoryDuration';
import { graphemeAwareSlice } from '../util/graphemeAwareSlice';
import type { saveAttachment } from '../util/saveAttachment';
import { isVideoAttachment } from '../types/Attachment';
import { graphemeAndLinkAwareSlice } from '../util/graphemeAndLinkAwareSlice';
import { useEscapeHandling } from '../hooks/useEscapeHandling';
import { useRetryStorySend } from '../hooks/useRetryStorySend';
import { resolveStorySendStatus } from '../util/resolveStorySendStatus';
@ -228,7 +228,7 @@ export function StoryViewer({
return;
}
return graphemeAwareSlice(
return graphemeAndLinkAwareSlice(
attachment.caption,
hasExpandedCaption ? CAPTION_MAX_LENGTH : CAPTION_INITIAL_LENGTH,
CAPTION_BUFFER

4
ts/components/conversation/MessageBodyReadMore.tsx
View file

@ -5,7 +5,7 @@ import React from 'react';
import type { Props as MessageBodyPropsType } from './MessageBody';
import { MessageBody } from './MessageBody';
import { graphemeAwareSlice } from '../../util/graphemeAwareSlice';
import { graphemeAndLinkAwareSlice } from '../../util/graphemeAndLinkAwareSlice';
export type Props = Pick<
MessageBodyPropsType,
@ -46,7 +46,7 @@ export function MessageBodyReadMore({
}: Props): JSX.Element {
const maxLength = displayLimit || INITIAL_LENGTH;
const { hasReadMore, text: slicedText } = graphemeAwareSlice(
const { hasReadMore, text: slicedText } = graphemeAndLinkAwareSlice(
text,
maxLength,
BUFFER