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

image-viewer: modal to avoid shrinking drawers #4548

Merged
merged 1 commit into from
Mar 25, 2025
Merged

image-viewer: modal to avoid shrinking drawers #4548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions packages/app/navigation/desktop/HomeNavigator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,12 @@ export const HomeNavigator = () => {
const state = navigation.getState();
const routes = state.routes[state.index].state?.routes;
const currentScreen = routes?.[routes.length - 1];
const isImageViewer = currentScreen?.name === 'ImageViewer';

return {
drawerType: 'permanent',
headerShown: false,
drawerStyle: {
width: isImageViewer ? 0 : DESKTOP_SIDEBAR_WIDTH,
width: DESKTOP_SIDEBAR_WIDTH,
backgroundColor,
borderRightColor: borderColor,
},
Expand Down
3 changes: 1 addition & 2 deletions packages/app/navigation/desktop/MessagesNavigator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,12 @@ export const MessagesNavigator = () => {
const state = navigation.getState();
const routes = state.routes[state.index].state?.routes;
const currentScreen = routes?.[routes.length - 1];
const isImageViewer = currentScreen?.name === 'ImageViewer';

return {
drawerType: 'permanent',
headerShown: false,
drawerStyle: {
width: isImageViewer ? 0 : DESKTOP_SIDEBAR_WIDTH,
width: DESKTOP_SIDEBAR_WIDTH,
backgroundColor,
borderRightColor: borderColor,
},
Expand Down
176 changes: 93 additions & 83 deletions packages/app/ui/components/ImageViewerScreenView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Image } from '@tloncorp/ui';
import * as FileSystem from 'expo-file-system';
import * as MediaLibrary from 'expo-media-library';
import { ElementRef, useRef, useState } from 'react';
import { Alert, Dimensions, TouchableOpacity } from 'react-native';
import { Alert, Dimensions, Modal, TouchableOpacity } from 'react-native';
import {
Directions,
Gesture,
Expand Down Expand Up @@ -96,96 +96,106 @@ export function ImageViewerScreenView(props: {
};

return (
<GestureDetector gesture={dismissGesture}>
<ZStack
flex={1}
backgroundColor="$black"
paddingTop={top}
data-testid="image-viewer"
>
<View flex={isWeb ? 0 : 1}>
{isWeb ? (
<Zoomable
ref={zoomableRef}
data-testid="zoomable-image"
style={{
height: '100%',
alignItems: 'center',
}}
isDoubleTapEnabled
isSingleTapEnabled
isPanEnabled
minScale={0.1}
onPinchEnd={handlePinchEnd}
onDoubleTap={onDoubleTap}
onSingleTap={onSingleTap}
maxPanPointers={maxPanPointers}
>
<Image
source={{
uri: props.uri,
}}
data-testid="image"
<Modal animationType="none">
<GestureDetector gesture={dismissGesture}>
<ZStack
flex={1}
backgroundColor="$black"
paddingTop={top}
data-testid="image-viewer"
>
<View flex={1}>
{isWeb ? (
<Zoomable
ref={zoomableRef}
data-testid="zoomable-image"
style={{
maxWidth: Dimensions.get('window').width,
maxHeight: Dimensions.get('window').height - top,
flex: 1,
height: '100%',
alignItems: 'center',
justifyContent: 'center',
}}
isDoubleTapEnabled
isSingleTapEnabled
isPanEnabled
minScale={0.1}
onPinchEnd={handlePinchEnd}
onDoubleTap={onDoubleTap}
onSingleTap={onSingleTap}
maxPanPointers={maxPanPointers}
>
<Image
source={{
uri: props.uri,
}}
data-testid="image"
style={{
height: 'auto',
maxWidth: Dimensions.get('window').width,
maxHeight: Dimensions.get('window').height - top,
}}
/>
</Zoomable>
) : (
<ImageZoom
ref={zoomableRef}
uri={props.uri}
style={{ flex: 1 }}
isDoubleTapEnabled
isSingleTapEnabled
isPanEnabled
width={Dimensions.get('window').width - 20}
maxPanPointers={maxPanPointers}
minScale={0.1}
onPinchEnd={handlePinchEnd}
onDoubleTap={onDoubleTap}
onSingleTap={onSingleTap}
/>
</Zoomable>
) : (
<ImageZoom
ref={zoomableRef}
uri={props.uri}
style={{ flex: 1 }}
isDoubleTapEnabled
isSingleTapEnabled
isPanEnabled
width={Dimensions.get('window').width - 20}
maxPanPointers={maxPanPointers}
minScale={0.1}
onPinchEnd={handlePinchEnd}
onDoubleTap={onDoubleTap}
onSingleTap={onSingleTap}
/>
)}
</View>
)}
</View>

{/* overlay */}
{showOverlay ? (
<YStack padding="$xl" paddingTop={isWeb ? 16 : top}>
<XStack
justifyContent={isWeb ? 'flex-end' : 'space-between'}
gap="$m"
{/* overlay */}
{showOverlay ? (
<YStack
position="absolute"
width="100%"
padding="$xl"
paddingTop={isWeb ? 16 : top}
>
<TouchableOpacity
onPress={handleDownloadImage}
activeOpacity={0.8}
<XStack
justifyContent={isWeb ? 'flex-end' : 'space-between'}
gap="$m"
>
<Stack
padding="$m"
backgroundColor="$darkOverlay"
borderRadius="$l"
<TouchableOpacity
onPress={handleDownloadImage}
activeOpacity={0.8}
>
<Icon type="ArrowDown" size="$l" color="$white" />
</Stack>
</TouchableOpacity>
<Stack
padding="$m"
backgroundColor="$darkOverlay"
borderRadius="$l"
>
<Icon type="ArrowDown" size="$l" color="$white" />
</Stack>
</TouchableOpacity>

<TouchableOpacity
onPress={() => props.goBack()}
activeOpacity={0.8}
>
<Stack
padding="$m"
backgroundColor="$darkOverlay"
borderRadius="$l"
<TouchableOpacity
onPress={() => props.goBack()}
activeOpacity={0.8}
>
<Icon type="Close" size="$l" color="$white" />
</Stack>
</TouchableOpacity>
</XStack>
</YStack>
) : null}
</ZStack>
</GestureDetector>
<Stack
padding="$m"
backgroundColor="$darkOverlay"
borderRadius="$l"
>
<Icon type="Close" size="$l" color="$white" />
</Stack>
</TouchableOpacity>
</XStack>
</YStack>
) : null}
</ZStack>
</GestureDetector>
</Modal>
);
}