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: right click to open view more actions (#6529)
Mathias Mogensenc9f0bbf26ac1
diff --git a/frontend/appflowy_flutter/integration_test/desktop/cloud/sidebar/sidebar_move_page_test.dart b/frontend/appflowy_flutter/integration_test/desktop/cloud/sidebar/sidebar_move_page_test.dartindex 57198e1c3d..4179c2afb7 100644--- a/frontend/appflowy_flutter/integration_test/desktop/cloud/sidebar/sidebar_move_page_test.dart+++ b/frontend/appflowy_flutter/integration_test/desktop/cloud/sidebar/sidebar_move_page_test.dart@@ -18,6 +18,7 @@ import 'package:appflowy/workspace/presentation/widgets/user_avatar.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/uuid.dart';+import 'package:flutter/gestures.dart';import 'package:flutter/material.dart';import 'package:flutter_test/flutter_test.dart';import 'package:integration_test/integration_test.dart';@@ -92,6 +93,14 @@ void main() {await tester.pumpAndSettle();}+ // Attempt right-click on the page name and expect not to see+ await tester.tap(gettingStarted.last, buttons: kSecondaryButton);+ await tester.pumpAndSettle();+ expect(+ find.text(LocaleKeys.disclosureAction_moveTo.tr()),+ findsOneWidget,+ );+// move the current page to Getting startedawait tester.tapButton(gettingStarted.last,diff --git a/frontend/appflowy_flutter/integration_test/desktop/document/document_deletion_test.dart b/frontend/appflowy_flutter/integration_test/desktop/document/document_deletion_test.dartindex edcbdfb5b9..f38138ce8a 100644--- a/frontend/appflowy_flutter/integration_test/desktop/document/document_deletion_test.dart+++ b/frontend/appflowy_flutter/integration_test/desktop/document/document_deletion_test.dart@@ -42,8 +42,10 @@ void main() {expect(mentionBlock, findsOneWidget);// Delete the page- await tester.hoverOnPageName(name);- await tester.tapDeletePageButton();+ await tester.hoverOnPageName(+ name,+ onHover: () async => tester.tapDeletePageButton(),+ );await tester.pumpAndSettle();// Navigate to the deleted page from the inline mentiondiff --git a/frontend/appflowy_flutter/integration_test/desktop/sidebar/sidebar_test.dart b/frontend/appflowy_flutter/integration_test/desktop/sidebar/sidebar_test.dartindex e6580dca5f..304e8e2e35 100644--- a/frontend/appflowy_flutter/integration_test/desktop/sidebar/sidebar_test.dart+++ b/frontend/appflowy_flutter/integration_test/desktop/sidebar/sidebar_test.dart@@ -198,7 +198,7 @@ void main() {layout: ViewLayoutPB.Grid,onHover: () async {expect(find.byType(ViewAddButton), findsNothing);- expect(find.byType(ViewMoreActionButton), findsOneWidget);+ expect(find.byType(ViewMoreActionPopover), findsOneWidget);},);});diff --git a/frontend/appflowy_flutter/integration_test/desktop/sidebar/sidebar_test_runner.dart b/frontend/appflowy_flutter/integration_test/desktop/sidebar/sidebar_test_runner.dartindex 3bc41d78c0..9e4212f955 100644--- a/frontend/appflowy_flutter/integration_test/desktop/sidebar/sidebar_test_runner.dart+++ b/frontend/appflowy_flutter/integration_test/desktop/sidebar/sidebar_test_runner.dart@@ -3,6 +3,7 @@ import 'package:integration_test/integration_test.dart';import 'sidebar_favorites_test.dart' as sidebar_favorite_test;import 'sidebar_icon_test.dart' as sidebar_icon_test;import 'sidebar_test.dart' as sidebar_test;+import 'sidebar_view_item_test.dart' as sidebar_view_item_test;void main() {IntegrationTestWidgetsFlutterBinding.ensureInitialized();@@ -12,4 +13,5 @@ void main() {// sidebar_expanded_test.main();sidebar_favorite_test.main();sidebar_icon_test.main();+ sidebar_view_item_test.main();}diff --git a/frontend/appflowy_flutter/integration_test/desktop/sidebar/sidebar_view_item_test.dart b/frontend/appflowy_flutter/integration_test/desktop/sidebar/sidebar_view_item_test.dartnew file mode 100644index 0000000000..d666479818--- /dev/null+++ b/frontend/appflowy_flutter/integration_test/desktop/sidebar/sidebar_view_item_test.dart@@ -0,0 +1,39 @@+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/base/emoji/emoji_picker.dart';+import 'package:appflowy/workspace/presentation/home/menu/view/view_item.dart';+import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flutter/gestures.dart';+import 'package:flutter_test/flutter_test.dart';+import 'package:integration_test/integration_test.dart';++import '../../shared/emoji.dart';+import '../../shared/util.dart';++void main() {+ IntegrationTestWidgetsFlutterBinding.ensureInitialized();++ group('Sidebar view item tests', () {+ testWidgets('Access view item context menu by right click', (tester) async {+ await tester.initializeAppFlowy();+ await tester.tapAnonymousSignInButton();++ // Right click on the view item and change icon+ await tester.tap(find.byType(ViewItem), buttons: kSecondaryButton);+ await tester.pumpAndSettle();++ // Change icon+ final changeIconButton =+ find.text(LocaleKeys.document_plugins_cover_changeIcon.tr());++ await tester.tapButton(changeIconButton);+ await tester.pumpUntilFound(find.byType(FlowyEmojiPicker));++ const emoji = '😁';+ await tester.tapEmoji(emoji);+ await tester.pumpAndSettle();++ tester.expectViewHasIcon(gettingStarted, ViewLayoutPB.Document, emoji);+ });+ });+}diff --git a/frontend/appflowy_flutter/integration_test/shared/base.dart b/frontend/appflowy_flutter/integration_test/shared/base.dartindex bcd6cc10e5..9ac3d87464 100644--- a/frontend/appflowy_flutter/integration_test/shared/base.dart+++ b/frontend/appflowy_flutter/integration_test/shared/base.dart@@ -158,17 +158,12 @@ extension AppFlowyTestBase on WidgetTester {Future<void> tapButton(Finder finder, {- int? pointer,int buttons = kPrimaryButton,bool warnIfMissed = false,int milliseconds = 500,bool pumpAndSettle = true,}) async {- await tap(- finder,- buttons: buttons,- warnIfMissed: warnIfMissed,- );+ await tap(finder, buttons: buttons, warnIfMissed: warnIfMissed);if (pumpAndSettle) {await this.pumpAndSettle(diff --git a/frontend/appflowy_flutter/integration_test/shared/common_operations.dart b/frontend/appflowy_flutter/integration_test/shared/common_operations.dartindex e889938589..bb99d10f77 100644--- a/frontend/appflowy_flutter/integration_test/shared/common_operations.dart+++ b/frontend/appflowy_flutter/integration_test/shared/common_operations.dart@@ -42,6 +42,7 @@ import 'package:flutter/material.dart';import 'package:flutter/services.dart';import 'package:flutter_test/flutter_test.dart';+import '../desktop/board/board_hide_groups_test.dart';import 'emoji.dart';import 'util.dart';@@ -199,8 +200,11 @@ extension CommonOperations on WidgetTester {////// Must call [hoverOnPageName] first.Future<void> tapPageOptionButton() async {- final optionButton = find.byType(ViewMoreActionButton);- await tapButton(optionButton);+ final optionButton = find.descendant(+ of: find.byType(ViewMoreActionPopover),+ matching: find.byFlowySvg(FlowySvgs.workspace_three_dots_s),+ );+ await tapButton(optionButton, warnIfMissed: true);}/// Tap the delete page button.diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/favorites/favorite_folder.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/favorites/favorite_folder.dartindex 1bfc324088..7751c0782b 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/favorites/favorite_folder.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/favorites/favorite_folder.dart@@ -16,10 +16,7 @@ import 'package:flutter/services.dart';import 'package:flutter_bloc/flutter_bloc.dart';class FavoriteFolder extends StatefulWidget {- const FavoriteFolder({- super.key,- required this.views,- });+ const FavoriteFolder({super.key, required this.views});final List<ViewPB> views;@@ -81,53 +78,46 @@ class _FavoriteFolderState extends State<FavoriteFolder> {return [];}- return context- .read<FavoriteBloc>()- .state- .pinnedViews- .map((e) => e.item)- .map(- (view) => ViewItem(- key: ValueKey(- '${FolderSpaceType.favorite.name} ${view.id}',- ),- spaceType: FolderSpaceType.favorite,- isDraggable: false,- isFirstChild: view.id == widget.views.first.id,- isFeedback: false,- view: view,- leftPadding: HomeSpaceViewSizes.leftPadding,- leftIconBuilder: (_, __) =>- const HSpace(HomeSpaceViewSizes.leftPadding),- level: 0,- isHovered: isHovered,- rightIconsBuilder: (context, view) => [- FavoriteMoreActions(view: view),- const HSpace(8.0),- FavoritePinAction(view: view),- const HSpace(4.0),- ],- shouldRenderChildren: false,- shouldLoadChildViews: false,- onTertiarySelected: (_, view) =>- context.read<TabsBloc>().openTab(view),- onSelected: (_, view) {- if (HardwareKeyboard.instance.isControlPressed) {- context.read<TabsBloc>().openTab(view);- }-- context.read<TabsBloc>().openPlugin(view);- },- ),- );+ final pinnedViews =+ context.read<FavoriteBloc>().state.pinnedViews.map((e) => e.item);++ return pinnedViews.map(+ (view) => ViewItem(+ key: ValueKey('${FolderSpaceType.favorite.name} ${view.id}'),+ spaceType: FolderSpaceType.favorite,+ isDraggable: false,+ isFirstChild: view.id == widget.views.first.id,+ isFeedback: false,+ view: view,+ enableRightClickContext: true,+ leftPadding: HomeSpaceViewSizes.leftPadding,+ leftIconBuilder: (_, __) =>+ const HSpace(HomeSpaceViewSizes.leftPadding),+ level: 0,+ isHovered: isHovered,+ rightIconsBuilder: (context, view) => [+ FavoriteMoreActions(view: view),+ const HSpace(8.0),+ FavoritePinAction(view: view),+ const HSpace(4.0),+ ],+ shouldRenderChildren: false,+ shouldLoadChildViews: false,+ onTertiarySelected: (_, view) => context.read<TabsBloc>().openTab(view),+ onSelected: (_, view) {+ if (HardwareKeyboard.instance.isControlPressed) {+ context.read<TabsBloc>().openTab(view);+ }++ context.read<TabsBloc>().openPlugin(view);+ },+ ),+ );}}class FavoriteHeader extends StatelessWidget {- const FavoriteHeader({- super.key,- required this.onPressed,- });+ const FavoriteHeader({super.key, required this.onPressed});final VoidCallback onPressed;@@ -171,25 +161,18 @@ class FavoriteMoreButton extends StatelessWidget {constraints: const BoxConstraints(minWidth: minWidth,),- popupBuilder: (_) {- return MultiBlocProvider(- providers: [- BlocProvider.value(value: favoriteBloc),- BlocProvider.value(value: tabsBloc),- ],- child: const FavoriteMenu(minWidth: minWidth),- );- },+ popupBuilder: (_) => MultiBlocProvider(+ providers: [+ BlocProvider.value(value: favoriteBloc),+ BlocProvider.value(value: tabsBloc),+ ],+ child: const FavoriteMenu(minWidth: minWidth),+ ),margin: EdgeInsets.zero,child: FlowyButton(- onTap: () {},margin: const EdgeInsets.symmetric(horizontal: 20.0, vertical: 7.0),- leftIcon: const FlowySvg(- FlowySvgs.workspace_three_dots_s,- ),- text: FlowyText.regular(- LocaleKeys.button_more.tr(),- ),+ leftIcon: const FlowySvg(FlowySvgs.workspace_three_dots_s),+ text: FlowyText.regular(LocaleKeys.button_more.tr()),),);}diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/favorites/favorite_more_actions.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/favorites/favorite_more_actions.dartindex 55ac449159..5f12ed1b04 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/favorites/favorite_more_actions.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/favorites/favorite_more_actions.dart@@ -1,3 +1,4 @@+import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/startup/startup.dart';import 'package:appflowy/workspace/application/favorite/favorite_bloc.dart';@@ -11,6 +12,7 @@ import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';+import 'package:flowy_infra_ui/style_widget/icon_button.dart';import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -24,7 +26,7 @@ class FavoriteMoreActions extends StatelessWidget {Widget build(BuildContext context) {return FlowyTooltip(message: LocaleKeys.menuAppHeader_moreButtonToolTip.tr(),- child: ViewMoreActionButton(+ child: ViewMoreActionPopover(view: view,spaceType: FolderSpaceType.favorite,isExpanded: false,@@ -63,6 +65,13 @@ class FavoriteMoreActions extends StatelessWidget {throw UnsupportedError('$action is not supported');}},+ buildChild: (popover) => FlowyIconButton(+ width: 24,+ icon: const FlowySvg(FlowySvgs.workspace_three_dots_s),+ onPressed: () {+ popover.show();+ },+ ),),);}diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/folder/_section_folder.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/folder/_section_folder.dartindex e9a4b99460..35a88ba76d 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/folder/_section_folder.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/folder/_section_folder.dart@@ -37,7 +37,7 @@ class SectionFolder extends StatefulWidget {}class _SectionFolderState extends State<SectionFolder> {- final ValueNotifier<bool> isHovered = ValueNotifier(false);+ final isHovered = ValueNotifier(false);@overridevoid dispose() {@@ -51,23 +51,19 @@ class _SectionFolderState extends State<SectionFolder> {onEnter: (_) => isHovered.value = true,onExit: (_) => isHovered.value = false,child: BlocProvider<FolderBloc>(- create: (context) => FolderBloc(type: widget.spaceType)- ..add(- const FolderEvent.initial(),- ),+ create: (_) => FolderBloc(type: widget.spaceType)+ ..add(const FolderEvent.initial()),child: BlocBuilder<FolderBloc, FolderState>(- builder: (context, state) {- return Column(- children: [- _buildHeader(context),- // Pages- const VSpace(4.0),- ..._buildViews(context, state, isHovered),- // Add a placeholder if there are no views- _buildDraggablePlaceholder(context),- ],- );- },+ builder: (context, state) => Column(+ children: [+ _buildHeader(context),+ // Pages+ const VSpace(4.0),+ ..._buildViews(context, state, isHovered),+ // Add a placeholder if there are no views+ _buildDraggablePlaceholder(context),+ ],+ ),),),);@@ -94,11 +90,9 @@ class _SectionFolderState extends State<SectionFolder> {),);- context.read<FolderBloc>().add(- const FolderEvent.expandOrUnExpand(- isExpanded: true,- ),- );+ context+ .read<FolderBloc>()+ .add(const FolderEvent.expandOrUnExpand(isExpanded: true));},);},@@ -124,6 +118,7 @@ class _SectionFolderState extends State<SectionFolder> {leftPadding: HomeSpaceViewSizes.leftPadding,isFeedback: false,isHovered: isHovered,+ enableRightClickContext: true,onSelected: (viewContext, view) {if (HardwareKeyboard.instance.isControlPressed) {context.read<TabsBloc>().openTab(view);@@ -142,21 +137,15 @@ class _SectionFolderState extends State<SectionFolder> {if (widget.views.isNotEmpty) {return const SizedBox.shrink();}+ final parentViewId =+ context.read<UserWorkspaceBloc>().state.currentWorkspace?.workspaceId;return ViewItem(spaceType: widget.spaceType,- view: ViewPB(- parentViewId: context- .read<UserWorkspaceBloc>()- .state- .currentWorkspace- ?.workspaceId ??- '',- ),+ view: ViewPB(parentViewId: parentViewId ?? ''),level: 0,leftPadding: HomeSpaceViewSizes.leftPadding,isFeedback: false,onSelected: (_, __) {},- onTertiarySelected: (_, __) {},isHoverEnabled: widget.isHoverEnabled,isPlaceholder: true,);diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/move_to/move_page_menu.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/move_to/move_page_menu.dartindex ea2427b1ea..631e20f14a 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/move_to/move_page_menu.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/move_to/move_page_menu.dart@@ -43,35 +43,27 @@ class _MovePageMenuState extends State<MovePageMenu> {@overrideWidget build(BuildContext context) {return BlocProvider(- create: (context) => SpaceSearchBloc()- ..add(- const SpaceSearchEvent.initial(),- ),+ create: (_) => SpaceSearchBloc()..add(const SpaceSearchEvent.initial()),child: BlocBuilder<SpaceBloc, SpaceState>(builder: (context, state) {final space = state.currentSpace;if (space == null) {return const SizedBox.shrink();}+return Column(children: [SpaceSearchField(width: 240,- onSearch: (context, value) {- context.read<SpaceSearchBloc>().add(- SpaceSearchEvent.search(- value,- ),- );- },+ onSearch: (context, value) => context+ .read<SpaceSearchBloc>()+ .add(SpaceSearchEvent.search(value)),),const VSpace(10),BlocBuilder<SpaceSearchBloc, SpaceSearchState>(builder: (context, state) {if (state.queryResults == null) {- return Expanded(- child: _buildSpace(space),- );+ return Expanded(child: _buildSpace(space));}return Expanded(child: _buildGroupedViews(space, state.queryResults!),@@ -87,10 +79,7 @@ class _MovePageMenuState extends State<MovePageMenu> {Widget _buildGroupedViews(ViewPB space, List<ViewPB> views) {final groupedViews = views- .where(- (view) =>- !_shouldIgnoreView(view, widget.sourceView) && !view.isSpace,- )+ .where((v) => !_shouldIgnoreView(v, widget.sourceView) && !v.isSpace).toList();return _MovePageGroupedViews(views: groupedViews,@@ -110,10 +99,8 @@ class _MovePageMenuState extends State<MovePageMenu> {child: FlowyTooltip(message: LocaleKeys.space_switchSpace.tr(),child: CurrentSpace(- onTapBlankArea: () {- // move the page to current space- widget.onSelected(space, space);- },+ // move the page to current space+ onTapBlankArea: () => widget.onSelected(space, space),space: space,),),@@ -149,10 +136,7 @@ class _MovePageMenuState extends State<MovePageMenu> {}class _MovePageGroupedViews extends StatelessWidget {- const _MovePageGroupedViews({- required this.views,- required this.onSelected,- });+ const _MovePageGroupedViews({required this.views, required this.onSelected});final List<ViewPB> views;final void Function(ViewPB view) onSelected;@@ -162,24 +146,22 @@ class _MovePageGroupedViews extends StatelessWidget {return SingleChildScrollView(child: Column(mainAxisSize: MainAxisSize.min,- children: views.map(- (e) {- final child = ViewItem(- key: ValueKey(e.id),- view: e,- spaceType: FolderSpaceType.unknown,- level: 0,- onSelected: (_, view) => onSelected(view),- isFeedback: false,- isDraggable: false,- shouldRenderChildren: false,- leftIconBuilder: (_, __) => const HSpace(0.0),- rightIconsBuilder: (_, view) => [],- );-- return child;- },- ).toList(),+ children: views+ .map(+ (view) => ViewItem(+ key: ValueKey(view.id),+ view: view,+ spaceType: FolderSpaceType.unknown,+ level: 0,+ onSelected: (_, view) => onSelected(view),+ isFeedback: false,+ isDraggable: false,+ shouldRenderChildren: false,+ leftIconBuilder: (_, __) => const HSpace(0.0),+ rightIconsBuilder: (_, view) => [],+ ),+ )+ .toList(),),);}diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar.dartindex 6f2b239b55..4b4fdfdb72 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar.dart@@ -108,22 +108,12 @@ class HomeSideBar extends StatelessWidget {BlocProvider.value(value: getIt<ActionNavigationBloc>()),BlocProvider(create: (_) => SidebarSectionsBloc()- ..add(- SidebarSectionsEvent.initial(- userProfile,- workspaceId,- ),- ),+ ..add(SidebarSectionsEvent.initial(userProfile, workspaceId)),),BlocProvider(- create: (_) => SpaceBloc(- userProfile: userProfile,- workspaceId: workspaceId,- )..add(- const SpaceEvent.initial(- openFirstPage: false,- ),- ),+ create: (_) =>+ SpaceBloc(userProfile: userProfile, workspaceId: workspaceId)+ ..add(const SpaceEvent.initial(openFirstPage: false)),),BlocProvider(create: (_) => SidebarPlanBloc()@@ -149,11 +139,9 @@ class HomeSideBar extends StatelessWidget {final page = state.lastCreatedPage;if (page == null || page.id.isEmpty) {// open the blank page- context.read<TabsBloc>().add(- TabsEvent.openPlugin(- plugin: BlankPagePlugin(),- ),- );+ context+ .read<TabsBloc>()+ .add(TabsEvent.openPlugin(plugin: BlankPagePlugin()));} else {context.read<TabsBloc>().add(TabsEvent.openPlugin(@@ -299,18 +287,14 @@ class _SidebarState extends State<_Sidebar> {),// user or workspace, settingBlocBuilder<UserWorkspaceBloc, UserWorkspaceState>(- builder: (context, state) {- return Container(- height: HomeSizes.workspaceSectionHeight,- padding:- menuHorizontalInset - const EdgeInsets.only(right: 6),- child:- // if the workspaces are empty, show the user profile instead- state.isCollabWorkspaceOn && state.workspaces.isNotEmpty- ? SidebarWorkspace(userProfile: widget.userProfile)- : SidebarUser(userProfile: widget.userProfile),- );- },+ builder: (context, state) => Container(+ height: HomeSizes.workspaceSectionHeight,+ padding: menuHorizontalInset - const EdgeInsets.only(right: 6),+ // if the workspaces are empty, show the user profile instead+ child: state.isCollabWorkspaceOn && state.workspaces.isNotEmpty+ ? SidebarWorkspace(userProfile: widget.userProfile)+ : SidebarUser(userProfile: widget.userProfile),+ ),),if (FeatureFlag.search.isOn) ...[const VSpace(6),@@ -329,12 +313,10 @@ class _SidebarState extends State<_Sidebar> {padding: const EdgeInsets.symmetric(horizontal: 12.0),child: ValueListenableBuilder(valueListenable: _scrollOffset,- builder: (_, offset, child) {- return Opacity(- opacity: offset > 0 ? 1 : 0,- child: child,- );- },+ builder: (_, offset, child) => Opacity(+ opacity: offset > 0 ? 1 : 0,+ child: child,+ ),child: const FlowyDivider(),),),diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/shared_widget.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/shared_widget.dartindex d8831109a4..a81f8c3e0d 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/shared_widget.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/shared_widget.dart@@ -563,18 +563,14 @@ class SpacePages extends StatelessWidget {@overrideWidget build(BuildContext context) {return BlocProvider(- create: (context) =>- ViewBloc(view: space)..add(const ViewEvent.initial()),+ create: (_) => ViewBloc(view: space)..add(const ViewEvent.initial()),child: BlocBuilder<ViewBloc, ViewState>(builder: (context, state) {// filter the child views that should be ignored- var childViews = state.view.childViews;+ List<ViewPB> childViews = state.view.childViews;if (shouldIgnoreView != null) {childViews = childViews- .where(- (childView) =>- shouldIgnoreView!(childView) != IgnoreViewType.hide,- )+ .where((v) => shouldIgnoreView!(v) != IgnoreViewType.hide).toList();}return Column(@@ -593,6 +589,7 @@ class SpacePages extends StatelessWidget {leftPadding: HomeSpaceViewSizes.leftPadding,isFeedback: false,isHovered: isHovered,+ enableRightClickContext: !disableSelectedStatus,disableSelectedStatus: disableSelectedStatus,isExpandedNotifier: isExpandedNotifier,rightIconsBuilder: rightIconsBuilder,diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space.dartindex c6e5098d07..fc73631171 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space.dart@@ -32,31 +32,29 @@ class SidebarSpace extends StatelessWidget {Widget build(BuildContext context) {return ValueListenableBuilder(valueListenable: getIt<MenuSharedState>().notifier,- builder: (context, value, child) {- return Provider.value(- value: userProfile,- child: Column(- children: [- const VSpace(4.0),- // favorite- BlocBuilder<FavoriteBloc, FavoriteState>(- builder: (context, state) {- if (state.views.isEmpty) {- return const SizedBox.shrink();- }- return FavoriteFolder(- views: state.views.map((e) => e.item).toList(),- );- },- ),- const VSpace(16.0),- // spaces- const _Space(),- const VSpace(200),- ],- ),- );- },+ builder: (_, __, ___) => Provider.value(+ value: userProfile,+ child: Column(+ children: [+ const VSpace(4.0),+ // favorite+ BlocBuilder<FavoriteBloc, FavoriteState>(+ builder: (context, state) {+ if (state.views.isEmpty) {+ return const SizedBox.shrink();+ }+ return FavoriteFolder(+ views: state.views.map((e) => e.item).toList(),+ );+ },+ ),+ const VSpace(16.0),+ // spaces+ const _Space(),+ const VSpace(200),+ ],+ ),+ ),);}}@@ -69,9 +67,8 @@ class _Space extends StatefulWidget {}class _SpaceState extends State<_Space> {- final ValueNotifier<bool> isHovered = ValueNotifier(false);- final PropertyValueNotifier<bool> isExpandedNotifier =- PropertyValueNotifier(false);+ final isHovered = ValueNotifier(false);+ final isExpandedNotifier = PropertyValueNotifier(false);@overridevoid initState() {@@ -82,6 +79,8 @@ class _SpaceState extends State<_Space> {@overridevoid dispose() {switchToTheNextSpace.removeListener(_switchToNextSpace);+ isHovered.dispose();+ isExpandedNotifier.dispose();super.dispose();}@@ -144,17 +143,15 @@ class _SpaceState extends State<_Space> {final spaceBloc = context.read<SpaceBloc>();showDialog(context: context,- builder: (_) {- return Dialog(- shape: RoundedRectangleBorder(- borderRadius: BorderRadius.circular(12.0),- ),- child: BlocProvider.value(- value: spaceBloc,- child: const CreateSpacePopup(),- ),- );- },+ builder: (_) => Dialog(+ shape: RoundedRectangleBorder(+ borderRadius: BorderRadius.circular(12.0),+ ),+ child: BlocProvider.value(+ value: spaceBloc,+ child: const CreateSpacePopup(),+ ),+ ),);}@@ -163,13 +160,9 @@ class _SpaceState extends State<_Space> {ViewPB space,ViewLayoutPB layout,) {- context.read<SpaceBloc>().add(- SpaceEvent.createPage(- name: '',- layout: layout,- index: 0,- ),- );+ context+ .read<SpaceBloc>()+ .add(SpaceEvent.createPage(name: '', layout: layout, index: 0));context.read<SpaceBloc>().add(SpaceEvent.expand(space, true));}diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/draggable_view_item.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/draggable_view_item.dartindex 0b6b3f210d..7f46266a9a 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/draggable_view_item.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/draggable_view_item.dart@@ -76,13 +76,8 @@ class _DraggableViewItemState extends State<DraggableViewItem> {),onAcceptWithDetails: (details) {final data = details.data;- _move(- data,- widget.view,- );- _updatePosition(- DraggableHoverPosition.none,- );+ _move(data, widget.view);+ _updatePosition(DraggableHoverPosition.none);},feedback: IntrinsicWidth(child: Opacity(@@ -177,9 +172,7 @@ class _DraggableViewItemState extends State<DraggableViewItem> {if (UniversalPlatform.isMobile && position != this.position) {HapticFeedback.mediumImpact();}- setState(- () => this.position = position,- );+ setState(() => this.position = position);}void _move(ViewPB from, ViewPB to) {diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dartindex 0adc97c204..36e7e1de99 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dart@@ -42,11 +42,7 @@ typedef ViewItemRightIconsBuilder = List<Widget> Function(ViewPB view,);-enum IgnoreViewType {- none,- hide,- disable,-}+enum IgnoreViewType { none, hide, disable }class ViewItem extends StatelessWidget {const ViewItem({@@ -73,6 +69,7 @@ class ViewItem extends StatelessWidget {this.extendBuilder,this.disableSelectedStatus,this.shouldIgnoreView,+ this.enableRightClickContext = false,});final ViewPB view;@@ -134,6 +131,10 @@ class ViewItem extends StatelessWidget {// ignore the views when rendering the child viewsfinal IgnoreViewType Function(ViewPB view)? shouldIgnoreView;+ /// Whether to add right-click to show the view action context menu+ ///+ final bool enableRightClickContext;+@overrideWidget build(BuildContext context) {return BlocProvider(@@ -148,13 +149,10 @@ class ViewItem extends StatelessWidget {context.read<TabsBloc>().openPlugin(state.lastCreatedView!),builder: (context, state) {// filter the child views that should be ignored- var childViews = state.view.childViews;+ List<ViewPB> childViews = state.view.childViews;if (shouldIgnoreView != null) {childViews = childViews- .where(- (childView) =>- shouldIgnoreView!(childView) != IgnoreViewType.hide,- )+ .where((v) => shouldIgnoreView!(v) != IgnoreViewType.hide).toList();}@@ -166,6 +164,7 @@ class ViewItem extends StatelessWidget {level: level,leftPadding: leftPadding,showActions: state.isEditing,+ enableRightClickContext: enableRightClickContext,isExpanded: state.isExpanded,disableSelectedStatus: disableSelectedStatus,onSelected: onSelected,@@ -192,9 +191,7 @@ class ViewItem extends StatelessWidget {message: LocaleKeys.space_cannotMovePageToDatabase.tr(),child: MouseRegion(cursor: SystemMouseCursors.forbidden,- child: IgnorePointer(- child: child,- ),+ child: IgnorePointer(child: child),),),);@@ -207,6 +204,7 @@ class ViewItem extends StatelessWidget {}}+// TODO: We shouldn't have local global variablesbool _isDragging = false;class InnerViewItem extends StatefulWidget {@@ -221,6 +219,7 @@ class InnerViewItem extends StatefulWidget {required this.level,required this.leftPadding,required this.showActions,+ this.enableRightClickContext = false,required this.onSelected,this.onTertiarySelected,this.isFirstChild = false,@@ -253,6 +252,7 @@ class InnerViewItem extends StatefulWidget {final double leftPadding;final bool showActions;+ final bool enableRightClickContext;final ViewItemOnSelected onSelected;final ViewItemOnSelected? onTertiarySelected;final double height;@@ -297,6 +297,7 @@ class _InnerViewItemState extends State<InnerViewItem> {parentView: widget.parentView,level: widget.level,showActions: widget.showActions,+ enableRightClickContext: widget.enableRightClickContext,spaceType: widget.spaceType,onSelected: widget.onSelected,onTertiarySelected: widget.onTertiarySelected,@@ -329,6 +330,7 @@ class _InnerViewItemState extends State<InnerViewItem> {isFirstChild: childView.id == widget.childViews.first.id,view: childView,level: widget.level + 1,+ enableRightClickContext: widget.enableRightClickContext,onSelected: widget.onSelected,onTertiarySelected: widget.onTertiarySelected,isDraggable: widget.isDraggable,@@ -346,10 +348,7 @@ class _InnerViewItemState extends State<InnerViewItem> {child = Column(mainAxisSize: MainAxisSize.min,- children: [- child,- ...children,- ],+ children: [child, ...children],);}@@ -359,9 +358,7 @@ class _InnerViewItemState extends State<InnerViewItem> {child = DraggableViewItem(isFirstChild: widget.isFirstChild,view: widget.view,- onDragging: (isDragging) {- _isDragging = isDragging;- },+ onDragging: (isDragging) => _isDragging = isDragging,onMove: widget.isPlaceholder? (from, to) => moveViewCrossSpace(context,@@ -373,32 +370,31 @@ class _InnerViewItemState extends State<InnerViewItem> {to.parentViewId,): null,- feedback: (context) {- return Container(- width: 250,- decoration: BoxDecoration(- color: Brightness.light == Theme.of(context).brightness- ? Colors.white- : Colors.black54,- borderRadius: BorderRadius.circular(8),- ),- child: ViewItem(- view: widget.view,- parentView: widget.parentView,- spaceType: widget.spaceType,- level: widget.level,- onSelected: widget.onSelected,- onTertiarySelected: widget.onTertiarySelected,- isDraggable: false,- leftPadding: widget.leftPadding,- isFeedback: true,- leftIconBuilder: widget.leftIconBuilder,- rightIconsBuilder: widget.rightIconsBuilder,- extendBuilder: widget.extendBuilder,- shouldIgnoreView: widget.shouldIgnoreView,- ),- );- },+ feedback: (context) => Container(+ width: 250,+ decoration: BoxDecoration(+ color: Brightness.light == Theme.of(context).brightness+ ? Colors.white+ : Colors.black54,+ borderRadius: BorderRadius.circular(8),+ ),+ child: ViewItem(+ view: widget.view,+ parentView: widget.parentView,+ spaceType: widget.spaceType,+ level: widget.level,+ onSelected: widget.onSelected,+ onTertiarySelected: widget.onTertiarySelected,+ isDraggable: false,+ leftPadding: widget.leftPadding,+ isFeedback: true,+ enableRightClickContext: widget.enableRightClickContext,+ leftIconBuilder: widget.leftIconBuilder,+ rightIconsBuilder: widget.rightIconsBuilder,+ extendBuilder: widget.extendBuilder,+ shouldIgnoreView: widget.shouldIgnoreView,+ ),+ ),child: child,);} else {@@ -430,6 +426,7 @@ class SingleInnerViewItem extends StatefulWidget {this.isDraggable = true,required this.spaceType,required this.showActions,+ this.enableRightClickContext = false,required this.onSelected,this.onTertiarySelected,required this.isFeedback,@@ -456,6 +453,7 @@ class SingleInnerViewItem extends StatefulWidget {final bool isDraggable;final bool showActions;+ final bool enableRightClickContext;final ViewItemOnSelected onSelected;final ViewItemOnSelected? onTertiarySelected;final FolderSpaceType spaceType;@@ -482,17 +480,14 @@ class _SingleInnerViewItemState extends State<SingleInnerViewItem> {@overrideWidget build(BuildContext context) {- var isSelected = widget.isSelected;+ bool isSelected = widget.isSelected;if (widget.disableSelectedStatus == true) {isSelected = false;}if (widget.isPlaceholder) {- return const SizedBox(- height: 4,- width: double.infinity,- );+ return const SizedBox(height: 4, width: double.infinity);}if (widget.isFeedback || !widget.isHoverEnabled) {@@ -503,14 +498,12 @@ class _SingleInnerViewItemState extends State<SingleInnerViewItem> {}return FlowyHover(- style: HoverStyle(- hoverColor: Theme.of(context).colorScheme.secondary,- ),+ style: HoverStyle(hoverColor: Theme.of(context).colorScheme.secondary),resetHoverOnRebuild: widget.showActions || !isIconPickerOpened,buildWhenOnHover: () =>!widget.showActions && !_isDragging && !isIconPickerOpened,- builder: (_, onHover) => _buildViewItem(onHover, isSelected),isSelected: () => widget.showActions || isSelected,+ builder: (_, onHover) => _buildViewItem(onHover, isSelected),);}@@ -532,16 +525,16 @@ class _SingleInnerViewItemState extends State<SingleInnerViewItem> {_buildViewIconButton(),const HSpace(6),// title- widget.extendBuilder != null- ? Expanded(- child: Row(+ Expanded(+ child: widget.extendBuilder != null+ ? Row(children: [Flexible(child: name),...widget.extendBuilder!(widget.view),],- ),- )- : Expanded(child: name),+ )+ : name,+ ),];// hover action@@ -550,7 +543,19 @@ class _SingleInnerViewItemState extends State<SingleInnerViewItem> {children.addAll(widget.rightIconsBuilder!(context, widget.view));} else {// ··· more action button- children.add(_buildViewMoreActionButton(context));+ children.add(+ _buildViewMoreActionButton(+ context,+ (popover) => FlowyTooltip(+ message: LocaleKeys.menuAppHeader_moreButtonToolTip.tr(),+ child: FlowyIconButton(+ width: 24,+ icon: const FlowySvg(FlowySvgs.workspace_three_dots_s),+ onPressed: popover.show,+ ),+ ),+ ),+ );// only support add button for document layoutif (widget.view.layout == ViewLayoutPB.Document) {// + button@@ -570,9 +575,13 @@ class _SingleInnerViewItemState extends State<SingleInnerViewItem> {height: widget.height,child: Padding(padding: EdgeInsets.only(left: widget.level * widget.leftPadding),- child: Row(- children: children,- ),+ child: widget.enableRightClickContext+ ? _buildViewMoreActionButton(+ context,+ showAtCursor: true,+ (_) => Row(children: children),+ )+ : Row(children: children),),),);@@ -694,109 +703,105 @@ class _SingleInnerViewItemState extends State<SingleInnerViewItem> {);}- viewBloc.add(- const ViewEvent.setIsExpanded(true),- );+ viewBloc.add(const ViewEvent.setIsExpanded(true));}// ··· more action button- Widget _buildViewMoreActionButton(BuildContext context) {- return FlowyTooltip(- message: LocaleKeys.menuAppHeader_moreButtonToolTip.tr(),- child: BlocProvider(- create: (context) => SpaceBloc(- userProfile: context.read<SpaceBloc>().userProfile,- workspaceId: context.read<SpaceBloc>().workspaceId,- )..add(const SpaceEvent.initial(openFirstPage: false)),- child: ViewMoreActionButton(- view: widget.view,- isExpanded: widget.isExpanded,- spaceType: widget.spaceType,- onEditing: (value) =>- context.read<ViewBloc>().add(ViewEvent.setIsEditing(value)),- onAction: (action, data) async {- switch (action) {- case ViewMoreActionType.favorite:- case ViewMoreActionType.unFavorite:- context- .read<FavoriteBloc>()- .add(FavoriteEvent.toggle(widget.view));- break;- case ViewMoreActionType.rename:- unawaited(- NavigatorTextFieldDialog(- title: LocaleKeys.disclosureAction_rename.tr(),- autoSelectAllText: true,- value: widget.view.name,- maxLength: 256,- onConfirm: (newValue, _) {- context.read<ViewBloc>().add(ViewEvent.rename(newValue));- },- ).show(context),- );- break;- case ViewMoreActionType.delete:- // get if current page contains published child views- final (containPublishedPage, _) =- await ViewBackendService.containPublishedPage(- widget.view,- );- if (containPublishedPage && context.mounted) {- await showConfirmDeletionDialog(- context: context,- name: widget.view.name,- description: LocaleKeys.publish_containsPublishedPage.tr(),- onConfirm: () {- context.read<ViewBloc>().add(const ViewEvent.delete());- },- );- } else if (context.mounted) {- context.read<ViewBloc>().add(const ViewEvent.delete());- }- break;- case ViewMoreActionType.duplicate:- context.read<ViewBloc>().add(const ViewEvent.duplicate());- break;- case ViewMoreActionType.openInNewTab:- context.read<TabsBloc>().openTab(widget.view);- break;- case ViewMoreActionType.collapseAllPages:- context- .read<ViewBloc>()- .add(const ViewEvent.collapseAllPages());- break;- case ViewMoreActionType.changeIcon:- if (data is! EmojiPickerResult) {- return;- }- final result = data;- await ViewBackendService.updateViewIcon(- viewId: widget.view.id,- viewIcon: result.emoji,- iconType: result.type.toProto(),- );- break;- case ViewMoreActionType.moveTo:- final value = data;- if (value is! (ViewPB, ViewPB)) {- return;- }- final space = value.$1;- final target = value.$2;- moveViewCrossSpace(- context,- space,- widget.view,- widget.parentView,- widget.spaceType,- widget.view,- target.id,+ Widget _buildViewMoreActionButton(+ BuildContext context,+ Widget Function(PopoverController) buildChild, {+ bool showAtCursor = false,+ }) {+ return BlocProvider(+ create: (context) => SpaceBloc(+ userProfile: context.read<SpaceBloc>().userProfile,+ workspaceId: context.read<SpaceBloc>().workspaceId,+ )..add(const SpaceEvent.initial(openFirstPage: false)),+ child: ViewMoreActionPopover(+ view: widget.view,+ isExpanded: widget.isExpanded,+ spaceType: widget.spaceType,+ showAtCursor: showAtCursor,+ onEditing: (value) =>+ context.read<ViewBloc>().add(ViewEvent.setIsEditing(value)),+ buildChild: buildChild,+ onAction: (action, data) async {+ switch (action) {+ case ViewMoreActionType.favorite:+ case ViewMoreActionType.unFavorite:+ context+ .read<FavoriteBloc>()+ .add(FavoriteEvent.toggle(widget.view));+ break;+ case ViewMoreActionType.rename:+ unawaited(+ NavigatorTextFieldDialog(+ title: LocaleKeys.disclosureAction_rename.tr(),+ autoSelectAllText: true,+ value: widget.view.name,+ maxLength: 256,+ onConfirm: (newValue, _) {+ context.read<ViewBloc>().add(ViewEvent.rename(newValue));+ },+ ).show(context),+ );+ break;+ case ViewMoreActionType.delete:+ // get if current page contains published child views+ final (containPublishedPage, _) =+ await ViewBackendService.containPublishedPage(widget.view);+ if (containPublishedPage && context.mounted) {+ await showConfirmDeletionDialog(+ context: context,+ name: widget.view.name,+ description: LocaleKeys.publish_containsPublishedPage.tr(),+ onConfirm: () =>+ context.read<ViewBloc>().add(const ViewEvent.delete()),);- default:- throw UnsupportedError('$action is not supported');- }- },- ),+ } else if (context.mounted) {+ context.read<ViewBloc>().add(const ViewEvent.delete());+ }+ break;+ case ViewMoreActionType.duplicate:+ context.read<ViewBloc>().add(const ViewEvent.duplicate());+ break;+ case ViewMoreActionType.openInNewTab:+ context.read<TabsBloc>().openTab(widget.view);+ break;+ case ViewMoreActionType.collapseAllPages:+ context.read<ViewBloc>().add(const ViewEvent.collapseAllPages());+ break;+ case ViewMoreActionType.changeIcon:+ if (data is! EmojiPickerResult) {+ return;+ }+ final result = data;+ await ViewBackendService.updateViewIcon(+ viewId: widget.view.id,+ viewIcon: result.emoji,+ iconType: result.type.toProto(),+ );+ break;+ case ViewMoreActionType.moveTo:+ final value = data;+ if (value is! (ViewPB, ViewPB)) {+ return;+ }+ final space = value.$1;+ final target = value.$2;+ moveViewCrossSpace(+ context,+ space,+ widget.view,+ widget.parentView,+ widget.spaceType,+ widget.view,+ target.id,+ );+ default:+ throw UnsupportedError('$action is not supported');+ }+ },),);}@@ -872,15 +877,7 @@ void moveViewCrossSpace(context.read<ViewBloc>().add(const ViewEvent.unpublish(sync: false));}- context.read<ViewBloc>().add(- ViewEvent.move(- from,- toId,- null,- null,- null,- ),- );+ context.read<ViewBloc>().add(ViewEvent.move(from, toId, null, null, null));}class ViewItemDefaultLeftIcon extends StatelessWidget {@@ -925,9 +922,8 @@ class ViewItemDefaultLeftIcon extends StatelessWidget {if (isHovered != null) {return ValueListenableBuilder<bool>(valueListenable: isHovered!,- builder: (_, isHovered, child) {- return Opacity(opacity: isHovered ? 1.0 : 0.0, child: child);- },+ builder: (_, isHovered, child) =>+ Opacity(opacity: isHovered ? 1.0 : 0.0, child: child),child: child,);}diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_more_action_button.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_more_action_button.dartindex be436d96f2..e9389e097f 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_more_action_button.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_more_action_button.dart@@ -13,14 +13,16 @@ import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';/// ··· button beside the view name-class ViewMoreActionButton extends StatelessWidget {- const ViewMoreActionButton({+class ViewMoreActionPopover extends StatelessWidget {+ const ViewMoreActionPopover({super.key,required this.view,required this.onEditing,required this.onAction,required this.spaceType,required this.isExpanded,+ this.showAtCursor = false,+ required this.buildChild,});final ViewPB view;@@ -28,6 +30,8 @@ class ViewMoreActionButton extends StatelessWidget {final void Function(ViewMoreActionType type, dynamic data) onAction;final FolderSpaceType spaceType;final bool isExpanded;+ final bool showAtCursor;+ final Widget Function(PopoverController) buildChild;@overrideWidget build(BuildContext context) {@@ -36,19 +40,10 @@ class ViewMoreActionButton extends StatelessWidget {direction: PopoverDirection.bottomWithLeftAligned,offset: const Offset(0, 8),actions: wrappers,- constraints: const BoxConstraints(- minWidth: 260,- ),- buildChild: (popover) {- return FlowyIconButton(- width: 24,- icon: const FlowySvg(FlowySvgs.workspace_three_dots_s),- onPressed: () {- onEditing(true);- popover.show();- },- );- },+ constraints: const BoxConstraints(minWidth: 260),+ showAtCursor: showAtCursor,+ onPopupBuilder: () => onEditing(true),+ buildChild: buildChild,onSelected: (_, __) {},onClosed: () => onEditing(false),);diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/pop_up_action.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/pop_up_action.dartindex ca0825d68a..e31c290a06 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/pop_up_action.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/pop_up_action.dart@@ -28,6 +28,7 @@ class PopoverActionList<T extends PopoverAction> extends StatefulWidget {maxWidth: 460,maxHeight: 300,),+ this.showAtCursor = false,});final PopoverMutex? popoverMutex;@@ -47,6 +48,7 @@ class PopoverActionList<T extends PopoverAction> extends StatefulWidget {final double endScaleFactor;final double beginOpacity;final double endOpacity;+ final bool showAtCursor;@overrideState<PopoverActionList<T>> createState() => _PopoverActionListState<T>();@@ -78,9 +80,12 @@ class _PopoverActionListState<T extends PopoverAction>direction: widget.direction,mutex: widget.mutex,offset: widget.offset,- triggerActions: PopoverTriggerFlags.none,+ triggerActions: widget.showAtCursor+ ? PopoverTriggerFlags.secondaryClick+ : PopoverTriggerFlags.none,onClose: widget.onClosed,- popupBuilder: (BuildContext popoverContext) {+ showAtCursor: widget.showAtCursor,+ popupBuilder: (_) {widget.onPopupBuilder?.call();final List<Widget> children = widget.actions.map((action) {if (action is ActionCell) {@@ -110,9 +115,7 @@ class _PopoverActionListState<T extends PopoverAction>return IntrinsicHeight(child: IntrinsicWidth(- child: Column(- children: children,- ),+ child: Column(children: children),),);},diff --git a/frontend/appflowy_flutter/packages/appflowy_popover/lib/src/layout.dart b/frontend/appflowy_flutter/packages/appflowy_popover/lib/src/layout.dartindex 861d988982..07df515cbc 100644--- a/frontend/appflowy_flutter/packages/appflowy_popover/lib/src/layout.dart+++ b/frontend/appflowy_flutter/packages/appflowy_popover/lib/src/layout.dart@@ -11,12 +11,16 @@ class PopoverLayoutDelegate extends SingleChildLayoutDelegate {required this.direction,required this.offset,required this.windowPadding,+ this.showAtCursor = false,+ this.cursorOffset,});PopoverLink link;PopoverDirection direction;final Offset offset;final EdgeInsets windowPadding;+ final bool showAtCursor;+ final Offset? cursorOffset;@overridebool shouldRelayout(PopoverLayoutDelegate oldDelegate) {@@ -36,6 +40,14 @@ class PopoverLayoutDelegate extends SingleChildLayoutDelegate {return true;}+ if (showAtCursor != oldDelegate.showAtCursor) {+ return true;+ }++ if (showAtCursor && cursorOffset != oldDelegate.cursorOffset) {+ return true;+ }+return false;}@@ -58,21 +70,43 @@ class PopoverLayoutDelegate extends SingleChildLayoutDelegate {@overrideOffset getPositionForChild(Size size, Size childSize) {- final leaderOffset = link.leaderOffset;+ final effectiveOffset =+ showAtCursor && cursorOffset != null && link.leaderOffset != null+ ? link.leaderOffset! + cursorOffset!+ : link.leaderOffset;+final leaderSize = link.leaderSize;- if (leaderOffset == null || leaderSize == null) {+ if (effectiveOffset == null || leaderSize == null) {return Offset.zero;}final anchorRect = Rect.fromLTWH(- leaderOffset.dx + offset.dx,- leaderOffset.dy + offset.dy,+ effectiveOffset.dx + offset.dx,+ effectiveOffset.dy + offset.dy,leaderSize.width,leaderSize.height,);- Offset position;+ Offset position = effectiveOffset;+ if (showAtCursor) {+ return Offset(+ math.max(+ windowPadding.left,+ math.min(+ windowPadding.left + size.width - childSize.width,+ anchorRect.left,+ ),+ ),+ math.max(+ windowPadding.top,+ math.min(+ windowPadding.top + size.height - childSize.height,+ anchorRect.top,+ ),+ ),+ );+ }switch (direction) {case PopoverDirection.topLeft:@@ -192,6 +226,24 @@ class PopoverLayoutDelegate extends SingleChildLayoutDelegate {),);}++ PopoverLayoutDelegate copyWith({+ PopoverLink? link,+ PopoverDirection? direction,+ Offset? offset,+ EdgeInsets? windowPadding,+ bool? showAtCursor,+ Offset? cursorOffset,+ }) {+ return PopoverLayoutDelegate(+ link: link ?? this.link,+ direction: direction ?? this.direction,+ offset: offset ?? this.offset,+ windowPadding: windowPadding ?? this.windowPadding,+ showAtCursor: showAtCursor ?? this.showAtCursor,+ cursorOffset: cursorOffset ?? this.cursorOffset,+ );+ }}class PopoverTarget extends SingleChildRenderObjectWidget {diff --git a/frontend/appflowy_flutter/packages/appflowy_popover/lib/src/popover.dart b/frontend/appflowy_flutter/packages/appflowy_popover/lib/src/popover.dartindex eb6aa8236e..c339ed60c4 100644--- a/frontend/appflowy_flutter/packages/appflowy_popover/lib/src/popover.dart+++ b/frontend/appflowy_flutter/packages/appflowy_popover/lib/src/popover.dart@@ -1,4 +1,5 @@import 'package:appflowy_popover/src/layout.dart';+import 'package:flutter/gestures.dart';import 'package:flutter/material.dart';import 'package:flutter/services.dart';@@ -8,19 +9,15 @@ import 'mutex.dart';class PopoverController {PopoverState? _state;- void close() {- _state?.close();- }-- void show() {- _state?.showOverlay();- }+ void close() => _state?.close();+ void show() => _state?.showOverlay();}class PopoverTriggerFlags {static const int none = 0x00;static const int click = 0x01;static const int hover = 0x02;+ static const int secondaryClick = 0x04;}enum PopoverDirection {@@ -80,6 +77,7 @@ class Popover extends StatefulWidget {this.maskDecoration = const BoxDecoration(color: Color.fromARGB(0, 244, 67, 54),),+ this.showAtCursor = false,});final PopoverController? controller;@@ -140,6 +138,8 @@ class Popover extends StatefulWidget {/// The content area of the popover.final Widget child;+ final bool showAtCursor;+@overrideState<Popover> createState() => PopoverState();}@@ -148,11 +148,12 @@ class PopoverState extends State<Popover> with SingleTickerProviderStateMixin {static final RootOverlayEntry rootEntry = RootOverlayEntry();final PopoverLink popoverLink = PopoverLink();- late final layoutDelegate = PopoverLayoutDelegate(+ late PopoverLayoutDelegate layoutDelegate = PopoverLayoutDelegate(direction: widget.direction,link: popoverLink,offset: widget.offset ?? Offset.zero,windowPadding: widget.windowPadding ?? EdgeInsets.zero,+ showAtCursor: widget.showAtCursor,);late AnimationController animationController;@@ -216,9 +217,7 @@ class PopoverState extends State<Popover> with SingleTickerProviderStateMixin {context,widget.debugId ?? '',this,- OverlayEntry(- builder: (context) => _buildOverlayContent(shouldAddMask),- ),+ OverlayEntry(builder: (_) => _buildOverlayContent(shouldAddMask)),widget.asBarrier,animationController,);@@ -269,9 +268,11 @@ class PopoverState extends State<Popover> with SingleTickerProviderStateMixin {child,() {widget.onOpen?.call();- if (widget.triggerActions & PopoverTriggerFlags.click != 0) {- showOverlay();+ if (widget.triggerActions & PopoverTriggerFlags.none != 0) {+ return;}++ showOverlay();},);@@ -288,11 +289,37 @@ class PopoverState extends State<Popover> with SingleTickerProviderStateMixin {Widget _buildClickHandler(Widget child, VoidCallback handler) {return switch (widget.clickHandler) {PopoverClickHandler.listener => Listener(- onPointerDown: (_) => _callHandler(handler),+ onPointerDown: (event) {+ if (widget.showAtCursor) {+ layoutDelegate =+ layoutDelegate.copyWith(cursorOffset: event.localPosition);+ }++ if (event.buttons == kSecondaryMouseButton &&+ widget.triggerActions & PopoverTriggerFlags.secondaryClick !=+ 0) {+ return _callHandler(handler);+ }++ if (event.buttons == kPrimaryMouseButton &&+ widget.triggerActions & PopoverTriggerFlags.click != 0) {+ return _callHandler(handler);+ }+ },child: child,),PopoverClickHandler.gestureDetector => GestureDetector(- onTap: () => _callHandler(handler),+ onTap: () {+ if (widget.triggerActions & PopoverTriggerFlags.click != 0) {+ return _callHandler(handler);+ }+ },+ onSecondaryTap: () {+ if (widget.triggerActions & PopoverTriggerFlags.secondaryClick !=+ 0) {+ return _callHandler(handler);+ }+ },child: child,),};@@ -345,18 +372,16 @@ class PopoverState extends State<Popover> with SingleTickerProviderStateMixin {if (widget.animationDuration != Duration.zero) {child = AnimatedBuilder(animation: animationController,- builder: (context, child) {- return Opacity(- opacity: fadeAnimation.value,- child: Transform.scale(- scale: scaleAnimation.value,- child: Transform.translate(- offset: slideAnimation.value,- child: child,- ),+ builder: (_, child) => Opacity(+ opacity: fadeAnimation.value,+ child: Transform.scale(+ scale: scaleAnimation.value,+ child: Transform.translate(+ offset: slideAnimation.value,+ child: child,),- );- },+ ),+ ),child: child,);}diff --git a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/appflowy_popover.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/appflowy_popover.dartindex e807b0ccf7..1ab7e9b885 100644--- a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/appflowy_popover.dart+++ b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/appflowy_popover.dart@@ -29,6 +29,7 @@ class AppFlowyPopover extends StatelessWidget {this.endScaleFactor = 1.0,this.beginOpacity = 0.0,this.endOpacity = 1.0,+ this.showAtCursor = false,});final Widget child;@@ -65,6 +66,8 @@ class AppFlowyPopover extends StatelessWidget {///final bool skipTraversal;+ final bool showAtCursor;+@overrideWidget build(BuildContext context) {return Popover(@@ -86,15 +89,14 @@ class AppFlowyPopover extends StatelessWidget {offset: offset,clickHandler: clickHandler,skipTraversal: skipTraversal,- popupBuilder: (context) {- return _PopoverContainer(- constraints: constraints,- margin: margin,- decorationColor: decorationColor,- borderRadius: borderRadius,- child: popupBuilder(context),- );- },+ showAtCursor: showAtCursor,+ popupBuilder: (context) => _PopoverContainer(+ constraints: constraints,+ margin: margin,+ decorationColor: decorationColor,+ borderRadius: borderRadius,+ child: popupBuilder(context),+ ),child: child,);}