Merge pull request #984 from nextcloud/fix/neon_files/browser_view

fix(neon_files): empty browser view

packages/neon/neon_files/lib/widgets/browser_view.dart

@@ -43,13 +43,30 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
   @override
   Widget build(final BuildContext context) => ResultBuilder<List<WebDavFile>>.behaviorSubject(
         stream: widget.bloc.files,
-        builder: (final context, final files) => StreamBuilder<List<String>>(
+        builder: (final context, final filesSnapshot) => StreamBuilder<List<String>>(
           stream: widget.bloc.path,
           builder: (final context, final pathSnapshot) => StreamBuilder<List<FilesTask>>(
             stream: widget.filesBloc.tasks,
-            builder: (final context, final tasksSnapshot) => !pathSnapshot.hasData || !tasksSnapshot.hasData
-                ? const SizedBox()
-                : BackButtonListener(
+            builder: (final context, final tasksSnapshot) {
+              if (!pathSnapshot.hasData || !tasksSnapshot.hasData) {
+                return const SizedBox();
+              }
+              return ValueListenableBuilder(
+                valueListenable: widget.bloc.options.showHiddenFilesOption,
+                builder: (final context, final showHiddenFiles, final _) {
+                  final files = filesSnapshot.data?.where((final file) {
+                    var hideFile = false;
+                    if (widget.mode == FilesBrowserMode.selectDirectory && !file.isDirectory) {
+                      hideFile = true;
+                    }
+                    if (!showHiddenFiles && file.isHidden) {
+                      hideFile = true;
+                    }
+
+                    return !hideFile;
+                  }).toList();
+
+                  return BackButtonListener(
                     onBackButtonPressed: () async {
                       final path = pathSnapshot.requireData;
                       if (path.isNotEmpty) {
@@ -65,10 +82,8 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
                       presort: const {
                         (FilesSortProperty.isFolder, SortBoxOrder.ascending),
                       },
-                      input: files.data,
-                      builder: (final context, final sorted) => ValueListenableBuilder(
-                        valueListenable: widget.bloc.options.showHiddenFilesOption,
-                        builder: (final context, final showHiddenFiles, final _) {
+                      input: files,
+                      builder: (final context, final sorted) {
                         final uploadingTasks = tasksSnapshot.requireData
                             .whereType<FilesUploadTask>()
                             .where(
@@ -90,10 +105,7 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
                                 ),
                               );
                             }
-
                             final file = sorted[index - uploadingTasks.length];
-                              if ((widget.mode != FilesBrowserMode.selectDirectory || file.isDirectory) &&
-                                  (!file.isHidden || showHiddenFiles)) {
                             final matchingTask = tasksSnapshot.requireData
                                 .firstWhereOrNull((final task) => _pathMatchesFile(task.path, file.name));
 
@@ -111,13 +123,11 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
                               bloc: widget.filesBloc,
                               browserBloc: widget.bloc,
                               details: details,
+                              mode: widget.mode,
                             );
-                              }
-
-                              return null;
                           },
-                            isLoading: files.isLoading,
-                            error: files.error,
+                          isLoading: filesSnapshot.isLoading,
+                          error: filesSnapshot.error,
                           onRefresh: widget.bloc.refresh,
                           topScrollingChildren: [
                             FilesBrowserNavigator(
@@ -128,8 +138,10 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
                         );
                       },
                     ),
-                    ),
-                  ),
+                  );
+                },
+              );
+            },
           ),
         ),
       );

packages/neon/neon_files/lib/widgets/file_list_tile.dart

@@ -73,7 +73,7 @@ class FileListTile extends StatelessWidget {
           details: details,
           bloc: bloc,
         ),
-        trailing: !details.hasTask && mode != FilesBrowserMode.noActions
+        trailing: !details.hasTask && mode == FilesBrowserMode.browser
             ? FileActions(details: details)
             : const SizedBox.square(
                 dimension: largeIconSize,