Skip to content

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.

Merge branch 'main' into feat/flowy-overlay

Vincent Chan9b5184cd7295
diff --cc frontend/app_flowy/lib/plugins/board/presentation/board_page.dart
index 423a075867,0b043a2ba7..21e38511b6
--- a/frontend/app_flowy/lib/plugins/board/presentation/board_page.dart
+++ b/frontend/app_flowy/lib/plugins/board/presentation/board_page.dart
@@@ -9,7 -10,10 +10,11 @@@ import 'package:app_flowy/plugins/grid/
import 'package:app_flowy/plugins/grid/presentation/widgets/cell/cell_builder.dart';
import 'package:app_flowy/plugins/grid/presentation/widgets/row/row_detail.dart';
import 'package:appflowy_board/appflowy_board.dart';
+ import 'package:easy_localization/easy_localization.dart';
+ import 'package:flowy_infra/image.dart';
+ import 'package:flowy_infra/theme.dart';
+ import 'package:flowy_infra_ui/style_widget/text.dart';
+import 'package:flowy_infra_ui/flowy_infra_ui_web.dart';
import 'package:flowy_infra_ui/widget/error_page.dart';
import 'package:flowy_sdk/protobuf/flowy-folder/view.pb.dart';
import 'package:flowy_sdk/protobuf/flowy-grid/block_entities.pb.dart';
@@@ -158,14 -285,29 +286,34 @@@ class _BoardContentState extends State<
rowCache: rowCache,
);
- RowDetailPage(
- cellBuilder: GridCellBuilder(delegate: dataController),
- dataController: dataController,
- ).show(context);
+ FlowyOverlay.show(
- context: context,
- builder: (BuildContext context) {
- return RowDetailPage(
- cellBuilder: GridCellBuilder(delegate: dataController),
- dataController: dataController,
- );
- });
++ context: context,
++ builder: (BuildContext context) {
++ return RowDetailPage(
++ cellBuilder: GridCellBuilder(delegate: dataController),
++ dataController: dataController,
++ );
++ },
++ );
+ }
+ }
+
+ class _ToolbarBlocAdaptor extends StatelessWidget {
+ const _ToolbarBlocAdaptor({Key? key}) : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ return BlocBuilder<BoardBloc, BoardState>(
+ builder: (context, state) {
+ final bloc = context.read<BoardBloc>();
+ final toolbarContext = BoardToolbarContext(
+ viewId: bloc.gridId,
+ fieldCache: bloc.fieldCache,
+ );
+
+ return BoardToolbar(toolbarContext: toolbarContext);
+ },
+ );
}
}
diff --cc frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/date_cell/date_editor.dart
index 25ecf613a6,d1289b93f2..92b0a3233d
--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/date_cell/date_editor.dart
+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/date_cell/date_editor.dart
@@@ -297,9 -304,7 +297,8 @@@ class _DateTypeOptionButton extends Sta
@override
Widget build(BuildContext context) {
final theme = context.watch<AppTheme>();
- final title = LocaleKeys.grid_field_dateFormat.tr() +
- " &" +
- LocaleKeys.grid_field_timeFormat.tr();
- final title = "${LocaleKeys.grid_field_dateFormat.tr()} &${LocaleKeys.grid_field_timeFormat.tr()}";
++ final title =
++ "${LocaleKeys.grid_field_dateFormat.tr()} &${LocaleKeys.grid_field_timeFormat.tr()}";
return BlocSelector<DateCalBloc, DateCalState, DateTypeOptionPB>(
selector: (state) => state.dateTypeOptionPB,
builder: (context, dateTypeOptionPB) {
diff --cc frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/select_option_cell.dart
index 72794adee3,c771586e70..c09c5e93db
--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/select_option_cell.dart
+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/select_option_cell/select_option_cell.dart
@@@ -178,7 -163,9 +178,9 @@@ class _SelectOptionWrapState extends St
child = Align(
alignment: Alignment.centerLeft,
child: Wrap(
+ spacing: 4,
+ runSpacing: 2,
- children: selectOptions
+ children: widget.selectOptions
.map((option) => SelectOptionTag.fromOption(
context: context,
option: option,
diff --cc frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/grid_header.dart
index 175e7272ef,c5bdb448c3..f07eba0843
--- 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
@@@ -2,10 -3,9 +3,11 @@@ import 'package:app_flowy/plugins/grid/
import 'package:app_flowy/plugins/grid/application/field/type_option/type_option_context.dart';
import 'package:app_flowy/startup/startup.dart';
import 'package:app_flowy/plugins/grid/application/prelude.dart';
+ import 'package:easy_localization/easy_localization.dart';
+import 'package:appflowy_popover/popover.dart';
import 'package:flowy_infra/image.dart';
import 'package:flowy_infra/theme.dart';
+import 'package:flowy_infra_ui/flowy_infra_ui_web.dart';
import 'package:flowy_infra_ui/style_widget/button.dart';
import 'package:flowy_infra_ui/style_widget/text.dart';
import 'package:flowy_sdk/protobuf/flowy-grid/field_entities.pb.dart';
@@@ -174,25 -156,18 +176,28 @@@ class CreateFieldButton extends Statele
Widget build(BuildContext context) {
final theme = context.watch<AppTheme>();
- return FlowyButton(
- text: FlowyText.medium(
- LocaleKeys.grid_field_newColumn.tr(),
- fontSize: 12,
+ return Popover(
+ triggerActions: PopoverTriggerActionFlags.click,
+ direction: PopoverDirection.bottomWithRightAligned,
+ child: FlowyButton(
- text: const FlowyText.medium('New column', fontSize: 12),
++ text: FlowyText.medium(
++ LocaleKeys.grid_field_newColumn.tr(),
++ fontSize: 12,
++ ),
+ hoverColor: theme.shader6,
+ onTap: () {},
+ leftIcon: svgWidget("home/add"),
),
- hoverColor: theme.shader6,
- onTap: () => FieldEditor(
- gridId: gridId,
- fieldName: "",
- typeOptionLoader: NewFieldTypeOptionLoader(gridId: gridId),
- ).show(context),
- leftIcon: svgWidget("home/add"),
+ popupBuilder: (BuildContext popover) {
+ return OverlayContainer(
+ constraints: BoxConstraints.loose(const Size(240, 200)),
+ child: FieldEditor(
+ gridId: gridId,
+ fieldName: "",
+ typeOptionLoader: NewFieldTypeOptionLoader(gridId: gridId),
+ ),
+ );
+ },
);
}
}
diff --cc frontend/app_flowy/lib/plugins/grid/presentation/widgets/row/row_detail.dart
index 7d22c51fab,58e9b2808c..3caedd652b
--- 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
@@@ -42,28 -60,31 +44,33 @@@ class RowDetailPage extends StatefulWid
class _RowDetailPageState extends State<RowDetailPage> {
@override
Widget build(BuildContext context) {
- return BlocProvider(
- create: (context) {
- final bloc = RowDetailBloc(
- dataController: widget.dataController,
- );
- bloc.add(const RowDetailEvent.initial());
- return bloc;
- },
- child: Padding(
- padding: const EdgeInsets.symmetric(horizontal: 30, vertical: 20),
- child: Column(
- children: [
- SizedBox(
- height: 30,
- child: Row(
- children: const [Spacer(), _CloseButton()],
+ return FlowyDialog(
+ child: BlocProvider(
+ create: (context) {
+ final bloc = RowDetailBloc(
+ dataController: widget.dataController,
+ );
+ bloc.add(const RowDetailEvent.initial());
+ return bloc;
+ },
+ child: Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 40, vertical: 20),
+ child: Column(
+ children: [
+ SizedBox(
+ height: 40,
+ child: Row(
+ children: const [Spacer(), _CloseButton()],
+ ),
),
- Expanded(child: _PropertyList(cellBuilder: widget.cellBuilder)),
- ),
- Expanded(
- child: _PropertyList(
- cellBuilder: widget.cellBuilder,
- viewId: widget.dataController.rowInfo.gridId,
++ Expanded(
++ child: _PropertyList(
++ cellBuilder: widget.cellBuilder,
++ viewId: widget.dataController.rowInfo.gridId,
++ ),
+ ),
- ),
- ],
+ ],
+ ),
),
),
);
@@@ -101,25 -123,59 +110,68 @@@ class _PropertyList extends StatelessWi
return BlocBuilder<RowDetailBloc, RowDetailState>(
buildWhen: (previous, current) => previous.gridCells != current.gridCells,
builder: (context, state) {
- return ScrollbarListStack(
- axis: Axis.vertical,
- controller: _scrollController,
- barSize: GridSize.scrollBarSize,
- child: ListView.separated(
- controller: _scrollController,
- itemCount: state.gridCells.length,
- itemBuilder: (BuildContext context, int index) {
- return _RowDetailCell(
- cellId: state.gridCells[index],
- cellBuilder: cellBuilder,
- );
- },
- separatorBuilder: (BuildContext context, int index) {
- return const VSpace(2);
- },
+ return Column(
+ children: [
+ Expanded(
+ child: ScrollbarListStack(
+ axis: Axis.vertical,
+ controller: _scrollController,
+ barSize: GridSize.scrollBarSize,
+ child: ListView.separated(
+ controller: _scrollController,
+ itemCount: state.gridCells.length,
+ itemBuilder: (BuildContext context, int index) {
+ return _RowDetailCell(
+ cellId: state.gridCells[index],
+ cellBuilder: cellBuilder,
+ );
+ },
+ separatorBuilder: (BuildContext context, int index) {
+ return const VSpace(2);
+ },
+ ),
+ ),
+ ),
+ _CreateFieldButton(viewId: viewId),
+ ],
+ );
+ },
+ );
+ }
+ }
+
+ class _CreateFieldButton extends StatelessWidget {
+ final String viewId;
+ const _CreateFieldButton({required this.viewId, Key? key}) : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ final theme = context.read<AppTheme>();
+
- return SizedBox(
- height: 40,
- child: FlowyButton(
- text: FlowyText.medium(
- LocaleKeys.grid_field_newColumn.tr(),
- fontSize: 12,
++ return Popover(
++ triggerActions: PopoverTriggerActionFlags.click,
++ child: SizedBox(
++ height: 40,
++ child: FlowyButton(
++ text: FlowyText.medium(
++ LocaleKeys.grid_field_newColumn.tr(),
++ fontSize: 12,
++ ),
++ hoverColor: theme.shader6,
++ onTap: () {},
++ leftIcon: svgWidget("home/add"),
+ ),
- hoverColor: theme.shader6,
- onTap: () => FieldEditor(
- gridId: viewId,
- fieldName: "",
- typeOptionLoader: NewFieldTypeOptionLoader(gridId: viewId),
- ).show(context),
- leftIcon: svgWidget("home/add"),
+ ),
++ popupBuilder: (BuildContext context) {
++ return OverlayContainer(
++ constraints: BoxConstraints.loose(const Size(240, 200)),
++ child: FieldEditor(
++ gridId: viewId,
++ fieldName: "",
++ typeOptionLoader: NewFieldTypeOptionLoader(gridId: viewId),
+ ),
+ );
+ },
);
}
}
diff --cc frontend/app_flowy/pubspec.lock
index 4717151e92,bb8391eee9..76d489c915
--- a/frontend/app_flowy/pubspec.lock
+++ b/frontend/app_flowy/pubspec.lock
@@@ -35,14 -35,7 +35,14 @@@ packages
path: "packages/appflowy_editor"
relative: true
source: path
- version: "0.0.2"
+ version: "0.0.3"
+ appflowy_popover:
+ dependency: "direct main"
+ description:
+ path: "packages/appflowy_popover"
+ relative: true
+ source: path
+ version: "0.0.1"
args:
dependency: transitive
description: