don't pass room around, use many watches
This commit is contained in:
parent
e0ba99d9b9
commit
60be7aaf72
15 changed files with 207 additions and 231 deletions
|
|
@ -1,12 +1,11 @@
|
|||
import "package:fast_immutable_collections/fast_immutable_collections.dart";
|
||||
import "package:flutter/material.dart";
|
||||
import "package:flutter/services.dart";
|
||||
import "package:flutter_chat_core/flutter_chat_core.dart";
|
||||
import "package:flutter_hooks/flutter_hooks.dart";
|
||||
import "package:fluttertagger/fluttertagger.dart";
|
||||
import "package:hooks_riverpod/hooks_riverpod.dart";
|
||||
import "package:nexus/controllers/room_chat_controller.dart";
|
||||
import "package:nexus/models/relation_type.dart";
|
||||
import "package:nexus/models/room.dart";
|
||||
import "package:nexus/widgets/chat_page/composer/mention_overlay.dart";
|
||||
import "package:nexus/widgets/chat_page/composer/relation_preview.dart";
|
||||
|
||||
|
|
@ -14,12 +13,17 @@ class ChatBox extends HookConsumerWidget {
|
|||
final Message? relatedMessage;
|
||||
final RelationType relationType;
|
||||
final VoidCallback onDismiss;
|
||||
final Room room;
|
||||
final Future<void> Function(
|
||||
String text, {
|
||||
required bool shouldMention,
|
||||
required IList<Tag> tags,
|
||||
})
|
||||
onSend;
|
||||
const ChatBox({
|
||||
required this.relatedMessage,
|
||||
required this.relationType,
|
||||
required this.onDismiss,
|
||||
required this.room,
|
||||
required this.onSend,
|
||||
super.key,
|
||||
});
|
||||
|
||||
|
|
@ -38,16 +42,12 @@ class ChatBox extends HookConsumerWidget {
|
|||
}
|
||||
|
||||
void send() {
|
||||
if (controller.value.text.trim().isEmpty || room.metadata == null) return;
|
||||
ref
|
||||
.watch(RoomChatController.provider(room.metadata!.id).notifier)
|
||||
.send(
|
||||
controller.value.formattedText,
|
||||
shouldMention: shouldMention.value,
|
||||
relation: relatedMessage,
|
||||
relationType: relationType,
|
||||
tags: controller.value.tags,
|
||||
);
|
||||
onSend(
|
||||
controller.value.formattedText,
|
||||
shouldMention: shouldMention.value,
|
||||
tags: controller.value.tags.toIList(),
|
||||
);
|
||||
|
||||
onDismiss();
|
||||
controller.value.text = "";
|
||||
}
|
||||
|
|
@ -81,7 +81,6 @@ class ChatBox extends HookConsumerWidget {
|
|||
children: [
|
||||
RelationPreview(
|
||||
relatedMessage,
|
||||
room: room,
|
||||
shouldMention: shouldMention.value,
|
||||
toggleShouldMention: () =>
|
||||
shouldMention.value = !shouldMention.value,
|
||||
|
|
@ -123,7 +122,6 @@ class ChatBox extends HookConsumerWidget {
|
|||
child: FlutterTagger(
|
||||
triggerStrategy: TriggerStrategy.eager,
|
||||
overlay: MentionOverlay(
|
||||
room,
|
||||
query: query.value,
|
||||
triggerCharacter: triggerCharacter.value,
|
||||
addTag: ({required id, required name}) {
|
||||
|
|
|
|||
|
|
@ -3,17 +3,14 @@ import "package:hooks_riverpod/hooks_riverpod.dart";
|
|||
import "package:nexus/controllers/members_controller.dart";
|
||||
import "package:nexus/controllers/rooms_controller.dart";
|
||||
import "package:nexus/helpers/extensions/better_when.dart";
|
||||
import "package:nexus/models/room.dart";
|
||||
import "package:nexus/widgets/avatar_or_hash.dart";
|
||||
import "package:nexus/widgets/loading.dart";
|
||||
|
||||
class MentionOverlay extends ConsumerWidget {
|
||||
final String? triggerCharacter;
|
||||
final String query;
|
||||
final Room room;
|
||||
final void Function({required String id, required String name}) addTag;
|
||||
const MentionOverlay(
|
||||
this.room, {
|
||||
const MentionOverlay({
|
||||
required this.query,
|
||||
required this.addTag,
|
||||
required this.triggerCharacter,
|
||||
|
|
@ -34,7 +31,7 @@ class MentionOverlay extends ConsumerWidget {
|
|||
child: switch (triggerCharacter) {
|
||||
"@" =>
|
||||
ref
|
||||
.watch(MembersController.provider(room))
|
||||
.watch(MembersController.provider)
|
||||
.betterWhen(
|
||||
data: (members) => ListView(
|
||||
children:
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ import "package:flutter/material.dart";
|
|||
import "package:flutter_chat_core/flutter_chat_core.dart";
|
||||
import "package:hooks_riverpod/hooks_riverpod.dart";
|
||||
import "package:nexus/models/relation_type.dart";
|
||||
import "package:nexus/models/room.dart";
|
||||
import "package:nexus/widgets/chat_page/lazy_loading/message_avatar.dart";
|
||||
import "package:nexus/widgets/chat_page/lazy_loading/message_displayname.dart";
|
||||
|
||||
|
|
@ -12,11 +11,9 @@ class RelationPreview extends ConsumerWidget {
|
|||
final VoidCallback onDismiss;
|
||||
final bool shouldMention;
|
||||
final VoidCallback toggleShouldMention;
|
||||
final Room room;
|
||||
|
||||
const RelationPreview(
|
||||
this.relatedMessage, {
|
||||
required this.room,
|
||||
required this.relationType,
|
||||
required this.onDismiss,
|
||||
required this.shouldMention,
|
||||
|
|
@ -41,10 +38,9 @@ class RelationPreview extends ConsumerWidget {
|
|||
"Editing message:",
|
||||
style: TextStyle(fontWeight: FontWeight.bold),
|
||||
),
|
||||
MessageAvatar(relatedMessage!, room),
|
||||
MessageAvatar(relatedMessage!),
|
||||
MessageDisplayname(
|
||||
relatedMessage!,
|
||||
room,
|
||||
style: theme.textTheme.labelMedium?.copyWith(
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue