Prevent list jitter on graphs - 1.157 🚀
If we always refresh on focus then we will be making many redundant requests, as well as causing the list to jump around whenever we navigate back/forward. The only downside to this is occasionally the data may be stale, however the user can just pull down on the list to refresh. Closes #165
This commit is contained in:
parent
07cb634883
commit
adbc87f462
|
@ -1,19 +1,16 @@
|
||||||
import {
|
import { NavigationProp, useNavigation } from "@react-navigation/native";
|
||||||
NavigationProp,
|
import { useCallback, useEffect, useState } from "react";
|
||||||
useFocusEffect,
|
|
||||||
useNavigation,
|
|
||||||
} from "@react-navigation/native";
|
|
||||||
import { useCallback, useState } from "react";
|
|
||||||
import { FlatList, Image } from "react-native";
|
import { FlatList, Image } from "react-native";
|
||||||
import { List } from "react-native-paper";
|
import { List } from "react-native-paper";
|
||||||
import { getBestSets } from "./best.service";
|
import { getBestSets } from "./best.service";
|
||||||
import { LIMIT } from "./constants";
|
import { LIMIT } from "./constants";
|
||||||
import { settingsRepo } from "./db";
|
import { settingsRepo } from "./db";
|
||||||
import DrawerHeader from "./DrawerHeader";
|
import DrawerHeader from "./DrawerHeader";
|
||||||
|
import { emitter } from "./emitter";
|
||||||
import { GraphsPageParams } from "./GraphsPage";
|
import { GraphsPageParams } from "./GraphsPage";
|
||||||
import GymSet from "./gym-set";
|
import GymSet from "./gym-set";
|
||||||
import Page from "./Page";
|
import Page from "./Page";
|
||||||
import Settings from "./settings";
|
import Settings, { SETTINGS } from "./settings";
|
||||||
|
|
||||||
export default function GraphsList() {
|
export default function GraphsList() {
|
||||||
const [bests, setBests] = useState<GymSet[]>();
|
const [bests, setBests] = useState<GymSet[]>();
|
||||||
|
@ -22,23 +19,29 @@ export default function GraphsList() {
|
||||||
const [term, setTerm] = useState("");
|
const [term, setTerm] = useState("");
|
||||||
const navigation = useNavigation<NavigationProp<GraphsPageParams>>();
|
const navigation = useNavigation<NavigationProp<GraphsPageParams>>();
|
||||||
const [settings, setSettings] = useState<Settings>();
|
const [settings, setSettings] = useState<Settings>();
|
||||||
|
const [refreshing, setRefreshing] = useState(false);
|
||||||
|
|
||||||
useFocusEffect(
|
useEffect(() => {
|
||||||
useCallback(() => {
|
refresh("");
|
||||||
settingsRepo.findOne({ where: {} }).then(setSettings);
|
settingsRepo.findOne({ where: {} }).then(setSettings);
|
||||||
}, [])
|
const description = emitter.addListener(SETTINGS, () => {
|
||||||
);
|
settingsRepo.findOne({ where: {} }).then(setSettings);
|
||||||
|
});
|
||||||
const refresh = useCallback(async (value: string) => {
|
return description.remove;
|
||||||
const result = await getBestSets({ term: value, offset: 0 });
|
/* eslint-disable react-hooks/exhaustive-deps */
|
||||||
setBests(result);
|
|
||||||
setOffset(0);
|
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
useFocusEffect(
|
const refresh = useCallback(
|
||||||
useCallback(() => {
|
async (value: string) => {
|
||||||
refresh(term);
|
if (refreshing) return;
|
||||||
}, [refresh, term])
|
setRefreshing(true);
|
||||||
|
const result = await getBestSets({ term: value, offset: 0 }).finally(() =>
|
||||||
|
setRefreshing(false)
|
||||||
|
);
|
||||||
|
setBests(result);
|
||||||
|
setOffset(0);
|
||||||
|
},
|
||||||
|
[refreshing]
|
||||||
);
|
);
|
||||||
|
|
||||||
const next = useCallback(async () => {
|
const next = useCallback(async () => {
|
||||||
|
@ -68,7 +71,7 @@ export default function GraphsList() {
|
||||||
description={`${item.reps} x ${item.weight}${item.unit || "kg"}`}
|
description={`${item.reps} x ${item.weight}${item.unit || "kg"}`}
|
||||||
onPress={() => navigation.navigate("ViewGraph", { best: item })}
|
onPress={() => navigation.navigate("ViewGraph", { best: item })}
|
||||||
left={() =>
|
left={() =>
|
||||||
(settings.images && item.image && (
|
(settings?.images && item.image && (
|
||||||
<Image
|
<Image
|
||||||
source={{ uri: item.image }}
|
source={{ uri: item.image }}
|
||||||
style={{ height: 75, width: 75 }}
|
style={{ height: 75, width: 75 }}
|
||||||
|
@ -95,6 +98,8 @@ export default function GraphsList() {
|
||||||
data={bests}
|
data={bests}
|
||||||
keyExtractor={(set) => set.name}
|
keyExtractor={(set) => set.name}
|
||||||
onEndReached={next}
|
onEndReached={next}
|
||||||
|
refreshing={refreshing}
|
||||||
|
onRefresh={() => refresh(term)}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</Page>
|
</Page>
|
||||||
|
|
|
@ -85,8 +85,8 @@ android {
|
||||||
applicationId "com.massive"
|
applicationId "com.massive"
|
||||||
minSdkVersion rootProject.ext.minSdkVersion
|
minSdkVersion rootProject.ext.minSdkVersion
|
||||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||||
versionCode 36182
|
versionCode 36183
|
||||||
versionName "1.156"
|
versionName "1.157"
|
||||||
}
|
}
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
release {
|
release {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "massive",
|
"name": "massive",
|
||||||
"version": "1.156",
|
"version": "1.157",
|
||||||
"private": true,
|
"private": true,
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user