Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: image gallery safe area #2855

Merged
merged 3 commits into from
Dec 18, 2024
Merged

fix: image gallery safe area #2855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
842e570
fix: image gallery safe area
isekovanic Dec 17, 2024
6469f4b
fix: isMessageAIGenerated type issue
isekovanic Dec 17, 2024
b682bd5
fix: bring back animations for opening and closing of the gallery hea…
isekovanic Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/SampleApp/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ const DrawerNavigatorWrapper: React.FC<{
enableOfflineSupport
// @ts-expect-error
ImageComponent={FastImage}
isMessageAIGenerated={(message: MessageType) => message.ai_generated}
isMessageAIGenerated={(message: MessageType) => !!message.ai_generated}
>
<AppOverlayProvider>
<UserSearchProvider>
Expand Down
40 changes: 21 additions & 19 deletions package/src/components/ImageGallery/components/ImageGalleryFooter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ import {
VideoType,
} from '../../../native';

const ReanimatedSafeAreaView = Animated.createAnimatedComponent
? Animated.createAnimatedComponent(SafeAreaView)
: SafeAreaView;

import { DefaultStreamChatGenerics, FileTypes } from '../../../types/types';
import type { Photo } from '../ImageGallery';

Expand Down Expand Up @@ -154,28 +158,26 @@ export const ImageGalleryFooterWithContext = <
};

return (
<SafeAreaView
<Animated.View
accessibilityLabel={accessibilityLabel}
onLayout={(event) => setHeight(event.nativeEvent.layout.height)}
pointerEvents={'box-none'}
style={styles.wrapper}
>
<Animated.View style={footerStyle}>
<View style={[{ backgroundColor: white }, container]}>
{photo.type === FileTypes.Video ? (
videoControlElement ? (
videoControlElement({ duration, onPlayPause, paused, progress, videoRef })
) : (
<ImageGalleryVideoControl
duration={duration}
onPlayPause={onPlayPause}
paused={paused}
progress={progress}
videoRef={videoRef}
/>
)
) : null}
</View>
<ReanimatedSafeAreaView style={[{ backgroundColor: white }, footerStyle, container]}>
{photo.type === FileTypes.Video ? (
videoControlElement ? (
videoControlElement({ duration, onPlayPause, paused, progress, videoRef })
) : (
<ImageGalleryVideoControl
duration={duration}
onPlayPause={onPlayPause}
paused={paused}
progress={progress}
videoRef={videoRef}
/>
)
) : null}
<View style={[styles.innerContainer, { backgroundColor: white }, innerContainer]}>
{leftElement ? (
leftElement({ openGridView, photo, share, shareMenuOpen })
Expand Down Expand Up @@ -204,8 +206,8 @@ export const ImageGalleryFooterWithContext = <
</TouchableOpacity>
)}
</View>
</Animated.View>
</SafeAreaView>
</ReanimatedSafeAreaView>
</Animated.View>
);
};

Expand Down
25 changes: 15 additions & 10 deletions package/src/components/ImageGallery/components/ImageGalleryHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ import type { DefaultStreamChatGenerics } from '../../../types/types';
import { getDateString } from '../../../utils/i18n/getDateString';
import type { Photo } from '../ImageGallery';

const ReanimatedSafeAreaView = Animated.createAnimatedComponent
? Animated.createAnimatedComponent(SafeAreaView)
: SafeAreaView;

export type ImageGalleryHeaderCustomComponent<
StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
> = ({
Expand Down Expand Up @@ -58,6 +62,7 @@ export const ImageGalleryHeader = <
centerContainer,
container,
dateText,
innerContainer,
leftContainer,
rightContainer,
usernameText,
Expand Down Expand Up @@ -93,12 +98,12 @@ export const ImageGalleryHeader = <
};

return (
<SafeAreaView
<View
onLayout={(event) => setHeight(event.nativeEvent.layout.height)}
pointerEvents={'box-none'}
>
<Animated.View style={headerStyle}>
<View style={[styles.container, { backgroundColor: white }, container]}>
<ReanimatedSafeAreaView style={[{ backgroundColor: white }, headerStyle, container]}>
<View style={[styles.innerContainer, innerContainer]}>
{leftElement ? (
leftElement({ hideOverlay, photo })
) : (
Expand All @@ -124,8 +129,8 @@ export const ImageGalleryHeader = <
<View style={[styles.rightContainer, rightContainer]} />
)}
</View>
</Animated.View>
</SafeAreaView>
</ReanimatedSafeAreaView>
</View>
);
};

Expand All @@ -137,16 +142,16 @@ const styles = StyleSheet.create({
flex: 1,
justifyContent: 'center',
},
container: {
flexDirection: 'row',
justifyContent: 'space-between',
paddingVertical: 8,
},
date: {
fontSize: 12,
fontWeight: '500',
opacity: 0.5,
},
innerContainer: {
flexDirection: 'row',
justifyContent: 'space-between',
paddingVertical: 8,
},
leftContainer: {
flex: 1,
justifyContent: 'center',
Expand Down
2 changes: 2 additions & 0 deletions package/src/contexts/themeContext/utils/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ export type Theme = {
centerContainer: ViewStyle;
container: ViewStyle;
dateText: TextStyle;
innerContainer: ViewStyle;
leftContainer: ViewStyle;
rightContainer: ViewStyle;
usernameText: TextStyle;
Expand Down Expand Up @@ -983,6 +984,7 @@ export const defaultTheme: Theme = {
centerContainer: {},
container: {},
dateText: {},
innerContainer: {},
leftContainer: {},
rightContainer: {},
usernameText: {},
Expand Down
Loading