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:
Brandon Presley 2023-09-07 16:50:03 +12:00
parent 07cb634883
commit adbc87f462
3 changed files with 29 additions and 24 deletions

View File

@ -1,19 +1,16 @@
import {
NavigationProp,
useFocusEffect,
useNavigation,
} from "@react-navigation/native";
import { useCallback, useState } from "react";
import { NavigationProp, useNavigation } from "@react-navigation/native";
import { useCallback, useEffect, useState } from "react";
import { FlatList, Image } from "react-native";
import { List } from "react-native-paper";
import { getBestSets } from "./best.service";
import { LIMIT } from "./constants";
import { settingsRepo } from "./db";
import DrawerHeader from "./DrawerHeader";
import { emitter } from "./emitter";
import { GraphsPageParams } from "./GraphsPage";
import GymSet from "./gym-set";
import Page from "./Page";
import Settings from "./settings";
import Settings, { SETTINGS } from "./settings";
export default function GraphsList() {
const [bests, setBests] = useState<GymSet[]>();
@ -22,23 +19,29 @@ export default function GraphsList() {
const [term, setTerm] = useState("");
const navigation = useNavigation<NavigationProp<GraphsPageParams>>();
const [settings, setSettings] = useState<Settings>();
const [refreshing, setRefreshing] = useState(false);
useFocusEffect(
useCallback(() => {
useEffect(() => {
refresh("");
settingsRepo.findOne({ where: {} }).then(setSettings);
const description = emitter.addListener(SETTINGS, () => {
settingsRepo.findOne({ where: {} }).then(setSettings);
}, [])
);
const refresh = useCallback(async (value: string) => {
const result = await getBestSets({ term: value, offset: 0 });
setBests(result);
setOffset(0);
});
return description.remove;
/* eslint-disable react-hooks/exhaustive-deps */
}, []);
useFocusEffect(
useCallback(() => {
refresh(term);
}, [refresh, term])
const refresh = useCallback(
async (value: string) => {
if (refreshing) return;
setRefreshing(true);
const result = await getBestSets({ term: value, offset: 0 }).finally(() =>
setRefreshing(false)
);
setBests(result);
setOffset(0);
},
[refreshing]
);
const next = useCallback(async () => {
@ -68,7 +71,7 @@ export default function GraphsList() {
description={`${item.reps} x ${item.weight}${item.unit || "kg"}`}
onPress={() => navigation.navigate("ViewGraph", { best: item })}
left={() =>
(settings.images && item.image && (
(settings?.images && item.image && (
<Image
source={{ uri: item.image }}
style={{ height: 75, width: 75 }}
@ -95,6 +98,8 @@ export default function GraphsList() {
data={bests}
keyExtractor={(set) => set.name}
onEndReached={next}
refreshing={refreshing}
onRefresh={() => refresh(term)}
/>
)}
</Page>

View File

@ -85,8 +85,8 @@ android {
applicationId "com.massive"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 36182
versionName "1.156"
versionCode 36183
versionName "1.157"
}
signingConfigs {
release {

View File

@ -1,6 +1,6 @@
{
"name": "massive",
"version": "1.156",
"version": "1.157",
"private": true,
"license": "GPL-3.0-only",
"scripts": {