From 729b8571b588f1dedb39e2d736db4c97e332f00d Mon Sep 17 00:00:00 2001
From: Richard Shiue <71320345+richardshiue@users.noreply.github.com>
Date: Fri, 17 Nov 2023 09:27:10 +0800
Subject: [PATCH] chore: fix ungroupedsection being shown (#3953)

* chore: fix ungroupedsection being shown

* chore: board ui adjustment
---
 .../database_view/board/application/board_bloc.dart        | 3 ++-
 .../board/presentation/widgets/board_hidden_groups.dart    | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/board/application/board_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/board_bloc.dart
index 52cb0e7e77..bdbcf0114a 100644
--- a/frontend/appflowy_flutter/lib/plugins/database_view/board/application/board_bloc.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/application/board_bloc.dart
@@ -278,7 +278,8 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {
           .where(
             (group) =>
                 fieldController.getField(group.fieldId) != null &&
-                (group.isVisible || (group.isDefault && !hideUngrouped)),
+                ((!group.isDefault && group.isVisible) ||
+                    (group.isDefault && !hideUngrouped)),
           )
           .map((group) => _initializeGroupData(group))
           .toList(),
diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/widgets/board_hidden_groups.dart b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/widgets/board_hidden_groups.dart
index b5673de400..6d7665371b 100644
--- a/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/widgets/board_hidden_groups.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/widgets/board_hidden_groups.dart
@@ -53,7 +53,7 @@ class HiddenGroupsColumn extends StatelessWidget {
                   ),
                 )
               : SizedBox(
-                  width: 260,
+                  width: 234,
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
@@ -62,7 +62,7 @@ class HiddenGroupsColumn extends StatelessWidget {
                         child: Padding(
                           padding: EdgeInsets.only(
                             left: 40 + margin.left,
-                            right: margin.right,
+                            right: margin.right + 4,
                           ),
                           child: Row(
                             children: [
@@ -99,6 +99,7 @@ class HiddenGroupsColumn extends StatelessWidget {
       message: isCollapsed
           ? LocaleKeys.board_hiddenGroupSection_expandTooltip.tr()
           : LocaleKeys.board_hiddenGroupSection_collapseTooltip.tr(),
+      preferBelow: false,
       child: FlowyIconButton(
         width: 20,
         height: 20,
@@ -252,7 +253,7 @@ class HiddenGroupButtonContent extends StatelessWidget {
                   }
 
                   return SizedBox(
-                    height: 30,
+                    height: 32,
                     child: Padding(
                       padding: const EdgeInsets.symmetric(
                         horizontal: 4,