From 609e4b9bb72eec9de0b709b4e57257f983c828e9 Mon Sep 17 00:00:00 2001
From: Eric Bailey <git@esb.lol>
Date: Sat, 18 Jan 2025 11:35:48 -0600
Subject: [PATCH] Make whole text clickable to expand

(cherry picked from commit 4cf31120779f4e06eb4c296b3d4b53814d432b07)
---
 src/screens/VideoFeed/index.tsx | 37 +++++++++++++--------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/screens/VideoFeed/index.tsx b/src/screens/VideoFeed/index.tsx
index ac93d72595..5190f1e910 100644
--- a/src/screens/VideoFeed/index.tsx
+++ b/src/screens/VideoFeed/index.tsx
@@ -2,6 +2,7 @@ import React, {useCallback, useMemo, useRef, useState} from 'react'
 import {
   LayoutAnimation,
   ListRenderItem,
+  Pressable,
   ScrollView,
   View,
   ViewToken,
@@ -540,13 +541,7 @@ function Overlay({
                   screen: 'Profile',
                   params: {name: post.author.did},
                 }}
-                style={[
-                  a.flex_1,
-                  a.flex_row,
-                  a.gap_md,
-                  a.pb_sm,
-                  a.align_center,
-                ]}>
+                style={[a.flex_1, a.flex_row, a.gap_md, a.align_center]}>
                 <UserAvatar type="user" avatar={post.author.avatar} size={32} />
                 <View style={[a.flex_1]}>
                   <Text
@@ -597,12 +592,10 @@ function Overlay({
               )}
             </View>
             {record?.text?.trim() && (
-              <View style={[a.pb_sm]}>
-                <ExpandableRichTextView
-                  value={richText}
-                  authorHandle={post.author.handle}
-                />
-              </View>
+              <ExpandableRichTextView
+                value={richText}
+                authorHandle={post.author.handle}
+              />
             )}
             {record && (
               <View style={[{left: -5}]}>
@@ -867,15 +860,16 @@ function ExpandableRichTextView({
       }}
       style={{height: Math.min(contentHeight, screenHeight * 0.5)}}
       contentContainerStyle={[
+        a.py_sm,
         a.gap_xs,
         expanded ? [a.align_start] : a.flex_row,
       ]}>
       <RichText
         value={value}
-        style={[a.text_sm, a.flex_1]}
+        style={[a.text_sm, a.flex_1, a.leading_normal]}
         authorHandle={authorHandle}
         enableTags
-        numberOfLines={expanded ? undefined : constrained ? 1 : 2}
+        numberOfLines={expanded ? undefined : constrained ? 2 : 2}
         onTextLayout={evt => {
           if (!constrained && evt.nativeEvent.lines.length > 1) {
             setConstrained(true)
@@ -883,14 +877,13 @@ function ExpandableRichTextView({
         }}
       />
       {constrained && (
-        <Button
-          label={expanded ? _(msg`Read less`) : _(msg`Read more`)}
+        <Pressable
+          accessibilityHint={_(msg`Tap to expand or collapse post text.`)}
+          accessibilityLabel={expanded ? _(msg`Read less`) : _(msg`Read more`)}
           hitSlop={HITSLOP_20}
-          onPress={() => setExpanded(prev => !prev)}>
-          <ButtonText>
-            {expanded ? <Trans>Read less</Trans> : <Trans>Read more</Trans>}
-          </ButtonText>
-        </Button>
+          onPress={() => setExpanded(prev => !prev)}
+          style={[a.absolute, a.inset_0]}
+        />
       )}
     </ScrollView>
   )