Make alt text scrollable on native (#5642)
This commit is contained in:
@@ -1,24 +1,28 @@
|
|||||||
import React from 'react'
|
import React from 'react'
|
||||||
import {LayoutAnimation, StyleSheet, View} from 'react-native'
|
import {Dimensions, LayoutAnimation, StyleSheet, View} from 'react-native'
|
||||||
|
import {useSafeAreaInsets} from 'react-native-safe-area-context'
|
||||||
import * as MediaLibrary from 'expo-media-library'
|
import * as MediaLibrary from 'expo-media-library'
|
||||||
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
|
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
|
||||||
import {msg, Trans} from '@lingui/macro'
|
import {msg, Trans} from '@lingui/macro'
|
||||||
import {useLingui} from '@lingui/react'
|
import {useLingui} from '@lingui/react'
|
||||||
|
|
||||||
|
import {saveImageToMediaLibrary, shareImageModal} from '#/lib/media/manip'
|
||||||
|
import {colors, s} from '#/lib/styles'
|
||||||
|
import {isIOS} from '#/platform/detection'
|
||||||
import {
|
import {
|
||||||
ImagesLightbox,
|
ImagesLightbox,
|
||||||
ProfileImageLightbox,
|
ProfileImageLightbox,
|
||||||
useLightbox,
|
useLightbox,
|
||||||
useLightboxControls,
|
useLightboxControls,
|
||||||
} from '#/state/lightbox'
|
} from '#/state/lightbox'
|
||||||
import {saveImageToMediaLibrary, shareImageModal} from 'lib/media/manip'
|
import {ScrollView} from '#/view/com/util/Views'
|
||||||
import {colors, s} from 'lib/styles'
|
|
||||||
import {isIOS} from 'platform/detection'
|
|
||||||
import {Button} from '../util/forms/Button'
|
import {Button} from '../util/forms/Button'
|
||||||
import {Text} from '../util/text/Text'
|
import {Text} from '../util/text/Text'
|
||||||
import * as Toast from '../util/Toast'
|
import * as Toast from '../util/Toast'
|
||||||
import ImageView from './ImageViewing'
|
import ImageView from './ImageViewing'
|
||||||
|
|
||||||
|
const SCREEN_HEIGHT = Dimensions.get('window').height
|
||||||
|
|
||||||
export function Lightbox() {
|
export function Lightbox() {
|
||||||
const {activeLightbox} = useLightbox()
|
const {activeLightbox} = useLightbox()
|
||||||
const {closeLightbox} = useLightboxControls()
|
const {closeLightbox} = useLightboxControls()
|
||||||
@@ -62,6 +66,9 @@ function LightboxFooter({imageIndex}: {imageIndex: number}) {
|
|||||||
const [permissionResponse, requestPermission] = MediaLibrary.usePermissions({
|
const [permissionResponse, requestPermission] = MediaLibrary.usePermissions({
|
||||||
granularPermissions: ['photo'],
|
granularPermissions: ['photo'],
|
||||||
})
|
})
|
||||||
|
const insets = useSafeAreaInsets()
|
||||||
|
const svMaxHeight = SCREEN_HEIGHT - insets.top - 50
|
||||||
|
const isMomentumScrolling = React.useRef(false)
|
||||||
|
|
||||||
const saveImageToAlbumWithToasts = React.useCallback(
|
const saveImageToAlbumWithToasts = React.useCallback(
|
||||||
async (uri: string) => {
|
async (uri: string) => {
|
||||||
@@ -110,7 +117,25 @@ function LightboxFooter({imageIndex}: {imageIndex: number}) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={[styles.footer]}>
|
<ScrollView
|
||||||
|
style={[
|
||||||
|
{
|
||||||
|
backgroundColor: '#000d',
|
||||||
|
},
|
||||||
|
{maxHeight: svMaxHeight},
|
||||||
|
]}
|
||||||
|
scrollEnabled={isAltExpanded}
|
||||||
|
onMomentumScrollBegin={() => {
|
||||||
|
isMomentumScrolling.current = true
|
||||||
|
}}
|
||||||
|
onMomentumScrollEnd={() => {
|
||||||
|
isMomentumScrolling.current = false
|
||||||
|
}}
|
||||||
|
contentContainerStyle={{
|
||||||
|
paddingTop: 16,
|
||||||
|
paddingBottom: insets.bottom + 10,
|
||||||
|
paddingHorizontal: 24,
|
||||||
|
}}>
|
||||||
{altText ? (
|
{altText ? (
|
||||||
<View accessibilityRole="button" style={styles.footerText}>
|
<View accessibilityRole="button" style={styles.footerText}>
|
||||||
<Text
|
<Text
|
||||||
@@ -118,9 +143,12 @@ function LightboxFooter({imageIndex}: {imageIndex: number}) {
|
|||||||
numberOfLines={isAltExpanded ? undefined : 3}
|
numberOfLines={isAltExpanded ? undefined : 3}
|
||||||
selectable
|
selectable
|
||||||
onPress={() => {
|
onPress={() => {
|
||||||
|
if (isMomentumScrolling.current) {
|
||||||
|
return
|
||||||
|
}
|
||||||
LayoutAnimation.configureNext({
|
LayoutAnimation.configureNext({
|
||||||
duration: 300,
|
duration: 450,
|
||||||
update: {type: 'spring', springDamping: 0.7},
|
update: {type: 'spring', springDamping: 1},
|
||||||
})
|
})
|
||||||
setAltExpanded(prev => !prev)
|
setAltExpanded(prev => !prev)
|
||||||
}}
|
}}
|
||||||
@@ -149,17 +177,11 @@ function LightboxFooter({imageIndex}: {imageIndex: number}) {
|
|||||||
</Text>
|
</Text>
|
||||||
</Button>
|
</Button>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</ScrollView>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
const styles = StyleSheet.create({
|
const styles = StyleSheet.create({
|
||||||
footer: {
|
|
||||||
paddingTop: 16,
|
|
||||||
paddingBottom: isIOS ? 40 : 24,
|
|
||||||
paddingHorizontal: 24,
|
|
||||||
backgroundColor: '#000d',
|
|
||||||
},
|
|
||||||
footerText: {
|
footerText: {
|
||||||
paddingBottom: isIOS ? 20 : 16,
|
paddingBottom: isIOS ? 20 : 16,
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user