Skip to content

Lightbox spinner: Show spinner in Lightbox when slow to load #2946

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Lightbox spinner: Show spinner in Lightbox when slow to load #2946

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
15 changes: 13 additions & 2 deletions src/lightbox/Lightbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import { constructActionSheetButtons, executeActionSheetAction } from './Lightbo
import { NAVBAR_SIZE } from '../styles';
import { getGravatarFromEmail } from '../utils/avatar';
import { navigateBack } from '../actions';
import { LoadingIndicator } from '../common';

const styles = StyleSheet.create({
img: {
height: 300,
flex: 1,
},
header: {},
Expand All @@ -45,12 +45,14 @@ type Props = {

type State = {
movement: 'in' | 'out',
loaded: boolean,
};

class Lightbox extends PureComponent<Props, State> {
props: Props;
state: State = {
movement: 'out',
loaded: false,
};

handleImagePress = () => {
Expand Down Expand Up @@ -89,12 +91,19 @@ class Lightbox extends PureComponent<Props, State> {
movement: this.state.movement,
});

showImage = () => {
this.setState({
loaded: true,
});
};

render() {
const { src, message, auth } = this.props;
const footerMessage =
message.type === 'stream' ? `Shared in #${message.display_recipient}` : 'Shared with you';
const resource = getResource(src, auth);
const { width, height } = Dimensions.get('window');
const displayImage = this.state.loaded ? 'flex' : 'none';

return (
<View style={styles.container}>
Expand All @@ -109,10 +118,12 @@ class Lightbox extends PureComponent<Props, State> {
realm={auth.realm}
{...this.getAnimationProps()}
/>
{!this.state.loaded && <LoadingIndicator />}
<PhotoView
source={resource}
style={[styles.img, { width }]}
style={[styles.img, { width }, { display: displayImage }]}
resizeMode="contain"
onLoadEnd={this.showImage}
onTap={this.handleImagePress}
/>
<AnimatedLightboxFooter
Expand Down