forked from Nexus/nexus
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
e58673431e |
|||
|
1723a0691a |
2 changed files with 15 additions and 19 deletions
|
|
@ -37,8 +37,7 @@ class RoomChatController extends AsyncNotifier<IList<Event>?> {
|
||||||
room = ref.read(RoomsController.provider)[roomId] ?? room;
|
room = ref.read(RoomsController.provider)[roomId] ?? room;
|
||||||
}
|
}
|
||||||
|
|
||||||
// While there are under 20 events, try to load more
|
// Load one more page when the initial timeline is short.
|
||||||
// until there's no more or the conditions are met.
|
|
||||||
if (room.hasMore && room.timeline.length < 20) {
|
if (room.hasMore && room.timeline.length < 20) {
|
||||||
await loadOlder();
|
await loadOlder();
|
||||||
room = ref.read(RoomsController.provider)[roomId] ?? room;
|
room = ref.read(RoomsController.provider)[roomId] ?? room;
|
||||||
|
|
|
||||||
|
|
@ -126,12 +126,6 @@ class RoomChat extends HookConsumerWidget {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> loadOlder() async {
|
|
||||||
if (controllerData case AsyncData(value: final _?)) {
|
|
||||||
await notifier.loadOlder();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
final composerNode = useFocusNode(
|
final composerNode = useFocusNode(
|
||||||
onKeyEvent: (_, event) {
|
onKeyEvent: (_, event) {
|
||||||
if (event is KeyDownEvent && event.logicalKey == .escape) {
|
if (event is KeyDownEvent && event.logicalKey == .escape) {
|
||||||
|
|
@ -429,26 +423,29 @@ class RoomChat extends HookConsumerWidget {
|
||||||
final historyLength = boundaryIndex + 1;
|
final historyLength = boundaryIndex + 1;
|
||||||
final liveLength = value.length - historyLength;
|
final liveLength = value.length - historyLength;
|
||||||
|
|
||||||
|
int? eventIndexForKey(Key key) {
|
||||||
|
if (key is! ValueKey<String>) return null;
|
||||||
|
final index = value.indexWhere(
|
||||||
|
(event) => event.eventId == key.value,
|
||||||
|
);
|
||||||
|
return index < 0 ? null : index;
|
||||||
|
}
|
||||||
|
|
||||||
int? historyChildIndex(Key key) {
|
int? historyChildIndex(Key key) {
|
||||||
if (key == const ValueKey("history-loader")) {
|
if (key == const ValueKey("history-loader")) {
|
||||||
return historyLength;
|
return historyLength;
|
||||||
}
|
}
|
||||||
if (key is! ValueKey<String>) return null;
|
final eventIndex = eventIndexForKey(key);
|
||||||
final eventIndex = value.indexWhere(
|
return eventIndex == null ||
|
||||||
(event) => event.eventId == key.value,
|
|
||||||
);
|
|
||||||
return eventIndex < 0 ||
|
|
||||||
eventIndex >= historyLength
|
eventIndex >= historyLength
|
||||||
? null
|
? null
|
||||||
: historyLength - eventIndex - 1;
|
: historyLength - eventIndex - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int? liveChildIndex(Key key) {
|
int? liveChildIndex(Key key) {
|
||||||
if (key is! ValueKey<String>) return null;
|
final eventIndex = eventIndexForKey(key);
|
||||||
final eventIndex = value.indexWhere(
|
return eventIndex == null ||
|
||||||
(event) => event.eventId == key.value,
|
eventIndex < historyLength
|
||||||
);
|
|
||||||
return eventIndex < historyLength
|
|
||||||
? null
|
? null
|
||||||
: eventIndex - historyLength;
|
: eventIndex - historyLength;
|
||||||
}
|
}
|
||||||
|
|
@ -508,7 +505,7 @@ class RoomChat extends HookConsumerWidget {
|
||||||
hasMore: hasMore,
|
hasMore: hasMore,
|
||||||
isLoading:
|
isLoading:
|
||||||
controllerData is AsyncLoading,
|
controllerData is AsyncLoading,
|
||||||
onLoad: loadOlder,
|
onLoad: notifier.loadOlder,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
final event =
|
final event =
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue