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: grid width update (#4101)
Richard Shiue96af012471d3
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/_field_options.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/_field_options.dartindex b02fa24ab4..075c473266 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/_field_options.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/card/card_detail/widgets/_field_options.dart@@ -16,7 +16,7 @@ const _supportedFieldTypes = [FieldType.MultiSelect,FieldType.DateTime,FieldType.Checkbox,- // FieldType.Checklist,+ FieldType.Checklist,];class FieldOptions extends StatelessWidget {diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_bloc.dartindex 5c7f692c14..0c28344f34 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/application/grid_bloc.dart@@ -57,7 +57,7 @@ class GridBloc extends Bloc<GridEvent, GridState> {didReceiveFieldUpdate: (fields) {emit(state.copyWith(- fields: FieldList(fields),+ fields: fields,),);},@@ -176,7 +176,7 @@ class GridState with _$GridState {const factory GridState({required String viewId,required Option<DatabasePB> grid,- required FieldList fields,+ required List<FieldInfo> fields,required List<RowInfo> rowInfos,required int rowCount,required RowMetaPB? createdRow,@@ -188,7 +188,7 @@ class GridState with _$GridState {}) = _GridState;factory GridState.initial(String viewId) => GridState(- fields: FieldList([]),+ fields: [],rowInfos: [],rowCount: 0,createdRow: null,@@ -201,8 +201,3 @@ class GridState with _$GridState {sorts: [],);}--@freezed-class FieldList with _$FieldList {- factory FieldList(List<FieldInfo> fields) = _FieldList;-}diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/grid_page.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/grid_page.dartindex 84327daf1e..f4c07ed084 100755--- a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/grid_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/grid_page.dart@@ -169,24 +169,16 @@ class _GridPageContentState extends State<GridPageContent> {@overrideWidget build(BuildContext context) {- return BlocBuilder<GridBloc, GridState>(- buildWhen: (previous, current) => previous.fields != current.fields,- builder: (context, state) {- final contentWidth = GridLayout.headerWidth(state.fields.fields);-- return Column(- crossAxisAlignment: CrossAxisAlignment.start,- children: [- _GridHeader(headerScrollController: headerScrollController),- _GridRows(- viewId: state.viewId,- contentWidth: contentWidth,- scrollController: _scrollController,- ),- const _GridFooter(),- ],- );- },+ return Column(+ crossAxisAlignment: CrossAxisAlignment.start,+ children: [+ _GridHeader(headerScrollController: headerScrollController),+ _GridRows(+ viewId: widget.view.id,+ scrollController: _scrollController,+ ),+ const _GridFooter(),+ ],);}}@@ -210,41 +202,44 @@ class _GridHeader extends StatelessWidget {class _GridRows extends StatelessWidget {final String viewId;- final double contentWidth;final GridScrollController scrollController;const _GridRows({required this.viewId,- required this.contentWidth,required this.scrollController,});@overrideWidget build(BuildContext context) {- return Flexible(- child: _WrapScrollView(- scrollController: scrollController,- contentWidth: contentWidth,- child: BlocBuilder<GridBloc, GridState>(- buildWhen: (previous, current) => current.reason.maybeWhen(- reorderRows: () => true,- reorderSingleRow: (reorderRow, rowInfo) => true,- delete: (item) => true,- insert: (item) => true,- orElse: () => false,+ return BlocBuilder<GridBloc, GridState>(+ buildWhen: (previous, current) => previous.fields != current.fields,+ builder: (context, state) {+ return Flexible(+ child: _WrapScrollView(+ scrollController: scrollController,+ contentWidth: GridLayout.headerWidth(state.fields),+ child: BlocBuilder<GridBloc, GridState>(+ buildWhen: (previous, current) => current.reason.maybeWhen(+ reorderRows: () => true,+ reorderSingleRow: (reorderRow, rowInfo) => true,+ delete: (item) => true,+ insert: (item) => true,+ orElse: () => false,+ ),+ builder: (context, state) {+ final rowInfos = state.rowInfos;+ final behavior = ScrollConfiguration.of(context).copyWith(+ scrollbars: false,+ );+ return ScrollConfiguration(+ behavior: behavior,+ child: _renderList(context, state, rowInfos),+ );+ },+ ),),- builder: (context, state) {- final rowInfos = state.rowInfos;- final behavior = ScrollConfiguration.of(context).copyWith(- scrollbars: false,- );- return ScrollConfiguration(- behavior: behavior,- child: _renderList(context, state, rowInfos),- );- },- ),- ),+ );+ },);}diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/layout/layout.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/layout/layout.dartindex 2b1882be1f..b4233ff8e6 100755--- a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/layout/layout.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/layout/layout.dart@@ -1,4 +1,5 @@import 'package:appflowy/plugins/database_view/application/field/field_info.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/field_settings_entities.pbenum.dart';import 'sizes.dart';class GridLayout {@@ -6,6 +7,11 @@ class GridLayout {if (fields.isEmpty) return 0;final fieldsWidth = fields+ .where(+ (element) =>+ element.visibility != null &&+ element.visibility != FieldVisibility.AlwaysHidden,+ ).map((fieldInfo) => fieldInfo.fieldSettings!.width.toDouble()).reduce((value, element) => value + element);diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/mobile_grid_page.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/mobile_grid_page.dartindex 61c7a36678..aa9cae0084 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/mobile_grid_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/mobile_grid_page.dart@@ -148,7 +148,7 @@ class _GridPageContentState extends State<GridPageContent> {@overrideWidget build(BuildContext context) {- return BlocConsumer<GridBloc, GridState>(+ return BlocListener<GridBloc, GridState>(listenWhen: (previous, current) =>previous.createdRow != current.createdRow,listener: (context, state) {@@ -165,37 +165,30 @@ class _GridPageContentState extends State<GridPageContent> {);bloc.add(const GridEvent.resetCreatedRow());},- buildWhen: (previous, current) => previous.fields != current.fields,- builder: (context, state) {- final contentWidth = GridLayout.headerWidth(state.fields.fields);-- return Stack(- children: [- Column(- crossAxisAlignment: CrossAxisAlignment.start,- children: [- Padding(- padding:- EdgeInsets.only(right: GridSize.leadingHeaderPadding),- child: _GridHeader(- headerScrollController: headerScrollController,- ),- ),- _GridRows(- viewId: state.viewId,- contentWidth: contentWidth,- scrollController: _scrollController,+ child: Stack(+ children: [+ Column(+ crossAxisAlignment: CrossAxisAlignment.start,+ children: [+ Padding(+ padding: EdgeInsets.only(right: GridSize.leadingHeaderPadding),+ child: _GridHeader(+ headerScrollController: headerScrollController,),- ],- ),- Positioned(- bottom: 20,- right: 20,- child: getGridFabs(context),- ),- ],- );- },+ ),+ _GridRows(+ viewId: widget.view.id,+ scrollController: _scrollController,+ ),+ ],+ ),+ Positioned(+ bottom: 20,+ right: 20,+ child: getGridFabs(context),+ ),+ ],+ ),);}}@@ -219,47 +212,52 @@ class _GridHeader extends StatelessWidget {class _GridRows extends StatelessWidget {final String viewId;- final double contentWidth;final GridScrollController scrollController;const _GridRows({required this.viewId,- required this.contentWidth,required this.scrollController,});@overrideWidget build(BuildContext context) {- return Expanded(- child: _WrapScrollView(- scrollController: scrollController,- contentWidth: contentWidth,- child: BlocBuilder<GridBloc, GridState>(- buildWhen: (previous, current) => current.reason.maybeWhen(- reorderRows: () => true,- reorderSingleRow: (reorderRow, rowInfo) => true,- delete: (item) => true,- insert: (item) => true,- orElse: () => false,+ return BlocBuilder<GridBloc, GridState>(+ buildWhen: (previous, current) => previous.fields != current.fields,+ builder: (context, state) {+ final contentWidth = GridLayout.headerWidth(state.fields);+ return Expanded(+ child: _WrapScrollView(+ scrollController: scrollController,+ contentWidth: contentWidth,+ child: BlocBuilder<GridBloc, GridState>(+ buildWhen: (previous, current) => current.reason.maybeWhen(+ reorderRows: () => true,+ reorderSingleRow: (reorderRow, rowInfo) => true,+ delete: (item) => true,+ insert: (item) => true,+ orElse: () => false,+ ),+ builder: (context, state) {+ final rowInfos = state.rowInfos;+ final behavior = ScrollConfiguration.of(context).copyWith(+ scrollbars: false,+ physics: const ClampingScrollPhysics(),+ );+ return ScrollConfiguration(+ behavior: behavior,+ child: _renderList(context, contentWidth, state, rowInfos),+ );+ },+ ),),- builder: (context, state) {- final rowInfos = state.rowInfos;- final behavior = ScrollConfiguration.of(context).copyWith(- scrollbars: false,- physics: const ClampingScrollPhysics(),- );- return ScrollConfiguration(- behavior: behavior,- child: _renderList(context, state, rowInfos),- );- },- ),- ),+ );+ },);}Widget _renderList(BuildContext context,+ double contentWidth,GridState state,List<RowInfo> rowInfos,) {diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/grid_header.dart b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/grid_header.dartindex 903bfcfde4..3403c095c7 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/grid_header.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/grid_header.dart@@ -46,19 +46,13 @@ class _GridHeaderSliverAdaptorState extends State<GridHeaderSliverAdaptor> {fieldController: fieldController,)..add(const GridHeaderEvent.initial());},- child: BlocBuilder<GridHeaderBloc, GridHeaderState>(- buildWhen: (previous, current) =>- previous.fields.length != current.fields.length,- builder: (context, state) {- return SingleChildScrollView(- scrollDirection: Axis.horizontal,- controller: widget.anchorScrollController,- child: _GridHeader(- viewId: widget.viewId,- fieldController: fieldController,- ),- );- },+ child: SingleChildScrollView(+ scrollDirection: Axis.horizontal,+ controller: widget.anchorScrollController,+ child: _GridHeader(+ viewId: widget.viewId,+ fieldController: fieldController,+ ),),);}diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/checklist_cell/mobile_checklist_cell_editor.dart b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/checklist_cell/mobile_checklist_cell_editor.dartindex 1f35865302..b31e48f167 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/checklist_cell/mobile_checklist_cell_editor.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/checklist_cell/mobile_checklist_cell_editor.dart@@ -47,12 +47,7 @@ class _MobileChecklistCellEditScreenStatechild: _buildHeader(context),),const Divider(),- const Expanded(- child: Padding(- padding: EdgeInsets.symmetric(horizontal: 0.0),- child: _TaskList(),- ),- ),+ const Expanded(child: _TaskList()),],);},@@ -169,7 +164,7 @@ class _ChecklistItemState extends State<_ChecklistItem> {@overrideWidget build(BuildContext context) {return Container(- padding: const EdgeInsets.only(left: 5, right: 16),+ padding: const EdgeInsets.symmetric(horizontal: 5),height: 44,child: Row(crossAxisAlignment: CrossAxisAlignment.center,diff --git a/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/sign_in_anonymous_button.dart b/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/sign_in_anonymous_button.dartindex c78afbc91b..d6c79ce390 100644--- a/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/sign_in_anonymous_button.dart+++ b/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/sign_in_anonymous_button.dart@@ -55,7 +55,11 @@ class SignInAnonymousButton extends StatelessWidget {minimumSize: const Size(double.infinity, 56),),onPressed: onTap,- child: Text(LocaleKeys.signIn_loginStartWithAnonymous.tr()),+ child: FlowyText(+ LocaleKeys.signIn_loginStartWithAnonymous.tr(),+ fontSize: 14,+ color: Theme.of(context).colorScheme.onPrimary,+ ),);}// SignInAnonymousButton in desktopdiff --git a/frontend/appflowy_flutter/lib/workspace/application/settings/appearance/mobile_appearance.dart b/frontend/appflowy_flutter/lib/workspace/application/settings/appearance/mobile_appearance.dartindex 3c5ac24600..86e3853d65 100644--- a/frontend/appflowy_flutter/lib/workspace/application/settings/appearance/mobile_appearance.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/settings/appearance/mobile_appearance.dart@@ -62,7 +62,7 @@ class MobileAppearance extends BaseAppearance {: ColorScheme(brightness: brightness,primary: _primaryColor,- onPrimary: Colors.white,+ onPrimary: Colors.black,// TODO(yijing): add color latersecondary: const Color(0xff2d2d2d), //temponSecondary: Colors.white,@@ -125,7 +125,7 @@ class MobileAppearance extends BaseAppearance {backgroundColor: MaterialStateProperty.resolveWith<Color>((Set<MaterialState> states) {if (states.contains(MaterialState.disabled)) {- return const Color(0xFF57B5F8);+ return _primaryColor;}return colorTheme.primary;},@@ -176,7 +176,7 @@ class MobileAppearance extends BaseAppearance {fontFamily: fontStyle.fontFamily,textTheme: TextTheme(displayLarge: const TextStyle(- color: Color(0xFF57B5F8),+ color: _primaryColor,fontSize: 32,fontWeight: FontWeight.w700,height: 1.20,