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: enable reordering properties from settings
Mathias Mogensen778e46252342
diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/application/setting/property_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/setting/property_bloc.dartindex 117dd1c3aa..1791e32d68 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/application/setting/property_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/setting/property_bloc.dart@@ -27,20 +27,32 @@ class DatabasePropertyBloc_startListening();},setFieldVisibility: (_SetFieldVisibility value) async {- final fieldBackendSvc =- FieldBackendService(viewId: viewId, fieldId: value.fieldId);- final result =- await fieldBackendSvc.updateField(visibility: value.visibility);- result.fold(- (l) => null,- (err) => Log.error(err),+ final fieldBackendSvc = FieldBackendService(+ viewId: viewId,+ fieldId: value.fieldId,);++ final result = await fieldBackendSvc.updateField(+ visibility: value.visibility,+ );++ result.fold((l) => null, (err) => Log.error(err));},didReceiveFieldUpdate: (_DidReceiveFieldUpdate value) {emit(state.copyWith(fieldContexts: value.fields));},- moveField: (_MoveField value) {- //+ moveField: (_MoveField value) async {+ final fieldBackendService = FieldBackendService(+ viewId: viewId,+ fieldId: value.fieldId,+ );++ final result = await fieldBackendService.moveField(+ value.fromIndex,+ value.toIndex,+ );++ result.fold((l) => null, (r) => Log.error(r));},);},@@ -76,8 +88,11 @@ class DatabasePropertyEvent with _$DatabasePropertyEvent {const factory DatabasePropertyEvent.didReceiveFieldUpdate(List<FieldInfo> fields,) = _DidReceiveFieldUpdate;- const factory DatabasePropertyEvent.moveField(int fromIndex, int toIndex) =- _MoveField;+ const factory DatabasePropertyEvent.moveField({+ required String fieldId,+ required int fromIndex,+ required int toIndex,+ }) = _MoveField;}@freezeddiff --git a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/field/grid_property.dart b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/field/grid_property.dartindex b290691693..10a3985a9a 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/field/grid_property.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/field/grid_property.dart@@ -9,6 +9,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:reorderables/reorderables.dart';import 'package:styled_widget/styled_widget.dart';import '../../grid/presentation/layout/sizes.dart';@@ -17,24 +18,19 @@ import '../../grid/presentation/widgets/header/field_editor.dart';class DatabasePropertyList extends StatefulWidget {final String viewId;final FieldController fieldController;+const DatabasePropertyList({+ super.key,required this.viewId,required this.fieldController,- Key? key,- }) : super(key: key);+ });@overrideState<StatefulWidget> createState() => _DatabasePropertyListState();}class _DatabasePropertyListState extends State<DatabasePropertyList> {- late PopoverMutex _popoverMutex;-- @override- void initState() {- _popoverMutex = PopoverMutex();- super.initState();- }+ final PopoverMutex _popoverMutex = PopoverMutex();@overrideWidget build(BuildContext context) {@@ -47,21 +43,29 @@ class _DatabasePropertyListState extends State<DatabasePropertyList> {builder: (context, state) {final cells = state.fieldContexts.map((field) {return _GridPropertyCell(- popoverMutex: _popoverMutex,+ key: ValueKey(field.id),viewId: widget.viewId,fieldInfo: field,- key: ValueKey(field.id),+ popoverMutex: _popoverMutex,);}).toList();- return ListView.separated(- controller: ScrollController(),- shrinkWrap: true,- itemCount: cells.length,- itemBuilder: (BuildContext context, int index) => cells[index],- separatorBuilder: (BuildContext context, int index) =>- VSpace(GridSize.typeOptionSeparatorHeight),+ return ReorderableColumn(+ needsLongPressDraggable: false,+ buildDraggableFeedback: (context, constraints, child) =>+ ConstrainedBox(+ constraints: constraints,+ child: Material(color: Colors.transparent, child: child),+ ),+ onReorder: (from, to) => context.read<DatabasePropertyBloc>().add(+ DatabasePropertyEvent.moveField(+ fieldId: cells[from].fieldInfo.id,+ fromIndex: from,+ toIndex: to,+ ),+ ),padding: const EdgeInsets.symmetric(vertical: 6.0),+ children: cells,);},),@@ -75,24 +79,18 @@ class _GridPropertyCell extends StatefulWidget {final PopoverMutex popoverMutex;const _GridPropertyCell({- required this.viewId,+ super.key,required this.fieldInfo,+ required this.viewId,required this.popoverMutex,- Key? key,- }) : super(key: key);+ });@overrideState<_GridPropertyCell> createState() => _GridPropertyCellState();}class _GridPropertyCellState extends State<_GridPropertyCell> {- late PopoverController _popoverController;-- @override- void initState() {- _popoverController = PopoverController();- super.initState();- }+ final PopoverController _popoverController = PopoverController();@overrideWidget build(BuildContext context) {diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/setting_button.dart b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/setting_button.dartindex db6ce38f28..7e9f3754c8 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/setting_button.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/setting_button.dart@@ -28,13 +28,7 @@ class SettingButton extends StatefulWidget {}class _SettingButtonState extends State<SettingButton> {- late PopoverController _popoverController;-- @override- void initState() {- _popoverController = PopoverController();- super.initState();- }+ final PopoverController _popoverController = PopoverController();@overrideWidget build(BuildContext context) {@@ -108,9 +102,18 @@ class _DatabaseSettingListPopoverState},);case DatabaseSettingAction.showProperties:- return DatabasePropertyList(- viewId: widget.databaseController.viewId,- fieldController: widget.databaseController.fieldController,+ return Column(+ mainAxisSize: MainAxisSize.min,+ children: [+ DatabasePropertyList(+ viewId: widget.databaseController.viewId,+ fieldController: widget.databaseController.fieldController,+ ),+ FlowyText.regular(+ LocaleKeys.grid_settings_reorderPropertiesTooltip.tr(),+ ),+ const VSpace(8),+ ],);case DatabaseSettingAction.showCalendarLayout:return CalendarLayoutSetting(@@ -165,7 +168,7 @@ extension DatabaseSettingActionExtension on DatabaseSettingAction {String title() {switch (this) {case DatabaseSettingAction.showProperties:- return LocaleKeys.grid_settings_Properties.tr();+ return LocaleKeys.grid_settings_properties.tr();case DatabaseSettingAction.showLayout:return LocaleKeys.grid_settings_databaseLayout.tr();case DatabaseSettingAction.showGroup:diff --git a/frontend/resources/translations/en.json b/frontend/resources/translations/en.jsonindex e85cf167d6..d960d66fe3 100644--- a/frontend/resources/translations/en.json+++ b/frontend/resources/translations/en.json@@ -285,7 +285,8 @@"filter": "Filter","sort": "Sort","sortBy": "Sort by",- "Properties": "Properties",+ "properties": "Properties",+ "reorderPropertiesTooltip": "Drag to reorder properties","group": "Group","addFilter": "Add Filter","deleteFilter": "Delete filter",