From 65890b8e006d5d409614d958d7482e4685bde5e1 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sun, 22 Nov 2026 13:17:44 -0500 Subject: [PATCH] insert unicode emojis as text not tags --- lib/widgets/composer/composer.dart | 15 +++++++++++++++ lib/widgets/composer/overlays/emoji_overlay.dart | 15 ++++++++------- lib/widgets/composer/overlays/tagger_overlay.dart | 8 +++++++- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/lib/widgets/composer/composer.dart b/lib/widgets/composer/composer.dart index 0b0a7db..3b722e0 100644 --- a/lib/widgets/composer/composer.dart +++ b/lib/widgets/composer/composer.dart @@ -834,6 +834,21 @@ class const Composer( controller.addTag(id: id, name: name); node?.requestFocus(); }, + insertText: (text) { + final end = + controller.selection.baseOffset; + controller + ..dismissOverlay() + ..value = controller.value.replaced( + .new( + start: + end - query.value.length - 1, + end: end, + ), + "$text ", + ); + node?.requestFocus(); + }, ), controller: controller, onSearch: (newQuery, newTriggerCharacter) { diff --git a/lib/widgets/composer/overlays/emoji_overlay.dart b/lib/widgets/composer/overlays/emoji_overlay.dart index bb4b88f..6f9c15f 100644 --- a/lib/widgets/composer/overlays/emoji_overlay.dart +++ b/lib/widgets/composer/overlays/emoji_overlay.dart @@ -12,6 +12,7 @@ class const EmojiOverlay( required final String roomId, required final void Function({required String id, required String name}) addTag, + required final void Function(String text) insertText, super.key, }) extends ConsumerWidget { @override @@ -38,19 +39,19 @@ class const EmojiOverlay( ), title: Text(emoji.aliases.first), subtitle: Text(emoji.description), - onTap: () => addTag( - id: emoji.value.startsWith("mxc://") - ? ImagePack.emojiMarkdown( + onTap: () => emoji.value.startsWith("mxc://") + ? addTag( + id: ImagePack.emojiMarkdown( emoji.aliases.first, emoji.value, description: switch (emoji.data) { PackImage(:final body) => body, _ => null, }, - ) - : emoji.value, - name: emoji.aliases.first, - ), + ), + name: emoji.aliases.first, + ) + : insertText(emoji.value), ), ) .toList(), diff --git a/lib/widgets/composer/overlays/tagger_overlay.dart b/lib/widgets/composer/overlays/tagger_overlay.dart index f760e01..e32a328 100644 --- a/lib/widgets/composer/overlays/tagger_overlay.dart +++ b/lib/widgets/composer/overlays/tagger_overlay.dart @@ -10,6 +10,7 @@ class const TaggerOverlay( required final String roomId, required final void Function({required String id, required String name}) addTag, + required final void Function(String text) insertText, required final String? triggerCharacter, super.key, }) extends ConsumerWidget { @@ -27,7 +28,12 @@ class const TaggerOverlay( child: switch (triggerCharacter) { "@" => UserOverlay(query, roomId: roomId, addTag: addTag), "#" => RoomOverlay(query, addTag: addTag), - ":" => EmojiOverlay(query, roomId: roomId, addTag: addTag), + ":" => EmojiOverlay( + query, + roomId: roomId, + addTag: addTag, + insertText: insertText, + ), _ => Loading(), },