From 52c44c600cdd9f792ba0d798133a79528511b75e Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Mon, 10 Oct 2022 23:28:40 +0200
Subject: [PATCH] Fixed #397

---
 src/components/Parse/HTML.tsx              | 32 ++++++----------------
 src/components/Timeline/Shared/Content.tsx | 14 ++--------
 2 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/src/components/Parse/HTML.tsx b/src/components/Parse/HTML.tsx
index b42b28c8..bd0fd13a 100644
--- a/src/components/Parse/HTML.tsx
+++ b/src/components/Parse/HTML.tsx
@@ -76,9 +76,7 @@ const renderNode = ({
             </CustomText>
           )
         } else if (classes.includes('mention') && mentions) {
-          const accountIndex = mentions.findIndex(
-            mention => mention.url === href
-          )
+          const accountIndex = mentions.findIndex(mention => mention.url === href)
           const differentAccount = routeParams?.account
             ? routeParams.account.id !== mentions[accountIndex]?.id
             : true
@@ -86,8 +84,7 @@ const renderNode = ({
             <CustomText
               key={index}
               style={{
-                color:
-                  accountIndex !== -1 ? colors.blue : colors.primaryDefault,
+                color: accountIndex !== -1 ? colors.blue : colors.primaryDefault,
                 fontSize: adaptedFontsize,
                 lineHeight: adaptedLineheight
               }}
@@ -109,10 +106,8 @@ const renderNode = ({
       } else {
         const domain = href?.split(new RegExp(/:\/\/(.[^\/]+)/))
         // Need example here
-        const content =
-          node.children && node.children[0] && node.children[0].data
-        const shouldBeTag =
-          tags && tags.filter(tag => `#${tag.name}` === content).length > 0
+        const content = node.children && node.children[0] && node.children[0].data
+        const shouldBeTag = tags && tags.filter(tag => `#${tag.name}` === content).length > 0
         return (
           <CustomText
             key={index}
@@ -135,8 +130,7 @@ const renderNode = ({
               }
             }}
           >
-            {(content && content !== href && content) ||
-              (showFullLink ? href : domain[1])}
+            {(content && content !== href && content) || (showFullLink ? href : domain[1])}
             {!shouldBeTag ? (
               <Icon
                 color={colors.blue}
@@ -205,8 +199,7 @@ const ParseHTML = React.memo(
       adaptiveSize ? adaptiveFontsize : 0
     )
 
-    const navigation =
-      useNavigation<StackNavigationProp<TabLocalStackParamList>>()
+    const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
     const route = useRoute()
     const { colors, theme } = useTheme()
     const { t, i18n } = useTranslation('componentParse')
@@ -254,7 +247,7 @@ const ParseHTML = React.memo(
 
         return (
           <View style={{ overflow: 'hidden' }}>
-            {typeof totalLines === 'number' ? (
+            {typeof totalLines === 'number' || numberOfLines === 1 ? (
               <Pressable
                 accessibilityLabel={t('HTML.accessibilityHint')}
                 onPress={() => {
@@ -296,10 +289,7 @@ const ParseHTML = React.memo(
             <CustomText
               children={children}
               onTextLayout={({ nativeEvent }) => {
-                if (
-                  numberOfLines === 1 ||
-                  nativeEvent.lines.length >= numberOfLines + 5
-                ) {
+                if (numberOfLines === 1 || nativeEvent.lines.length >= numberOfLines + 5) {
                   setTotalLines(nativeEvent.lines.length)
                 }
               }}
@@ -307,11 +297,7 @@ const ParseHTML = React.memo(
                 height: numberOfLines === 1 && !expanded ? 0 : undefined
               }}
               numberOfLines={
-                typeof totalLines === 'number'
-                  ? expanded
-                    ? 999
-                    : numberOfLines
-                  : undefined
+                typeof totalLines === 'number' ? (expanded ? 999 : numberOfLines) : undefined
               }
               selectable={selectable}
             />
diff --git a/src/components/Timeline/Shared/Content.tsx b/src/components/Timeline/Shared/Content.tsx
index 25df7d5b..cfdbcbb7 100644
--- a/src/components/Timeline/Shared/Content.tsx
+++ b/src/components/Timeline/Shared/Content.tsx
@@ -9,18 +9,12 @@ export interface Props {
     mentions?: Mastodon.Status['mentions']
     tags?: Mastodon.Status['tags']
   }
-  numberOfLines?: number
   highlighted?: boolean
   disableDetails?: boolean
 }
 
 const TimelineContent = React.memo(
-  ({
-    status,
-    numberOfLines,
-    highlighted = false,
-    disableDetails = false
-  }: Props) => {
+  ({ status, highlighted = false, disableDetails = false }: Props) => {
     const { t } = useTranslation('componentTimeline')
     const instanceAccount = useSelector(getInstanceAccount, () => true)
 
@@ -46,9 +40,7 @@ const TimelineContent = React.memo(
               emojis={status.emojis}
               mentions={status.mentions}
               tags={status.tags}
-              numberOfLines={
-                instanceAccount.preferences['reading:expand:spoilers'] ? 999 : 1
-              }
+              numberOfLines={instanceAccount.preferences['reading:expand:spoilers'] ? 999 : 1}
               expandHint={t('shared.content.expandHint')}
               highlighted={highlighted}
               disableDetails={disableDetails}
@@ -62,7 +54,7 @@ const TimelineContent = React.memo(
             emojis={status.emojis}
             mentions={status.mentions}
             tags={status.tags}
-            numberOfLines={highlighted ? 999 : numberOfLines}
+            numberOfLines={highlighted ? 999 : undefined}
             disableDetails={disableDetails}
           />
         )}