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

gate pop behind canPop

Browse source
This commit is contained in:
Henry Hiles 2026-09-28 09:49:20 -04:00
commit d37538b69f
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/widgets/pages/chat.dart
View file

@ -25,7 +25,7 @@ class const ChatPage({super.key}) extends HookConsumerWidget {
body: initComplete
? Row(
children: [
if (isDesktop) Sidebar(isDesktop: isDesktop),
if (isDesktop) Sidebar(),
Expanded(
child: Consumer(
builder: (context, ref, _) {
@ -50,9 +50,7 @@ class const ChatPage({super.key}) extends HookConsumerWidget {
children: [Loading(), Text("Syncing...")],
),
),
drawer: isDesktop || !initComplete
? null
: Sidebar(isDesktop: isDesktop),
drawer: isDesktop || !initComplete ? null : Sidebar(),
),
);
},

9
lib/widgets/sidebar.dart
View file

@ -16,8 +16,7 @@ import "package:nexus/widgets/room_menu.dart";
// Needed for navigation_rail_m3e (#65).
import "package:flutter/material.dart" as old_mat;
class const Sidebar({required final bool isDesktop, super.key})
extends HookConsumerWidget {
class const Sidebar({super.key}) extends HookConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final selectedSpaceProvider = KeyController.provider(
@ -193,7 +192,8 @@ class const Sidebar({required final bool isDesktop, super.key})
IconButton(
tooltip: "Open notifications",
onPressed: () {
if (!isDesktop) Navigator.of(context).pop();
if (Navigator.of(context).canPop())
Navigator.of(context).pop();
Navigator.of(context).push(
MaterialPageRoute(
builder: (_) => NotificationsPage(),
@ -309,7 +309,8 @@ class const Sidebar({required final bool isDesktop, super.key})
selectedRoomIdNotifier.set(
children[value].metadata?.id, //
);
if (!isDesktop) Navigator.of(context).pop();
if (Navigator.of(context).canPop())
Navigator.of(context).pop();
},
),
),