Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
feat: refactor databse styles (#7405)
Morn9eed9934213d
diff --git a/frontend/appflowy_flutter/integration_test/desktop/board/board_hide_groups_test.dart b/frontend/appflowy_flutter/integration_test/desktop/board/board_hide_groups_test.dartindex 15da47f0f1..6a012ac763 100644--- a/frontend/appflowy_flutter/integration_test/desktop/board/board_hide_groups_test.dart+++ b/frontend/appflowy_flutter/integration_test/desktop/board/board_hide_groups_test.dart@@ -23,24 +23,24 @@ void main() {final expandFinder = find.byFlowySvg(FlowySvgs.hamburger_s_s);// Is expanded by default- expect(collapseFinder, findsOneWidget);- expect(expandFinder, findsNothing);+ expect(collapseFinder, findsNothing);+ expect(expandFinder, findsOneWidget);// Collapse hidden groups- await tester.tap(collapseFinder);+ await tester.tap(expandFinder);await tester.pumpAndSettle();// Is collapsed- expect(collapseFinder, findsNothing);- expect(expandFinder, findsOneWidget);+ expect(collapseFinder, findsOneWidget);+ expect(expandFinder, findsNothing);// Expand hidden groups- await tester.tap(expandFinder);+ await tester.tap(collapseFinder);await tester.pumpAndSettle();// Is expanded- expect(collapseFinder, findsOneWidget);- expect(expandFinder, findsNothing);+ expect(collapseFinder, findsNothing);+ expect(expandFinder, findsOneWidget);});testWidgets('hide first group, and show it again', (tester) async {@@ -48,6 +48,9 @@ void main() {await tester.tapAnonymousSignInButton();await tester.createNewPageWithNameUnderParent(layout: ViewLayoutPB.Board);+ final expandFinder = find.byFlowySvg(FlowySvgs.hamburger_s_s);+ await tester.tapButton(expandFinder);+// Tap the options of the first groupfinal optionsFinder = find.descendant(diff --git a/frontend/appflowy_flutter/integration_test/shared/common_operations.dart b/frontend/appflowy_flutter/integration_test/shared/common_operations.dartindex 9bc663ff12..4a117a71ff 100644--- a/frontend/appflowy_flutter/integration_test/shared/common_operations.dart+++ b/frontend/appflowy_flutter/integration_test/shared/common_operations.dart@@ -617,7 +617,7 @@ extension CommonOperations on WidgetTester {);final distanceY = getCenter(to).dy - getCenter(from).dx;await drag(from, Offset(0, distanceY));- await pumpAndSettle();+ await pumpAndSettle(const Duration(seconds: 1));}// tap the button with [FlowySvgData]diff --git a/frontend/appflowy_flutter/lib/core/config/kv_keys.dart b/frontend/appflowy_flutter/lib/core/config/kv_keys.dartindex b9f59d6434..aefd5e5d36 100644--- a/frontend/appflowy_flutter/lib/core/config/kv_keys.dart+++ b/frontend/appflowy_flutter/lib/core/config/kv_keys.dart@@ -115,4 +115,9 @@ class KVKeys {////// The value is a json string of [RecentIcons]static const String recentIcons = 'kRecentIcons';++ /// The key for saving compact mode ids for node or databse view+ ///+ /// The value is a json list of id+ static const String compactModeIds = 'compactModeIds';}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/mobile_card_detail_screen.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/mobile_card_detail_screen.dartindex df44c84286..5896c51b9b 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/mobile_card_detail_screen.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/mobile_card_detail_screen.dart@@ -1,5 +1,3 @@-import 'package:flutter/material.dart';-import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/mobile/presentation/base/app_bar/app_bar.dart';@@ -29,6 +27,7 @@ import 'package:appflowy_backend/protobuf/flowy-database2/row_entities.pb.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:fluttertoast/fluttertoast.dart';import 'package:go_router/go_router.dart';@@ -59,7 +58,9 @@ class _MobileRowDetailPageState extends State<MobileRowDetailPage> {late final PageController _pageController;String get viewId => widget.databaseController.viewId;+RowCache get rowCache => widget.databaseController.rowCache;+FieldController get fieldController =>widget.databaseController.fieldController;@@ -380,7 +381,9 @@ class MobileRowDetailPageContentStatelate final EditableCellBuilder cellBuilder;String get viewId => widget.databaseController.viewId;+RowCache get rowCache => widget.databaseController.rowCache;+FieldController get fieldController =>widget.databaseController.fieldController;ValueNotifier<String> primaryFieldId = ValueNotifier('');@@ -542,6 +545,7 @@ class _TitleSkin extends IEditableTextCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,TextCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/database_controller.dart b/frontend/appflowy_flutter/lib/plugins/database/application/database_controller.dartindex 5d0bb760fe..5317539128 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/database_controller.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/database_controller.dart@@ -1,7 +1,5 @@import 'dart:async';-import 'package:flutter/material.dart';-import 'package:appflowy/plugins/database/application/field/field_controller.dart';import 'package:appflowy/plugins/database/application/view/view_cache.dart';import 'package:appflowy/plugins/database/domain/database_view_service.dart';@@ -14,6 +12,7 @@ import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:appflowy_result/appflowy_result.dart';import 'package:collection/collection.dart';+import 'package:flutter/material.dart';import 'defines.dart';import 'row/row_cache.dart';@@ -41,7 +40,9 @@ class GroupCallbacks {}class DatabaseLayoutSettingCallbacks {- DatabaseLayoutSettingCallbacks({required this.onLayoutSettingsChanged});+ DatabaseLayoutSettingCallbacks({+ required this.onLayoutSettingsChanged,+ });final void Function(DatabaseLayoutSettingPB) onLayoutSettingsChanged;}@@ -97,9 +98,11 @@ class DatabaseController {final List<DatabaseCallbacks> _databaseCallbacks = [];final List<GroupCallbacks> _groupCallbacks = [];final List<DatabaseLayoutSettingCallbacks> _layoutCallbacks = [];+ final Set<ValueChanged<bool>> _compactModeCallbacks = {};// GettersRowCache get rowCache => _viewCache.rowCache;+String get viewId => view.id;// Listener@@ -107,17 +110,26 @@ class DatabaseController {final DatabaseLayoutSettingListener _layoutListener;final ValueNotifier<bool> _isLoading = ValueNotifier(true);+ final ValueNotifier<bool> _compactMode = ValueNotifier(true);- void setIsLoading(bool isLoading) {- _isLoading.value = isLoading;- }+ void setIsLoading(bool isLoading) => _isLoading.value = isLoading;ValueNotifier<bool> get isLoading => _isLoading;+ void setCompactMode(bool compactMode) {+ _compactMode.value = compactMode;+ for (final callback in Set.of(_compactModeCallbacks)) {+ callback.call(compactMode);+ }+ }++ ValueNotifier<bool> get compactModeNotifier => _compactMode;+void addListener({DatabaseCallbacks? onDatabaseChanged,DatabaseLayoutSettingCallbacks? onLayoutSettingsChanged,GroupCallbacks? onGroupChanged,+ ValueChanged<bool>? onCompactModeChanged,}) {if (onLayoutSettingsChanged != null) {_layoutCallbacks.add(onLayoutSettingsChanged);@@ -130,12 +142,17 @@ class DatabaseController {if (onGroupChanged != null) {_groupCallbacks.add(onGroupChanged);}++ if (onCompactModeChanged != null) {+ _compactModeCallbacks.add(onCompactModeChanged);+ }}void removeListener({DatabaseCallbacks? onDatabaseChanged,DatabaseLayoutSettingCallbacks? onLayoutSettingsChanged,GroupCallbacks? onGroupChanged,+ ValueChanged<bool>? onCompactModeChanged,}) {if (onDatabaseChanged != null) {_databaseCallbacks.remove(onDatabaseChanged);@@ -148,6 +165,10 @@ class DatabaseController {if (onGroupChanged != null) {_groupCallbacks.remove(onGroupChanged);}++ if (onCompactModeChanged != null) {+ _compactModeCallbacks.remove(onCompactModeChanged);+ }}Future<FlowyResult<void, FlowyError>> open() async {@@ -242,6 +263,7 @@ class DatabaseController {_databaseCallbacks.clear();_groupCallbacks.clear();_layoutCallbacks.clear();+ _compactModeCallbacks.clear();_isLoading.dispose();}@@ -376,4 +398,10 @@ class DatabaseController {},);}++ void initCompactMode(bool enableCompactMode) {+ if (_compactMode.value != enableCompactMode) {+ _compactMode.value = enableCompactMode;+ }+ }}diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/layout/layout_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/application/layout/layout_bloc.dartindex a5dd0d9ca1..0f884a1e9a 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/layout/layout_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/layout/layout_bloc.dart@@ -31,6 +31,7 @@ class DatabaseLayoutBloc@freezedclass DatabaseLayoutEvent with _$DatabaseLayoutEvent {const factory DatabaseLayoutEvent.initial() = _Initial;+const factory DatabaseLayoutEvent.updateLayout(DatabaseLayoutPB layout) =_UpdateLayout;}diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/tab_bar_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/application/tab_bar_bloc.dartindex bb892f4b47..e55bbb96a4 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/tab_bar_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/tab_bar_bloc.dart@@ -1,6 +1,7 @@import 'package:appflowy/plugins/database/domain/database_view_service.dart';import 'package:appflowy/plugins/database/tab_bar/tab_bar_view.dart';import 'package:appflowy/plugins/database/widgets/database_layout_ext.dart';+import 'package:appflowy/plugins/document/presentation/compact_mode_event.dart';import 'package:appflowy/workspace/application/view/prelude.dart';import 'package:appflowy/workspace/application/view/view_ext.dart';import 'package:appflowy_backend/log.dart';@@ -17,8 +18,17 @@ part 'tab_bar_bloc.freezed.dart';class DatabaseTabBarBlocextends Bloc<DatabaseTabBarEvent, DatabaseTabBarState> {- DatabaseTabBarBloc({required ViewPB view})- : super(DatabaseTabBarState.initial(view)) {+ DatabaseTabBarBloc({+ required ViewPB view,+ required String compactModeId,+ required bool enableCompactMode,+ }) : super(+ DatabaseTabBarState.initial(+ view,+ compactModeId,+ enableCompactMode,+ ),+ ) {on<DatabaseTabBarEvent>((event, emit) async {await event.when(@@ -154,10 +164,13 @@ class DatabaseTabBarBloc) {final tabBarControllerByViewId = {...state.tabBarControllerByViewId};for (final view in newViews) {- final controller = DatabaseTabBarController(view: view);- controller.onViewUpdated = (newView) {- add(DatabaseTabBarEvent.viewDidUpdate(newView));- };+ final controller = DatabaseTabBarController(+ view: view,+ compactModeId: state.compactModeId,+ enableCompactMode: state.enableCompactMode,+ )..onViewUpdated = (newView) {+ add(DatabaseTabBarEvent.viewDidUpdate(newView));+ };tabBarControllerByViewId[view.id] = controller;}@@ -205,20 +218,27 @@ class DatabaseTabBarBloc@freezedclass DatabaseTabBarEvent with _$DatabaseTabBarEvent {const factory DatabaseTabBarEvent.initial() = _Initial;+const factory DatabaseTabBarEvent.didLoadChildViews(List<ViewPB> childViews,) = _DidLoadChildViews;+const factory DatabaseTabBarEvent.selectView(String viewId) = _DidSelectView;+const factory DatabaseTabBarEvent.createView(DatabaseLayoutPB layout,String? name,) = _CreateView;+const factory DatabaseTabBarEvent.renameView(String viewId, String newName) =_RenameView;+const factory DatabaseTabBarEvent.deleteView(String viewId) = _DeleteView;+const factory DatabaseTabBarEvent.didUpdateChildViews(ChildViewUpdatePB updatePB,) = _DidUpdateChildViews;+const factory DatabaseTabBarEvent.viewDidUpdate(ViewPB view) = _ViewDidUpdate;}@@ -227,19 +247,29 @@ class DatabaseTabBarState with _$DatabaseTabBarState {const factory DatabaseTabBarState({required ViewPB parentView,required int selectedIndex,+ required String compactModeId,+ required bool enableCompactMode,required List<DatabaseTabBar> tabBars,required Map<String, DatabaseTabBarController> tabBarControllerByViewId,}) = _DatabaseTabBarState;- factory DatabaseTabBarState.initial(ViewPB view) {+ factory DatabaseTabBarState.initial(+ ViewPB view,+ String compactModeId,+ bool enableCompactMode,+ ) {final tabBar = DatabaseTabBar(view: view);return DatabaseTabBarState(parentView: view,selectedIndex: 0,+ compactModeId: compactModeId,+ enableCompactMode: enableCompactMode,tabBars: [tabBar],tabBarControllerByViewId: {view.id: DatabaseTabBarController(view: view,+ compactModeId: compactModeId,+ enableCompactMode: enableCompactMode,),},);@@ -257,7 +287,9 @@ class DatabaseTabBar extends Equatable {final DatabaseTabBarItemBuilder _builder;String get viewId => view.id;+DatabaseTabBarItemBuilder get builder => _builder;+ViewLayoutPB get layout => view.layout;@override@@ -274,8 +306,18 @@ typedef OnViewChildViewChanged = void Function();class DatabaseTabBarController {- DatabaseTabBarController({required this.view})- : controller = DatabaseController(view: view),+ DatabaseTabBarController({+ required this.view,+ required String compactModeId,+ required bool enableCompactMode,+ }) : controller = DatabaseController(view: view)+ ..initCompactMode(enableCompactMode)+ ..addListener(+ onCompactModeChanged: (v) async {+ compactModeEventBus+ .fire(CompactModeEvent(id: compactModeId, enable: v));+ },+ ),viewListener = ViewListener(viewId: view.id) {viewListener.start(onViewChildViewsUpdated: (update) => onViewChildViewChanged?.call(update),diff --git a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/board_page.dart b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/board_page.dartindex 412d2bbbd8..77a26a9c58 100644--- a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/board_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/board_page.dart@@ -285,6 +285,9 @@ class _BoardContentState extends State<_BoardContent> {@overrideWidget build(BuildContext context) {+ final horizontalPadding =+ context.read<DatabasePluginWidgetBuilderSize?>()?.horizontalPadding ??+ 0.0;return MultiBlocListener(listeners: [BlocListener<BoardBloc, BoardState>(@@ -337,68 +340,85 @@ class _BoardContentState extends State<_BoardContent> {focusScope: widget.focusScope,child: Padding(padding: const EdgeInsets.only(top: 8.0),- child: AppFlowyBoard(- boardScrollController: scrollManager,- scrollController: scrollController,- controller: context.read<BoardBloc>().boardController,- groupConstraints: const BoxConstraints.tightFor(width: 256),- config: config,- leading: HiddenGroupsColumn(margin: config.groupHeaderPadding),- trailing: context- .read<BoardBloc>()- .groupingFieldType- ?.canCreateNewGroup ??- false- ? BoardTrailing(scrollController: scrollController)- : const HSpace(40),- headerBuilder: (_, groupData) => BlocProvider.value(- value: context.read<BoardBloc>(),- child: BoardColumnHeader(- databaseController: databaseController,- groupData: groupData,- margin: config.groupHeaderPadding,- ),- ),- footerBuilder: (_, groupData) => MultiBlocProvider(- providers: [- BlocProvider.value(value: context.read<BoardBloc>()),- BlocProvider.value(value: context.read<BoardActionsCubit>()),- ],- child: BoardColumnFooter(- columnData: groupData,- boardConfig: config,- scrollManager: scrollManager,- ),- ),- cardBuilder: (context, column, columnItem) => MultiBlocProvider(- key: ValueKey("board_card_${column.id}_${columnItem.id}"),- providers: [- BlocProvider<BoardBloc>.value(- value: context.read<BoardBloc>(),+ child: ValueListenableBuilder(+ valueListenable: databaseController.compactModeNotifier,+ builder: (context, compactMode, _) {+ return AppFlowyBoard(+ boardScrollController: scrollManager,+ scrollController: scrollController,+ shrinkWrap: widget.shrinkWrap,+ controller: context.read<BoardBloc>().boardController,+ groupConstraints:+ BoxConstraints.tightFor(width: compactMode ? 196 : 256),+ config: config,+ leading: HiddenGroupsColumn(+ shrinkWrap: widget.shrinkWrap,+ margin: config.groupHeaderPadding ++ EdgeInsets.only(+ left: widget.shrinkWrap ? horizontalPadding : 0.0,+ ),),- BlocProvider.value(- value: context.read<BoardActionsCubit>(),+ trailing: context+ .read<BoardBloc>()+ .groupingFieldType+ ?.canCreateNewGroup ??+ false+ ? BoardTrailing(scrollController: scrollController)+ : const HSpace(40),+ headerBuilder: (_, groupData) => BlocProvider.value(+ value: context.read<BoardBloc>(),+ child: BoardColumnHeader(+ databaseController: databaseController,+ groupData: groupData,+ margin: config.groupHeaderPadding,+ ),),- BlocProvider(- create: (_) => ViewLockStatusBloc(view: widget.view)- ..add(ViewLockStatusEvent.initial()),+ footerBuilder: (_, groupData) => MultiBlocProvider(+ providers: [+ BlocProvider.value(value: context.read<BoardBloc>()),+ BlocProvider.value(+ value: context.read<BoardActionsCubit>(),+ ),+ ],+ child: BoardColumnFooter(+ columnData: groupData,+ boardConfig: config,+ scrollManager: scrollManager,+ ),),- ],- child: BlocBuilder<ViewLockStatusBloc, ViewLockStatusState>(- builder: (context, state) {- return IgnorePointer(- ignoring: state.isLocked,- child: _BoardCard(- afGroupData: column,- groupItem: columnItem as GroupItem,- boardConfig: config,- notifier: widget.focusScope,- cellBuilder: cellBuilder,+ cardBuilder: (context, column, columnItem) =>+ MultiBlocProvider(+ key: ValueKey("board_card_${column.id}_${columnItem.id}"),+ providers: [+ BlocProvider<BoardBloc>.value(+ value: context.read<BoardBloc>(),),- );- },- ),- ),+ BlocProvider.value(+ value: context.read<BoardActionsCubit>(),+ ),+ BlocProvider(+ create: (_) => ViewLockStatusBloc(view: widget.view)+ ..add(ViewLockStatusEvent.initial()),+ ),+ ],+ child: BlocBuilder<ViewLockStatusBloc, ViewLockStatusState>(+ builder: (context, state) {+ return IgnorePointer(+ ignoring: state.isLocked,+ child: _BoardCard(+ afGroupData: column,+ groupItem: columnItem as GroupItem,+ boardConfig: config,+ notifier: widget.focusScope,+ cellBuilder: cellBuilder,+ compactMode: compactMode,+ ),+ );+ },+ ),+ ),+ );+ },),),),@@ -560,6 +580,7 @@ class _BoardCard extends StatefulWidget {required this.boardConfig,required this.cellBuilder,required this.notifier,+ required this.compactMode,});final AppFlowyGroupData afGroupData;@@ -567,6 +588,7 @@ class _BoardCard extends StatefulWidget {final AppFlowyBoardConfig boardConfig;final CardCellBuilder cellBuilder;final BoardFocusScope notifier;+ final bool compactMode;@overrideState<_BoardCard> createState() => _BoardCardState();@@ -653,15 +675,21 @@ class _BoardCardState extends State<_BoardCard> {return previousContainsFocus != currentContainsFocus;},- builder: (context, focusedItems, child) => Container(- margin: widget.boardConfig.cardMargin,- decoration: _makeBoxDecoration(- context,- groupData.group.groupId,- widget.groupItem.id,- ),- child: child,- ),+ builder: (context, focusedItems, child) {+ final cardMargin = widget.boardConfig.cardMargin;+ final margin = widget.compactMode+ ? cardMargin - EdgeInsets.symmetric(horizontal: 2)+ : cardMargin;+ return Container(+ margin: margin,+ decoration: _makeBoxDecoration(+ context,+ groupData.group.groupId,+ widget.groupItem.id,+ ),+ child: child,+ );+ },child: RowCard(fieldController: databaseController.fieldController,rowMeta: rowMeta,diff --git a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_hidden_groups.dart b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_hidden_groups.dartindex c1c127c522..1a0d1a3163 100644--- a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_hidden_groups.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_hidden_groups.dart@@ -1,8 +1,5 @@import 'dart:io';-import 'package:appflowy/workspace/application/user/user_workspace_bloc.dart';-import 'package:flutter/material.dart';-import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';@@ -16,20 +13,24 @@ import 'package:appflowy/plugins/database/tab_bar/tab_bar_view.dart';import 'package:appflowy/plugins/database/widgets/cell/card_cell_builder.dart';import 'package:appflowy/plugins/database/widgets/cell/card_cell_skeleton/text_card_cell.dart';import 'package:appflowy/plugins/database/widgets/row/row_detail.dart';+import 'package:appflowy/workspace/application/user/user_workspace_bloc.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:collection/collection.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flowy_infra_ui/style_widget/hover.dart';+import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';class HiddenGroupsColumn extends StatelessWidget {const HiddenGroupsColumn({super.key,required this.margin,+ required this.shrinkWrap,});final EdgeInsets margin;+ final bool shrinkWrap;@overrideWidget build(BuildContext context) {@@ -85,11 +86,7 @@ class HiddenGroupsColumn extends StatelessWidget {],),),- Expanded(- child: HiddenGroupList(- databaseController: databaseController,- ),- ),+ _hiddenGroupList(databaseController),],),),@@ -98,6 +95,14 @@ class HiddenGroupsColumn extends StatelessWidget {);}+ Widget _hiddenGroupList(DatabaseController databaseController) {+ final hiddenGroupList = HiddenGroupList(+ shrinkWrap: shrinkWrap,+ databaseController: databaseController,+ );+ return shrinkWrap ? hiddenGroupList : Expanded(child: hiddenGroupList);+ }+Widget _collapseExpandIcon(BuildContext context, bool isCollapsed) {return FlowyTooltip(message: isCollapsed@@ -125,9 +130,11 @@ class HiddenGroupList extends StatelessWidget {const HiddenGroupList({super.key,required this.databaseController,+ required this.shrinkWrap,});final DatabaseController databaseController;+ final bool shrinkWrap;@overrideWidget build(BuildContext context) {@@ -150,6 +157,7 @@ class HiddenGroupList extends StatelessWidget {],),),+ shrinkWrap: shrinkWrap,buildDefaultDragHandles: false,itemCount: state.hiddenGroups.length,itemBuilder: (_, index) => Padding(diff --git a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_editor.dart b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_editor.dartindex 6c4b365906..dcbe626dd8 100644--- a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_editor.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_editor.dart@@ -289,6 +289,7 @@ class _TitleTextCellSkin extends IEditableTextCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,TextCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/grid_page.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/grid_page.dartindex 5d3ec15b46..4c9fd7bd61 100755--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/grid_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/grid_page.dart@@ -298,6 +298,7 @@ class _GridPageContentState extends State<GridPageContent> {_GridHeader(headerScrollController: headerScrollController,editable: !context.read<ViewLockStatusBloc>().state.isLocked,+ shrinkWrap: widget.shrinkWrap,),_GridRows(viewId: widget.view.id,@@ -313,10 +314,12 @@ class _GridHeader extends StatelessWidget {const _GridHeader({required this.headerScrollController,required this.editable,+ required this.shrinkWrap,});final ScrollController headerScrollController;final bool editable;+ final bool shrinkWrap;@overrideWidget build(BuildContext context) {@@ -324,6 +327,7 @@ class _GridHeader extends StatelessWidget {builder: (_, state) => GridHeaderSliverAdaptor(viewId: state.viewId,anchorScrollController: headerScrollController,+ shrinkWrap: shrinkWrap,),);@@ -416,12 +420,13 @@ class _GridRowsState extends State<_GridRows> {constraints: BoxConstraints(maxWidth: GridLayout.headerWidth(context- .read<DatabasePluginWidgetBuilderSize>()- .horizontalPadding,+ .read<DatabasePluginWidgetBuilderSize>()+ .horizontalPadding *+ 3,context.read<GridBloc>().state.fields,),),- child: _renderList(context),+ child: _shrinkWrapRenderList(context),),),);@@ -452,9 +457,31 @@ class _GridRowsState extends State<_GridRows> {return Flexible(child: child);}- Widget _renderList(BuildContext context) {+ Widget _shrinkWrapRenderList(BuildContext context) {final state = context.read<GridBloc>().state;+ final horizontalPadding =+ context.read<DatabasePluginWidgetBuilderSize?>()?.horizontalPadding ??+ 0.0;+ return ListView(+ shrinkWrap: true,+ physics: const NeverScrollableScrollPhysics(),+ padding: EdgeInsets.symmetric(horizontal: horizontalPadding),+ children: [+ widget.shrinkWrap+ ? _reorderableListView(state)+ : Expanded(child: _reorderableListView(state)),+ if (showFloatingCalculations && !widget.shrinkWrap) ...[+ _PositionedCalculationsRow(+ viewId: widget.viewId,+ isAtBottom: isAtBottom,+ ),+ ],+ ],+ );+ }+ Widget _renderList(BuildContext context) {+ final state = context.read<GridBloc>().state;return Column(mainAxisSize: MainAxisSize.min,crossAxisAlignment: CrossAxisAlignment.start,diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/layout/layout.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/layout/layout.dartindex 903ecbb864..c7402a17f9 100755--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/layout/layout.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/layout/layout.dart@@ -1,5 +1,6 @@import 'package:appflowy/plugins/database/application/field/field_info.dart';import 'package:appflowy_backend/protobuf/flowy-database2/field_settings_entities.pbenum.dart';+import 'sizes.dart';class GridLayout {diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/layout/sizes.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/layout/sizes.dartindex 18883e8a0c..78a8c97dae 100755--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/layout/sizes.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/layout/sizes.dart@@ -5,16 +5,26 @@ class GridSize {static double scale = 1;static double get scrollBarSize => 8 * scale;+static double get headerHeight => 36 * scale;+static double get buttonHeight => 38 * scale;+static double get footerHeight => 36 * scale;+static double get horizontalHeaderPadding =>UniversalPlatform.isDesktop ? 40 * scale : 16 * scale;+static double get cellHPadding => 10 * scale;- static double get cellVPadding => 10 * scale;++ static double get cellVPadding => 8 * scale;+static double get popoverItemHeight => 26 * scale;+static double get typeOptionSeparatorHeight => 4 * scale;+static double get newPropertyButtonWidth => 140 * scale;+static double get mobileNewPropertyButtonWidth => 200 * scale;static EdgeInsets get cellContentInsets => EdgeInsets.symmetric(@@ -22,10 +32,8 @@ class GridSize {vertical: GridSize.cellVPadding,);- static EdgeInsets get fieldContentInsets => EdgeInsets.symmetric(- horizontal: GridSize.cellHPadding,- vertical: GridSize.cellVPadding,- );+ static EdgeInsets get compactCellContentInsets =>+ cellContentInsets - EdgeInsets.symmetric(vertical: 2);static EdgeInsets get typeOptionContentInsets => const EdgeInsets.all(4);diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/header/grid_header.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/header/grid_header.dartindex bcb9139406..e30c238f96 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/header/grid_header.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/header/grid_header.dart@@ -21,11 +21,13 @@ class GridHeaderSliverAdaptor extends StatefulWidget {const GridHeaderSliverAdaptor({super.key,required this.viewId,+ required this.shrinkWrap,required this.anchorScrollController,});final String viewId;final ScrollController anchorScrollController;+ final bool shrinkWrap;@overrideState<GridHeaderSliverAdaptor> createState() =>@@ -37,6 +39,9 @@ class _GridHeaderSliverAdaptorState extends State<GridHeaderSliverAdaptor> {Widget build(BuildContext context) {final fieldController =context.read<GridBloc>().databaseController.fieldController;+ final horizontalPadding =+ context.read<DatabasePluginWidgetBuilderSize?>()?.horizontalPadding ??+ 0.0;return BlocProvider(create: (context) {return GridHeaderBloc(@@ -47,9 +52,14 @@ class _GridHeaderSliverAdaptorState extends State<GridHeaderSliverAdaptor> {child: SingleChildScrollView(scrollDirection: Axis.horizontal,controller: widget.anchorScrollController,- child: _GridHeader(- viewId: widget.viewId,- fieldController: fieldController,+ child: Padding(+ padding: widget.shrinkWrap+ ? EdgeInsets.symmetric(horizontal: horizontalPadding)+ : EdgeInsets.zero,+ child: _GridHeader(+ viewId: widget.viewId,+ fieldController: fieldController,+ ),),),);diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/row/row.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/row/row.dartindex dd66f34e4d..2306767f46 100755--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/row/row.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/row/row.dart@@ -308,14 +308,20 @@ class RowContent extends StatelessWidget {Widget _finalCellDecoration(BuildContext context) {return MouseRegion(cursor: SystemMouseCursors.basic,- child: Container(- width: GridSize.newPropertyButtonWidth,- constraints: const BoxConstraints(minHeight: 36),- decoration: BoxDecoration(- border: Border(- bottom: BorderSide(color: AFThemeExtension.of(context).borderColor),- ),- ),+ child: ValueListenableBuilder(+ valueListenable: cellBuilder.databaseController.compactModeNotifier,+ builder: (context, compactMode, _) {+ return Container(+ width: GridSize.newPropertyButtonWidth,+ constraints: BoxConstraints(minHeight: compactMode ? 32 : 36),+ decoration: BoxDecoration(+ border: Border(+ bottom:+ BorderSide(color: AFThemeExtension.of(context).borderColor),+ ),+ ),+ );+ },),);}diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/filter_button.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/filter_button.dartindex ece2658cf2..5c33426281 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/filter_button.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/filter_button.dart@@ -1,14 +1,13 @@+import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';import 'package:appflowy/plugins/database/grid/presentation/grid_page.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra/size.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import '../../layout/sizes.dart';import '../filter/create_filter_list.dart';class FilterButton extends StatefulWidget {@@ -30,27 +29,25 @@ class _FilterButtonState extends State<FilterButton> {Widget build(BuildContext context) {return BlocBuilder<FilterEditorBloc, FilterEditorState>(builder: (context, state) {- final textColor = state.filters.isEmpty- ? Theme.of(context).hintColor- : Theme.of(context).colorScheme.primary;-return _wrapPopover(- FlowyTextButton(- LocaleKeys.grid_settings_filter.tr(),- fontColor: textColor,- fontSize: FontSizes.s12,- fillColor: Colors.transparent,- hoverColor: AFThemeExtension.of(context).lightGreyHover,- padding: GridSize.toolbarSettingButtonInsets,- radius: Corners.s4Border,- onPressed: () {- final bloc = context.read<FilterEditorBloc>();- if (bloc.state.filters.isEmpty) {- _popoverController.show();- } else {- widget.toggleExtension.toggle();- }- },+ MouseRegion(+ cursor: SystemMouseCursors.click,+ child: FlowyIconButton(+ tooltipText: LocaleKeys.grid_settings_filter.tr(),+ width: 24,+ height: 24,+ iconPadding: const EdgeInsets.all(3),+ hoverColor: AFThemeExtension.of(context).lightGreyHover,+ icon: const FlowySvg(FlowySvgs.database_filter_s),+ onPressed: () {+ final bloc = context.read<FilterEditorBloc>();+ if (bloc.state.filters.isEmpty) {+ _popoverController.show();+ } else {+ widget.toggleExtension.toggle();+ }+ },+ ),),);},diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/grid_setting_bar.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/grid_setting_bar.dartindex 047781c6cc..c44341e214 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/grid_setting_bar.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/grid_setting_bar.dart@@ -3,12 +3,15 @@ import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_import 'package:appflowy/plugins/database/grid/application/sort/sort_editor_bloc.dart';import 'package:appflowy/plugins/database/grid/presentation/grid_page.dart';import 'package:appflowy/plugins/database/widgets/setting/setting_button.dart';+import 'package:appflowy/plugins/document/presentation/editor_plugins/mention/mention_page_block.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import 'package:provider/provider.dart';import 'filter_button.dart';import 'sort_button.dart';+import 'view_database_button.dart';class GridSettingBar extends StatelessWidget {const GridSettingBar({@@ -43,6 +46,8 @@ class GridSettingBar extends StatelessWidget {if (isLoading) {return const SizedBox.shrink();}+ final isReference =+ Provider.of<ReferenceState?>(context)?.isReference ?? false;return SizedBox(height: 20,child: Row(@@ -52,9 +57,9 @@ class GridSettingBar extends StatelessWidget {const HSpace(6),SortButton(toggleExtension: toggleExtension),const HSpace(6),- SettingButton(- databaseController: controller,- ),+ SettingButton(databaseController: controller),+ if (isReference) const HSpace(6),+ if (isReference) ViewDatabaseButton(view: controller.view),],),);diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/sort_button.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/sort_button.dartindex e16c851f3a..6649d53594 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/sort_button.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/sort_button.dart@@ -1,13 +1,12 @@+import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/database/grid/application/sort/sort_editor_bloc.dart';import 'package:appflowy/plugins/database/grid/presentation/grid_page.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra/size.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';import '../sort/create_sort_list.dart';@@ -27,26 +26,24 @@ class _SortButtonState extends State<SortButton> {Widget build(BuildContext context) {return BlocBuilder<SortEditorBloc, SortEditorState>(builder: (context, state) {- final textColor = state.sorts.isEmpty- ? Theme.of(context).hintColor- : Theme.of(context).colorScheme.primary;-return wrapPopover(- FlowyTextButton(- LocaleKeys.grid_settings_sort.tr(),- fontColor: textColor,- fontSize: FontSizes.s12,- fillColor: Colors.transparent,- hoverColor: AFThemeExtension.of(context).lightGreyHover,- padding: GridSize.toolbarSettingButtonInsets,- radius: Corners.s4Border,- onPressed: () {- if (state.sorts.isEmpty) {- _popoverController.show();- } else {- widget.toggleExtension.toggle();- }- },+ MouseRegion(+ cursor: SystemMouseCursors.click,+ child: FlowyIconButton(+ tooltipText: LocaleKeys.grid_settings_sort.tr(),+ width: 24,+ height: 24,+ iconPadding: const EdgeInsets.all(3),+ hoverColor: AFThemeExtension.of(context).lightGreyHover,+ icon: const FlowySvg(FlowySvgs.database_sort_s),+ onPressed: () {+ if (state.sorts.isEmpty) {+ _popoverController.show();+ } else {+ widget.toggleExtension.toggle();+ }+ },+ ),),);},diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/view_database_button.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/view_database_button.dartnew file mode 100644index 0000000000..93493e599f--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/view_database_button.dart@@ -0,0 +1,37 @@+import 'package:appflowy/generated/flowy_svgs.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/workspace/application/tabs/tabs_bloc.dart';+import 'package:appflowy/workspace/application/view/view_ext.dart';+import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flowy_infra_ui/style_widget/icon_button.dart';+import 'package:flutter/material.dart';++class ViewDatabaseButton extends StatelessWidget {+ const ViewDatabaseButton({super.key, required this.view});++ final ViewPB view;++ @override+ Widget build(BuildContext context) {+ return MouseRegion(+ cursor: SystemMouseCursors.click,+ child: FlowyIconButton(+ tooltipText: LocaleKeys.grid_rowPage_openAsFullPage.tr(),+ width: 24,+ height: 24,+ iconPadding: const EdgeInsets.all(3),+ icon: const FlowySvg(FlowySvgs.database_fullscreen_s),+ onPressed: () {+ getIt<TabsBloc>().add(+ TabsEvent.openPlugin(+ plugin: view.plugin(),+ view: view,+ ),+ );+ },+ ),+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/tab_bar_header.dart b/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/tab_bar_header.dartindex ea69f40540..fa5e44a5e6 100644--- a/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/tab_bar_header.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/tab_bar_header.dart@@ -1,8 +1,8 @@import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/database/application/tab_bar_bloc.dart';-import 'package:appflowy/plugins/database/tab_bar/tab_bar_view.dart';import 'package:appflowy/plugins/document/presentation/editor_plugins/header/emoji_icon_widget.dart';+import 'package:appflowy/plugins/document/presentation/editor_plugins/mention/mention_page_block.dart';import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';import 'package:appflowy/shared/icon_emoji_picker/tab.dart';import 'package:appflowy/workspace/application/view/view_ext.dart';@@ -16,6 +16,7 @@ import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';+import 'package:provider/provider.dart';import 'tab_bar_add_button.dart';@@ -26,12 +27,8 @@ class TabBarHeader extends StatelessWidget {@overrideWidget build(BuildContext context) {- return Container(+ return SizedBox(height: 35,- padding: EdgeInsets.symmetric(- horizontal:- context.read<DatabasePluginWidgetBuilderSize>().horizontalPadding,- ),child: Stack(children: [Positioned(@@ -332,7 +329,24 @@ class _TabBarItemButtonState extends State<TabBarItemButton> {enableColor: false,);}- return Opacity(opacity: 0.6, child: icon);+ final isReference =+ Provider.of<ReferenceState?>(context)?.isReference ?? false;+ final iconWidget = Opacity(opacity: 0.6, child: icon);+ return isReference+ ? Stack(+ children: [+ iconWidget,+ const Positioned(+ right: 0,+ bottom: 0,+ child: FlowySvg(+ FlowySvgs.referenced_page_s,+ blendMode: BlendMode.dstIn,+ ),+ ),+ ],+ )+ : iconWidget;}}diff --git a/frontend/appflowy_flutter/lib/plugins/database/tab_bar/tab_bar_view.dart b/frontend/appflowy_flutter/lib/plugins/database/tab_bar/tab_bar_view.dartindex 7e009cb7f8..3554f9112e 100644--- a/frontend/appflowy_flutter/lib/plugins/database/tab_bar/tab_bar_view.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/tab_bar/tab_bar_view.dart@@ -1,9 +1,17 @@+import 'dart:async';+import 'dart:convert';++import 'package:appflowy/core/config/kv.dart';+import 'package:appflowy/core/config/kv_keys.dart';import 'package:appflowy/plugins/database/application/database_controller.dart';import 'package:appflowy/plugins/database/application/tab_bar_bloc.dart';import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';+import 'package:appflowy/plugins/document/presentation/compact_mode_event.dart';+import 'package:appflowy/plugins/document/presentation/editor_plugins/database/database_view_block_component.dart';import 'package:appflowy/plugins/shared/share/share_button.dart';import 'package:appflowy/plugins/util.dart';import 'package:appflowy/startup/plugin/plugin.dart';+import 'package:appflowy/startup/startup.dart';import 'package:appflowy/workspace/application/view/view_bloc.dart';import 'package:appflowy/workspace/application/view/view_ext.dart';import 'package:appflowy/workspace/application/view_info/view_info_bloc.dart';@@ -12,7 +20,9 @@ import 'package:appflowy/workspace/presentation/widgets/favorite_button.dart';import 'package:appflowy/workspace/presentation/widgets/more_view_actions/more_view_actions.dart';import 'package:appflowy/workspace/presentation/widgets/tab_bar_item.dart';import 'package:appflowy/workspace/presentation/widgets/view_title_bar.dart';+import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flutter/material.dart';@@ -55,31 +65,84 @@ abstract class DatabaseTabBarItemBuilder {void dispose() {}}-class DatabaseTabBarView extends StatelessWidget {+class DatabaseTabBarView extends StatefulWidget {const DatabaseTabBarView({super.key,required this.view,required this.shrinkWrap,+ required this.showActions,this.initialRowId,+ this.actionBuilder,+ this.node,});final ViewPB view;final bool shrinkWrap;+ final BlockComponentActionBuilder? actionBuilder;+ final bool showActions;+ final Node? node;/// Used to open a Row on plugin load///final String? initialRowId;+ @override+ State<DatabaseTabBarView> createState() => _DatabaseTabBarViewState();+}++class _DatabaseTabBarViewState extends State<DatabaseTabBarView> {+ bool enableCompactMode = false;+ bool initialed = false;+ StreamSubscription<CompactModeEvent>? compactModeSubscription;++ String get compactModeId => widget.node?.id ?? widget.view.id;++ @override+ void initState() {+ super.initState();+ if (widget.node != null) {+ enableCompactMode =+ widget.node!.attributes[DatabaseBlockKeys.enableCompactMode] ?? false;+ setState(() {+ initialed = true;+ });+ } else {+ fetchLocalCompactMode(compactModeId).then((v) {+ if (mounted) {+ setState(() {+ enableCompactMode = v;+ initialed = true;+ });+ }+ });+ compactModeSubscription =+ compactModeEventBus.on<CompactModeEvent>().listen((event) {+ if (event.id != widget.view.id) return;+ updateLocalCompactMode(event.enable);+ });+ }+ }++ @override+ void dispose() {+ super.dispose();+ compactModeSubscription?.cancel();+ }+@overrideWidget build(BuildContext context) {+ if (!initialed) return Center(child: CircularProgressIndicator());return MultiBlocProvider(providers: [BlocProvider<DatabaseTabBarBloc>(- create: (_) => DatabaseTabBarBloc(view: view)- ..add(const DatabaseTabBarEvent.initial()),+ create: (_) => DatabaseTabBarBloc(+ view: widget.view,+ compactModeId: compactModeId,+ enableCompactMode: enableCompactMode,+ )..add(const DatabaseTabBarEvent.initial()),),BlocProvider<ViewBloc>(- create: (_) => ViewBloc(view: view)+ create: (_) => ViewBloc(view: widget.view)..add(const ViewEvent.initial(),),@@ -88,9 +151,15 @@ class DatabaseTabBarView extends StatelessWidget {child: BlocBuilder<DatabaseTabBarBloc, DatabaseTabBarState>(builder: (innerContext, state) {final layout = state.tabBars[state.selectedIndex].layout;-+ final isCalendar = layout == ViewLayoutPB.Calendar;+ final horizontalPadding =+ context.read<DatabasePluginWidgetBuilderSize>().horizontalPadding;+ final showActionWrapper = widget.showActions &&+ widget.actionBuilder != null &&+ widget.node != null;final Widget child = Column(crossAxisAlignment: CrossAxisAlignment.start,+ mainAxisSize: MainAxisSize.min,children: [if (UniversalPlatform.isMobile) const VSpace(12),ValueListenableBuilder<bool>(@@ -113,13 +182,39 @@ class DatabaseTabBarView extends StatelessWidget {);}+ if (showActionWrapper) {+ child = BlockComponentActionWrapper(+ node: widget.node!,+ actionBuilder: widget.actionBuilder!,+ child: Padding(+ padding: EdgeInsets.only(right: horizontalPadding),+ child: child,+ ),+ );+ }++ if (UniversalPlatform.isDesktop) {+ child = Container(+ padding: EdgeInsets.symmetric(+ horizontal: horizontalPadding,+ ),+ child: child,+ );+ }+return child;},),pageSettingBarExtensionFromState(context, state),wrapContent(layout: layout,- child: pageContentFromState(context, state),+ child: Padding(+ padding:+ (isCalendar && widget.shrinkWrap || showActionWrapper)+ ? EdgeInsets.only(left: 42 - horizontalPadding)+ : EdgeInsets.zero,+ child: pageContentFromState(context, state),+ ),),],);@@ -130,8 +225,44 @@ class DatabaseTabBarView extends StatelessWidget {);}+ Future<bool> fetchLocalCompactMode(String compactModeId) async {+ Set<String> compactModeIds = {};+ try {+ final localIds = await getIt<KeyValueStorage>().get(+ KVKeys.compactModeIds,+ );+ final List<dynamic> decodedList = jsonDecode(localIds ?? '');+ compactModeIds = Set.from(decodedList.map((item) => item as String));+ } catch (e) {+ Log.warn('fetch local compact mode from id :$compactModeId failed', e);+ }+ return compactModeIds.contains(compactModeId);+ }++ Future<void> updateLocalCompactMode(bool enableCompactMode) async {+ Set<String> compactModeIds = {};+ try {+ final localIds = await getIt<KeyValueStorage>().get(+ KVKeys.compactModeIds,+ );+ final List<dynamic> decodedList = jsonDecode(localIds ?? '');+ compactModeIds = Set.from(decodedList.map((item) => item as String));+ } catch (e) {+ Log.warn('get compact mode ids failed', e);+ }+ if (enableCompactMode) {+ compactModeIds.add(compactModeId);+ } else {+ compactModeIds.remove(compactModeId);+ }+ await getIt<KeyValueStorage>().set(+ KVKeys.compactModeIds,+ jsonEncode(compactModeIds.toList()),+ );+ }+Widget wrapContent({required ViewLayoutPB layout, required Widget child}) {- if (shrinkWrap) {+ if (widget.shrinkWrap) {if (layout.shrinkWrappable) {return child;}@@ -153,8 +284,8 @@ class DatabaseTabBarView extends StatelessWidget {context,tab.view,controller,- shrinkWrap,- initialRowId,+ widget.shrinkWrap,+ widget.initialRowId,);}@@ -226,6 +357,9 @@ class DatabaseTabBarViewPlugin extends Plugin {}const kDatabasePluginWidgetBuilderHorizontalPadding = 'horizontal_padding';+const kDatabasePluginWidgetBuilderShowActions = 'show_actions';+const kDatabasePluginWidgetBuilderActionBuilder = 'action_builder';+const kDatabasePluginWidgetBuilderNode = 'node';class DatabasePluginWidgetBuilderSize {const DatabasePluginWidgetBuilderSize({required this.horizontalPadding});@@ -274,6 +408,11 @@ class DatabasePluginWidgetBuilder extends PluginWidgetBuilder {final horizontalPadding =data?[kDatabasePluginWidgetBuilderHorizontalPadding] as double? ??GridSize.horizontalHeaderPadding + 40;+ final BlockComponentActionBuilder? actionBuilder =+ data?[kDatabasePluginWidgetBuilderActionBuilder];+ final bool showActions =+ data?[kDatabasePluginWidgetBuilderShowActions] ?? false;+ final Node? node = data?[kDatabasePluginWidgetBuilderNode];return Provider(create: (context) => DatabasePluginWidgetBuilderSize(@@ -284,6 +423,9 @@ class DatabasePluginWidgetBuilder extends PluginWidgetBuilder {view: notifier.view,shrinkWrap: shrinkWrap,initialRowId: initialRowId,+ actionBuilder: actionBuilder,+ showActions: showActions,+ node: node,),);}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/card.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/card.dartindex e7c6150448..68c4b15d5c 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/card.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/card.dart@@ -1,5 +1,3 @@-import 'package:flutter/material.dart';-import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/mobile/application/page_style/document_page_style_bloc.dart';import 'package:appflowy/mobile/presentation/database/card/card.dart';@@ -16,12 +14,12 @@ import 'package:collection/collection.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flowy_infra_ui/style_widget/hover.dart';+import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:universal_platform/universal_platform.dart';import '../cell/card_cell_builder.dart';import '../cell/card_cell_skeleton/card_cell.dart';-import 'card_bloc.dart';import 'container/accessory.dart';import 'container/card_container.dart';@@ -462,7 +460,7 @@ class RowCardStyleConfiguration {const RowCardStyleConfiguration({required this.cellStyleMap,this.showAccessory = true,- this.cardPadding = const EdgeInsets.all(8),+ this.cardPadding = const EdgeInsets.all(4),this.hoverStyle,});diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/container/card_container.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/container/card_container.dartindex ba71fcd30b..a91ffae42d 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/container/card_container.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/container/card_container.dart@@ -40,7 +40,7 @@ class RowCardContainer extends StatelessWidget {}},child: ConstrainedBox(- constraints: const BoxConstraints(minHeight: 42),+ constraints: const BoxConstraints(minHeight: 36),child: _CardEnterRegion(shouldBuildAccessory: shouldBuildAccessory,accessories: accessories,@@ -77,8 +77,8 @@ class _CardEnterRegion extends StatelessWidget {child,if (onEnter && shouldBuildAccessory)Positioned(- top: 10.0,- right: 10.0,+ top: 7.0,+ right: 7.0,child: CardAccessoryContainer(accessories: accessories,onTapAccessory: onTapAccessory,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_checkbox_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_checkbox_cell.dartindex befe49dd6d..74abcecb3a 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_checkbox_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_checkbox_cell.dart@@ -1,7 +1,7 @@import 'package:appflowy/generated/flowy_svgs.g.dart';+import 'package:appflowy/plugins/database/application/cell/bloc/checkbox_cell_bloc.dart';import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';-import 'package:appflowy/plugins/database/application/cell/bloc/checkbox_cell_bloc.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';@@ -12,22 +12,31 @@ class DesktopGridCheckboxCellSkin extends IEditableCheckboxCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,CheckboxCellBloc bloc,CheckboxCellState state,) {- return Container(- alignment: AlignmentDirectional.centerStart,- padding: GridSize.cellContentInsets,- child: FlowyIconButton(- hoverColor: Colors.transparent,- onPressed: () => bloc.add(const CheckboxCellEvent.select()),- icon: FlowySvg(- state.isSelected ? FlowySvgs.check_filled_s : FlowySvgs.uncheck_s,- blendMode: BlendMode.dst,- size: const Size.square(20),- ),- width: 20,- ),+ return ValueListenableBuilder(+ valueListenable: compactModeNotifier,+ builder: (context, compactMode, _) {+ final padding = compactMode+ ? GridSize.compactCellContentInsets+ : GridSize.cellContentInsets;+ return Container(+ alignment: AlignmentDirectional.centerStart,+ padding: padding,+ child: FlowyIconButton(+ hoverColor: Colors.transparent,+ onPressed: () => bloc.add(const CheckboxCellEvent.select()),+ icon: FlowySvg(+ state.isSelected ? FlowySvgs.check_filled_s : FlowySvgs.uncheck_s,+ blendMode: BlendMode.dst,+ size: const Size.square(20),+ ),+ width: 20,+ ),+ );+ },);}}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_checklist_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_checklist_cell.dartindex f5ad4f3970..ebc4a6f976 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_checklist_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_checklist_cell.dart@@ -1,11 +1,10 @@-import 'package:flutter/material.dart';-import 'package:appflowy/plugins/database/application/cell/bloc/checklist_cell_bloc.dart';import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';import 'package:appflowy/plugins/database/widgets/cell_editor/checklist_cell_editor.dart';import 'package:appflowy/plugins/database/widgets/cell_editor/checklist_progress_bar.dart';import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import '../editable_cell_skeleton/checklist.dart';@@ -15,6 +14,7 @@ class DesktopGridChecklistCellSkin extends IEditableChecklistCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,ChecklistCellBloc bloc,PopoverController popoverController,) {@@ -39,15 +39,24 @@ class DesktopGridChecklistCellSkin extends IEditableChecklistCellSkin {onClose: () => cellContainerNotifier.isFocus = false,child: BlocBuilder<ChecklistCellBloc, ChecklistCellState>(builder: (context, state) {- return Container(- alignment: AlignmentDirectional.centerStart,- padding: GridSize.cellContentInsets,- child: state.tasks.isEmpty- ? const SizedBox.shrink()- : ChecklistProgressBar(- tasks: state.tasks,- percent: state.percent,- ),+ return ValueListenableBuilder(+ valueListenable: compactModeNotifier,+ builder: (context, compactMode, _) {+ final padding = compactMode+ ? GridSize.compactCellContentInsets+ : GridSize.cellContentInsets;++ return Container(+ alignment: AlignmentDirectional.centerStart,+ padding: padding,+ child: state.tasks.isEmpty+ ? const SizedBox.shrink()+ : ChecklistProgressBar(+ tasks: state.tasks,+ percent: state.percent,+ ),+ );+ },);},),diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_date_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_date_cell.dartindex 21bbee23ff..de7f7f5a2e 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_date_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_date_cell.dart@@ -1,9 +1,9 @@import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:appflowy/plugins/database/application/cell/bloc/date_cell_bloc.dart';+import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';import 'package:appflowy/plugins/database/widgets/cell_editor/date_cell_editor.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/widgets.dart';@@ -15,6 +15,7 @@ class DesktopGridDateCellSkin extends IEditableDateCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,DateCellBloc bloc,DateCellState state,PopoverController popoverController,@@ -28,11 +29,11 @@ class DesktopGridDateCellSkin extends IEditableDateCellSkin {child: Align(alignment: AlignmentDirectional.centerStart,child: state.fieldInfo.wrapCellContent ?? false- ? _buildCellContent(state)+ ? _buildCellContent(state, compactModeNotifier): SingleChildScrollView(physics: const NeverScrollableScrollPhysics(),scrollDirection: Axis.horizontal,- child: _buildCellContent(state),+ child: _buildCellContent(state, compactModeNotifier),),),popupBuilder: (BuildContext popoverContent) {@@ -47,33 +48,44 @@ class DesktopGridDateCellSkin extends IEditableDateCellSkin {);}- Widget _buildCellContent(DateCellState state) {+ Widget _buildCellContent(+ DateCellState state,+ ValueNotifier<bool> compactModeNotifier,+ ) {final wrap = state.fieldInfo.wrapCellContent ?? false;final dateStr = getDateCellStrFromCellData(state.fieldInfo,state.cellData,);- return Padding(- padding: GridSize.cellContentInsets,- child: Row(- mainAxisSize: MainAxisSize.min,- children: [- Flexible(- child: FlowyText(- dateStr,- overflow: wrap ? null : TextOverflow.ellipsis,- maxLines: wrap ? null : 1,- ),+ return ValueListenableBuilder(+ valueListenable: compactModeNotifier,+ builder: (context, compactMode, _) {+ final padding = compactMode+ ? GridSize.compactCellContentInsets+ : GridSize.cellContentInsets;+ return Padding(+ padding: padding,+ child: Row(+ mainAxisSize: MainAxisSize.min,+ children: [+ Flexible(+ child: FlowyText(+ dateStr,+ overflow: wrap ? null : TextOverflow.ellipsis,+ maxLines: wrap ? null : 1,+ ),+ ),+ if (state.cellData.reminderId.isNotEmpty) ...[+ const HSpace(4),+ FlowyTooltip(+ message: LocaleKeys.grid_field_reminderOnDateTooltip.tr(),+ child: const FlowySvg(FlowySvgs.clock_alarm_s),+ ),+ ],+ ],),- if (state.cellData.reminderId.isNotEmpty) ...[- const HSpace(4),- FlowyTooltip(- message: LocaleKeys.grid_field_reminderOnDateTooltip.tr(),- child: const FlowySvg(FlowySvgs.clock_alarm_s),- ),- ],- ],- ),+ );+ },);}}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_media_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_media_cell.dartindex f66d106ed0..b070af7cc7 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_media_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_media_cell.dart@@ -72,7 +72,7 @@ class GridMediaCellSkin extends IEditableMediaCellSkin {if (!isMobile && wrapContent) {return Padding(- padding: const EdgeInsets.all(4),+ padding: const EdgeInsets.symmetric(horizontal: 4),child: SizedBox(width: double.infinity,child: Wrap(@@ -233,7 +233,7 @@ class _FilePreviewRender extends StatelessWidget {height: 28,width: 28,clipBehavior: Clip.antiAlias,- padding: const EdgeInsets.all(8),+ padding: const EdgeInsets.symmetric(horizontal: 8),decoration: BoxDecoration(color: AFThemeExtension.of(context).greyHover,borderRadius: BorderRadius.circular(4),diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_number_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_number_cell.dartindex 04368bc725..7a6f3e63bc 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_number_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_number_cell.dart@@ -1,6 +1,6 @@+import 'package:appflowy/plugins/database/application/cell/bloc/number_cell_bloc.dart';import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';-import 'package:appflowy/plugins/database/application/cell/bloc/number_cell_bloc.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -11,27 +11,37 @@ class DesktopGridNumberCellSkin extends IEditableNumberCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,NumberCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,) {- return TextField(- controller: textEditingController,- focusNode: focusNode,- onEditingComplete: () => focusNode.unfocus(),- onSubmitted: (_) => focusNode.unfocus(),- maxLines: context.watch<NumberCellBloc>().state.wrap ? null : 1,- style: Theme.of(context).textTheme.bodyMedium,- textInputAction: TextInputAction.done,- decoration: InputDecoration(- contentPadding: GridSize.cellContentInsets,- border: InputBorder.none,- focusedBorder: InputBorder.none,- enabledBorder: InputBorder.none,- errorBorder: InputBorder.none,- disabledBorder: InputBorder.none,- isDense: true,- ),+ return ValueListenableBuilder(+ valueListenable: compactModeNotifier,+ builder: (context, compactMode, _) {+ final padding = compactMode+ ? GridSize.compactCellContentInsets+ : GridSize.cellContentInsets;++ return TextField(+ controller: textEditingController,+ focusNode: focusNode,+ onEditingComplete: () => focusNode.unfocus(),+ onSubmitted: (_) => focusNode.unfocus(),+ maxLines: context.watch<NumberCellBloc>().state.wrap ? null : 1,+ style: Theme.of(context).textTheme.bodyMedium,+ textInputAction: TextInputAction.done,+ decoration: InputDecoration(+ contentPadding: padding,+ border: InputBorder.none,+ focusedBorder: InputBorder.none,+ enabledBorder: InputBorder.none,+ errorBorder: InputBorder.none,+ disabledBorder: InputBorder.none,+ isDense: true,+ ),+ );+ },);}}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_relation_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_relation_cell.dartindex 88d5fdf9d3..dda3183b59 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_relation_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_relation_cell.dart@@ -17,6 +17,7 @@ class DesktopGridRelationCellSkin extends IEditableRelationCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,RelationCellBloc bloc,RelationCellState state,PopoverController popoverController,@@ -39,9 +40,14 @@ class DesktopGridRelationCellSkin extends IEditableRelationCellSkin {},child: Align(alignment: AlignmentDirectional.centerStart,- child: state.wrap- ? _buildWrapRows(context, state.rows)- : _buildNoWrapRows(context, state.rows),+ child: ValueListenableBuilder(+ valueListenable: compactModeNotifier,+ builder: (context, compactMode, _) {+ return state.wrap+ ? _buildWrapRows(context, state.rows, compactMode)+ : _buildNoWrapRows(context, state.rows, compactMode);+ },+ ),),);}@@ -49,9 +55,12 @@ class DesktopGridRelationCellSkin extends IEditableRelationCellSkin {Widget _buildWrapRows(BuildContext context,List<RelatedRowDataPB> rows,+ bool compactMode,) {return Padding(- padding: GridSize.cellContentInsets,+ padding: compactMode+ ? GridSize.compactCellContentInsets+ : GridSize.cellContentInsets,child: Wrap(runSpacing: 4,spacing: 4.0,@@ -73,6 +82,7 @@ class DesktopGridRelationCellSkin extends IEditableRelationCellSkin {Widget _buildNoWrapRows(BuildContext context,List<RelatedRowDataPB> rows,+ bool compactMode,) {return SingleChildScrollView(physics: const NeverScrollableScrollPhysics(),diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_select_option_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_select_option_cell.dartindex 8cebb2d77a..b599acc4f1 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_select_option_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_select_option_cell.dart@@ -15,6 +15,7 @@ class DesktopGridSelectOptionCellSkin extends IEditableSelectOptionCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,SelectOptionCellBloc bloc,PopoverController popoverController,) {@@ -35,63 +36,92 @@ class DesktopGridSelectOptionCellSkin extends IEditableSelectOptionCellSkin {return Align(alignment: AlignmentDirectional.centerStart,child: state.wrap- ? _buildWrapOptions(context, state.selectedOptions)- : _buildNoWrapOptions(context, state.selectedOptions),+ ? _buildWrapOptions(+ context,+ state.selectedOptions,+ compactModeNotifier,+ )+ : _buildNoWrapOptions(+ context,+ state.selectedOptions,+ compactModeNotifier,+ ),);},),);}- Widget _buildWrapOptions(BuildContext context, List<SelectOptionPB> options) {- return Padding(- padding: GridSize.cellContentInsets,- child: Wrap(- runSpacing: 4,- children: options.map(- (option) {- return Padding(- padding: const EdgeInsets.only(right: 4),- child: SelectOptionTag(- option: option,- padding: const EdgeInsets.symmetric(- vertical: 4,- horizontal: 8,- ),- ),- );- },- ).toList(),- ),+ Widget _buildWrapOptions(+ BuildContext context,+ List<SelectOptionPB> options,+ ValueNotifier<bool> compactModeNotifier,+ ) {+ return ValueListenableBuilder(+ valueListenable: compactModeNotifier,+ builder: (context, compactMode, _) {+ final padding = compactMode+ ? GridSize.compactCellContentInsets+ : GridSize.cellContentInsets;+ return Padding(+ padding: padding,+ child: Wrap(+ runSpacing: 4,+ children: options.map(+ (option) {+ return Padding(+ padding: const EdgeInsets.only(right: 4),+ child: SelectOptionTag(+ option: option,+ padding: EdgeInsets.symmetric(+ vertical: compactMode ? 2 : 4,+ horizontal: 8,+ ),+ ),+ );+ },+ ).toList(),+ ),+ );+ },);}Widget _buildNoWrapOptions(BuildContext context,List<SelectOptionPB> options,+ ValueNotifier<bool> compactModeNotifier,) {return SingleChildScrollView(physics: const NeverScrollableScrollPhysics(),scrollDirection: Axis.horizontal,- child: Padding(- padding: GridSize.cellContentInsets,- child: Row(- mainAxisSize: MainAxisSize.min,- children: options.map(- (option) {- return Padding(- padding: const EdgeInsets.only(right: 4),- child: SelectOptionTag(- option: option,- padding: const EdgeInsets.symmetric(- vertical: 1,- horizontal: 8,- ),- ),- );- },- ).toList(),- ),+ child: ValueListenableBuilder(+ valueListenable: compactModeNotifier,+ builder: (context, compactMode, _) {+ final padding = compactMode+ ? GridSize.compactCellContentInsets+ : GridSize.cellContentInsets;+ return Padding(+ padding: padding,+ child: Row(+ mainAxisSize: MainAxisSize.min,+ children: options.map(+ (option) {+ return Padding(+ padding: const EdgeInsets.only(right: 4),+ child: SelectOptionTag(+ option: option,+ padding: const EdgeInsets.symmetric(+ vertical: 1,+ horizontal: 8,+ ),+ ),+ );+ },+ ).toList(),+ ),+ );+ },),);}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_summary_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_summary_cell.dartindex b5d915b022..1f3ded0109 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_summary_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_summary_cell.dart@@ -11,6 +11,7 @@ class DesktopGridSummaryCellSkin extends IEditableSummaryCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,SummaryCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,@@ -27,58 +28,69 @@ class DesktopGridSummaryCellSkin extends IEditableSummaryCellSkin {onExit: (p) =>Provider.of<SummaryMouseNotifier>(context, listen: false).onEnter = false,- child: ConstrainedBox(- constraints: BoxConstraints(- minHeight: GridSize.headerHeight,- ),- child: Stack(- fit: StackFit.expand,- children: [- Center(- child: TextField(- controller: textEditingController,- enabled: false,- focusNode: focusNode,- onEditingComplete: () => focusNode.unfocus(),- onSubmitted: (_) => focusNode.unfocus(),- maxLines: null,- style: Theme.of(context).textTheme.bodyMedium,- textInputAction: TextInputAction.done,- decoration: InputDecoration(- contentPadding: GridSize.cellContentInsets,- border: InputBorder.none,- focusedBorder: InputBorder.none,- enabledBorder: InputBorder.none,- errorBorder: InputBorder.none,- disabledBorder: InputBorder.none,- isDense: true,+ child: ValueListenableBuilder(+ valueListenable: compactModeNotifier,+ builder: (context, compactMode, _) {+ final padding = compactMode+ ? GridSize.compactCellContentInsets+ : GridSize.cellContentInsets;++ return ConstrainedBox(+ constraints: BoxConstraints(+ minHeight: compactMode+ ? GridSize.headerHeight - 4+ : GridSize.headerHeight,+ ),+ child: Stack(+ fit: StackFit.expand,+ children: [+ Center(+ child: TextField(+ controller: textEditingController,+ enabled: false,+ focusNode: focusNode,+ onEditingComplete: () => focusNode.unfocus(),+ onSubmitted: (_) => focusNode.unfocus(),+ maxLines: null,+ style: Theme.of(context).textTheme.bodyMedium,+ textInputAction: TextInputAction.done,+ decoration: InputDecoration(+ contentPadding: padding,+ border: InputBorder.none,+ focusedBorder: InputBorder.none,+ enabledBorder: InputBorder.none,+ errorBorder: InputBorder.none,+ disabledBorder: InputBorder.none,+ isDense: true,+ ),+ ),),- ),+ Padding(+ padding: EdgeInsets.symmetric(+ horizontal: GridSize.cellVPadding,+ ),+ child: Consumer<SummaryMouseNotifier>(+ builder: (+ BuildContext context,+ SummaryMouseNotifier notifier,+ Widget? child,+ ) {+ if (notifier.onEnter) {+ return SummaryCellAccessory(+ viewId: bloc.cellController.viewId,+ fieldId: bloc.cellController.fieldId,+ rowId: bloc.cellController.rowId,+ );+ } else {+ return const SizedBox.shrink();+ }+ },+ ),+ ).positioned(right: 0, bottom: compactMode ? 4 : 8),+ ],),- Padding(- padding: EdgeInsets.symmetric(- horizontal: GridSize.cellVPadding,- ),- child: Consumer<SummaryMouseNotifier>(- builder: (- BuildContext context,- SummaryMouseNotifier notifier,- Widget? child,- ) {- if (notifier.onEnter) {- return SummaryCellAccessory(- viewId: bloc.cellController.viewId,- fieldId: bloc.cellController.fieldId,- rowId: bloc.cellController.rowId,- );- } else {- return const SizedBox.shrink();- }- },- ),- ).positioned(right: 0, bottom: 8),- ],- ),+ );+ },),);},diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_text_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_text_cell.dartindex f28cb756c8..75c973d886 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_text_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_text_cell.dart@@ -13,43 +13,52 @@ class DesktopGridTextCellSkin extends IEditableTextCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,TextCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,) {- return Padding(- padding: GridSize.cellContentInsets,- child: Row(- crossAxisAlignment: CrossAxisAlignment.start,- children: [- const _IconOrEmoji(),- Expanded(- child: TextField(- controller: textEditingController,- focusNode: focusNode,- maxLines: context.watch<TextCellBloc>().state.wrap ? null : 1,- style: Theme.of(context).textTheme.bodyMedium?.copyWith(- fontWeight: context- .read<TextCellBloc>()- .cellController- .fieldInfo- .isPrimary- ? FontWeight.w500- : null,+ return ValueListenableBuilder(+ valueListenable: compactModeNotifier,+ builder: (context, compactMode, data) {+ final padding = compactMode+ ? GridSize.compactCellContentInsets+ : GridSize.cellContentInsets;+ return Padding(+ padding: padding,+ child: Row(+ crossAxisAlignment: CrossAxisAlignment.start,+ children: [+ const _IconOrEmoji(),+ Expanded(+ child: TextField(+ controller: textEditingController,+ focusNode: focusNode,+ maxLines: context.watch<TextCellBloc>().state.wrap ? null : 1,+ style: Theme.of(context).textTheme.bodyMedium?.copyWith(+ fontWeight: context+ .read<TextCellBloc>()+ .cellController+ .fieldInfo+ .isPrimary+ ? FontWeight.w500+ : null,+ ),+ decoration: const InputDecoration(+ border: InputBorder.none,+ focusedBorder: InputBorder.none,+ enabledBorder: InputBorder.none,+ errorBorder: InputBorder.none,+ disabledBorder: InputBorder.none,+ isDense: true,+ isCollapsed: true,),- decoration: const InputDecoration(- border: InputBorder.none,- focusedBorder: InputBorder.none,- enabledBorder: InputBorder.none,- errorBorder: InputBorder.none,- disabledBorder: InputBorder.none,- isDense: true,- isCollapsed: true,+ ),),- ),+ ],),- ],- ),+ );+ },);}}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_timestamp_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_timestamp_cell.dartindex a1690310d4..8a1fd92499 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_timestamp_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_timestamp_cell.dart@@ -1,6 +1,6 @@+import 'package:appflowy/plugins/database/application/cell/bloc/timestamp_cell_bloc.dart';import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';-import 'package:appflowy/plugins/database/application/cell/bloc/timestamp_cell_bloc.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/widgets.dart';@@ -11,29 +11,41 @@ class DesktopGridTimestampCellSkin extends IEditableTimestampCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,TimestampCellBloc bloc,TimestampCellState state,) {return Container(alignment: AlignmentDirectional.centerStart,child: state.wrap- ? _buildCellContent(state)+ ? _buildCellContent(state, compactModeNotifier): SingleChildScrollView(physics: const NeverScrollableScrollPhysics(),scrollDirection: Axis.horizontal,- child: _buildCellContent(state),+ child: _buildCellContent(state, compactModeNotifier),),);}- Widget _buildCellContent(TimestampCellState state) {- return Padding(- padding: GridSize.cellContentInsets,- child: FlowyText(- state.dateStr,- overflow: state.wrap ? null : TextOverflow.ellipsis,- maxLines: state.wrap ? null : 1,- ),+ Widget _buildCellContent(+ TimestampCellState state,+ ValueNotifier<bool> compactModeNotifier,+ ) {+ return ValueListenableBuilder(+ valueListenable: compactModeNotifier,+ builder: (context, compactMode, _) {+ final padding = compactMode+ ? GridSize.compactCellContentInsets+ : GridSize.cellContentInsets;+ return Padding(+ padding: padding,+ child: FlowyText(+ state.dateStr,+ overflow: state.wrap ? null : TextOverflow.ellipsis,+ maxLines: state.wrap ? null : 1,+ ),+ );+ },);}}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_translate_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_translate_cell.dartindex aece28373c..102b491f52 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_translate_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_translate_cell.dart@@ -11,6 +11,7 @@ class DesktopGridTranslateCellSkin extends IEditableTranslateCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,TranslateCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,@@ -18,68 +19,79 @@ class DesktopGridTranslateCellSkin extends IEditableTranslateCellSkin {return ChangeNotifierProvider(create: (_) => TranslateMouseNotifier(),builder: (context, child) {- return MouseRegion(- cursor: SystemMouseCursors.click,- opaque: false,- onEnter: (p) =>- Provider.of<TranslateMouseNotifier>(context, listen: false)- .onEnter = true,- onExit: (p) =>- Provider.of<TranslateMouseNotifier>(context, listen: false)- .onEnter = false,- child: ConstrainedBox(- constraints: BoxConstraints(- minHeight: GridSize.headerHeight,- ),- child: Stack(- fit: StackFit.expand,- children: [- Center(- child: TextField(- controller: textEditingController,- readOnly: true,- focusNode: focusNode,- onEditingComplete: () => focusNode.unfocus(),- onSubmitted: (_) => focusNode.unfocus(),- maxLines: null,- style: Theme.of(context).textTheme.bodyMedium,- textInputAction: TextInputAction.done,- decoration: InputDecoration(- contentPadding: GridSize.cellContentInsets,- border: InputBorder.none,- focusedBorder: InputBorder.none,- enabledBorder: InputBorder.none,- errorBorder: InputBorder.none,- disabledBorder: InputBorder.none,- isDense: true,+ return ValueListenableBuilder(+ valueListenable: compactModeNotifier,+ builder: (context, compactMode, _) {+ final padding = compactMode+ ? GridSize.compactCellContentInsets+ : GridSize.cellContentInsets;++ return MouseRegion(+ cursor: SystemMouseCursors.click,+ opaque: false,+ onEnter: (p) =>+ Provider.of<TranslateMouseNotifier>(context, listen: false)+ .onEnter = true,+ onExit: (p) =>+ Provider.of<TranslateMouseNotifier>(context, listen: false)+ .onEnter = false,+ child: ConstrainedBox(+ constraints: BoxConstraints(+ minHeight: compactMode+ ? GridSize.headerHeight - 4+ : GridSize.headerHeight,+ ),+ child: Stack(+ fit: StackFit.expand,+ children: [+ Center(+ child: TextField(+ controller: textEditingController,+ readOnly: true,+ focusNode: focusNode,+ onEditingComplete: () => focusNode.unfocus(),+ onSubmitted: (_) => focusNode.unfocus(),+ maxLines: null,+ style: Theme.of(context).textTheme.bodyMedium,+ textInputAction: TextInputAction.done,+ decoration: InputDecoration(+ contentPadding: padding,+ border: InputBorder.none,+ focusedBorder: InputBorder.none,+ enabledBorder: InputBorder.none,+ errorBorder: InputBorder.none,+ disabledBorder: InputBorder.none,+ isDense: true,+ ),+ ),),- ),+ Padding(+ padding: EdgeInsets.symmetric(+ horizontal: GridSize.cellVPadding,+ ),+ child: Consumer<TranslateMouseNotifier>(+ builder: (+ BuildContext context,+ TranslateMouseNotifier notifier,+ Widget? child,+ ) {+ if (notifier.onEnter) {+ return TranslateCellAccessory(+ viewId: bloc.cellController.viewId,+ fieldId: bloc.cellController.fieldId,+ rowId: bloc.cellController.rowId,+ );+ } else {+ return const SizedBox.shrink();+ }+ },+ ),+ ).positioned(right: 0, bottom: compactMode ? 4 : 8),+ ],),- Padding(- padding: EdgeInsets.symmetric(- horizontal: GridSize.cellVPadding,- ),- child: Consumer<TranslateMouseNotifier>(- builder: (- BuildContext context,- TranslateMouseNotifier notifier,- Widget? child,- ) {- if (notifier.onEnter) {- return TranslateCellAccessory(- viewId: bloc.cellController.viewId,- fieldId: bloc.cellController.fieldId,- rowId: bloc.cellController.rowId,- );- } else {- return const SizedBox.shrink();- }- },- ),- ).positioned(right: 0, bottom: 8),- ],- ),- ),+ ),+ );+ },);},);diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_url_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_url_cell.dartindex 17a3519d3d..935716e686 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_url_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_url_cell.dart@@ -21,6 +21,7 @@ class DesktopGridURLSkin extends IEditableURLCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,URLCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,@@ -28,28 +29,36 @@ class DesktopGridURLSkin extends IEditableURLCellSkin {) {return BlocSelector<URLCellBloc, URLCellState, bool>(selector: (state) => state.wrap,- builder: (context, wrap) => TextField(- controller: textEditingController,- focusNode: focusNode,- maxLines: wrap ? null : 1,- style: Theme.of(context).textTheme.bodyMedium?.copyWith(- color: Theme.of(context).colorScheme.primary,- decoration: TextDecoration.underline,+ builder: (context, wrap) => ValueListenableBuilder(+ valueListenable: compactModeNotifier,+ builder: (context, compactMode, _) {+ final padding = compactMode+ ? GridSize.compactCellContentInsets+ : GridSize.cellContentInsets;+ return TextField(+ controller: textEditingController,+ focusNode: focusNode,+ maxLines: wrap ? null : 1,+ style: Theme.of(context).textTheme.bodyMedium?.copyWith(+ color: Theme.of(context).colorScheme.primary,+ decoration: TextDecoration.underline,+ ),+ decoration: InputDecoration(+ contentPadding: padding,+ border: InputBorder.none,+ focusedBorder: InputBorder.none,+ enabledBorder: InputBorder.none,+ errorBorder: InputBorder.none,+ disabledBorder: InputBorder.none,+ hintStyle: Theme.of(context)+ .textTheme+ .bodyMedium+ ?.copyWith(color: Theme.of(context).hintColor),+ isDense: true,),- decoration: InputDecoration(- contentPadding: GridSize.cellContentInsets,- border: InputBorder.none,- focusedBorder: InputBorder.none,- enabledBorder: InputBorder.none,- errorBorder: InputBorder.none,- disabledBorder: InputBorder.none,- hintStyle: Theme.of(context)- .textTheme- .bodyMedium- ?.copyWith(color: Theme.of(context).hintColor),- isDense: true,- ),- onTapOutside: (_) => focusNode.unfocus(),+ onTapOutside: (_) => focusNode.unfocus(),+ );+ },),);}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_checkbox_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_checkbox_cell.dartindex bb15cd5d9f..1e56c5160e 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_checkbox_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_checkbox_cell.dart@@ -1,6 +1,6 @@import 'package:appflowy/generated/flowy_svgs.g.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:appflowy/plugins/database/application/cell/bloc/checkbox_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';@@ -11,6 +11,7 @@ class DesktopRowDetailCheckboxCellSkin extends IEditableCheckboxCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,CheckboxCellBloc bloc,CheckboxCellState state,) {diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_checklist_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_checklist_cell.dartindex d7e1d64fc3..b10d63d2d4 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_checklist_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_checklist_cell.dart@@ -24,6 +24,7 @@ class DesktopRowDetailChecklistCellSkin extends IEditableChecklistCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,ChecklistCellBloc bloc,PopoverController popoverController,) {diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_date_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_date_cell.dartindex f10f9a9279..f1b5f14975 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_date_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_date_cell.dart@@ -1,9 +1,9 @@import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/date.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:appflowy/plugins/database/application/cell/bloc/date_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/date.dart';import 'package:appflowy/plugins/database/widgets/cell_editor/date_cell_editor.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';@@ -13,6 +13,7 @@ class DesktopRowDetailDateCellSkin extends IEditableDateCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,DateCellBloc bloc,DateCellState state,PopoverController popoverController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_number_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_number_cell.dartindex 97f8f80569..e90fc85549 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_number_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_number_cell.dart@@ -1,6 +1,6 @@import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:appflowy/plugins/database/application/cell/bloc/number_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flutter/material.dart';@@ -11,6 +11,7 @@ class DesktopRowDetailNumberCellSkin extends IEditableNumberCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,NumberCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_relation_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_relation_cell.dartindex 89db702d22..d760d3ac29 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_relation_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_relation_cell.dart@@ -16,6 +16,7 @@ class DesktopRowDetailRelationCellSkin extends IEditableRelationCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,RelationCellBloc bloc,RelationCellState state,PopoverController popoverController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_select_option_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_select_option_cell.dartindex 3d41a824ce..ff84744c27 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_select_option_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_select_option_cell.dart@@ -1,5 +1,3 @@-import 'package:flutter/material.dart';-import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/database/application/cell/bloc/select_option_cell_bloc.dart';import 'package:appflowy/plugins/database/widgets/cell_editor/extension.dart';@@ -8,6 +6,7 @@ import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart'import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import '../editable_cell_skeleton/select_option.dart';@@ -18,6 +17,7 @@ class DesktopRowDetailSelectOptionCellSkinWidget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,SelectOptionCellBloc bloc,PopoverController popoverController,) {diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_summary_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_summary_cell.dartindex d8a8902a8c..30cd54832d 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_summary_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_summary_cell.dart@@ -10,6 +10,7 @@ class DesktopRowDetailSummaryCellSkin extends IEditableSummaryCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,SummaryCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_text_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_text_cell.dartindex b1e10e4da3..9511c2f871 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_text_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_text_cell.dart@@ -1,6 +1,6 @@import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:appflowy/plugins/database/application/cell/bloc/text_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flutter/material.dart';@@ -11,6 +11,7 @@ class DesktopRowDetailTextCellSkin extends IEditableTextCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,TextCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_timestamp_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_timestamp_cell.dartindex af212c6dfd..6fc534f313 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_timestamp_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_timestamp_cell.dart@@ -1,5 +1,5 @@-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:appflowy/plugins/database/application/cell/bloc/timestamp_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/widgets.dart';@@ -10,6 +10,7 @@ class DesktopRowDetailTimestampCellSkin extends IEditableTimestampCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,TimestampCellBloc bloc,TimestampCellState state,) {diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_url_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_url_cell.dartindex 00d7372027..ee9d7e7300 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_url_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_url_cell.dart@@ -1,8 +1,8 @@import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database/application/cell/bloc/url_cell_bloc.dart';import 'package:appflowy/plugins/database/widgets/cell/desktop_grid/desktop_grid_url_cell.dart';import 'package:appflowy/plugins/database/widgets/row/accessory/cell_accessory.dart';import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';-import 'package:appflowy/plugins/database/application/cell/bloc/url_cell_bloc.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flutter/material.dart';import 'package:flutter/services.dart';@@ -14,6 +14,7 @@ class DesktopRowDetailURLSkin extends IEditableURLCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,URLCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/destop_row_detail_translate_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/destop_row_detail_translate_cell.dartindex 1c7bab9f92..a374417b3d 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/destop_row_detail_translate_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/destop_row_detail_translate_cell.dart@@ -10,6 +10,7 @@ class DesktopRowDetailTranslateCellSkin extends IEditableTranslateCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,TranslateCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/checkbox.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/checkbox.dartindex 4b7bd2c442..ab421b8925 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/checkbox.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/checkbox.dart@@ -1,9 +1,9 @@+import 'package:appflowy/plugins/database/application/cell/bloc/checkbox_cell_bloc.dart';import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';import 'package:appflowy/plugins/database/application/database_controller.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';-import 'package:appflowy/plugins/database/application/cell/bloc/checkbox_cell_bloc.dart';import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -27,6 +27,7 @@ abstract class IEditableCheckboxCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,CheckboxCellBloc bloc,CheckboxCellState state,);@@ -71,6 +72,7 @@ class _CheckboxCellState extends GridCellState<EditableCheckboxCell> {return widget.skin.build(context,widget.cellContainerNotifier,+ widget.databaseController.compactModeNotifier,cellBloc,state,);diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/checklist.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/checklist.dartindex 4cdebee36d..fbed429642 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/checklist.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/checklist.dart@@ -1,9 +1,9 @@+import 'package:appflowy/plugins/database/application/cell/bloc/checklist_cell_bloc.dart';import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';import 'package:appflowy/plugins/database/application/database_controller.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';-import 'package:appflowy/plugins/database/application/cell/bloc/checklist_cell_bloc.dart';import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -28,6 +28,7 @@ abstract class IEditableChecklistCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,ChecklistCellBloc bloc,PopoverController popoverController,);@@ -72,6 +73,7 @@ class GridChecklistCellState extends GridCellState<EditableChecklistCell> {child: widget.skin.build(context,widget.cellContainerNotifier,+ widget.databaseController.compactModeNotifier,cellBloc,_popover,),diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/date.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/date.dartindex 877b4c6dfb..e61c759f48 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/date.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/date.dart@@ -1,12 +1,12 @@+import 'package:appflowy/plugins/database/application/cell/bloc/date_cell_bloc.dart';import 'package:appflowy/plugins/database/application/cell/bloc/date_cell_editor_bloc.dart';import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';import 'package:appflowy/plugins/database/application/database_controller.dart';import 'package:appflowy/plugins/database/application/field/field_info.dart';import 'package:appflowy/plugins/database/application/field/type_option/type_option_data_parser.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';-import 'package:appflowy/plugins/database/application/cell/bloc/date_cell_bloc.dart';import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flutter/material.dart';@@ -33,6 +33,7 @@ abstract class IEditableDateCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,DateCellBloc bloc,DateCellState state,PopoverController popoverController,@@ -79,6 +80,7 @@ class _DateCellState extends GridCellState<EditableDateCell> {return widget.skin.build(context,widget.cellContainerNotifier,+ widget.databaseController.compactModeNotifier,cellBloc,state,_popover,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/number.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/number.dartindex b218c78195..4d2bfdf627 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/number.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/number.dart@@ -1,11 +1,11 @@import 'dart:async';+import 'package:appflowy/plugins/database/application/cell/bloc/number_cell_bloc.dart';import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';import 'package:appflowy/plugins/database/application/database_controller.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';-import 'package:appflowy/plugins/database/application/cell/bloc/number_cell_bloc.dart';import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -29,6 +29,7 @@ abstract class IEditableNumberCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,NumberCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,@@ -89,6 +90,7 @@ class _NumberCellState extends GridEditableTextCell<EditableNumberCell> {return widget.skin.build(context,widget.cellContainerNotifier,+ widget.databaseController.compactModeNotifier,cellBloc,focusNode,_textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/relation.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/relation.dartindex 4e39900abf..67ca6275a6 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/relation.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/relation.dart@@ -1,9 +1,9 @@+import 'package:appflowy/plugins/database/application/cell/bloc/relation_cell_bloc.dart';import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';import 'package:appflowy/plugins/database/application/database_controller.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';-import 'package:appflowy/plugins/database/application/cell/bloc/relation_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -28,6 +28,7 @@ abstract class IEditableRelationCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,RelationCellBloc bloc,RelationCellState state,PopoverController popoverController,@@ -74,6 +75,7 @@ class _RelationCellState extends GridCellState<EditableRelationCell> {return widget.skin.build(context,widget.cellContainerNotifier,+ widget.databaseController.compactModeNotifier,cellBloc,state,_popover,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/select_option.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/select_option.dartindex b45018f4f5..f7e8b6f435 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/select_option.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/select_option.dart@@ -1,9 +1,9 @@+import 'package:appflowy/plugins/database/application/cell/bloc/select_option_cell_bloc.dart';import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';import 'package:appflowy/plugins/database/application/database_controller.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';-import 'package:appflowy/plugins/database/application/cell/bloc/select_option_cell_bloc.dart';import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:flutter/material.dart';@@ -31,6 +31,7 @@ abstract class IEditableSelectOptionCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,SelectOptionCellBloc bloc,PopoverController popoverController,);@@ -79,6 +80,7 @@ class _SelectOptionCellState extends GridCellState<EditableSelectOptionCell> {child: widget.skin.build(context,widget.cellContainerNotifier,+ widget.databaseController.compactModeNotifier,cellBloc,_popover,),diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/summary.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/summary.dartindex d3b43b0d17..7a086b2a35 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/summary.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/summary.dart@@ -1,6 +1,3 @@-import 'package:flutter/material.dart';-import 'package:flutter/services.dart';-import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/database/application/cell/bloc/summary_cell_bloc.dart';@@ -22,6 +19,8 @@ import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/style_widget/icon_button.dart';import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';import 'package:flowy_infra_ui/widget/spacing.dart';+import 'package:flutter/material.dart';+import 'package:flutter/services.dart';import 'package:flutter_bloc/flutter_bloc.dart';abstract class IEditableSummaryCellSkin {@@ -39,6 +38,7 @@ abstract class IEditableSummaryCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,SummaryCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,@@ -98,6 +98,7 @@ class _SummaryCellState extends GridEditableTextCell<EditableSummaryCell> {return widget.skin.build(context,widget.cellContainerNotifier,+ widget.databaseController.compactModeNotifier,cellBloc,focusNode,_textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/text.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/text.dartindex 7666919c49..3ea622374e 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/text.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/text.dart@@ -1,11 +1,11 @@import 'dart:async';+import 'package:appflowy/plugins/database/application/cell/bloc/text_cell_bloc.dart';import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';import 'package:appflowy/plugins/database/application/database_controller.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';-import 'package:appflowy/plugins/database/application/cell/bloc/text_cell_bloc.dart';import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -29,6 +29,7 @@ abstract class IEditableTextCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,TextCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,@@ -92,6 +93,7 @@ class _TextCellState extends GridEditableTextCell<EditableTextCell> {return widget.skin.build(context,widget.cellContainerNotifier,+ widget.databaseController.compactModeNotifier,cellBloc,focusNode,_textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/timestamp.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/timestamp.dartindex 6c00e8b4b4..2fc9d049cc 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/timestamp.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/timestamp.dart@@ -1,9 +1,9 @@+import 'package:appflowy/plugins/database/application/cell/bloc/timestamp_cell_bloc.dart';import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';import 'package:appflowy/plugins/database/application/database_controller.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';-import 'package:appflowy/plugins/database/application/cell/bloc/timestamp_cell_bloc.dart';import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -28,6 +28,7 @@ abstract class IEditableTimestampCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,TimestampCellBloc bloc,TimestampCellState state,);@@ -74,6 +75,7 @@ class _TimestampCellState extends GridCellState<EditableTimestampCell> {return widget.skin.build(context,widget.cellContainerNotifier,+ widget.databaseController.compactModeNotifier,cellBloc,state,);diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/translate.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/translate.dartindex b4ff26d946..b273419aed 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/translate.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/translate.dart@@ -1,6 +1,3 @@-import 'package:flutter/material.dart';-import 'package:flutter/services.dart';-import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/database/application/cell/bloc/translate_cell_bloc.dart';@@ -22,6 +19,8 @@ import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/style_widget/icon_button.dart';import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';import 'package:flowy_infra_ui/widget/spacing.dart';+import 'package:flutter/material.dart';+import 'package:flutter/services.dart';import 'package:flutter_bloc/flutter_bloc.dart';abstract class IEditableTranslateCellSkin {@@ -39,6 +38,7 @@ abstract class IEditableTranslateCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,TranslateCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,@@ -98,6 +98,7 @@ class _TranslateCellState extends GridEditableTextCell<EditableTranslateCell> {return widget.skin.build(context,widget.cellContainerNotifier,+ widget.databaseController.compactModeNotifier,cellBloc,focusNode,_textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/url.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/url.dartindex 0b4afc086e..0dc7779e55 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/url.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/url.dart@@ -4,13 +4,13 @@ import 'dart:io';import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/mobile/presentation/widgets/flowy_mobile_quick_action_button.dart';+import 'package:appflowy/plugins/database/application/cell/bloc/url_cell_bloc.dart';import 'package:appflowy/plugins/database/application/cell/cell_controller.dart';import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';import 'package:appflowy/plugins/database/application/database_controller.dart';+import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';import 'package:appflowy/plugins/database/widgets/row/accessory/cell_accessory.dart';import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';-import 'package:appflowy/plugins/database/application/cell/bloc/url_cell_bloc.dart';-import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';@@ -40,6 +40,7 @@ abstract class IEditableURLCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,URLCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,@@ -121,6 +122,7 @@ class _GridURLCellState extends GridEditableTextCell<EditableURLCell> {child: widget.skin.build(context,widget.cellContainerNotifier,+ widget.databaseController.compactModeNotifier,cellBloc,focusNode,_textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_checkbox_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_checkbox_cell.dartindex 8859372c2a..e9ac19c874 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_checkbox_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_checkbox_cell.dart@@ -1,6 +1,6 @@import 'package:appflowy/generated/flowy_svgs.g.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:appflowy/plugins/database/application/cell/bloc/checkbox_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:flutter/material.dart';import '../editable_cell_skeleton/checkbox.dart';@@ -10,6 +10,7 @@ class MobileGridCheckboxCellSkin extends IEditableCheckboxCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,CheckboxCellBloc bloc,CheckboxCellState state,) {diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_checklist_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_checklist_cell.dartindex ff9f83319f..c56d28e1a7 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_checklist_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_checklist_cell.dart@@ -1,9 +1,9 @@import 'package:appflowy/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart';-import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:appflowy/plugins/database/application/cell/bloc/checklist_cell_bloc.dart';+import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';import 'package:appflowy/plugins/database/widgets/cell_editor/checklist_progress_bar.dart';import 'package:appflowy/plugins/database/widgets/cell_editor/mobile_checklist_cell_editor.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -15,6 +15,7 @@ class MobileGridChecklistCellSkin extends IEditableChecklistCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,ChecklistCellBloc bloc,PopoverController popoverController,) {diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_date_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_date_cell.dartindex 43b6b7f347..5686e09295 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_date_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_date_cell.dart@@ -1,18 +1,18 @@-import 'package:flutter/material.dart';-import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart';import 'package:appflowy/mobile/presentation/database/date_picker/mobile_date_picker_screen.dart';+import 'package:appflowy/plugins/database/application/cell/bloc/date_cell_bloc.dart';import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/date.dart';import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';-import 'package:appflowy/plugins/database/application/cell/bloc/date_cell_bloc.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';class MobileGridDateCellSkin extends IEditableDateCellSkin {@overrideWidget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,DateCellBloc bloc,DateCellState state,PopoverController popoverController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_number_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_number_cell.dartindex c02cf6aa8d..310c0b5692 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_number_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_number_cell.dart@@ -1,5 +1,5 @@-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:appflowy/plugins/database/application/cell/bloc/number_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:flutter/material.dart';import '../editable_cell_skeleton/number.dart';@@ -9,6 +9,7 @@ class MobileGridNumberCellSkin extends IEditableNumberCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,NumberCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_relation_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_relation_cell.dartindex 0951e2fb0d..69e9b20104 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_relation_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_relation_cell.dart@@ -1,6 +1,6 @@import 'package:appflowy/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:appflowy/plugins/database/application/cell/bloc/relation_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';@@ -11,6 +11,7 @@ class MobileGridRelationCellSkin extends IEditableRelationCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,RelationCellBloc bloc,RelationCellState state,PopoverController popoverController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_select_option_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_select_option_cell.dartindex 61f67fec4f..010974e49a 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_select_option_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_select_option_cell.dart@@ -1,8 +1,8 @@import 'package:appflowy/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/application/cell/bloc/select_option_cell_bloc.dart';import 'package:appflowy/plugins/database/widgets/cell_editor/extension.dart';import 'package:appflowy/plugins/database/widgets/cell_editor/mobile_select_option_editor.dart';-import 'package:appflowy/plugins/database/application/cell/bloc/select_option_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:appflowy_backend/protobuf/flowy-database2/select_option_entities.pb.dart';import 'package:collection/collection.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';@@ -16,6 +16,7 @@ class MobileGridSelectOptionCellSkin extends IEditableSelectOptionCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,SelectOptionCellBloc bloc,PopoverController popoverController,) {diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_summary_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_summary_cell.dartindex 0da8d6bc64..e48c56d74d 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_summary_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_summary_cell.dart@@ -12,6 +12,7 @@ class MobileGridSummaryCellSkin extends IEditableSummaryCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,SummaryCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_text_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_text_cell.dartindex 40e8c35319..43a4fe49d7 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_text_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_text_cell.dart@@ -11,6 +11,7 @@ class MobileGridTextCellSkin extends IEditableTextCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,TextCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_timestamp_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_timestamp_cell.dartindex d9e020eece..68209e7e05 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_timestamp_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_timestamp_cell.dart@@ -1,5 +1,5 @@-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:appflowy/plugins/database/application/cell/bloc/timestamp_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';@@ -10,6 +10,7 @@ class MobileGridTimestampCellSkin extends IEditableTimestampCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,TimestampCellBloc bloc,TimestampCellState state,) {diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_translate_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_translate_cell.dartindex 3a7b44cbc5..4288136734 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_translate_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_translate_cell.dart@@ -12,6 +12,7 @@ class MobileGridTranslateCellSkin extends IEditableTranslateCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,TranslateCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_url_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_url_cell.dartindex cddb821943..0dbe5474c7 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_url_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_url_cell.dart@@ -13,6 +13,7 @@ class MobileGridURLCellSkin extends IEditableURLCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,URLCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_checkbox_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_checkbox_cell.dartindex 279e790913..ade82e8c5c 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_checkbox_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_checkbox_cell.dart@@ -1,9 +1,8 @@-import 'package:flutter/material.dart';-import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/plugins/database/application/cell/bloc/checkbox_cell_bloc.dart';import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:flowy_infra/theme_extension.dart';+import 'package:flutter/material.dart';import '../editable_cell_skeleton/checkbox.dart';@@ -12,6 +11,7 @@ class MobileRowDetailCheckboxCellSkin extends IEditableCheckboxCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,CheckboxCellBloc bloc,CheckboxCellState state,) {diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_checklist_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_checklist_cell.dartindex daf085e2ce..75eee9a560 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_checklist_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_checklist_cell.dart@@ -17,6 +17,7 @@ class MobileRowDetailChecklistCellSkin extends IEditableChecklistCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,ChecklistCellBloc bloc,PopoverController popoverController,) {diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_date_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_date_cell.dartindex 8671bacd8f..0256ee25cf 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_date_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_date_cell.dart@@ -2,9 +2,9 @@ import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart';import 'package:appflowy/mobile/presentation/database/date_picker/mobile_date_picker_screen.dart';+import 'package:appflowy/plugins/database/application/cell/bloc/date_cell_bloc.dart';import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/date.dart';import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';-import 'package:appflowy/plugins/database/application/cell/bloc/date_cell_bloc.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';@@ -14,6 +14,7 @@ class MobileRowDetailDateCellSkin extends IEditableDateCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,DateCellBloc bloc,DateCellState state,PopoverController popoverController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_number_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_number_cell.dartindex 6e32fbbbdc..430044fb5c 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_number_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_number_cell.dart@@ -1,6 +1,6 @@import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:appflowy/plugins/database/application/cell/bloc/number_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flutter/material.dart';@@ -11,6 +11,7 @@ class MobileRowDetailNumberCellSkin extends IEditableNumberCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,NumberCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_relation_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_relation_cell.dartindex 61a39a867a..c3e8b82867 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_relation_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_relation_cell.dart@@ -1,7 +1,7 @@import 'package:appflowy/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart';+import 'package:appflowy/plugins/database/application/cell/bloc/relation_cell_bloc.dart';import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/relation.dart';import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';-import 'package:appflowy/plugins/database/application/cell/bloc/relation_cell_bloc.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';@@ -10,6 +10,7 @@ class MobileRowDetailRelationCellSkin extends IEditableRelationCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,RelationCellBloc bloc,RelationCellState state,PopoverController popoverController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_select_cell_option.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_select_cell_option.dartindex 9dafb6afe0..7d4eb71f9d 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_select_cell_option.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_select_cell_option.dart@@ -1,9 +1,9 @@import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';+import 'package:appflowy/plugins/database/application/cell/bloc/select_option_cell_bloc.dart';import 'package:appflowy/plugins/database/widgets/cell_editor/extension.dart';import 'package:appflowy/plugins/database/widgets/cell_editor/mobile_select_option_editor.dart';-import 'package:appflowy/plugins/database/application/cell/bloc/select_option_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:appflowy_backend/protobuf/flowy-database2/select_option_entities.pb.dart';import 'package:collection/collection.dart';import 'package:easy_localization/easy_localization.dart';@@ -19,6 +19,7 @@ class MobileRowDetailSelectOptionCellSkinWidget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,SelectOptionCellBloc bloc,PopoverController popoverController,) {diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_summary_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_summary_cell.dartindex 1e709bdeb9..9974220b96 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_summary_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_summary_cell.dart@@ -9,6 +9,7 @@ class MobileRowDetailSummaryCellSkin extends IEditableSummaryCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,SummaryCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_text_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_text_cell.dartindex 1cdde84c27..fc8f816103 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_text_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_text_cell.dart@@ -1,6 +1,6 @@import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:appflowy/plugins/database/application/cell/bloc/text_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flutter/material.dart';@@ -11,6 +11,7 @@ class MobileRowDetailTextCellSkin extends IEditableTextCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,TextCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_timestamp_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_timestamp_cell.dartindex 7ddda492c9..f3f800e994 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_timestamp_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_timestamp_cell.dart@@ -1,6 +1,6 @@import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:appflowy/plugins/database/application/cell/bloc/timestamp_cell_bloc.dart';+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';@@ -12,6 +12,7 @@ class MobileRowDetailTimestampCellSkin extends IEditableTimestampCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,TimestampCellBloc bloc,TimestampCellState state,) {diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_translate_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_translate_cell.dartindex a1e4b4bf29..c2d84b3d2e 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_translate_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_translate_cell.dart@@ -9,6 +9,7 @@ class MobileRowDetailTranslateCellSkin extends IEditableTranslateCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,TranslateCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_url_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_url_cell.dartindex f87b225492..9bb91255aa 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_url_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_url_cell.dart@@ -4,9 +4,9 @@ import 'package:appflowy/plugins/database/application/cell/bloc/url_cell_bloc.daimport 'package:appflowy/plugins/database/widgets/row/accessory/cell_accessory.dart';import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';import 'package:easy_localization/easy_localization.dart';+import 'package:flowy_infra/theme_extension.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:flowy_infra/theme_extension.dart';import '../editable_cell_skeleton/url.dart';@@ -15,6 +15,7 @@ class MobileRowDetailURLCellSkin extends IEditableURLCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,URLCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/database_view_widget.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/database_view_widget.dartindex c979ee0829..a218e1ed68 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/database_view_widget.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/database_view_widget.dart@@ -3,17 +3,25 @@ import 'package:appflowy/startup/plugin/plugin.dart';import 'package:appflowy/workspace/application/view/view_ext.dart';import 'package:appflowy/workspace/application/view/view_listener.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';+import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flutter/material.dart';+import 'package:provider/provider.dart';class DatabaseViewWidget extends StatefulWidget {const DatabaseViewWidget({super.key,required this.view,this.shrinkWrap = true,+ required this.showActions,+ required this.node,+ this.actionBuilder,});final ViewPB view;final bool shrinkWrap;+ final BlockComponentActionBuilder? actionBuilder;+ final bool showActions;+ final Node node;@overrideState<DatabaseViewWidget> createState() => _DatabaseViewWidgetState();@@ -50,14 +58,26 @@ class _DatabaseViewWidgetState extends State<DatabaseViewWidget> {@overrideWidget build(BuildContext context) {+ double? horizontalPadding = 0.0;+ final databasePluginWidgetBuilderSize =+ Provider.of<DatabasePluginWidgetBuilderSize?>(context);+ if (view.layout == ViewLayoutPB.Grid || view.layout == ViewLayoutPB.Board) {+ horizontalPadding = 40.0;+ }+ if (databasePluginWidgetBuilderSize != null) {+ horizontalPadding = databasePluginWidgetBuilderSize.horizontalPadding;+ }+return ValueListenableBuilder<ViewLayoutPB>(valueListenable: _layoutTypeChangeNotifier,builder: (_, __, ___) => viewPlugin.widgetBuilder.buildWidget(shrinkWrap: widget.shrinkWrap,context: PluginContext(),data: {- kDatabasePluginWidgetBuilderHorizontalPadding:- view.layout == ViewLayoutPB.Grid ? 40.0 : 0.0,+ kDatabasePluginWidgetBuilderHorizontalPadding: horizontalPadding,+ kDatabasePluginWidgetBuilderActionBuilder: widget.actionBuilder,+ kDatabasePluginWidgetBuilderShowActions: widget.showActions,+ kDatabasePluginWidgetBuilderNode: widget.node,},),);diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/group/database_group.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/group/database_group.dartindex 7a888b96ed..f1486094bf 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/group/database_group.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/group/database_group.dart@@ -57,25 +57,28 @@ class DatabaseGroupList extends StatelessWidget {final children = [if (showHideUngroupedToggle) ...[- SizedBox(- height: GridSize.popoverItemHeight,- child: Padding(- padding:- const EdgeInsets.symmetric(horizontal: 12, vertical: 4),- child: Row(- children: [- Expanded(- child: FlowyText(- LocaleKeys.board_showUngrouped.tr(),- ),- ),- Toggle(- value: !state.layoutSettings.hideUngroupedColumn,- onChanged: (value) =>- _updateLayoutSettings(state.layoutSettings, !value),- padding: EdgeInsets.zero,- ),- ],+ Padding(+ padding: const EdgeInsets.symmetric(horizontal: 6),+ child: SizedBox(+ height: GridSize.popoverItemHeight,+ child: FlowyButton(+ resetHoverOnRebuild: false,+ text: FlowyText(+ LocaleKeys.board_showUngrouped.tr(),+ lineHeight: 1.0,+ ),+ onTap: () {+ _updateLayoutSettings(+ state.layoutSettings,+ !state.layoutSettings.hideUngroupedColumn,+ );+ },+ rightIcon: Toggle(+ value: !state.layoutSettings.hideUngroupedColumn,+ onChanged: (value) =>+ _updateLayoutSettings(state.layoutSettings, !value),+ padding: EdgeInsets.zero,+ ),),),),diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/cell_container.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/cell_container.dartindex 2e1260fe3d..333ff0fe96 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/cell_container.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/cells/cell_container.dart@@ -1,6 +1,5 @@import 'package:flowy_infra/theme_extension.dart';import 'package:flutter/material.dart';-import 'package:provider/provider.dart';import 'package:styled_widget/styled_widget.dart';@@ -58,7 +57,7 @@ class CellContainer extends StatelessWidget {}},child: Container(- constraints: BoxConstraints(maxWidth: width, minHeight: 36),+ constraints: BoxConstraints(maxWidth: width, minHeight: 32),decoration: _makeBoxDecoration(context, isFocus),child: container,),diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_banner.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_banner.dartindex 5b77e93f8e..8d64c537c3 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_banner.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_banner.dart@@ -624,6 +624,7 @@ class _TitleSkin extends IEditableTextCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,TextCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_detail.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_detail.dartindex f6c1a87782..8bd181b427 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_detail.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_detail.dart@@ -85,39 +85,51 @@ class _RowDetailPageState extends State<RowDetailPage> {],child: BlocBuilder<RowDetailBloc, RowDetailState>(builder: (context, state) => Stack(+ fit: StackFit.expand,children: [- ListView(- controller: scrollController,- physics: const ClampingScrollPhysics(),- children: [- RowBanner(- databaseController: widget.databaseController,- rowController: widget.rowController,- cellBuilder: cellBuilder,- allowOpenAsFullPage: widget.allowOpenAsFullPage,- userProfile: widget.userProfile,- ),- const VSpace(16),- Padding(- padding: const EdgeInsets.only(left: 40, right: 60),- child: RowPropertyList(- cellBuilder: cellBuilder,- viewId: widget.databaseController.viewId,- fieldController:- widget.databaseController.fieldController,- ),- ),- const VSpace(20),- const Padding(- padding: EdgeInsets.symmetric(horizontal: 60),- child: Divider(height: 1.0),- ),- const VSpace(20),- RowDocument(+ Positioned.fill(+ child: NestedScrollView(+ controller: scrollController,+ headerSliverBuilder:+ (BuildContext context, bool innerBoxIsScrolled) {+ return <Widget>[+ SliverToBoxAdapter(+ child: Column(+ children: [+ RowBanner(+ databaseController: widget.databaseController,+ rowController: widget.rowController,+ cellBuilder: cellBuilder,+ allowOpenAsFullPage: widget.allowOpenAsFullPage,+ userProfile: widget.userProfile,+ ),+ const VSpace(16),+ Padding(+ padding:+ const EdgeInsets.only(left: 40, right: 60),+ child: RowPropertyList(+ cellBuilder: cellBuilder,+ viewId: widget.databaseController.viewId,+ fieldController:+ widget.databaseController.fieldController,+ ),+ ),+ const VSpace(20),+ const Padding(+ padding: EdgeInsets.symmetric(horizontal: 60),+ child: Divider(height: 1.0),+ ),+ const VSpace(20),+ ],+ ),+ ),+ ];+ },+ body: RowDocument(viewId: widget.rowController.viewId,rowId: widget.rowController.rowId,),- ],+ ),),Positioned(top: calculateActionsOffset(diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_document.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_document.dartindex e3d30249ac..0489db8907 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_document.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_document.dart@@ -1,5 +1,6 @@import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/database/grid/application/row/row_document_bloc.dart';+import 'package:appflowy/plugins/database/tab_bar/tab_bar_view.dart';import 'package:appflowy/plugins/document/application/document_bloc.dart';import 'package:appflowy/plugins/document/presentation/editor_drop_handler.dart';import 'package:appflowy/plugins/document/presentation/editor_drop_manager.dart';@@ -102,24 +103,26 @@ class _RowEditor extends StatelessWidget {return BlocProvider<ViewInfoBloc>(create: (context) => ViewInfoBloc(view: view),- child: IntrinsicHeight(- child: Container(- constraints: const BoxConstraints(minHeight: 300),- child: Provider(- create: (_) {- final context = SharedEditorContext();- context.isInDatabaseRowPage = true;- return context;- },- dispose: (_, editorContext) => editorContext.dispose(),- child: EditorDropHandler(+ child: Container(+ constraints: const BoxConstraints(minHeight: 300),+ child: Provider(+ create: (_) {+ final context = SharedEditorContext();+ context.isInDatabaseRowPage = true;+ return context;+ },+ dispose: (_, editorContext) => editorContext.dispose(),+ child: EditorDropHandler(+ viewId: view.id,+ editorState: editorState,+ isLocalMode: context.read<DocumentBloc>().isLocalMode,+ dropManagerState: context.read<EditorDropManagerState>(),+ child: EditorTransactionService(viewId: view.id,editorState: editorState,- isLocalMode: context.read<DocumentBloc>().isLocalMode,- dropManagerState: context.read<EditorDropManagerState>(),- child: EditorTransactionService(- viewId: view.id,- editorState: editorState,+ child: Provider(+ create: (context) =>+ DatabasePluginWidgetBuilderSize(horizontalPadding: 0),child: AppFlowyEditorPage(shrinkWrap: true,autoFocus: false,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/database_layout_selector.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/database_layout_selector.dartindex c8c23365de..dd600241db 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/database_layout_selector.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/database_layout_selector.dart@@ -1,35 +1,33 @@import 'package:appflowy/generated/flowy_svgs.g.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database/application/database_controller.dart';import 'package:appflowy/plugins/database/application/layout/layout_bloc.dart';+import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';import 'package:appflowy/plugins/database/widgets/database_layout_ext.dart';+import 'package:appflowy/workspace/presentation/widgets/toggle/toggle.dart';import 'package:appflowy_backend/protobuf/flowy-database2/setting_entities.pb.dart';+import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';-import '../../grid/presentation/layout/sizes.dart';--class DatabaseLayoutSelector extends StatefulWidget {+class DatabaseLayoutSelector extends StatelessWidget {const DatabaseLayoutSelector({super.key,required this.viewId,- required this.currentLayout,+ required this.databaseController,});final String viewId;- final DatabaseLayoutPB currentLayout;-- @override- State<StatefulWidget> createState() => _DatabaseLayoutSelectorState();-}+ final DatabaseController databaseController;-class _DatabaseLayoutSelectorState extends State<DatabaseLayoutSelector> {@overrideWidget build(BuildContext context) {return BlocProvider(create: (context) => DatabaseLayoutBloc(- viewId: widget.viewId,- databaseLayout: widget.currentLayout,+ viewId: viewId,+ databaseLayout: databaseController.databaseLayout,)..add(const DatabaseLayoutEvent.initial()),child: BlocBuilder<DatabaseLayoutBloc, DatabaseLayoutState>(builder: (context, state) {@@ -44,14 +42,56 @@ class _DatabaseLayoutSelectorState extends State<DatabaseLayoutSelector> {),).toList();-- return ListView.separated(- shrinkWrap: true,- itemCount: cells.length,+ return Padding(padding: const EdgeInsets.symmetric(vertical: 6.0),- itemBuilder: (_, int index) => cells[index],- separatorBuilder: (_, __) =>- VSpace(GridSize.typeOptionSeparatorHeight),+ child: Column(+ crossAxisAlignment: CrossAxisAlignment.start,+ mainAxisSize: MainAxisSize.min,+ children: [+ ListView.separated(+ shrinkWrap: true,+ itemCount: cells.length,+ padding: EdgeInsets.zero,+ itemBuilder: (_, int index) => cells[index],+ separatorBuilder: (_, __) =>+ VSpace(GridSize.typeOptionSeparatorHeight),+ ),+ Container(+ height: 1,+ margin: EdgeInsets.fromLTRB(8, 4, 8, 0),+ color: AFThemeExtension.of(context).borderColor,+ ),+ Padding(+ padding: const EdgeInsets.fromLTRB(8, 4, 8, 2),+ child: SizedBox(+ height: 30,+ child: FlowyButton(+ resetHoverOnRebuild: false,+ text: FlowyText(+ LocaleKeys.grid_settings_compactMode.tr(),+ lineHeight: 1.0,+ ),+ onTap: () {+ databaseController.setCompactMode(+ !databaseController.compactModeNotifier.value,+ );+ },+ rightIcon: ValueListenableBuilder(+ valueListenable: databaseController.compactModeNotifier,+ builder: (context, compactMode, child) {+ return Toggle(+ value: compactMode,+ onChanged: (value) =>+ databaseController.setCompactMode(value),+ padding: EdgeInsets.zero,+ );+ },+ ),+ ),+ ),+ ),+ ],+ ),);},),@@ -76,7 +116,7 @@ class DatabaseViewLayoutCell extends StatelessWidget {return Padding(padding: const EdgeInsets.symmetric(horizontal: 6),child: SizedBox(- height: GridSize.popoverItemHeight,+ height: 30,child: FlowyButton(hoverColor: AFThemeExtension.of(context).lightGreyHover,text: FlowyText(diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/database_setting_action.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/database_setting_action.dartindex 409454848a..5f40959c02 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/database_setting_action.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/database_setting_action.dart@@ -3,8 +3,8 @@ import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/database/application/database_controller.dart';import 'package:appflowy/plugins/database/calendar/presentation/toolbar/calendar_layout_setting.dart';import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';-import 'package:appflowy/plugins/database/widgets/setting/database_layout_selector.dart';import 'package:appflowy/plugins/database/widgets/group/database_group.dart';+import 'package:appflowy/plugins/database/widgets/setting/database_layout_selector.dart';import 'package:appflowy/plugins/database/widgets/setting/setting_property_list.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/theme_extension.dart';@@ -53,7 +53,7 @@ extension DatabaseSettingActionExtension on DatabaseSettingAction {final popover = switch (this) {DatabaseSettingAction.showLayout => DatabaseLayoutSelector(viewId: databaseController.viewId,- currentLayout: databaseController.databaseLayout,+ databaseController: databaseController,),DatabaseSettingAction.showGroup => DatabaseGroupList(viewId: databaseController.viewId,@@ -88,6 +88,7 @@ extension DatabaseSettingActionExtension on DatabaseSettingAction {iconData(),color: Theme.of(context).iconTheme.color,),+ rightIcon: FlowySvg(FlowySvgs.database_settings_arrow_right_s),),),popupBuilder: (context) => popover,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/setting_button.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/setting_button.dartindex 4d31e5a79d..36a6436b2a 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/setting_button.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/setting_button.dart@@ -1,13 +1,11 @@-import 'package:flutter/material.dart';-+import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/database/application/database_controller.dart';-import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';import 'package:appflowy/plugins/database/widgets/setting/database_settings_list.dart';import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra/size.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/material.dart';class SettingButton extends StatefulWidget {const SettingButton({super.key, required this.databaseController});@@ -29,15 +27,17 @@ class _SettingButtonState extends State<SettingButton> {direction: PopoverDirection.bottomWithCenterAligned,offset: const Offset(0, 8),triggerActions: PopoverTriggerFlags.none,- child: FlowyTextButton(- LocaleKeys.settings_title.tr(),- fontColor: Theme.of(context).hintColor,- fontSize: FontSizes.s12,- fillColor: Colors.transparent,- hoverColor: AFThemeExtension.of(context).lightGreyHover,- padding: GridSize.toolbarSettingButtonInsets,- radius: Corners.s4Border,- onPressed: _popoverController.show,+ child: MouseRegion(+ cursor: SystemMouseCursors.click,+ child: FlowyIconButton(+ tooltipText: LocaleKeys.settings_title.tr(),+ width: 24,+ height: 24,+ iconPadding: const EdgeInsets.all(3),+ hoverColor: AFThemeExtension.of(context).lightGreyHover,+ icon: const FlowySvg(FlowySvgs.settings_s),+ onPressed: _popoverController.show,+ ),),popupBuilder: (_) =>DatabaseSettingsList(databaseController: widget.databaseController),diff --git a/frontend/appflowy_flutter/lib/plugins/database_document/presentation/database_document_title.dart b/frontend/appflowy_flutter/lib/plugins/database_document/presentation/database_document_title.dartindex 788834d074..7f4493a999 100644--- a/frontend/appflowy_flutter/lib/plugins/database_document/presentation/database_document_title.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_document/presentation/database_document_title.dart@@ -141,6 +141,7 @@ class _TitleSkin extends IEditableTextCellSkin {Widget build(BuildContext context,CellContainerNotifier cellContainerNotifier,+ ValueNotifier<bool> compactModeNotifier,TextCellBloc bloc,FocusNode focusNode,TextEditingController textEditingController,diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/compact_mode_event.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/compact_mode_event.dartnew file mode 100644index 0000000000..eaee989bbc--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/compact_mode_event.dart@@ -0,0 +1,13 @@+import 'package:event_bus/event_bus.dart';++EventBus compactModeEventBus = EventBus();++class CompactModeEvent {+ CompactModeEvent({+ required this.id,+ required this.enable,+ });++ final String id;+ final bool enable;+}diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_configuration.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_configuration.dartindex 20049236ef..7e3b5347da 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_configuration.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_configuration.dart@@ -15,6 +15,8 @@ import 'package:flutter/services.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:universal_platform/universal_platform.dart';+import 'editor_plugins/page_block/custom_page_block_component.dart';+/// A global configuration for the editor.class EditorGlobalConfiguration {/// Whether to enable the drag menu in the editor.@@ -215,6 +217,9 @@ void _customBlockOptionActions(} else {top += 2.0;}+ if (overflowTypes.contains(type)) {+ top = top / 2;+ }return ValueListenableBuilder(valueListenable: EditorGlobalConfiguration.enableDragMenu,builder: (_, enableDragMenu, child) {@@ -268,7 +273,7 @@ Map<String, BlockComponentBuilder> _buildBlockComponentBuilderMap(bool alwaysDistributeSimpleTableColumnWidths = false,}) {final customBlockComponentBuilderMap = {- PageBlockKeys.type: PageBlockComponentBuilder(),+ PageBlockKeys.type: CustomPageBlockComponentBuilder(),ParagraphBlockKeys.type: _buildParagraphBlockComponentBuilder(context,configuration,diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/block_action_list.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/block_action_list.dartindex fcbd7ea6ca..6323f675cc 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/block_action_list.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/block_action_list.dart@@ -42,7 +42,7 @@ class BlockActionList extends StatelessWidget {editorState: editorState,blockComponentBuilder: blockComponentBuilder,),- const HSpace(8.0),+ const HSpace(5.0),],);}diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/built_in_page_widget.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/built_in_page_widget.dartindex 9f25e4745d..f96a06b21d 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/built_in_page_widget.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/built_in_page_widget.dart@@ -1,16 +1,9 @@-import 'package:appflowy/generated/flowy_svgs.g.dart';-import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/document/presentation/editor_plugins/plugins.dart';-import 'package:appflowy/startup/startup.dart';-import 'package:appflowy/workspace/application/tabs/tabs_bloc.dart';-import 'package:appflowy/workspace/application/view/view_ext.dart';import 'package:appflowy/workspace/application/view/view_service.dart';-import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pbserver.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:appflowy_result/appflowy_result.dart';-import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';@@ -79,14 +72,7 @@ class _BuiltInPageWidgetState extends State<BuiltInPageWidget> {return MouseRegion(onEnter: (_) => widget.editorState.service.scrollService?.disable(),onExit: (_) => widget.editorState.service.scrollService?.enable(),- child: Column(- mainAxisSize: MainAxisSize.min,- crossAxisAlignment: CrossAxisAlignment.start,- children: [- _buildMenu(context, viewPB),- Flexible(child: _buildPage(context, viewPB)),- ],- ),+ child: _buildPage(context, viewPB),);}@@ -98,64 +84,10 @@ class _BuiltInPageWidgetState extends State<BuiltInPageWidget> {widget.editorState.service.selectionService.clearSelection();}},- child: widget.builder(view),- );- }-- Widget _buildMenu(BuildContext context, ViewPB view) {- return Row(- mainAxisSize: MainAxisSize.min,- mainAxisAlignment: MainAxisAlignment.center,- children: [- // information- FlowyIconButton(- tooltipText: LocaleKeys.tooltip_referencePage.tr(- namedArgs: {'name': view.layout.name},- ),- width: 24,- height: 24,- iconPadding: const EdgeInsets.all(3),- icon: const FlowySvg(- FlowySvgs.information_s,- ),- ),- // setting- const Space(7, 0),- PopoverActionList<_ActionWrapper>(- direction: PopoverDirection.bottomWithCenterAligned,- actions: _ActionType.values- .map((action) => _ActionWrapper(action))- .toList(),- buildChild: (controller) => FlowyIconButton(- tooltipText: LocaleKeys.tooltip_openMenu.tr(),- width: 24,- height: 24,- iconPadding: const EdgeInsets.all(3),- icon: const FlowySvg(- FlowySvgs.settings_s,- ),- onPressed: () => controller.show(),- ),- onSelected: (action, controller) async {- switch (action.inner) {- case _ActionType.viewDatabase:- getIt<TabsBloc>().add(- TabsEvent.openPlugin(- plugin: view.plugin(),- view: view,- ),- );- break;- case _ActionType.delete:- final transaction = widget.editorState.transaction;- transaction.deleteNode(widget.node);- await widget.editorState.apply(transaction);- break;- }- controller.close();- },- ),- ],+ child: Padding(+ padding: const EdgeInsets.symmetric(vertical: 16),+ child: widget.builder(view),+ ),);}@@ -165,23 +97,3 @@ class _BuiltInPageWidgetState extends State<BuiltInPageWidget> {await widget.editorState.apply(transaction);}}--enum _ActionType { viewDatabase, delete }--class _ActionWrapper extends ActionCell {- _ActionWrapper(this.inner);-- final _ActionType inner;-- Widget? icon(Color iconColor) => null;-- @override- String get name {- switch (inner) {- case _ActionType.viewDatabase:- return LocaleKeys.tooltip_viewDataBase.tr();- case _ActionType.delete:- return LocaleKeys.disclosureAction_delete.tr();- }- }-}diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/database/database_view_block_component.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/database/database_view_block_component.dartindex bc0dcc17e3..86df2ae172 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/database/database_view_block_component.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/database/database_view_block_component.dart@@ -1,5 +1,9 @@+import 'dart:async';+import 'package:appflowy/plugins/database/widgets/database_view_widget.dart';+import 'package:appflowy/plugins/document/presentation/compact_mode_event.dart';import 'package:appflowy/plugins/document/presentation/editor_plugins/base/built_in_page_widget.dart';+import 'package:appflowy/plugins/document/presentation/editor_plugins/mention/mention_page_block.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:flutter/material.dart';import 'package:provider/provider.dart';@@ -13,8 +17,14 @@ class DatabaseBlockKeys {static const String parentID = 'parent_id';static const String viewID = 'view_id';+ static const String enableCompactMode = 'enable_compact_mode';}+const overflowTypes = {+ DatabaseBlockKeys.gridType,+ DatabaseBlockKeys.boardType,+};+class DatabaseViewBlockComponentBuilder extends BlockComponentBuilder {DatabaseViewBlockComponentBuilder({super.configuration,@@ -65,35 +75,62 @@ class _DatabaseBlockComponentWidgetState@overrideBlockComponentConfiguration get configuration => widget.configuration;+ late StreamSubscription<CompactModeEvent> compactModeSubscription;+ EditorState? editorState;++ @override+ void initState() {+ super.initState();+ compactModeSubscription =+ compactModeEventBus.on<CompactModeEvent>().listen((event) {+ if (event.id != node.id) return;+ final newAttributes = {+ ...node.attributes,+ DatabaseBlockKeys.enableCompactMode: event.enable,+ };+ final theEditorState = editorState;+ if (theEditorState == null) return;+ final transaction = theEditorState.transaction;+ transaction.updateNode(node, newAttributes);+ theEditorState.apply(transaction);+ });+ }++ @override+ void dispose() {+ super.dispose();+ compactModeSubscription.cancel();+ editorState = null;+ }+@overrideWidget build(BuildContext context) {final editorState = Provider.of<EditorState>(context, listen: false);+ this.editorState = editorState;Widget child = BuiltInPageWidget(node: widget.node,editorState: editorState,- builder: (view) => DatabaseViewWidget(key: ValueKey(view.id), view: view),- );-- child = Padding(- padding: padding,- child: FocusScope(- skipTraversal: true,- onFocusChange: (value) {- if (value && keepEditorFocusNotifier.value == 0) {- context.read<EditorState>().selection = null;- }- },- child: child,+ builder: (view) => Provider.value(+ value: ReferenceState(true),+ child: DatabaseViewWidget(+ key: ValueKey(view.id),+ view: view,+ actionBuilder: widget.actionBuilder,+ showActions: widget.showActions,+ node: widget.node,+ ),),);- if (widget.showActions && widget.actionBuilder != null) {- child = BlockComponentActionWrapper(- node: widget.node,- actionBuilder: widget.actionBuilder!,- child: child,- );- }+ child = FocusScope(+ skipTraversal: true,+ onFocusChange: (value) {+ if (value && keepEditorFocusNotifier.value == 0) {+ context.read<EditorState>().selection = null;+ }+ },+ child: child,+ );if (!editorState.editable) {child = IgnorePointer(diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/document_cover_widget.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/document_cover_widget.dartindex 12fe821459..c18e01b3dd 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/document_cover_widget.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/document_cover_widget.dart@@ -160,6 +160,7 @@ class _DocumentCoverWidgetState extends State<DocumentCoverWidget> {final offset = _calculateIconLeft(context, constraints);return Column(mainAxisSize: MainAxisSize.min,+ crossAxisAlignment: CrossAxisAlignment.start,children: [Stack(children: [diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_page_block.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_page_block.dartindex 90a4c73013..398d158e9a 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_page_block.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_page_block.dart@@ -62,6 +62,12 @@ Node pageMentionNode(String viewId) {);}+class ReferenceState {+ ReferenceState(this.isReference);++ final bool isReference;+}+class MentionPageBlock extends StatefulWidget {const MentionPageBlock({super.key,diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/page_block/custom_page_block_component.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/page_block/custom_page_block_component.dartnew file mode 100644index 0000000000..5d7028f6e1--- /dev/null+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/page_block/custom_page_block_component.dart@@ -0,0 +1,116 @@+import 'package:appflowy/plugins/document/presentation/editor_plugins/database/database_view_block_component.dart';+import 'package:appflowy_editor/appflowy_editor.dart';+// ignore: implementation_imports+import 'package:appflowy_editor/src/editor/block_component/base_component/widget/ignore_parent_gesture.dart';+// ignore: implementation_imports+import 'package:appflowy_editor/src/flutter/scrollable_positioned_list/scrollable_positioned_list.dart';+import 'package:flutter/material.dart';+import 'package:provider/provider.dart';++class CustomPageBlockComponentBuilder extends BlockComponentBuilder {+ @override+ BlockComponentWidget build(BlockComponentContext blockComponentContext) {+ return CustomPageBlockComponent(+ key: blockComponentContext.node.key,+ node: blockComponentContext.node,+ header: blockComponentContext.header,+ footer: blockComponentContext.footer,+ );+ }+}++class CustomPageBlockComponent extends BlockComponentStatelessWidget {+ const CustomPageBlockComponent({+ super.key,+ required super.node,+ super.showActions,+ super.actionBuilder,+ super.configuration = const BlockComponentConfiguration(),+ this.header,+ this.footer,+ });++ final Widget? header;+ final Widget? footer;++ @override+ Widget build(BuildContext context) {+ final editorState = context.read<EditorState>();+ final scrollController = context.read<EditorScrollController?>();+ final items = node.children;++ if (scrollController == null || scrollController.shrinkWrap) {+ return SingleChildScrollView(+ child: Builder(+ builder: (context) {+ final scroller = Scrollable.maybeOf(context);+ if (scroller != null) {+ editorState.updateAutoScroller(scroller);+ }+ return Column(+ children: [+ if (header != null) header!,+ ...items.map(+ (e) => Container(+ constraints: BoxConstraints(+ maxWidth:+ editorState.editorStyle.maxWidth ?? double.infinity,+ ),+ padding: editorState.editorStyle.padding,+ child: editorState.renderer.build(context, e),+ ),+ ),+ if (footer != null) footer!,+ ],+ );+ },+ ),+ );+ } else {+ int extentCount = 0;+ if (header != null) extentCount++;+ if (footer != null) extentCount++;++ return ScrollablePositionedList.builder(+ shrinkWrap: scrollController.shrinkWrap,+ itemCount: items.length + extentCount,+ itemBuilder: (context, index) {+ editorState.updateAutoScroller(Scrollable.of(context));+ if (header != null && index == 0) {+ return IgnoreEditorSelectionGesture(+ child: header!,+ );+ }++ if (footer != null && index == (items.length - 1) + extentCount) {+ return IgnoreEditorSelectionGesture(+ child: footer!,+ );+ }++ final childNode = items[index - (header != null ? 1 : 0)];+ final isOverflowType = overflowTypes.contains(childNode.type);++ final item = Container(+ constraints: BoxConstraints(+ maxWidth: editorState.editorStyle.maxWidth ?? double.infinity,+ ),+ padding: isOverflowType+ ? EdgeInsets.zero+ : editorState.editorStyle.padding,+ child: editorState.renderer.build(+ context,+ childNode,+ ),+ );++ return isOverflowType ? item : Center(child: item);+ },+ itemScrollController: scrollController.itemScrollController,+ scrollOffsetController: scrollController.scrollOffsetController,+ itemPositionsListener: scrollController.itemPositionsListener,+ scrollOffsetListener: scrollController.scrollOffsetListener,+ );+ }+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/toggle/toggle_block_component.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/toggle/toggle_block_component.dartindex 99275b9a8e..9fc0a02cec 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/toggle/toggle_block_component.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/toggle/toggle_block_component.dart@@ -1,8 +1,10 @@import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database/tab_bar/tab_bar_view.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:easy_localization/easy_localization.dart' hide TextDirection;import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';+import 'package:provider/provider.dart';import 'package:universal_platform/universal_platform.dart';class ToggleListBlockKeys {@@ -172,6 +174,7 @@ class _ToggleListBlockComponentWidgetState);bool get collapsed => node.attributes[ToggleListBlockKeys.collapsed] ?? false;+int? get level => node.attributes[ToggleListBlockKeys.level] as int?;@override@@ -194,12 +197,16 @@ class _ToggleListBlockComponentWidgetStatecolor: backgroundColor,),),- NestedListWidget(- indentPadding: indentPadding,- child: buildComponent(context),- children: editorState.renderer.buildList(- context,- widget.node.children,+ Provider(+ create: (context) =>+ DatabasePluginWidgetBuilderSize(horizontalPadding: 0.0),+ child: NestedListWidget(+ indentPadding: indentPadding,+ child: buildComponent(context),+ children: editorState.renderer.buildList(+ context,+ widget.node.children,+ ),),),],diff --git a/frontend/appflowy_flutter/lib/plugins/shared/share/share_button.dart b/frontend/appflowy_flutter/lib/plugins/shared/share/share_button.dartindex 7f3eff9d34..59ee55b980 100644--- a/frontend/appflowy_flutter/lib/plugins/shared/share/share_button.dart+++ b/frontend/appflowy_flutter/lib/plugins/shared/share/share_button.dart@@ -30,8 +30,11 @@ class ShareButton extends StatelessWidget {),if (view.layout.isDatabaseView)BlocProvider(- create: (context) => DatabaseTabBarBloc(view: view)- ..add(const DatabaseTabBarEvent.initial()),+ create: (context) => DatabaseTabBarBloc(+ view: view,+ compactModeId: view.id,+ enableCompactMode: false,+ )..add(const DatabaseTabBarEvent.initial()),),],child: BlocListener<ShareBloc, ShareState>(diff --git a/frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dart b/frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dartindex 7f19e976d4..fcd991fcf9 100644--- a/frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dart@@ -334,6 +334,7 @@ extension ViewLayoutExtension on ViewLayoutPB {bool get shrinkWrappable => switch (this) {ViewLayoutPB.Grid => true,+ ViewLayoutPB.Board => true,_ => false,};diff --git a/frontend/appflowy_flutter/pubspec.lock b/frontend/appflowy_flutter/pubspec.lockindex fad0defff3..043b11cde5 100644--- a/frontend/appflowy_flutter/pubspec.lock+++ b/frontend/appflowy_flutter/pubspec.lock@@ -81,8 +81,8 @@ packages:dependency: "direct main"description:path: "."- ref: "5517c8704c0dbeaeda5601e9baadb4cc2b29990d"- resolved-ref: "5517c8704c0dbeaeda5601e9baadb4cc2b29990d"+ ref: e8317c0d1af8d23dc5707b02ea43864536b6de91+ resolved-ref: e8317c0d1af8d23dc5707b02ea43864536b6de91url: "https://github.com/AppFlowy-IO/appflowy-board.git"source: gitversion: "0.1.2"@@ -618,6 +618,14 @@ packages:url: "https://pub.dev"source: hostedversion: "2.0.7"+ event_bus:+ dependency: "direct main"+ description:+ name: event_bus+ sha256: "1a55e97923769c286d295240048fc180e7b0768902c3c2e869fe059aafa15304"+ url: "https://pub.dev"+ source: hosted+ version: "2.0.1"expandable:dependency: "direct main"description:diff --git a/frontend/appflowy_flutter/pubspec.yaml b/frontend/appflowy_flutter/pubspec.yamlindex a93b261419..6dc31cf237 100644--- a/frontend/appflowy_flutter/pubspec.yaml+++ b/frontend/appflowy_flutter/pubspec.yaml@@ -18,7 +18,7 @@ dependencies:appflowy_board:git:url: https://github.com/AppFlowy-IO/appflowy-board.git- ref: 5517c8704c0dbeaeda5601e9baadb4cc2b29990d+ ref: e8317c0d1af8d23dc5707b02ea43864536b6de91appflowy_editor:appflowy_editor_plugins:appflowy_popover:@@ -135,6 +135,7 @@ dependencies:synchronized: ^3.1.0+1table_calendar: ^3.0.9time: ^2.1.3+ event_bus: ^2.0.1toastification: ^2.0.0universal_platform: ^1.1.0diff --git a/frontend/resources/flowy_icons/16x/database_filter.svg b/frontend/resources/flowy_icons/16x/database_filter.svgnew file mode 100644index 0000000000..8ca4fa3e51--- /dev/null+++ b/frontend/resources/flowy_icons/16x/database_filter.svg@@ -0,0 +1,5 @@+<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">+<path d="M14.75 4.875H2.25" stroke="#666D76" stroke-linecap="round"/>+<path d="M12.875 8H4.125" stroke="#666D76" stroke-linecap="round"/>+<path d="M11 11.125H6" stroke="#666D76" stroke-linecap="round"/>+</svg>diff --git a/frontend/resources/flowy_icons/16x/database_fullscreen.svg b/frontend/resources/flowy_icons/16x/database_fullscreen.svgnew file mode 100644index 0000000000..7e8794cbc5--- /dev/null+++ b/frontend/resources/flowy_icons/16x/database_fullscreen.svg@@ -0,0 +1,4 @@+<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">+<path d="M7.13636 9.36328L3.5 12.9996M3.5 12.9996H6.54267M3.5 12.9996V9.957" stroke="#666D76" stroke-linecap="round" stroke-linejoin="round"/>+<path d="M9.86328 6.63636L13.4996 3M13.4996 3H10.457M13.4996 3V6.04267" stroke="#666D76" stroke-linecap="round" stroke-linejoin="round"/>+</svg>diff --git a/frontend/resources/flowy_icons/16x/database_settings_arrow_right.svg b/frontend/resources/flowy_icons/16x/database_settings_arrow_right.svgnew file mode 100644index 0000000000..00fe13b7fc--- /dev/null+++ b/frontend/resources/flowy_icons/16x/database_settings_arrow_right.svg@@ -0,0 +1,3 @@+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">+<path d="M9.39568 7.6963L6.91032 5.56599C6.65085 5.34358 6.25 5.52795 6.25 5.86969L6.25 10.1303C6.25 10.4721 6.65085 10.6564 6.91032 10.434L9.39568 8.3037C9.58192 8.14406 9.58192 7.85594 9.39568 7.6963Z" fill="#8F959E"/>+</svg>diff --git a/frontend/resources/flowy_icons/16x/database_sort.svg b/frontend/resources/flowy_icons/16x/database_sort.svgnew file mode 100644index 0000000000..3df5682f3a--- /dev/null+++ b/frontend/resources/flowy_icons/16x/database_sort.svg@@ -0,0 +1,4 @@+<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">+<path d="M5.5 3.5V12.5M5.5 12.5L8.5 9.40625M5.5 12.5L2.5 9.40625" stroke="#666D76" stroke-linecap="round" stroke-linejoin="round"/>+<path d="M11.5 12.5V3.5M11.5 3.5L14.5 6.59375M11.5 3.5L8.5 6.59375" stroke="#666D76" stroke-linecap="round" stroke-linejoin="round"/>+</svg>diff --git a/frontend/resources/translations/en.json b/frontend/resources/translations/en.jsonindex d2c9eaaf23..3a78ef813f 100644--- a/frontend/resources/translations/en.json+++ b/frontend/resources/translations/en.json@@ -1392,6 +1392,7 @@"filterBy": "Filter by","typeAValue": "Type a value...","layout": "Layout",+ "compactMode": "Compact mode","databaseLayout": "Layout","viewList": {"zero": "0 views",diff --git a/frontend/rust-lib/flowy-database2/src/services/setting/entities.rs b/frontend/rust-lib/flowy-database2/src/services/setting/entities.rsindex 8535f46024..d40ab58d72 100644--- a/frontend/rust-lib/flowy-database2/src/services/setting/entities.rs+++ b/frontend/rust-lib/flowy-database2/src/services/setting/entities.rs@@ -94,7 +94,10 @@ pub struct BoardLayoutSetting {impl BoardLayoutSetting {pub fn new() -> Self {- Self::default()+ Self {+ hide_ungrouped_column: false,+ collapse_hidden_groups: true,+ }}}