From 91be219ff3346a314853d41d3be3635b12f2f94f Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Mon, 12 Dec 2022 21:02:17 +0100
Subject: [PATCH] Fixed #553

---
 src/screens/Compose/EditAttachment/Image.tsx | 22 ++++++-------
 src/screens/Compose/EditAttachment/Root.tsx  | 34 ++++++++------------
 2 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/src/screens/Compose/EditAttachment/Image.tsx b/src/screens/Compose/EditAttachment/Image.tsx
index 05f0236f..f8b1e118 100644
--- a/src/screens/Compose/EditAttachment/Image.tsx
+++ b/src/screens/Compose/EditAttachment/Image.tsx
@@ -112,6 +112,17 @@ const ComposeEditAttachmentImage: React.FC<Props> = ({ index }) => {
 
   return (
     <>
+      <CustomText
+        fontStyle='M'
+        style={{
+          color: colors.primaryDefault,
+          padding: StyleConstants.Spacing.Global.PagePadding,
+          paddingTop: 0
+        }}
+        fontWeight='Bold'
+      >
+        {t('content.editAttachment.content.imageFocus')}
+      </CustomText>
       <View style={{ overflow: 'hidden', flex: 1, alignItems: 'center' }}>
         <Image
           style={{
@@ -155,17 +166,6 @@ const ComposeEditAttachmentImage: React.FC<Props> = ({ index }) => {
           />
         </GestureDetector>
       </View>
-      {screenReaderEnabled ? null : (
-        <CustomText
-          fontStyle='M'
-          style={{
-            padding: StyleConstants.Spacing.Global.PagePadding,
-            color: colors.primaryDefault
-          }}
-        >
-          {t('content.editAttachment.content.imageFocus')}
-        </CustomText>
-      )}
     </>
   )
 }
diff --git a/src/screens/Compose/EditAttachment/Root.tsx b/src/screens/Compose/EditAttachment/Root.tsx
index fcce19ed..db48d07d 100644
--- a/src/screens/Compose/EditAttachment/Root.tsx
+++ b/src/screens/Compose/EditAttachment/Root.tsx
@@ -2,7 +2,7 @@ import CustomText from '@components/Text'
 import AttachmentVideo from '@components/Timeline/Shared/Attachment/Video'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React, { useContext, useRef } from 'react'
+import React, { useContext } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ScrollView, StyleSheet, TextInput, View } from 'react-native'
 import ComposeContext from '../utils/createContext'
@@ -34,10 +34,10 @@ const ComposeEditAttachmentRoot: React.FC<Props> = ({ index }) => {
               video={
                 video.local
                   ? ({
-                    url: video.local.uri,
-                    preview_url: video.local.thumbnail,
-                    blurhash: video.remote?.blurhash
-                  } as Mastodon.AttachmentVideo)
+                      url: video.local.uri,
+                      preview_url: video.local.thumbnail,
+                      blurhash: video.remote?.blurhash
+                    } as Mastodon.AttachmentVideo)
                   : (video.remote as Mastodon.AttachmentVideo)
               }
             />
@@ -47,45 +47,36 @@ const ComposeEditAttachmentRoot: React.FC<Props> = ({ index }) => {
     return null
   }
 
-  const scrollViewRef = useRef<ScrollView>(null)
-
   return (
-    <ScrollView ref={scrollViewRef}>
-      {mediaDisplay()}
-      <View style={{ padding: StyleConstants.Spacing.Global.PagePadding }}>
-        <CustomText
-          fontStyle='M'
-          style={{ color: colors.primaryDefault }}
-          fontWeight='Bold'
-        >
+    <ScrollView>
+      <View style={{ padding: StyleConstants.Spacing.Global.PagePadding, paddingBottom: 0 }}>
+        <CustomText fontStyle='M' style={{ color: colors.primaryDefault }} fontWeight='Bold'>
           {t('content.editAttachment.content.altText.heading')}
         </CustomText>
         <TextInput
           style={{
-            height: 200,
+            height: StyleConstants.Font.Size.M * 11 + StyleConstants.Spacing.Global.PagePadding * 2,
             ...StyleConstants.FontStyle.M,
             marginTop: StyleConstants.Spacing.M,
             marginBottom: StyleConstants.Spacing.S,
             padding: StyleConstants.Spacing.Global.PagePadding,
-            paddingTop: StyleConstants.Spacing.S * 1.5,
             borderWidth: StyleSheet.hairlineWidth,
             borderColor: colors.border,
             color: colors.primaryDefault
           }}
-          onFocus={() => scrollViewRef.current?.scrollToEnd()}
           maxLength={1500}
           multiline
-          onChangeText={(e) =>
+          onChangeText={e =>
             composeDispatch({
               type: 'attachment/edit',
               payload: {
                 ...theAttachment,
                 description: e
               }
-            })}
+            })
+          }
           placeholder={t('content.editAttachment.content.altText.placeholder')}
           placeholderTextColor={colors.secondary}
-          scrollEnabled
           value={theAttachment.description}
           keyboardAppearance={mode}
         />
@@ -101,6 +92,7 @@ const ComposeEditAttachmentRoot: React.FC<Props> = ({ index }) => {
           {theAttachment.description?.length || 0} / 1500
         </CustomText>
       </View>
+      {mediaDisplay()}
     </ScrollView>
   )
 }