make loadOlder properly guard

This commit is contained in:
Henry Hiles 2026-08-11 10:39:45 -04:00
commit 43d2e94d62
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
2 changed files with 38 additions and 31 deletions

View file

@ -75,12 +75,13 @@ class RoomChatController extends AsyncNotifier<IList<Event>?> {
); );
Future<bool> loadOlder() async { Future<bool> loadOlder() async {
state = AsyncLoading();
final timelineKeys = ref final timelineKeys = ref
.read(RoomsController.provider.select((value) => value[roomId])) .read(RoomsController.provider.select((value) => value[roomId]))
?.timeline ?.timeline
.keys; .keys;
final response = await ref final response = await ref
.watch(ClientController.provider.notifier) .read(ClientController.provider.notifier)
.paginate( .paginate(
.new( .new(
roomId: roomId, roomId: roomId,
@ -90,8 +91,11 @@ class RoomChatController extends AsyncNotifier<IList<Event>?> {
), ),
); );
if (response.events.isEmpty) {
state = .data(state.value);
} else {
ref ref
.watch(RoomsController.provider.notifier) .read(RoomsController.provider.notifier)
.update( .update(
IMap({ IMap({
roomId: Room( roomId: Room(
@ -110,6 +114,7 @@ class RoomChatController extends AsyncNotifier<IList<Event>?> {
}), }),
.new(), .new(),
); );
}
return response.hasMore; return response.hasMore;
} }

View file

@ -80,6 +80,7 @@ class RoomChat extends HookConsumerWidget {
final controllerData = ref.watch(controllerProvider); final controllerData = ref.watch(controllerProvider);
final topEventBeforeLoad = useState<String?>(null); final topEventBeforeLoad = useState<String?>(null);
final hasMore = useState<bool>(true);
Future<void> jumpToId(String eventId) async { Future<void> jumpToId(String eventId) async {
final index = controllerData.value?.indexWhere( final index = controllerData.value?.indexWhere(
@ -105,7 +106,7 @@ class RoomChat extends HookConsumerWidget {
Future<void> loadOlder() async { Future<void> loadOlder() async {
if (controllerData case AsyncData(:final value?)) { if (controllerData case AsyncData(:final value?)) {
topEventBeforeLoad.value = value.firstOrNull?.eventId; topEventBeforeLoad.value = value.firstOrNull?.eventId;
await notifier.loadOlder(); hasMore.value = await notifier.loadOlder();
} }
} }
@ -470,6 +471,7 @@ class RoomChat extends HookConsumerWidget {
ScrollViewKeyboardDismissBehavior.onDrag, ScrollViewKeyboardDismissBehavior.onDrag,
controller: scrollController, controller: scrollController,
slivers: [ slivers: [
if (hasMore.value)
SliverToBoxAdapter( SliverToBoxAdapter(
child: Padding( child: Padding(
padding: .symmetric(vertical: 36), padding: .symmetric(vertical: 36),