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
Merge branch 'main' into feat/flowy-overlay
Vincent Chanbd40768c6ac2
diff --cc frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_setting.dartindex 3404776c35,86beac6830..c9c39796f3--- a/frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_setting.dart+++ b/frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_setting.dart@@@ -135,48 -177,3 +140,50 @@@ extension _GridSettingExtension on Boar}}}++class BoardSettingListPopover extends StatefulWidget {+ final BoardSettingContext settingContext;++ const BoardSettingListPopover({+ Key? key,+ required this.settingContext,+ }) : super(key: key);++ @override+ State<StatefulWidget> createState() => _BoardSettingListPopoverState();+}++class _BoardSettingListPopoverState extends State<BoardSettingListPopover> {+ bool _showGridPropertyList = false;++ @override+ Widget build(BuildContext context) {+ if (_showGridPropertyList) {+ return OverlayContainer(+ constraints: BoxConstraints.loose(const Size(260, 400)),+ child: GridPropertyList(+ gridId: widget.settingContext.viewId,- fieldCache: widget.settingContext.fieldCache,++ fieldController: widget.settingContext.fieldController,+ ),+ );+ }++ return OverlayContainer(+ constraints: BoxConstraints.loose(const Size(140, 400)),+ child: BoardSettingList(+ settingContext: widget.settingContext,+ onAction: (action, settingContext) {+ switch (action) {++ case BoardSettingAction.groups:++ break;+ case BoardSettingAction.properties:+ setState(() {+ _showGridPropertyList = true;+ });+ break;+ }+ },+ ),+ );+ }+}diff --cc frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_toolbar.dartindex 0753c380b5,8bc4dcb0c7..ce3bd188d0--- a/frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_toolbar.dart+++ b/frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_toolbar.dart@@@ -1,5 -1,4 +1,5 @@@- import 'package:app_flowy/plugins/grid/application/field/field_cache.dart';+ import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';+import 'package:appflowy_popover/popover.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/theme.dart';import 'package:flowy_infra_ui/style_widget/icon_button.dart';diff --cc frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/grid_header.dartindex f07eba0843,05c1faec08..909a799554--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/grid_header.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/grid_header.dart@@@ -101,11 -84,8 +101,11 @@@ class _GridHeaderState extends State<_Gfinal cells = state.fields.where((field) => field.visibility).map((field) =>- GridFieldCellContext(gridId: widget.gridId, field: field))+ GridFieldCellContext(gridId: widget.gridId, field: field.field))- .map((ctx) => GridFieldCell(ctx, key: ValueKey(ctx.field.id)))+ .map((ctx) => GridFieldCell(+ key: _getKeyById(ctx.field.id),+ cellContext: ctx,+ )).toList();return Container(diff --cc frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/builder.dartindex 3d355c188a,cfa2f9291f..02350f3a5e--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/builder.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/builder.dart@@@ -1,8 -1,8 +1,9 @@@import 'dart:typed_data';+ import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_data_controller.dart';+import 'package:appflowy_popover/popover.dart';import 'package:flowy_sdk/protobuf/flowy-grid/checkbox_type_option.pb.dart';import 'package:flowy_sdk/protobuf/flowy-grid/date_type_option.pb.dart';import 'package:flowy_sdk/protobuf/flowy-grid/multi_select_type_option.pb.dart';diff --cc frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/grid_row.dartindex 74e48db8b1,621f53cf1a..ebe2a41db2--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/grid_row.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/grid_row.dart@@@ -194,17 -194,12 +194,17 @@@ class RowContent extends StatelessWidgeProvider.of<RegionStateNotifier>(context, listen: false),accessoryBuilder: (buildContext) {final builder = child.accessoryBuilder;- List<GridCellAccessory> accessories = [];+ List<GridCellAccessoryBuilder> accessories = [];- if (cellId.field.isPrimary) {+ if (cellId.fieldContext.isPrimary) {- accessories.add(PrimaryCellAccessory(- onTapCallback: onExpand,- isCellEditing: buildContext.isCellEditing,- ));+ accessories.add(+ GridCellAccessoryBuilder(+ builder: (key) => PrimaryCellAccessory(+ key: key,+ onTapCallback: onExpand,+ isCellEditing: buildContext.isCellEditing,+ ),+ ),+ );}if (builder != null) {diff --cc frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/row_detail.dartindex 3caedd652b,266be35a36..4965fb5407--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/row_detail.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/row_detail.dart@@@ -217,26 -214,9 +217,26 @@@ class _RowDetailCellState extends Statechildren: [SizedBox(width: 150,- child: FieldCellButton(- field: cellId.fieldContext.field,- onTap: () => _showFieldEditor(context),+ child: Popover(+ controller: popover,+ offset: const Offset(20, 0),+ popupBuilder: (context) {+ return OverlayContainer(+ constraints: BoxConstraints.loose(const Size(240, 200)),+ child: FieldEditor(+ gridId: widget.cellId.gridId,- fieldName: widget.cellId.field.name,++ fieldName: widget.cellId.fieldContext.field.name,+ typeOptionLoader: FieldTypeOptionLoader(+ gridId: widget.cellId.gridId,- field: widget.cellId.field,++ field: widget.cellId.fieldContext.field,+ ),+ ),+ );+ },+ child: FieldCellButton(- field: widget.cellId.field,++ field: widget.cellId.fieldContext.field,+ onTap: () => popover.show(),+ ),),),const HSpace(10),diff --cc frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_property.dartindex 3f7b789c59,f5acbcba2a..5e38efd9cb--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_property.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_property.dart@@@ -16,15 -13,16 +15,15 @@@ import 'package:flutter/material.dart'import 'package:flutter_bloc/flutter_bloc.dart';import 'package:styled_widget/styled_widget.dart';- import '../../../application/field/field_cache.dart';+ import '../../../application/field/field_controller.dart';import '../../layout/sizes.dart';-import '../header/field_editor.dart';-class GridPropertyList extends StatelessWidget with FlowyOverlayDelegate {+class GridPropertyList extends StatefulWidget {final String gridId;- final GridFieldCache fieldCache;+ final GridFieldController fieldController;const GridPropertyList({required this.gridId,- required this.fieldCache,+ required this.fieldController,Key? key,}) : super(key: key);@@@ -44,18 -43,14 +43,18 @@@ class _GridPropertyListState extends St@overrideWidget build(BuildContext context) {return BlocProvider(- create: (context) =>- getIt<GridPropertyBloc>(param1: gridId, param2: fieldController)- ..add(const GridPropertyEvent.initial()),+ create: (context) => getIt<GridPropertyBloc>(- param1: widget.gridId, param2: widget.fieldCache)++ param1: widget.gridId, param2: widget.fieldController)+ ..add(const GridPropertyEvent.initial()),child: BlocBuilder<GridPropertyBloc, GridPropertyState>(builder: (context, state) {- final cells = state.fields.map((field) {+ final cells = state.fieldContexts.map((field) {return _GridPropertyCell(- gridId: gridId, fieldContext: field, key: ValueKey(field.id));+ popoverMutex: _popoverMutex,+ gridId: widget.gridId,- field: field,++ fieldContext: field,+ key: ValueKey(field.id),+ );}).toList();return ListView.separated(@@@ -76,15 -70,18 +75,15 @@@}class _GridPropertyCell extends StatelessWidget {- final FieldPB field;+ final GridFieldContext fieldContext;final String gridId;- const _GridPropertyCell(- {required this.gridId, required this.fieldContext, Key? key})- : super(key: key);+ final PopoverMutex popoverMutex;+ const _GridPropertyCell({+ required this.gridId,- required this.field,++ required this.fieldContext,+ required this.popoverMutex,+ Key? key,+ }) : super(key: key);@overrideWidget build(BuildContext context) {@@@ -116,26 -113,21 +115,27 @@@);}- FlowyButton _editFieldButton(AppTheme theme, BuildContext context) {- return FlowyButton(- text: FlowyText.medium(fieldContext.name, fontSize: 12),- hoverColor: theme.hover,- leftIcon:- svgWidget(fieldContext.fieldType.iconName(), color: theme.iconColor),- onTap: () {- FieldEditor(- gridId: gridId,- fieldName: fieldContext.name,- typeOptionLoader: FieldTypeOptionLoader(+ Widget _editFieldButton(AppTheme theme, BuildContext context) {+ return Popover(+ mutex: popoverMutex,+ triggerActions: PopoverTriggerActionFlags.click,+ offset: const Offset(20, 0),+ child: FlowyButton(- text: FlowyText.medium(field.name, fontSize: 12),++ text: FlowyText.medium(fieldContext.name, fontSize: 12),+ hoverColor: theme.hover,- leftIcon: svgWidget(field.fieldType.iconName(), color: theme.iconColor),++ leftIcon: svgWidget(fieldContext.fieldType.iconName(),++ color: theme.iconColor),+ ),+ popupBuilder: (BuildContext context) {+ return OverlayContainer(+ constraints: BoxConstraints.loose(const Size(240, 200)),+ child: FieldEditor(gridId: gridId,- fieldName: field.name,- typeOptionLoader:- FieldTypeOptionLoader(gridId: gridId, field: field),- field: fieldContext.field,++ fieldName: fieldContext.name,++ typeOptionLoader: FieldTypeOptionLoader(++ gridId: gridId, field: fieldContext.field),),- ).show(context, anchorDirection: AnchorDirection.bottomRight);+ );},);}diff --cc frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_setting.dartindex ca7209d50d,c793d7eef1..9198f54de8--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_setting.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_setting.dart@@@ -11,8 -11,9 +11,8 @@@ import 'package:flutter/material.dart'import 'package:flutter_bloc/flutter_bloc.dart';import 'package:app_flowy/generated/locale_keys.g.dart';- import '../../../application/field/field_cache.dart';+ import '../../../application/field/field_controller.dart';import '../../layout/sizes.dart';-import 'grid_property.dart';class GridSettingContext {final String gridId;diff --cc frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_toolbar.dartindex 38e95dc782,61ea099f56..88b64a8f25--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_toolbar.dart+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/grid_toolbar.dart@@@ -8,9 -5,8 +8,9 @@@ import 'package:flowy_infra_ui/style_wiimport 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';- import '../../../application/field/field_cache.dart';+ import '../../../application/field/field_controller.dart';import '../../layout/sizes.dart';+import 'grid_property.dart';import 'grid_setting.dart';class GridToolbarContext {@@@ -53,57 -49,12 +53,57 @@@ class _SettingButton extends StatelessW@overrideWidget build(BuildContext context) {final theme = context.watch<AppTheme>();- return FlowyIconButton(- hoverColor: theme.hover,- width: 22,- onPressed: () => GridSettingList.show(context, settingContext),- icon:- svgWidget("grid/setting/setting").padding(horizontal: 3, vertical: 3),+ return Popover(+ triggerActions: PopoverTriggerActionFlags.click,+ offset: const Offset(0, 10),+ child: FlowyIconButton(+ width: 22,+ hoverColor: theme.hover,+ icon: svgWidget("grid/setting/setting")+ .padding(horizontal: 3, vertical: 3),+ ),+ popupBuilder: (BuildContext context) {+ return _GridSettingListPopover(settingContext: settingContext);+ },+ );+ }+}++class _GridSettingListPopover extends StatefulWidget {+ final GridSettingContext settingContext;++ const _GridSettingListPopover({Key? key, required this.settingContext})+ : super(key: key);++ @override+ State<StatefulWidget> createState() => _GridSettingListPopoverState();+}++class _GridSettingListPopoverState extends State<_GridSettingListPopover> {+ GridSettingAction? _action;++ @override+ Widget build(BuildContext context) {+ if (_action == GridSettingAction.properties) {+ return OverlayContainer(+ constraints: BoxConstraints.loose(const Size(260, 400)),+ child: GridPropertyList(+ gridId: widget.settingContext.gridId,- fieldCache: widget.settingContext.fieldCache,++ fieldController: widget.settingContext.fieldController,+ ),+ );+ }++ return OverlayContainer(+ constraints: BoxConstraints.loose(const Size(140, 400)),+ child: GridSettingList(+ settingContext: widget.settingContext,+ onAction: (action, settingContext) {+ setState(() {+ _action = action;+ });+ },+ ),);}}diff --cc frontend/app_flowy/pubspec.lockindex 76d489c915,bb8391eee9..3e2bdfe2be--- a/frontend/app_flowy/pubspec.lock+++ b/frontend/app_flowy/pubspec.lock@@@ -35,14 -35,7 +35,14 @@@ packagespath: "packages/appflowy_editor"relative: truesource: path-- version: "0.0.3"++ version: "0.0.4"+ appflowy_popover:+ dependency: "direct main"+ description:+ path: "packages/appflowy_popover"+ relative: true+ source: path+ version: "0.0.1"args:dependency: transitivedescription: