Skip to content

Commit

Permalink
Add layout transitions to the composer photo gallery on iOS (#3609)
Browse files Browse the repository at this point in the history
* add layoutanimation + transition to images

* make iOS-only

* use useLayoutEffect

* make iOS only (again)
  • Loading branch information
mozzius authored Apr 18, 2024
1 parent bef7d8a commit 1a5b8b2
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 10 deletions.
17 changes: 16 additions & 1 deletion src/view/com/composer/Composer.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'
import React, {
useCallback,
useEffect,
useLayoutEffect,
useMemo,
useRef,
useState,
} from 'react'
import {
ActivityIndicator,
BackHandler,
Keyboard,
KeyboardAvoidingView,
LayoutAnimation,
Platform,
Pressable,
ScrollView,
Expand Down Expand Up @@ -122,6 +130,13 @@ export const ComposePost = observer(function ComposePost({
() => new GalleryModel(initImageUris),
[initImageUris],
)

useLayoutEffect(() => {
if (isIOS) {
LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut)
}
}, [gallery.size])

const onClose = useCallback(() => {
closeComposer()
}, [closeComposer])
Expand Down
20 changes: 11 additions & 9 deletions src/view/com/composer/photos/Gallery.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
import React, {useState} from 'react'
import {ImageStyle, Keyboard, LayoutChangeEvent} from 'react-native'
import {GalleryModel} from 'state/models/media/gallery'
import {observer} from 'mobx-react-lite'
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
import {s, colors} from 'lib/styles'
import {StyleSheet, TouchableOpacity, View} from 'react-native'
import {Image} from 'expo-image'
import {Text} from 'view/com/util/text/Text'
import {Dimensions} from 'lib/media/types'
import {usePalette} from 'lib/hooks/usePalette'
import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries'
import {Trans, msg} from '@lingui/macro'
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
import {msg, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'
import {observer} from 'mobx-react-lite'

import {useModalControls} from '#/state/modals'
import {usePalette} from 'lib/hooks/usePalette'
import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries'
import {Dimensions} from 'lib/media/types'
import {colors, s} from 'lib/styles'
import {isNative} from 'platform/detection'
import {GalleryModel} from 'state/models/media/gallery'
import {Text} from 'view/com/util/text/Text'

const IMAGE_GAP = 8

Expand Down Expand Up @@ -197,6 +198,7 @@ const GalleryInner = observer(function GalleryImpl({
}}
accessible={true}
accessibilityIgnoresInvertColors
transition={200}
/>
</View>
))}
Expand Down

0 comments on commit 1a5b8b2

Please sign in to comment.