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.dart index 2fc1b311ad..55ac449159 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,5 +1,3 @@ -import 'package:flutter/material.dart'; - import 'package:appflowy/generated/locale_keys.g.dart'; import 'package:appflowy/startup/startup.dart'; import 'package:appflowy/workspace/application/favorite/favorite_bloc.dart'; @@ -14,6 +12,7 @@ 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/widget/flowy_tooltip.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; class FavoriteMoreActions extends StatelessWidget { @@ -28,6 +27,7 @@ class FavoriteMoreActions extends StatelessWidget { child: ViewMoreActionButton( view: view, spaceType: FolderSpaceType.favorite, + isExpanded: false, onEditing: (value) => context.read().add(ViewEvent.setIsEditing(value)), onAction: (action, _) { 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.dart index 8a2b207450..aab249d0f8 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 @@ -693,6 +693,7 @@ class _SingleInnerViewItemState extends State { message: LocaleKeys.menuAppHeader_moreButtonToolTip.tr(), child: ViewMoreActionButton( view: widget.view, + isExpanded: widget.isExpanded, spaceType: widget.spaceType, onEditing: (value) => context.read().add(ViewEvent.setIsEditing(value)), 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.dart index 6a10db604e..0383c9c1e1 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 @@ -19,12 +19,14 @@ class ViewMoreActionButton extends StatelessWidget { required this.onEditing, required this.onAction, required this.spaceType, + required this.isExpanded, }); final ViewPB view; final void Function(bool value) onEditing; final void Function(ViewMoreActionType type, dynamic data) onAction; final FolderSpaceType spaceType; + final bool isExpanded; @override Widget build(BuildContext context) { @@ -102,7 +104,9 @@ class ViewMoreActionButton extends StatelessWidget { // Chat doesn't change collapse // Only show collapse all pages if the view has child views - if (view.layout != ViewLayoutPB.Chat && view.childViews.isNotEmpty) { + if (view.layout != ViewLayoutPB.Chat && + view.childViews.isNotEmpty && + isExpanded) { actionTypes.add(ViewMoreActionType.collapseAllPages); actionTypes.add(ViewMoreActionType.divider); }