do not reverse the scrollview

This commit is contained in:
Henry Hiles 2026-06-02 19:47:51 -04:00
commit 29157c7252
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
2 changed files with 44 additions and 29 deletions

View file

@ -38,16 +38,11 @@ class RoomChatController extends AsyncNotifier<IList<Event>> {
loadOlder(); loadOlder();
} }
return IMap<int, int?>.fromValues( return room.timeline
keyMapper: (id) => 9999999999 + (id ?? 0), .toValueIList(sort: true, compare: (a, b) => (a ?? 0).compareTo(b ?? 0))
values: room.sticky, .addAll(room.sticky)
)
.addAll(room.timeline)
.toEntryIList(compare: (a, b) => (b?.key ?? 0).compareTo(a?.key ?? 0))
.map((entry) { .map((entry) {
final foundEvent = entry.value == null final foundEvent = entry == null ? null : room.events[entry];
? null
: room.events[entry.value!];
final editedEvent = final editedEvent =
foundEvent == null || foundEvent.lastEditRowId == 0 foundEvent == null || foundEvent.lastEditRowId == 0

View file

@ -77,6 +77,29 @@ class RoomChat extends HookConsumerWidget {
final listController = useRef(ListController()); final listController = useRef(ListController());
final scrollController = useScrollController(); final scrollController = useScrollController();
final controllerData = ref.watch(controllerProvider);
useEffect(() {
WidgetsBinding.instance.addPostFrameCallback((_) {
if (scrollController.hasClients) {
scrollController.jumpTo(scrollController.position.maxScrollExtent);
}
});
return null;
}, [scrollController.hasClients]);
useEffect(() {
if (scrollController.position.atEdge &&
scrollController.position.pixels != 0) {
WidgetsBinding.instance.addPostFrameCallback((_) {
if (scrollController.hasClients) {
scrollController.jumpTo(scrollController.position.maxScrollExtent);
}
});
}
return null;
}, [controllerData]);
useEffect(() { useEffect(() {
Future<void> listener() async { Future<void> listener() async {
@ -88,9 +111,9 @@ class RoomChat extends HookConsumerWidget {
if (room == null) return; if (room == null) return;
if (scrollController.position.pixels == 0) { if (scrollController.position.pixels == 0) {
await client.markRead(room);
} else {
if (room.hasMore) await notifier.loadOlder(); if (room.hasMore) await notifier.loadOlder();
} else {
await client.markRead(room);
} }
} }
@ -316,8 +339,6 @@ class RoomChat extends HookConsumerWidget {
].toIList(); ].toIList();
} }
final controllerData = ref.watch(controllerProvider);
return Scaffold( return Scaffold(
appBar: RoomAppbar( appBar: RoomAppbar(
roomId: roomId, roomId: roomId,
@ -339,11 +360,20 @@ class RoomChat extends HookConsumerWidget {
child: switch (controllerData) { child: switch (controllerData) {
AsyncData(:final value) || AsyncData(:final value) ||
AsyncLoading(:final value?) => CustomScrollView( AsyncLoading(:final value?) => CustomScrollView(
reverse: true,
controller: scrollController, controller: scrollController,
slivers: [ slivers: [
SliverPadding( SliverToBoxAdapter(
padding: .only(bottom: composerSize.value), child: Padding(
padding: .symmetric(vertical: 36),
child: Center(
child: ElevatedButton(
onPressed: controllerData is AsyncData
? notifier.loadOlder
: null,
child: Text("Load More"),
),
),
),
), ),
SuperSliverList.builder( SuperSliverList.builder(
@ -351,7 +381,7 @@ class RoomChat extends HookConsumerWidget {
itemCount: value.length, itemCount: value.length,
itemBuilder: (_, index) { itemBuilder: (_, index) {
final event = value[index]; final event = value[index];
final previousEvent = value.getOrNull(index + 1); final previousEvent = value.getOrNull(index - 1);
return FlashWrapper( return FlashWrapper(
EventRenderer( EventRenderer(
event, event,
@ -389,18 +419,8 @@ class RoomChat extends HookConsumerWidget {
}, },
), ),
SliverToBoxAdapter( SliverPadding(
child: Padding( padding: .only(bottom: composerSize.value),
padding: .symmetric(vertical: 36),
child: Center(
child: controllerData is AsyncLoading
? Loading()
: ElevatedButton(
onPressed: notifier.loadOlder,
child: Text("Load More"),
),
),
),
), ),
], ],
), ),