ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: listen to scroll metrics to update scroll down button (#5522)

Browse source
This commit is contained in:
ggurdin 2026-01-29 14:35:40 -05:00 • committed by GitHub
parent bfc3b9ff40
commit 9ea916dae0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 156 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pages/chat/chat.dart
View file

@ -195,6 +195,7 @@ class ChatController extends State<ChatPageWithRoom>
StreamSubscription? _botAudioSubscription;
final timelineUpdateNotifier = _TimelineUpdateNotifier();
late final ActivityChatController activityController;
final ValueNotifier<bool> scrollableNotifier = ValueNotifier(false);
// Pangea#
Room get room => sendingClient.getRoomById(roomId) ?? widget.room;
@ -807,6 +808,7 @@ class ChatController extends State<ChatPageWithRoom>
scrollController.dispose();
inputFocus.dispose();
depressMessageButton.dispose();
scrollableNotifier.dispose();
TokensUtil.clearNewTokenCache();
//Pangea#
super.dispose();

293
lib/pages/chat/chat_event_list.dart
View file

@ -51,147 +51,160 @@ class ChatEventList extends StatelessWidget {
controller.room.client.applicationAccountConfig.wallpaperUrl != null;
return SelectionArea(
child: ListView.custom(
padding: EdgeInsets.only(
top: 16,
bottom: 8,
left: horizontalPadding,
right: horizontalPadding,
),
reverse: true,
controller: controller.scrollController,
keyboardDismissBehavior: PlatformInfos.isIOS
? ScrollViewKeyboardDismissBehavior.onDrag
: ScrollViewKeyboardDismissBehavior.manual,
childrenDelegate: SliverChildBuilderDelegate(
(BuildContext context, int i) {
// Footer to display typing indicator and read receipts:
if (i == 0) {
if (timeline.isRequestingFuture) {
return const Center(
child: CircularProgressIndicator.adaptive(strokeWidth: 2),
);
}
if (timeline.canRequestFuture) {
return Center(
child: IconButton(
onPressed: controller.requestFuture,
icon: const Icon(Icons.refresh_outlined),
),
);
}
return Column(
mainAxisSize: MainAxisSize.min,
children: [
SeenByRow(controller),
TypingIndicators(controller),
],
);
}
// Request history button or progress indicator:
// #Pangea
// if (i == events.length + 1) {
if (i == events.length + 2) {
// Pangea#
if (timeline.isRequestingHistory) {
return const Center(
child: CircularProgressIndicator.adaptive(strokeWidth: 2),
);
}
if (timeline.canRequestHistory) {
return Builder(
builder: (context) {
// #Pangea
// WidgetsBinding.instance
// .addPostFrameCallback(controller.requestHistory);
WidgetsBinding.instance.addPostFrameCallback(
(_) => controller.requestHistory(),
);
// Pangea#
return Center(
child: IconButton(
onPressed: controller.requestHistory,
icon: const Icon(Icons.refresh_outlined),
),
);
},
);
}
return const SizedBox.shrink();
}
// #Pangea
if (i == 1) {
return ActivityUserSummaries(controller: controller);
}
// Pangea#
// #Pangea
// i--;
i = i - 2;
// Pangea#
// The message at this index:
final event = events[i];
final animateIn = animateInEventIndex != null &&
timeline.events.length > animateInEventIndex &&
event == timeline.events[animateInEventIndex];
return AutoScrollTag(
key: ValueKey(event.eventId),
index: i,
controller: controller.scrollController,
child: Message(
event,
animateIn: animateIn,
resetAnimateIn: () {
controller.animateInEventIndex = null;
},
onSwipe: () => controller.replyAction(replyTo: event),
// #Pangea
onInfoTab: (_) => {},
// onInfoTab: controller.showEventInfo,
// Pangea#
onMention: () => controller.sendController.text +=
'${event.senderFromMemoryOrFallback.mention} ',
highlightMarker:
controller.scrollToEventIdMarker == event.eventId,
// #Pangea
// onSelect: controller.onSelectMessage,
onSelect: (_) {},
// Pangea#
scrollToEventId: (String eventId) =>
controller.scrollToEventId(eventId),
longPressSelect: controller.selectedEvents.isNotEmpty,
// #Pangea
controller: controller,
isButton: event.eventId == controller.buttonEventID,
canRefresh: event.eventId == controller.refreshEventID,
// Pangea#
selected: controller.selectedEvents
.any((e) => e.eventId == event.eventId),
singleSelected:
controller.selectedEvents.singleOrNull?.eventId ==
event.eventId,
onEdit: () => controller.editSelectedEventAction(),
timeline: timeline,
displayReadMarker:
i > 0 && controller.readMarkerEventId == event.eventId,
nextEvent: i + 1 < events.length ? events[i + 1] : null,
previousEvent: i > 0 ? events[i - 1] : null,
wallpaperMode: hasWallpaper,
scrollController: controller.scrollController,
colors: colors,
),
);
},
// #Pangea
// childCount: events.length + 2,
childCount: events.length + 3,
// #Pangea
// child: ListView.custom(
child: NotificationListener<ScrollMetricsNotification>(
onNotification: (_) {
WidgetsBinding.instance.addPostFrameCallback((_) {
final scrollable =
controller.scrollController.position.maxScrollExtent > 0;
controller.scrollableNotifier.value = scrollable;
});
return true;
},
child: ListView.custom(
// Pangea#
findChildIndexCallback: (key) =>
controller.findChildIndexCallback(key, thisEventsKeyMap),
padding: EdgeInsets.only(
top: 16,
bottom: 8,
left: horizontalPadding,
right: horizontalPadding,
),
reverse: true,
controller: controller.scrollController,
keyboardDismissBehavior: PlatformInfos.isIOS
? ScrollViewKeyboardDismissBehavior.onDrag
: ScrollViewKeyboardDismissBehavior.manual,
childrenDelegate: SliverChildBuilderDelegate(
(BuildContext context, int i) {
// Footer to display typing indicator and read receipts:
if (i == 0) {
if (timeline.isRequestingFuture) {
return const Center(
child: CircularProgressIndicator.adaptive(strokeWidth: 2),
);
}
if (timeline.canRequestFuture) {
return Center(
child: IconButton(
onPressed: controller.requestFuture,
icon: const Icon(Icons.refresh_outlined),
),
);
}
return Column(
mainAxisSize: MainAxisSize.min,
children: [
SeenByRow(controller),
TypingIndicators(controller),
],
);
}
// Request history button or progress indicator:
// #Pangea
// if (i == events.length + 1) {
if (i == events.length + 2) {
// Pangea#
if (timeline.isRequestingHistory) {
return const Center(
child: CircularProgressIndicator.adaptive(strokeWidth: 2),
);
}
if (timeline.canRequestHistory) {
return Builder(
builder: (context) {
// #Pangea
// WidgetsBinding.instance
// .addPostFrameCallback(controller.requestHistory);
WidgetsBinding.instance.addPostFrameCallback(
(_) => controller.requestHistory(),
);
// Pangea#
return Center(
child: IconButton(
onPressed: controller.requestHistory,
icon: const Icon(Icons.refresh_outlined),
),
);
},
);
}
return const SizedBox.shrink();
}
// #Pangea
if (i == 1) {
return ActivityUserSummaries(controller: controller);
}
// Pangea#
// #Pangea
// i--;
i = i - 2;
// Pangea#
// The message at this index:
final event = events[i];
final animateIn = animateInEventIndex != null &&
timeline.events.length > animateInEventIndex &&
event == timeline.events[animateInEventIndex];
return AutoScrollTag(
key: ValueKey(event.eventId),
index: i,
controller: controller.scrollController,
child: Message(
event,
animateIn: animateIn,
resetAnimateIn: () {
controller.animateInEventIndex = null;
},
onSwipe: () => controller.replyAction(replyTo: event),
// #Pangea
onInfoTab: (_) => {},
// onInfoTab: controller.showEventInfo,
// Pangea#
onMention: () => controller.sendController.text +=
'${event.senderFromMemoryOrFallback.mention} ',
highlightMarker:
controller.scrollToEventIdMarker == event.eventId,
// #Pangea
// onSelect: controller.onSelectMessage,
onSelect: (_) {},
// Pangea#
scrollToEventId: (String eventId) =>
controller.scrollToEventId(eventId),
longPressSelect: controller.selectedEvents.isNotEmpty,
// #Pangea
controller: controller,
isButton: event.eventId == controller.buttonEventID,
canRefresh: event.eventId == controller.refreshEventID,
// Pangea#
selected: controller.selectedEvents
.any((e) => e.eventId == event.eventId),
singleSelected:
controller.selectedEvents.singleOrNull?.eventId ==
event.eventId,
onEdit: () => controller.editSelectedEventAction(),
timeline: timeline,
displayReadMarker:
i > 0 && controller.readMarkerEventId == event.eventId,
nextEvent: i + 1 < events.length ? events[i + 1] : null,
previousEvent: i > 0 ? events[i - 1] : null,
wallpaperMode: hasWallpaper,
scrollController: controller.scrollController,
colors: colors,
),
);
},
// #Pangea
// childCount: events.length + 2,
childCount: events.length + 3,
// Pangea#
findChildIndexCallback: (key) =>
controller.findChildIndexCallback(key, thisEventsKeyMap),
),
),
),
);

1
lib/pangea/chat/widgets/chat_floating_action_button.dart
View file

@ -22,6 +22,7 @@ class ChatFloatingActionButton extends StatelessWidget {
controller.choreographer.errorService,
controller.choreographer.itController.open,
controller.scrollController,
controller.scrollableNotifier,
],
),
builder: (context, _) {