🐛 Fix side nav cause render error

android/app/src/main/AndroidManifest.xml

@@ -17,6 +17,7 @@
         android:label="Solian"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
+        android:enableOnBackInvokedCallback="true"
         android:requestLegacyExternalStorage="true">
         <activity
             android:name=".MainActivity"

assets/translations/en-US.json

@@ -294,6 +294,7 @@
   "addAttachmentFromCameraPhoto": "Take photo",
   "addAttachmentFromCameraVideo": "Take video",
   "addAttachmentFromRandomId": "Link via RID",
+  "attachmentDetailInfo": "Attachment details",
   "attachmentPastedImage": "Pasted Image",
   "attachmentInsertLink": "Insert Link",
   "attachmentSetAsPostThumbnail": "Set as post thumbnail",

assets/translations/zh-CN.json

@@ -292,6 +292,7 @@
   "addAttachmentFromCameraPhoto": "拍摄照片",
   "addAttachmentFromCameraVideo": "拍摄视频",
   "addAttachmentFromRandomId": "通过访问 ID 链接",
+  "attachmentDetailInfo": "附件详细信息",
   "attachmentPastedImage": "粘贴的图片",
   "attachmentInsertLink": "插入连接",
   "attachmentSetAsPostThumbnail": "设置为帖子缩略图",

lib/screens/explore.dart

@@ -217,27 +217,48 @@ class _ExploreScreenState extends State<ExploreScreen> {
               hasReachedMax: _postCount != null && _posts.length >= _postCount!,
               onFetchData: _fetchPosts,
               itemBuilder: (context, idx) {
-                return GestureDetector(
+                return Center(
-                  child: PostItem(
+                  child: Container(
-                    data: _posts[idx],
+                    decoration: BoxDecoration(
-                    maxWidth: 640,
+                      border: Border(
-                    onChanged: (data) {
+                        left: BorderSide(
-                      setState(() => _posts[idx] = data);
+                          color: Theme.of(context).dividerColor,
-                    },
+                          width: 1 / MediaQuery.of(context).devicePixelRatio,
-                    onDeleted: () {
+                        ),
-                      _refreshPosts();
+                        right: BorderSide(
-                    },
+                          color: Theme.of(context).dividerColor,
+                          width: 1 / MediaQuery.of(context).devicePixelRatio,
+                        ),
+                      ),
+                    ),
+                    constraints: const BoxConstraints(maxWidth: 640),
+                    child: Column(
+                      children: [
+                        GestureDetector(
+                          child: PostItem(
+                            data: _posts[idx],
+                            maxWidth: 640,
+                            onChanged: (data) {
+                              setState(() => _posts[idx] = data);
+                            },
+                            onDeleted: () {
+                              _refreshPosts();
+                            },
+                          ),
+                          onTap: () {
+                            GoRouter.of(context).pushNamed(
+                              'postDetail',
+                              pathParameters: {'slug': _posts[idx].id.toString()},
+                              extra: _posts[idx],
+                            );
+                          },
+                        ),
+                        const Divider(height: 1),
+                      ],
+                    ),
                   ),
-                  onTap: () {
-                    GoRouter.of(context).pushNamed(
-                      'postDetail',
-                      pathParameters: {'slug': _posts[idx].id.toString()},
-                      extra: _posts[idx],
-                    );
-                  },
                 );
               },
-              separatorBuilder: (context, index) => const Divider(height: 1),
             ),
           ],
         ),

lib/screens/settings.dart

@@ -120,7 +120,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                   subtitle: Text('settingsThemeMaterial3Description').tr(),
                   contentPadding: const EdgeInsets.only(left: 24, right: 17),
                   secondary: const Icon(Symbols.new_releases),
