insert unicode emojis as text not tags
This commit is contained in:
parent
f8938b8257
commit
65890b8e00
3 changed files with 30 additions and 8 deletions
|
|
@ -834,6 +834,21 @@ class const Composer(
|
||||||
controller.addTag(id: id, name: name);
|
controller.addTag(id: id, name: name);
|
||||||
node?.requestFocus();
|
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,
|
controller: controller,
|
||||||
onSearch: (newQuery, newTriggerCharacter) {
|
onSearch: (newQuery, newTriggerCharacter) {
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ class const EmojiOverlay(
|
||||||
required final String roomId,
|
required final String roomId,
|
||||||
required final void Function({required String id, required String name})
|
required final void Function({required String id, required String name})
|
||||||
addTag,
|
addTag,
|
||||||
|
required final void Function(String text) insertText,
|
||||||
super.key,
|
super.key,
|
||||||
}) extends ConsumerWidget {
|
}) extends ConsumerWidget {
|
||||||
@override
|
@override
|
||||||
|
|
@ -38,19 +39,19 @@ class const EmojiOverlay(
|
||||||
),
|
),
|
||||||
title: Text(emoji.aliases.first),
|
title: Text(emoji.aliases.first),
|
||||||
subtitle: Text(emoji.description),
|
subtitle: Text(emoji.description),
|
||||||
onTap: () => addTag(
|
onTap: () => emoji.value.startsWith("mxc://")
|
||||||
id: emoji.value.startsWith("mxc://")
|
? addTag(
|
||||||
? ImagePack.emojiMarkdown(
|
id: ImagePack.emojiMarkdown(
|
||||||
emoji.aliases.first,
|
emoji.aliases.first,
|
||||||
emoji.value,
|
emoji.value,
|
||||||
description: switch (emoji.data) {
|
description: switch (emoji.data) {
|
||||||
PackImage(:final body) => body,
|
PackImage(:final body) => body,
|
||||||
_ => null,
|
_ => null,
|
||||||
},
|
},
|
||||||
)
|
),
|
||||||
: emoji.value,
|
name: emoji.aliases.first,
|
||||||
name: emoji.aliases.first,
|
)
|
||||||
),
|
: insertText(emoji.value),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
.toList(),
|
.toList(),
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ class const TaggerOverlay(
|
||||||
required final String roomId,
|
required final String roomId,
|
||||||
required final void Function({required String id, required String name})
|
required final void Function({required String id, required String name})
|
||||||
addTag,
|
addTag,
|
||||||
|
required final void Function(String text) insertText,
|
||||||
required final String? triggerCharacter,
|
required final String? triggerCharacter,
|
||||||
super.key,
|
super.key,
|
||||||
}) extends ConsumerWidget {
|
}) extends ConsumerWidget {
|
||||||
|
|
@ -27,7 +28,12 @@ class const TaggerOverlay(
|
||||||
child: switch (triggerCharacter) {
|
child: switch (triggerCharacter) {
|
||||||
"@" => UserOverlay(query, roomId: roomId, addTag: addTag),
|
"@" => UserOverlay(query, roomId: roomId, addTag: addTag),
|
||||||
"#" => RoomOverlay(query, addTag: addTag),
|
"#" => RoomOverlay(query, addTag: addTag),
|
||||||
":" => EmojiOverlay(query, roomId: roomId, addTag: addTag),
|
":" => EmojiOverlay(
|
||||||
|
query,
|
||||||
|
roomId: roomId,
|
||||||
|
addTag: addTag,
|
||||||
|
insertText: insertText,
|
||||||
|
),
|
||||||
|
|
||||||
_ => Loading(),
|
_ => Loading(),
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue