fix: menu unable to be shown on repeated posts

Kaiteki-Fedi · Sep 25, 2023 · 73bfb0e · 73bfb0e
1 parent eb34913
commit 73bfb0e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/src/kaiteki/lib/ui/shared/posts/layouts/expanded.dart b/src/kaiteki/lib/ui/shared/posts/layouts/expanded.dart
@@ -57,9 +57,11 @@ class ExpandedPostLayout extends ConsumerWidget {
           ),
           ExpandedPostLayout(
             repeatOf,
-            onOpen: onOpen,
             callbacks: callbacks,
             onReact: onReact,
+            onOpen: onOpen,
+            onTap: onTap,
+            menuFocusNode: menuFocusNode,
           ),
         ],
       );

diff --git a/src/kaiteki/lib/ui/shared/posts/layouts/normal.dart b/src/kaiteki/lib/ui/shared/posts/layouts/normal.dart
@@ -60,6 +60,9 @@ class NormalPostLayout extends ConsumerWidget {
             repeatOf,
             callbacks: callbacks,
             onReact: onReact,
+            onOpen: onOpen,
+            onTap: onTap,
+            menuFocusNode: menuFocusNode,
           ),
         ],
       );

diff --git a/src/kaiteki/lib/ui/shared/posts/layouts/wide.dart b/src/kaiteki/lib/ui/shared/posts/layouts/wide.dart
@@ -54,9 +54,11 @@ class WidePostLayout extends ConsumerWidget {
           ),
           WidePostLayout(
             repeatOf,
-            onOpen: onOpen,
             callbacks: callbacks,
             onReact: onReact,
+            onOpen: onOpen,
+            onTap: onTap,
+            menuFocusNode: menuFocusNode,
           ),
         ],
       );

diff --git a/src/kaiteki/lib/ui/shared/posts/post_widget.dart b/src/kaiteki/lib/ui/shared/posts/post_widget.dart
@@ -214,10 +214,12 @@ class _PostWidgetState extends ConsumerState<PostWidget> {
     final anchor =
         _menuAnchorKey.currentContext!.findRenderObject() as RenderBox;
 
-    final button =
-        _menuButtonFocusNode.context!.findRenderObject() as RenderBox;
+    final buttonContext = _menuButtonFocusNode.context;
 
-    final offset = button.localToGlobal(Offset.zero, ancestor: anchor);
+    assert(buttonContext != null);
+
+    final buttonRenderBox = buttonContext!.findRenderObject() as RenderBox;
+    final offset = buttonRenderBox.localToGlobal(Offset.zero, ancestor: anchor);
 
     _menuController.open(position: offset);
   }