Ensure timeline interruption only gets rendered after the posts. Fixes #38
This commit is contained in:
parent
78eaf0efe6
commit
1aebc9f770
|
@ -13,6 +13,7 @@ import * as requests from "src/requests";
|
||||||
const FeedJsx = (props) => {
|
const FeedJsx = (props) => {
|
||||||
const [state, setState] = useState({
|
const [state, setState] = useState({
|
||||||
loaded: false,
|
loaded: false,
|
||||||
|
postsRendered: false,
|
||||||
});
|
});
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
@ -63,6 +64,43 @@ const FeedJsx = (props) => {
|
||||||
);
|
);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
const _handleTimelineLoaded = () => setState({...state,
|
||||||
|
postsRendered: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
let endOfTimelineMessage = <></>;
|
||||||
|
if (state.postsRendered) {
|
||||||
|
// Only render the timeline interruption if all of the posts have been
|
||||||
|
// rendered in the feed.
|
||||||
|
endOfTimelineMessage = <>
|
||||||
|
<View style = {
|
||||||
|
state.posts.length == 0
|
||||||
|
? {}
|
||||||
|
: styles.interruption.topBorder
|
||||||
|
}>
|
||||||
|
<View style = { styles.interruption.inner }>
|
||||||
|
<Ionicons
|
||||||
|
name="ios-checkmark-circle-outline"
|
||||||
|
size= { 150 }
|
||||||
|
color="black" />
|
||||||
|
|
||||||
|
<Text style = { styles.interruption.header }>
|
||||||
|
You're all caught up.
|
||||||
|
</Text>
|
||||||
|
<Text> Wow, it sure is a lovely day outside 🌳 </Text>
|
||||||
|
|
||||||
|
<TouchableWithoutFeedback
|
||||||
|
style = { styles.interruption.button }
|
||||||
|
onPress = {
|
||||||
|
() => props.navigation.navigate("OlderPosts")
|
||||||
|
}>
|
||||||
|
<Text> See older posts </Text>
|
||||||
|
</TouchableWithoutFeedback>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
</>;
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{ state.loaded
|
{ state.loaded
|
||||||
|
@ -77,33 +115,9 @@ const FeedJsx = (props) => {
|
||||||
|
|
||||||
<TimelineViewJsx
|
<TimelineViewJsx
|
||||||
navigation = { props.navigation }
|
navigation = { props.navigation }
|
||||||
posts = { state.posts } />
|
posts = { state.posts }
|
||||||
<View style = {
|
onTimelineLoaded = { _handleTimelineLoaded }/>
|
||||||
state.posts.length == 0
|
{ endOfTimelineMessage }
|
||||||
? {}
|
|
||||||
: styles.interruption.topBorder
|
|
||||||
}>
|
|
||||||
|
|
||||||
<View style = { styles.interruption.inner }>
|
|
||||||
<Ionicons
|
|
||||||
name="ios-checkmark-circle-outline"
|
|
||||||
size= { 150 }
|
|
||||||
color="black" />
|
|
||||||
|
|
||||||
<Text style = { styles.interruption.header }>
|
|
||||||
You're all caught up.
|
|
||||||
</Text>
|
|
||||||
<Text> Wow, it sure is a lovely day outside 🌳 </Text>
|
|
||||||
|
|
||||||
<TouchableWithoutFeedback
|
|
||||||
style = { styles.interruption.button }
|
|
||||||
onPress = {
|
|
||||||
() => props.navigation.navigate("OlderPosts")
|
|
||||||
}>
|
|
||||||
<Text> See older posts </Text>
|
|
||||||
</TouchableWithoutFeedback>
|
|
||||||
</View>
|
|
||||||
</View>
|
|
||||||
</ScreenWithTrayJsx>
|
</ScreenWithTrayJsx>
|
||||||
: <></>
|
: <></>
|
||||||
}
|
}
|
||||||
|
|
|
@ -180,8 +180,8 @@ export const RawPostJsx = (props) => {
|
||||||
|
|
||||||
export const PostByDataJsx = (props) => {
|
export const PostByDataJsx = (props) => {
|
||||||
/*
|
/*
|
||||||
Renders a post where the data is supplied directly to the element through
|
* Renders a post where the data is supplied directly to the element through
|
||||||
its properties, as it is in a timeline.
|
* its properties, as it is in a timeline.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
let [state, setState] = useState({
|
let [state, setState] = useState({
|
||||||
|
@ -217,6 +217,10 @@ export const PostByDataJsx = (props) => {
|
||||||
own,
|
own,
|
||||||
loaded: true
|
loaded: true
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (props.onPostLoaded != null) {
|
||||||
|
props.onPostLoaded();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
@ -417,13 +421,6 @@ const styles = {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// customStyles for react-native-popup-menu should be defined in particular
|
|
||||||
// objects to be interpreted correctly.
|
|
||||||
|
|
||||||
//const menuStyles = {
|
|
||||||
// menuProviderWrapper
|
|
||||||
//}
|
|
||||||
|
|
||||||
const optionsStyles = {
|
const optionsStyles = {
|
||||||
optionWrapper: { // The wrapper around a single option
|
optionWrapper: { // The wrapper around a single option
|
||||||
paddingLeft: SCREEN_WIDTH / 15,
|
paddingLeft: SCREEN_WIDTH / 15,
|
||||||
|
|
|
@ -1,15 +1,30 @@
|
||||||
import React from "react";
|
import React, { useState, useEffect } from "react";
|
||||||
import { View } from "react-native";
|
import { View } from "react-native";
|
||||||
|
|
||||||
import { PostByDataJsx } from "src/components/posts/post";
|
import { PostByDataJsx } from "src/components/posts/post";
|
||||||
|
|
||||||
const TimelineViewJsx = (props) => {
|
const TimelineViewJsx = (props) => {
|
||||||
|
// Count the number of posts that have already loaded
|
||||||
|
const [postsLoaded, setPostsLoaded] = useState(0);
|
||||||
|
|
||||||
// Ensure only posts with media get in the timeline
|
// Ensure only posts with media get in the timeline
|
||||||
const posts = props.posts.filter(
|
const posts = props.posts.filter(
|
||||||
p => p.media_attachments != null
|
p => p.media_attachments != null
|
||||||
&& p.media_attachments.length > 0
|
&& p.media_attachments.length > 0
|
||||||
);
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
// When all the posts have been loaded, call onTimelineLoaded
|
||||||
|
// if it's been defined
|
||||||
|
if (postsLoaded == posts.length) {
|
||||||
|
if (props.onTimelineLoaded != null) {
|
||||||
|
props.onTimelineLoaded();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, [postsLoaded]);
|
||||||
|
|
||||||
|
_handlePostLoaded = () => setPostsLoaded(postsLoaded + 1);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View>
|
<View>
|
||||||
{ props.posts.map((post, i) => {
|
{ props.posts.map((post, i) => {
|
||||||
|
@ -17,7 +32,8 @@ const TimelineViewJsx = (props) => {
|
||||||
<View key = { i } >
|
<View key = { i } >
|
||||||
<PostByDataJsx
|
<PostByDataJsx
|
||||||
navigation = { props.navigation }
|
navigation = { props.navigation }
|
||||||
data = { post } />
|
data = { post }
|
||||||
|
onPostLoaded = { _handlePostLoaded }/>
|
||||||
</View>
|
</View>
|
||||||
);
|
);
|
||||||
}) }
|
}) }
|
||||||
|
|
Loading…
Reference in New Issue