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

chore: close lemma emoji snackbar on parent widget disposed (#4972)

Browse source
This commit is contained in:
ggurdin 2025-12-30 09:40:40 -05:00 • committed by GitHub
parent 9c4b8629e5
commit d0a22c6618
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 46 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/pangea/analytics_misc/lemma_emoji_setter_mixin.dart
View file

@ -29,6 +29,7 @@ mixin LemmaEmojiSetter {
}
void showLemmaEmojiSnackbar(
ScaffoldMessengerState messenger,
BuildContext context,
ConstructIdentifier constructId,
String emoji,
@ -36,7 +37,7 @@ mixin LemmaEmojiSetter {
if (InstructionsEnum.setLemmaEmoji.isToggledOff) return;
InstructionsEnum.setLemmaEmoji.setToggledOff(true);
ScaffoldMessenger.of(context).showSnackBar(
messenger.showSnackBar(
SnackBar(
padding: const EdgeInsets.all(8.0),
content: Row(
@ -46,7 +47,7 @@ mixin LemmaEmojiSetter {
constructId: constructId,
textColor: Theme.of(context).colorScheme.surface,
onTap: () {
ScaffoldMessenger.of(context).hideCurrentSnackBar();
messenger.hideCurrentSnackBar();
AnalyticsNavigationUtil.navigateToAnalytics(
context: context,
view: constructId.type.indicator,

68
lib/pangea/toolbar/word_card/lemma_reaction_picker.dart
View file

@ -9,7 +9,7 @@ import 'package:fluffychat/pangea/constructs/construct_identifier.dart';
import 'package:fluffychat/pangea/lemmas/lemma_highlight_emoji_row.dart';
import 'package:fluffychat/widgets/matrix.dart';
class LemmaReactionPicker extends StatelessWidget with LemmaEmojiSetter {
class LemmaReactionPicker extends StatefulWidget with LemmaEmojiSetter {
final Event? event;
final ConstructIdentifier constructId;
final String langCode;
@ -21,10 +21,24 @@ class LemmaReactionPicker extends StatelessWidget with LemmaEmojiSetter {
this.event,
});
Event? _sentReaction(String emoji, BuildContext context) {
final userSentEmojis = event!
@override
LemmaReactionPickerState createState() => LemmaReactionPickerState();
}
class LemmaReactionPickerState extends State<LemmaReactionPicker> {
ScaffoldMessengerState? messenger;
@override
void dispose() {
messenger?.hideCurrentSnackBar();
messenger = null;
super.dispose();
}
Event? _sentReaction(String emoji) {
final userSentEmojis = widget.event!
.aggregatedEvents(
event!.room.timeline!,
widget.event!.room.timeline!,
RelationshipTypes.reaction,
)
.where(
@ -38,25 +52,29 @@ class LemmaReactionPicker extends StatelessWidget with LemmaEmojiSetter {
Future<void> _setEmoji(
String emoji,
BuildContext context,
String targetId,
) async {
await setLemmaEmoji(constructId, emoji, targetId);
showLemmaEmojiSnackbar(context, constructId, emoji);
await widget.setLemmaEmoji(widget.constructId, emoji, targetId);
messenger = ScaffoldMessenger.of(context);
widget.showLemmaEmojiSnackbar(
messenger!,
context,
widget.constructId,
emoji,
);
}
Future<void> _sendOrRedactReaction(String emoji, BuildContext context) async {
if (event?.room.timeline == null) return;
Future<void> _sendOrRedactReaction(String emoji) async {
if (widget.event?.room.timeline == null) return;
try {
final reactionEvent = _sentReaction(emoji, context);
final reactionEvent = _sentReaction(emoji);
if (reactionEvent != null) {
await reactionEvent.redactEvent();
return;
}
await event!.room.sendReaction(
event!.eventId,
await widget.event!.room.sendReaction(
widget.event!.eventId,
emoji,
);
} catch (e, s) {
@ -65,7 +83,7 @@ class LemmaReactionPicker extends StatelessWidget with LemmaEmojiSetter {
s: s,
data: {
'emoji': emoji,
'eventId': event?.eventId,
'eventId': widget.event?.eventId,
},
);
}
@ -76,27 +94,27 @@ class LemmaReactionPicker extends StatelessWidget with LemmaEmojiSetter {
final stream = Matrix.of(context)
.analyticsDataService
.updateDispatcher
.lemmaUpdateStream(constructId);
.lemmaUpdateStream(widget.constructId);
final targetId = "emoji-choice-item-${constructId.lemma}-$hashCode";
final targetId = "emoji-choice-item-${widget.constructId.lemma}-$hashCode";
return StreamBuilder(
stream: stream,
builder: (context, snapshot) {
final selectedEmoji =
snapshot.data?.emojis?.firstOrNull ?? constructId.userSetEmoji;
final selectedEmoji = snapshot.data?.emojis?.firstOrNull ??
widget.constructId.userSetEmoji;
return LemmaHighlightEmojiRow(
cId: constructId,
langCode: langCode,
cId: widget.constructId,
langCode: widget.langCode,
targetId: targetId,
onEmojiSelected: (emoji, target) => emoji != selectedEmoji
? _setEmoji(emoji, context, target)
: _sendOrRedactReaction(emoji, context),
? _setEmoji(emoji, target)
: _sendOrRedactReaction(emoji),
emoji: selectedEmoji,
messageInfo: event?.content ?? {},
selectedEmojiBadge: event != null &&
messageInfo: widget.event?.content ?? {},
selectedEmojiBadge: widget.event != null &&
selectedEmoji != null &&
_sentReaction(selectedEmoji, context) == null
_sentReaction(selectedEmoji) == null
? const Icon(
Icons.add_reaction,
size: 12.0,