Nexus/nexus
Nexus/nexus
Watch
2
5
Fork
You've already forked nexus
 7
Code Issues 29 Pull requests Releases Activity

make relatedEvent store a rowId

Browse source
This commit is contained in:
Henry Hiles 2026-09-29 15:17:35 -04:00
commit 9bc2d9955a
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
4 changed files with 30 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/widgets/composer/composer.dart
View file

@ -2,6 +2,7 @@ import "dart:io";
import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:file_selector/file_selector.dart";
import "package:nexus/controllers/rooms.dart";
import "package:nexus/widgets/emoji_picker.dart";
import "package:material_ui/material_ui.dart";
import "package:flutter/services.dart";
@ -12,7 +13,6 @@ import "package:nexus/controllers/attachment.dart";
import "package:nexus/controllers/image_picker.dart";
import "package:nexus/controllers/power_level.dart";
import "package:nexus/models/content/message.dart";
import "package:nexus/models/event.dart";
import "package:nexus/models/relation_type.dart";
import "package:nexus/widgets/composer/overlays/tagger_overlay.dart";
import "package:nexus/widgets/composer/relation_preview.dart";
@ -20,7 +20,7 @@ import "package:nexus/main.dart";
class const Composer(
final String roomId, {
required final Event? relatedEvent,
required final int? relatedEvent,
required final RelationType relationType,
required final VoidCallback onDismiss,
required final Future<void> Function(
@ -39,6 +39,13 @@ class const Composer(
final triggerCharacter = useState("");
final shouldMention = useState(true);
final query = useState("");
final relatedEvent = this.relatedEvent == null
? null
: ref.watch(
RoomsController.provider.select(
(rooms) => rooms[roomId]?.events[this.relatedEvent!],
),
);
if (relationType == .edit && controller.value.text.isEmpty) {
controller.value.text =

8
lib/widgets/room_chat/room_chat.dart
View file

@ -29,7 +29,7 @@ final class const RoomChat({
}) extends HookConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final relatedEvent = useState<Event?>(null);
final relatedEvent = useState<int?>(null);
final relationType = useState(RelationType.reply);
final contextualEvent = useState<int?>(initialHighlight);
final highlightedEvent = useState<int?>(null);
@ -132,8 +132,8 @@ final class const RoomChat({
ref: ref,
roomId: roomId,
userId: userId,
onRelation: (event, type) {
relatedEvent.value = event;
onRelation: (rowId, type) {
relatedEvent.value = rowId;
relationType.value = type;
composerNode.requestFocus();
},
@ -210,7 +210,7 @@ final class const RoomChat({
tags: tags,
relationType: relationType.value,
shouldMention: shouldMention,
relation: relatedEvent.value,
relatedEventRowId: relatedEvent.value,
)
.onError(showError),
relationType: relationType.value,