-                  value: _prefs.getBool(kMaterialYouToggleStoreKey) ?? false,
+                  value: _prefs.getBool(kMaterialYouToggleStoreKey) ?? true,
                   onChanged: (value) {
                     setState(() {
                       _prefs.setBool(

lib/theme.dart

@@ -36,7 +36,7 @@ Future<ThemeData> createAppTheme(
   final hasAppBarBlurry = prefs.getBool(kAppbarTransparentStoreKey) ?? false;
 
   return ThemeData(
-    useMaterial3: useMaterial3 ?? (prefs.getBool(kMaterialYouToggleStoreKey) ?? false),
+    useMaterial3: useMaterial3 ?? (prefs.getBool(kMaterialYouToggleStoreKey) ?? true),
     colorScheme: colorScheme,
     brightness: brightness,
     iconTheme: IconThemeData(
@@ -52,5 +52,15 @@ Future<ThemeData> createAppTheme(
       foregroundColor: hasAppBarBlurry ? colorScheme.onSurface : colorScheme.onPrimary,
     ),
     scaffoldBackgroundColor: Colors.transparent,
+    pageTransitionsTheme: PageTransitionsTheme(
+      builders: {
+        TargetPlatform.android: PredictiveBackPageTransitionsBuilder(),
+        TargetPlatform.iOS: ZoomPageTransitionsBuilder(),
+        TargetPlatform.macOS: ZoomPageTransitionsBuilder(),
+        TargetPlatform.fuchsia: ZoomPageTransitionsBuilder(),
+        TargetPlatform.linux: ZoomPageTransitionsBuilder(),
+        TargetPlatform.windows: ZoomPageTransitionsBuilder(),
+      },
+    ),
   );
 }

lib/widgets/account/account_popover.dart

@@ -10,7 +10,6 @@ import 'package:surface/providers/experience.dart';
 import 'package:surface/providers/sn_network.dart';
 import 'package:surface/screens/account/profile_page.dart';
 import 'package:surface/types/account.dart';
-import 'package:surface/types/post.dart';
 import 'package:surface/widgets/account/account_image.dart';
 import 'package:surface/widgets/universal_image.dart';
 

lib/widgets/attachment/attachment_zoom.dart

@@ -129,6 +129,8 @@ class _AttachmentZoomViewState extends State<AttachmentZoomView> {
 
   Color get _unFocusColor => Theme.of(context).colorScheme.onSurface.withOpacity(0.75);
 
+  bool _showDetail = false;
+
   @override
   Widget build(BuildContext context) {
     final sn = context.read<SnNetworkProvider>();
@@ -144,218 +146,348 @@ class _AttachmentZoomViewState extends State<AttachmentZoomView> {
       onDismissed: () {
         Navigator.of(context).pop();
       },
-      direction: DismissiblePageDismissDirection.down,
+      direction: DismissiblePageDismissDirection.none,
       backgroundColor: Colors.transparent,
       isFullScreen: true,
-      child: Scaffold(
+      child: GestureDetector(
-        body: Stack(
+        behavior: HitTestBehavior.translucent,
-          children: [
+        child: Scaffold(
-            Builder(builder: (context) {
+          body: Stack(
-              if (widget.data.length == 1) {
+            children: [
-                final heroTag = widget.heroTags?.first ?? uuid.v4();
+              Builder(builder: (context) {
-                return Hero(
+                if (widget.data.length == 1) {
-                  tag: 'attachment-${widget.data.first.rid}-$heroTag',
+                  final heroTag = widget.heroTags?.first ?? uuid.v4();
-                  child: PhotoView(
+                  return Hero(
-                    key: Key('attachment-detail-${widget.data.first.rid}-$heroTag'),
+                    tag: 'attachment-${widget.data.first.rid}-$heroTag',
-                    backgroundDecoration: BoxDecoration(color: Colors.transparent),
+                    child: PhotoView(
-                    imageProvider: UniversalImage.provider(
+                      key: Key('attachment-detail-${widget.data.first.rid}-$heroTag'),
-                      sn.getAttachmentUrl(widget.data.first.rid),
+                      backgroundDecoration: BoxDecoration(color: Colors.transparent),
-                    ),
+                      imageProvider: UniversalImage.provider(
-                  ),
+                        sn.getAttachmentUrl(widget.data.first.rid),
-                );
+                      ),
-              }
-
-              return PhotoViewGallery.builder(
-                pageController: _pageController,
-                scrollPhysics: const BouncingScrollPhysics(),
-                builder: (context, idx) {
-                  final heroTag = widget.heroTags?.elementAt(idx) ?? uuid.v4();
-                  return PhotoViewGalleryPageOptions(
-                    imageProvider: UniversalImage.provider(
-                      sn.getAttachmentUrl(widget.data.elementAt(idx).rid),
-                    ),
-                    heroAttributes: PhotoViewHeroAttributes(
-                      tag: 'attachment-${widget.data.first.rid}-$heroTag',
                     ),
                   );
-                },
+                }
-                itemCount: widget.data.length,
+
-                loadingBuilder: (context, event) => Center(
+                return PhotoViewGallery.builder(
-                  child: SizedBox(
+                  pageController: _pageController,
-                    width: 20.0,
+                  scrollPhysics: const BouncingScrollPhysics(),
-                    height: 20.0,
+                  builder: (context, idx) {
-                    child: CircularProgressIndicator(
+                    final heroTag = widget.heroTags?.elementAt(idx) ?? uuid.v4();
-                      value: event == null ? 0 : event.cumulativeBytesLoaded / (event.expectedTotalBytes ?? 1),
+                    return PhotoViewGalleryPageOptions(
+                      imageProvider: UniversalImage.provider(
+                        sn.getAttachmentUrl(widget.data.elementAt(idx).rid),
+                      ),
+                      heroAttributes: PhotoViewHeroAttributes(
+                        tag: 'attachment-${widget.data.first.rid}-$heroTag',
+                      ),
+                    );
+                  },
+                  itemCount: widget.data.length,
+                  loadingBuilder: (context, event) => Center(
+                    child: SizedBox(
+                      width: 20.0,
+                      height: 20.0,
+                      child: CircularProgressIndicator(
+                        value: event == null ? 0 : event.cumulativeBytesLoaded / (event.expectedTotalBytes ?? 1),
+                      ),
                     ),
                   ),
-                ),
+                  backgroundDecoration: BoxDecoration(color: Colors.transparent),
-                backgroundDecoration: BoxDecoration(color: Colors.transparent),
+                );
-              );
+              }),
-            }),
+              Align(
-            Align(
+                alignment: Alignment.bottomCenter,
-              alignment: Alignment.bottomCenter,
+                child: IgnorePointer(
-              child: IgnorePointer(
+                  child: Container(
-                child: Container(
+                    height: 300,
-                  height: 300,
+                    decoration: BoxDecoration(
-                  decoration: BoxDecoration(
+                      gradient: LinearGradient(
-                    gradient: LinearGradient(
+                        begin: Alignment.bottomCenter,
-                      begin: Alignment.bottomCenter,
+                        end: Alignment.topCenter,
-                      end: Alignment.topCenter,
+                        colors: [
-                      colors: [
+                          Theme.of(context).colorScheme.surface,
-                        Theme.of(context).colorScheme.surface,
+                          Colors.transparent,
-                        Colors.transparent,
+                        ],
-                      ],
+                      ),
                     ),
                   ),
                 ),
               ),
-            ),
+              Positioned(
-            Positioned(
+                left: 16,
-              left: 16,
+                right: 16,
-              right: 16,
+                bottom: 16 + MediaQuery.of(context).padding.bottom,
-              bottom: 16 + MediaQuery.of(context).padding.bottom,
+                child: Material(
-              child: Material(
+                  color: Colors.transparent,
-                color: Colors.transparent,
+                  child: Builder(builder: (context) {
-                child: Builder(builder: (context) {
+                    final ud = context.read<UserDirectoryProvider>();
-                  final ud = context.read<UserDirectoryProvider>();
+                    final item = widget.data.elementAt(
-                  final item = widget.data.elementAt(
+                      widget.data.length > 1 ? _pageController.page?.round() ?? 0 : 0,
-                    widget.data.length > 1 ? _pageController.page?.round() ?? 0 : 0,
+                    );
-                  );
+                    final account = ud.getAccountFromCache(item.accountId);
-                  final account = ud.getAccountFromCache(item.accountId);
 
-                  return Column(
+                    return Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
+                      crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
+                      children: [
-                      if (item.accountId > 0)
+                        if (item.accountId > 0)
-                        Row(
+                          Row(
-                          children: [
+                            children: [
-                            IgnorePointer(
+                              IgnorePointer(
-                              child: AccountImage(
+                                child: AccountImage(
-                                content: account?.avatar,
+                                  content: account?.avatar,
-                                radius: 19,
+                                  radius: 19,
-                              ),
-                            ),
-                            const Gap(8),
-                            Expanded(
-                              child: IgnorePointer(
-                                child: Column(
-                                  crossAxisAlignment: CrossAxisAlignment.start,
-                                  children: [
-                                    Text(
-                                      'attachmentUploadBy'.tr(),
-                                      style: Theme.of(context).textTheme.bodySmall,
-                                    ),
-                                    Text(
-                                      account?.nick ?? 'unknown'.tr(),
-                                      style: Theme.of(context).textTheme.bodyMedium,
-                                    ),
-                                  ],
                                 ),
                               ),
-                            ),
+                              const Gap(8),
-                            if (widget.data.length > 1)
+                              Expanded(
-                              IgnorePointer(
+                                child: IgnorePointer(
-                                child: Text(
+                                  child: Column(
-                                  '${(_pageController.page?.round() ?? 0) + 1}/${widget.data.length}',
+                                    crossAxisAlignment: CrossAxisAlignment.start,
-                                  style: GoogleFonts.robotoMono(fontSize: 13),
+                                    children: [
-                                ).padding(right: 8),
+                                      Text(
-                              ),
+                                        'attachmentUploadBy'.tr(),
-                            InkWell(
+                                        style: Theme.of(context).textTheme.bodySmall,
-                              borderRadius: const BorderRadius.all(Radius.circular(16)),
-                              onTap: _isDownloading
-                                  ? null
-                                  : () => _saveToAlbum(widget.data.length > 1 ? _pageController.page?.round() ?? 0 : 0),
-                              child: Container(
-                                padding: const EdgeInsets.all(6),
-                                child: !_isDownloading
-                                    ? !_isCompletedDownload
-                                        ? const Icon(Symbols.save_alt)
-                                        : const Icon(Symbols.download_done)
-                                    : SizedBox(
-                                        width: 24,
-                                        height: 24,
-                                        child: CircularProgressIndicator(
-                                          value: _progressOfDownload,
-                                          strokeWidth: 3,
-                                        ),
                                       ),
+                                      Text(
+                                        account?.nick ?? 'unknown'.tr(),
+                                        style: Theme.of(context).textTheme.bodyMedium,
+                                      ),
+                                    ],
+                                  ),
+                                ),
                               ),
+                              if (widget.data.length > 1)
+                                IgnorePointer(
+                                  child: Text(
+                                    '${(_pageController.page?.round() ?? 0) + 1}/${widget.data.length}',
+                                    style: GoogleFonts.robotoMono(fontSize: 13),
+                                  ).padding(right: 8),
+                                ),
+                              InkWell(
+                                borderRadius: const BorderRadius.all(Radius.circular(16)),
+                                onTap: _isDownloading
+                                    ? null
+                                    : () =>
+                                        _saveToAlbum(widget.data.length > 1 ? _pageController.page?.round() ?? 0 : 0),
+                                child: Container(
+                                  padding: const EdgeInsets.all(6),
+                                  child: !_isDownloading
+                                      ? !_isCompletedDownload
+                                          ? const Icon(Symbols.save_alt)
+                                          : const Icon(Symbols.download_done)
+                                      : SizedBox(
+                                          width: 24,
+                                          height: 24,
+                                          child: CircularProgressIndicator(
+                                            value: _progressOfDownload,
+                                            strokeWidth: 3,
+                                          ),
+                                        ),
+                                ),
+                              ),
+                            ],
+                          ),
+                        const Gap(4),
+                        IgnorePointer(
+                          child: Text(
+                            item.alt,
+                            maxLines: 2,
+                            overflow: TextOverflow.ellipsis,
+                            style: const TextStyle(
+                              fontSize: 15,
+                              fontWeight: FontWeight.w500,
                             ),
-                          ],
-                        ),
-                      const Gap(4),
-                      IgnorePointer(
-                        child: Text(
-                          item.alt,
-                          maxLines: 2,
-                          overflow: TextOverflow.ellipsis,
-                          style: const TextStyle(
-                            fontSize: 15,
-                            fontWeight: FontWeight.w500,
                           ),
                         ),
-                      ),
+                        const Gap(2),
-                      const Gap(2),
+                        IgnorePointer(
-                      IgnorePointer(
+                          child: Wrap(
-                        child: Wrap(
+                            spacing: 6,
-                          spacing: 6,
+                            children: [
-                          children: [
+                              if (item.metadata['exif'] == null)
-                            if (item.metadata['exif'] == null)
+                                Text(
+                                  '#${item.rid}',
+                                  style: metaTextStyle,
+                                ),
+                              if (item.metadata['exif']?['Model'] != null)
+                                Text(
+                                  'attachmentShotOn'.tr(args: [
+                                    item.metadata['exif']?['Model'],
+                                  ]),
+                                  style: metaTextStyle,
+                                ).padding(right: 2),
+                              if (item.metadata['exif']?['ISO'] != null)
+                                Text(
+                                  'ISO${item.metadata['exif']?['ISO']}',
+                                  style: metaTextStyle,
+                                ).padding(right: 2),
+                              if (item.metadata['exif']?['Aperture'] != null)
+                                Text(
+                                  'f/${item.metadata['exif']?['Aperture']}',
+                                  style: metaTextStyle,
+                                ).padding(right: 2),
+                              if (item.metadata['exif']?['Megapixels'] != null &&
+                                  item.metadata['exif']?['Model'] != null)
+                                Text(
+                                  '${item.metadata['exif']?['Megapixels']}MP',
+                                  style: metaTextStyle,
+                                )
+                              else
+                                Text(
+                                  item.size.formatBytes(),
+                                  style: metaTextStyle,
+                                ),
+                              if (item.metadata['width'] != null && item.metadata['height'] != null)
+                                Text(
+                                  '${item.metadata['width']}x${item.metadata['height']}',
+                                  style: metaTextStyle,
+                                ),
+                              if (item.metadata['ratio'] != null)
+                                Text(
+                                  (item.metadata['ratio'] as num).toStringAsFixed(2),
+                                  style: metaTextStyle,
+                                ),
                               Text(
-                                '#${item.rid}',
+                                item.mimetype,
                                 style: metaTextStyle,
                               ),
-                            if (item.metadata['exif']?['Model'] != null)
+                            ],
-                              Text(
+                          ),
-                                'attachmentShotOn'.tr(args: [
-                                  item.metadata['exif']?['Model'],
-                                ]),
-                                style: metaTextStyle,
-                              ).padding(right: 2),
-                            if (item.metadata['exif']?['ISO'] != null)
-                              Text(
-                                'ISO${item.metadata['exif']?['ISO']}',
-                                style: metaTextStyle,
-                              ).padding(right: 2),
-                            if (item.metadata['exif']?['Aperture'] != null)
-                              Text(
-                                'f/${item.metadata['exif']?['Aperture']}',
-                                style: metaTextStyle,
-                              ).padding(right: 2),
-                            if (item.metadata['exif']?['Megapixels'] != null && item.metadata['exif']?['Model'] != null)
-                              Text(
-                                '${item.metadata['exif']?['Megapixels']}MP',
-                                style: metaTextStyle,
-                              )
-                            else
-                              Text(
-                                item.size.formatBytes(),
-                                style: metaTextStyle,
-                              ),
-                            if (item.metadata['width'] != null && item.metadata['height'] != null)
-                              Text(
-                                '${item.metadata['width']}x${item.metadata['height']}',
-                                style: metaTextStyle,
-                              ),
-                            if (item.metadata['ratio'] != null)
-                              Text(
-                                (item.metadata['ratio'] as num).toStringAsFixed(2),
-                                style: metaTextStyle,
-                              ),
-                            Text(
-                              item.mimetype,
-                              style: metaTextStyle,
-                            ),
-                          ],
                         ),
-                      ),
+                      ],
-                    ],
+                    );
-                  );
+                  }),
-                }),
+                ),
               ),
-            ),
+            ],
-          ],
+          ),
         ),
+        onVerticalDragUpdate: (details) {
+          if (_showDetail) return;
+          if (details.delta.dy < 0) {
+            _showDetail = true;
+            showModalBottomSheet(
+              context: context,
+              builder: (context) => _AttachmentZoomDetailPopup(
+                data: widget.data.elementAt(widget.data.length > 1 ? _pageController.page?.round() ?? 0 : 0),
+              ),
+            ).then((_) {
+              _showDetail = false;
+            });
+          }
+        },
+        onTap: () {
+          Navigator.of(context).pop();
+        },
+      ),
+    );
+  }
+}
+
+class _AttachmentZoomDetailPopup extends StatelessWidget {
+  final SnAttachment data;
+
+  const _AttachmentZoomDetailPopup({required this.data});
+
+  @override
+  Widget build(BuildContext context) {
+    final ud = context.read<UserDirectoryProvider>();
+    final account = ud.getAccountFromCache(data.accountId);
+
+    const tableGap = TableRow(
+      children: [
+        TableCell(child: SizedBox(height: 16)),
+        TableCell(child: SizedBox(height: 16)),
+      ],
+    );
+
+    return SizedBox(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              const Icon(Symbols.info, size: 24),
+              const Gap(16),
+              Text('attachmentDetailInfo').tr().textStyle(Theme.of(context).textTheme.titleLarge!),
+            ],
+          ).padding(horizontal: 20, top: 16, bottom: 12),
+          Expanded(
+            child: Table(
+              columnWidths: {
+                0: IntrinsicColumnWidth(),
+                1: FlexColumnWidth(),
+              },
+              children: [
+                TableRow(
+                  children: [
+                    TableCell(
+                      child: Text('attachmentUploadBy').tr().padding(right: 16),
+                    ),
+                    TableCell(
+                      child: Row(
+                        children: [
+                          if (data.accountId > 0)
+                            AccountImage(
+                              content: account?.avatar,
+                              radius: 8,
+                            ),
+                          const Gap(8),
+                          Text(data.accountId > 0 ? account?.nick ?? 'unknown'.tr() : 'unknown'.tr()),
+                          const Gap(8),
+                          Text('#${data.accountId}', style: GoogleFonts.robotoMono()).opacity(0.75),
+                        ],
+                      ),
+                    ),
+                  ],
+                ),
+                tableGap,
+                TableRow(
+                  children: [
+                    TableCell(child: Text('Mimetype').padding(right: 16)),
+                    TableCell(child: Text(data.mimetype)),
+                  ],
+                ),
+                TableRow(
+                  children: [
+                    TableCell(child: Text('Size').padding(right: 16)),
+                    TableCell(
+                        child: Row(
+                      children: [
+                        Text(data.size.formatBytes()),
+                        const Gap(12),
+                        Text('${data.size} Bytes', style: GoogleFonts.robotoMono()).opacity(0.75),
+                      ],
+                    )),
+                  ],
+                ),
+                TableRow(
+                  children: [
+                    TableCell(child: Text('Name').padding(right: 16)),
+                    TableCell(child: Text(data.name)),
+                  ],
+                ),
+                if (data.hash.isNotEmpty)
+                  TableRow(
+                    children: [
+                      TableCell(child: Text('Hash').padding(right: 16)),
+                      TableCell(child: Text(data.hash, style: GoogleFonts.robotoMono(fontSize: 11)).opacity(0.9)),
+                    ],
+                  ),
+                tableGap,
+                ...(data.metadata['exif']?.keys.map((k) => TableRow(
+                      children: [
+                        TableCell(child: Text(k).padding(right: 16)),
+                        TableCell(child: Text(data.metadata['exif'][k].toString())),
+                      ],
+                    )) ??
+                    []),
+              ],
+            ).padding(horizontal: 20, vertical: 8),
+          ),
+        ],
       ),
     );
   }

lib/widgets/navigation/app_rail_navigation.dart

@@ -18,9 +18,7 @@ class _AppRailNavigationState extends State<AppRailNavigation> {
   void initState() {
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      context
+      context.read<NavigationProvider>().autoDetectIndex(GoRouter.maybeOf(context));
-          .read<NavigationProvider>()
-          .autoDetectIndex(GoRouter.maybeOf(context));
     });
   }
 
@@ -31,11 +29,11 @@ class _AppRailNavigationState extends State<AppRailNavigation> {
     return ListenableBuilder(
       listenable: nav,
       builder: (context, _) {
-        final destinations =
+        final destinations = nav.destinations.where((ele) => ele.isPinned).toList();
-            nav.destinations.where((ele) => ele.isPinned).toList();
 
         return NavigationRail(
-          selectedIndex: nav.currentIndex,
+          selectedIndex:
+              nav.currentIndex != null && nav.currentIndex! < nav.pinnedDestinationCount ? nav.currentIndex : null,
           destinations: [
             ...destinations.where((ele) => ele.isPinned).map((ele) {
               return NavigationRailDestination(