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
fix: database padding issue with max document width (#7991)
Morn837e75494641
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/search/mobile_search_reference_bottom_sheet.dart b/frontend/appflowy_flutter/lib/mobile/presentation/search/mobile_search_reference_bottom_sheet.dartindex 231460cd2d..a76e04ba8a 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/search/mobile_search_reference_bottom_sheet.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/search/mobile_search_reference_bottom_sheet.dart@@ -12,7 +12,6 @@ import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy_ui/appflowy_ui.dart';import 'package:easy_localization/easy_localization.dart' hide TextDirection;import 'package:flowy_infra_ui/flowy_infra_ui.dart';-import 'package:universal_platform/universal_platform.dart';class SearchSourceReferenceBottomSheet extends StatelessWidget {const SearchSourceReferenceBottomSheet(this.sources, {super.key});@@ -37,12 +36,11 @@ class SearchSourceReferenceBottomSheet extends StatelessWidget {showDragHandle: true,showDivider: false,enableDraggableScrollable: true,- maxChildSize: 1.0,- minChildSize: 1.0,- initialChildSize: 1.0,+ maxChildSize: 0.95,+ minChildSize: 0.95,+ initialChildSize: 0.95,backgroundColor: theme.surfaceColorScheme.primary,- dragHandleBuilder:- UniversalPlatform.isAndroid ? (_) => const _DragHandler() : null,+ dragHandleBuilder: (_) => const _DragHandler(),builder: (_) => SizedBox(height: MediaQuery.of(context).size.height,child: MobileViewPage(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 1a0d1a3163..a87f140a1b 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@@ -46,7 +46,10 @@ class HiddenGroupsColumn extends StatelessWidget {}final isCollapsed = layoutSettings.collapseHiddenGroups;final leftPadding = margin.left +- context.read<DatabasePluginWidgetBuilderSize>().horizontalPadding;+ context.read<DatabasePluginWidgetBuilderSize>().paddingLeft;+ final leftPaddingWithMaxDocWidth = context+ .read<DatabasePluginWidgetBuilderSize>()+ .paddingLeftWithMaxDocumentWidth;return AnimatedSize(alignment: AlignmentDirectional.topStart,curve: Curves.easeOut,@@ -55,14 +58,17 @@ class HiddenGroupsColumn extends StatelessWidget {? SizedBox(height: 50,child: Padding(- padding: const EdgeInsets.only(left: 80, right: 8),+ padding: EdgeInsets.only(+ left: 80 + leftPaddingWithMaxDocWidth,+ right: 8,+ ),child: Center(child: _collapseExpandIcon(context, isCollapsed),),),): Container(- width: 274,+ width: 274 + leftPaddingWithMaxDocWidth,padding: EdgeInsets.only(left: leftPadding,right: margin.right + 4,diff --git a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dart b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dartindex 1876332d01..e99d374f5b 100644--- a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dart@@ -221,6 +221,8 @@ class _CalendarPageState extends State<CalendarPage> {return LayoutBuilder(// must specify MonthView width for useAvailableVerticalSpace to work properlybuilder: (context, constraints) {+ final paddingLeft =+ context.read<DatabasePluginWidgetBuilderSize>().paddingLeft;EdgeInsets padding = UniversalPlatform.isMobile? CalendarSize.contentInsetsMobile: CalendarSize.contentInsets +@@ -230,6 +232,7 @@ class _CalendarPageState extends State<CalendarPage> {if (horizontalPadding == 0) {padding = padding.copyWith(left: 0, right: 0);}+ padding = padding.copyWith(left: paddingLeft + padding.left);return Padding(padding: padding,child: ScrollConfiguration(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 4c9fd7bd61..8a40279332 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@@ -409,6 +409,10 @@ class _GridRowsState extends State<_GridRows> {@overrideWidget build(BuildContext context) {+ final paddingLeft = context+ .read<DatabasePluginWidgetBuilderSize?>()+ ?.paddingLeftWithMaxDocumentWidth ??+ 0.0;Widget child;if (widget.shrinkWrap) {child = Scrollbar(@@ -420,9 +424,10 @@ class _GridRowsState extends State<_GridRows> {constraints: BoxConstraints(maxWidth: GridLayout.headerWidth(context- .read<DatabasePluginWidgetBuilderSize>()- .horizontalPadding *- 3,+ .read<DatabasePluginWidgetBuilderSize>()+ .horizontalPadding *+ 3 ++ paddingLeft,context.read<GridBloc>().state.fields,),),@@ -459,13 +464,16 @@ class _GridRowsState extends State<_GridRows> {Widget _shrinkWrapRenderList(BuildContext context) {final state = context.read<GridBloc>().state;- final horizontalPadding =- context.read<DatabasePluginWidgetBuilderSize?>()?.horizontalPadding ??- 0.0;+ final databaseSize = context.read<DatabasePluginWidgetBuilderSize?>();return ListView(shrinkWrap: true,physics: const NeverScrollableScrollPhysics(),- padding: EdgeInsets.symmetric(horizontal: horizontalPadding),+ padding: EdgeInsets.fromLTRB(+ databaseSize?.paddingLeft ?? 0.0,+ 0,+ databaseSize?.horizontalPadding ?? 0.0,+ 0,+ ),children: [widget.shrinkWrap? _reorderableListView(state)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 e30c238f96..88c68f2070 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@@ -39,9 +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;+ final databaseSize = context.read<DatabasePluginWidgetBuilderSize?>();+ final horizontalPadding = databaseSize?.horizontalPadding ?? 0.0;+ final paddingLeft = databaseSize?.paddingLeftWithMaxDocumentWidth ?? 0.0;return BlocProvider(create: (context) {return GridHeaderBloc(@@ -54,7 +54,12 @@ class _GridHeaderSliverAdaptorState extends State<GridHeaderSliverAdaptor> {controller: widget.anchorScrollController,child: Padding(padding: widget.shrinkWrap- ? EdgeInsets.symmetric(horizontal: horizontalPadding)+ ? EdgeInsets.fromLTRB(+ horizontalPadding + paddingLeft,+ 0,+ horizontalPadding,+ 0,+ ): EdgeInsets.zero,child: _GridHeader(viewId: widget.viewId,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 7c2dc40869..bdebfb1412 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,5 +1,6 @@import 'dart:async';import 'dart:convert';+import 'dart:math';import 'package:appflowy/core/config/kv.dart';import 'package:appflowy/core/config/kv_keys.dart';@@ -132,96 +133,115 @@ class _DatabaseTabBarViewState extends State<DatabaseTabBarView> {@overrideWidget build(BuildContext context) {if (!initialed) return Center(child: CircularProgressIndicator());- return MultiBlocProvider(- providers: [- BlocProvider<DatabaseTabBarBloc>(- create: (_) => DatabaseTabBarBloc(- view: widget.view,- compactModeId: compactModeId,- enableCompactMode: enableCompactMode,- )..add(const DatabaseTabBarEvent.initial()),- ),- BlocProvider<ViewBloc>(- create: (_) => ViewBloc(view: widget.view)- ..add(- const ViewEvent.initial(),+ return LayoutBuilder(+ builder: (context, constraints) {+ final maxWidth = constraints.maxWidth;+ final editorState = context.read<EditorState?>();+ final maxDocWidth = editorState?.editorStyle.maxWidth ?? maxWidth;+ final paddingLeft = max(0, maxWidth - maxDocWidth) / 2;+ return MultiBlocProvider(+ providers: [+ BlocProvider<DatabaseTabBarBloc>(+ create: (_) => DatabaseTabBarBloc(+ view: widget.view,+ compactModeId: compactModeId,+ enableCompactMode: enableCompactMode,+ )..add(const DatabaseTabBarEvent.initial()),),- ),- ],- 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>(- valueListenable: state- .tabBarControllerByViewId[state.parentView.id]!- .controller- .isLoading,- builder: (_, value, ___) {- if (value) {- return const SizedBox.shrink();- }-- Widget child = UniversalPlatform.isDesktop- ? const TabBarHeader()- : const MobileTabBarHeader();-- if (innerContext.watch<ViewBloc>().state.view.isLocked) {- child = IgnorePointer(- child: child,- );- }-- 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: Padding(- padding:- (isCalendar && widget.shrinkWrap || showActionWrapper)- ? EdgeInsets.only(left: 42 - horizontalPadding)- : EdgeInsets.zero,- child: pageContentFromState(context, state),+ BlocProvider<ViewBloc>(+ create: (_) => ViewBloc(view: widget.view)+ ..add(+ const ViewEvent.initial(),),- ),- ],- );-- return child;- },- ),+ ),+ ],+ child: BlocBuilder<DatabaseTabBarBloc, DatabaseTabBarState>(+ builder: (innerContext, state) {+ final layout = state.tabBars[state.selectedIndex].layout;+ final isCalendar = layout == ViewLayoutPB.Calendar;+ final databseBuilderSize =+ context.read<DatabasePluginWidgetBuilderSize>();+ final horizontalPadding = databseBuilderSize.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>(+ valueListenable: state+ .tabBarControllerByViewId[state.parentView.id]!+ .controller+ .isLoading,+ builder: (_, value, ___) {+ if (value) {+ return const SizedBox.shrink();+ }++ Widget child = UniversalPlatform.isDesktop+ ? const TabBarHeader()+ : const MobileTabBarHeader();++ if (innerContext.watch<ViewBloc>().state.view.isLocked) {+ child = IgnorePointer(+ child: child,+ );+ }++ 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.fromLTRB(+ horizontalPadding + paddingLeft,+ 0,+ horizontalPadding,+ 0,+ ),+ child: child,+ );+ }++ return child;+ },+ ),+ pageSettingBarExtensionFromState(context, state),+ wrapContent(+ layout: layout,+ child: Padding(+ padding:+ (isCalendar && widget.shrinkWrap || showActionWrapper)+ ? EdgeInsets.only(left: 42 - horizontalPadding)+ : EdgeInsets.zero,+ child: Provider(+ create: (_) => DatabasePluginWidgetBuilderSize(+ horizontalPadding: horizontalPadding,+ paddingLeftWithMaxDocumentWidth: paddingLeft,+ verticalPadding: databseBuilderSize.verticalPadding,+ ),+ child: pageContentFromState(context, state),+ ),+ ),+ ),+ ],+ );++ return child;+ },+ ),+ );+ },);}@@ -365,10 +385,14 @@ class DatabasePluginWidgetBuilderSize {const DatabasePluginWidgetBuilderSize({required this.horizontalPadding,this.verticalPadding = 16.0,+ this.paddingLeftWithMaxDocumentWidth = 0.0,});final double horizontalPadding;final double verticalPadding;+ final double paddingLeftWithMaxDocumentWidth;++ double get paddingLeft => paddingLeftWithMaxDocumentWidth + horizontalPadding;}class DatabasePluginWidgetBuilder extends PluginWidgetBuilder {