diff options
author | dan <dan.abramov@gmail.com> | 2024-11-21 22:52:16 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-11-21 22:52:16 +0000 |
commit | dc3a42edb1bcdb8c7f07111e936dddcfac1c1bb1 (patch) | |
tree | 7508231ca720f6bc3a833cb6504443685c4115b2 /src/components/RichText.tsx | |
parent | 84724bb940a827a7020da6ccbd6fa80f7209a455 (diff) | |
download | voidsky-dc3a42edb1bcdb8c7f07111e936dddcfac1c1bb1.tar.zst |
Reduce <Text> nesting (#6615)
* Move isOnlyEmoji out of RichText To fix Fast Refresh. * Make renderChildrenWithEmoji work with any children * Always go through UITextView for consistency It already contains the `selectable` and `iOS` checks inside. * Move `emoji` check into `renderChildrenWithEmoji` * Remove unnecessary intermediate UITextView nodes * Make childHasEmoji check recursive It didn't handle nested arrays etc correctly before. * Remove the "children must be string" limitation Should not be necessary now that we correctly handle nested arrays etc. * Fix unnecessary regex reallocation This doesn't have a global flag so it's okay to reuse. * Remove unnecessary <Text> wrapper in RichText
Diffstat (limited to 'src/components/RichText.tsx')
-rw-r--r-- | src/components/RichText.tsx | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/components/RichText.tsx b/src/components/RichText.tsx index e2d05ac6c..6d7e50e48 100644 --- a/src/components/RichText.tsx +++ b/src/components/RichText.tsx @@ -9,6 +9,7 @@ import {NavigationProp} from '#/lib/routes/types' import {toShortUrl} from '#/lib/strings/url-helpers' import {isNative} from '#/platform/detection' import {atoms as a, flatten, native, TextStyleProp, useTheme, web} from '#/alf' +import {isOnlyEmoji} from '#/alf/typography' import {useInteractionState} from '#/components/hooks/useInteractionState' import {InlineLinkText, LinkProps} from '#/components/Link' import {ProfileHoverCard} from '#/components/ProfileHoverCard' @@ -150,17 +151,14 @@ export function RichText({ />, ) } else { - els.push( - <Text key={key} emoji style={plainStyles}> - {segment.text} - </Text>, - ) + els.push(segment.text) } key++ } return ( <Text + emoji selectable={selectable} testID={testID} style={plainStyles} @@ -250,10 +248,3 @@ function RichTextTag({ </React.Fragment> ) } - -export function isOnlyEmoji(text: string) { - return ( - text.length <= 15 && - /^[\p{Emoji_Presentation}\p{Extended_Pictographic}]+$/u.test(text) - ) -} |