From 11457470a0480894a08a9a8aba8614766638996b Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Wed, 16 Sep 2026 16:30:15 -0400
Subject: [PATCH] move around args to overlays

---
 lib/widgets/composer/composer.dart                | 4 ++--
 lib/widgets/composer/overlays/room_overlay.dart   | 3 +--
 lib/widgets/composer/overlays/tagger_overlay.dart | 8 ++++----
 lib/widgets/composer/overlays/user_overlay.dart   | 4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/widgets/composer/composer.dart b/lib/widgets/composer/composer.dart
index a120595..3d04a78 100644
--- a/lib/widgets/composer/composer.dart
+++ b/lib/widgets/composer/composer.dart
@@ -196,8 +196,8 @@ class const Composer(
                               child: FlutterTagger(
                                 triggerStrategy: .eager,
                                 overlay: TaggerOverlay(
-                                  roomId,
-                                  query: query.value,
+                                  query.value,
+                                  roomId: roomId,
                                   triggerCharacter: triggerCharacter.value,
                                   addTag: ({required id, required name}) {
                                     controller.value.addTag(id: id, name: name);
diff --git a/lib/widgets/composer/overlays/room_overlay.dart b/lib/widgets/composer/overlays/room_overlay.dart
index 5956608..db74fc0 100644
--- a/lib/widgets/composer/overlays/room_overlay.dart
+++ b/lib/widgets/composer/overlays/room_overlay.dart
@@ -5,8 +5,7 @@ import "package:nexus/controllers/via.dart";
 import "package:nexus/widgets/avatar_or_hash.dart";
 
 class const RoomOverlay(
-  final String roomId, {
-  required final String query,
+  final String query, {
   required final void Function({required String id, required String name})
   addTag,
   super.key,
diff --git a/lib/widgets/composer/overlays/tagger_overlay.dart b/lib/widgets/composer/overlays/tagger_overlay.dart
index ef78636..dda9043 100644
--- a/lib/widgets/composer/overlays/tagger_overlay.dart
+++ b/lib/widgets/composer/overlays/tagger_overlay.dart
@@ -5,8 +5,8 @@ import "package:nexus/widgets/composer/overlays/user_overlay.dart";
 import "package:nexus/widgets/loading.dart";
 
 class const TaggerOverlay(
-  final String roomId, {
-  required final String query,
+  final String query, {
+  required final String roomId,
   required final void Function({required String id, required String name})
   addTag,
   required final String? triggerCharacter,
@@ -22,8 +22,8 @@ class const TaggerOverlay(
           color: Theme.of(context).colorScheme.surfaceContainerHigh,
           padding: .all(8),
           child: switch (triggerCharacter) {
-            "@" => UserOverlay(roomId, query: query, addTag: addTag),
-            "#" => RoomOverlay(roomId, query: query, addTag: addTag),
+            "@" => UserOverlay(query, roomId: roomId, addTag: addTag),
+            "#" => RoomOverlay(query, addTag: addTag),
 
             _ => Loading(),
           },
diff --git a/lib/widgets/composer/overlays/user_overlay.dart b/lib/widgets/composer/overlays/user_overlay.dart
index caf3d0f..ba23c1e 100644
--- a/lib/widgets/composer/overlays/user_overlay.dart
+++ b/lib/widgets/composer/overlays/user_overlay.dart
@@ -7,8 +7,8 @@ import "package:nexus/models/content/membership.dart";
 import "package:nexus/widgets/avatar_or_hash.dart";
 
 class const UserOverlay(
-  final String roomId, {
-  required final String query,
+  final String query, {
+  required final String roomId,
   required final void Function({required String id, required String name})
   addTag,
   super.key,