Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: auto size filter menu (#1552)

Browse Source 
Co-authored-by: nathan <nathan@appflowy.io>
This commit is contained in:
Nathan.fooo
2022-12-09 10:12:45 +08:00
committed by GitHub
parent 53b7595de8
commit 12441f1183
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/app_flowy/lib/plugins/grid/application/filter/filter_create_bloc.dart
View File

@ -62,7 +62,7 @@ class GridCreateFilterBloc
final List<FieldInfo> allFields = List.from(fields); final List<FieldInfo> allFields = List.from(fields);
final keyword = filterText.toLowerCase(); final keyword = filterText.toLowerCase();
allFields.retainWhere((field) { allFields.retainWhere((field) {
if (field.canCreateFilter) { if (!field.canCreateFilter) {
return false; return false;
} }

21
frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/menu.dart
View File

@ -54,21 +54,26 @@ class GridFilterMenu extends StatelessWidget {
} }
Widget buildFilterItems(String viewId, GridFilterMenuState state) { Widget buildFilterItems(String viewId, GridFilterMenuState state) {
final List<Widget> children = state.filters final List<Widget> children = [];
children.addAll(
state.filters
.map((filterInfo) => FilterMenuItem(filterInfo: filterInfo)) .map((filterInfo) => FilterMenuItem(filterInfo: filterInfo))
.toList(); .toList(),
);
if (state.creatableFields.isNotEmpty) {
children.add(AddFilterButton(viewId: viewId));
}
return Row( return Row(
children: [ children: [
SingleChildScrollView( Expanded(
controller: ScrollController(),
scrollDirection: Axis.horizontal,
child: Wrap( child: Wrap(
spacing: 4, spacing: 6,
runSpacing: 4,
children: children, children: children,
), ),
), ),
const HSpace(4),
if (state.creatableFields.isNotEmpty) AddFilterButton(viewId: viewId),
], ],
); );
} }

8
frontend/app_flowy/packages/flowy_infra_ui/lib/style_widget/button.dart
View File

@ -24,7 +24,7 @@ class FlowyButton extends StatelessWidget {
required this.text, required this.text,
this.onTap, this.onTap,
this.onHover, this.onHover,
this.margin = const EdgeInsets.symmetric(horizontal: 6, vertical: 2), this.margin = const EdgeInsets.symmetric(horizontal: 10, vertical: 2),
this.leftIcon, this.leftIcon,
this.rightIcon, this.rightIcon,
this.hoverColor, this.hoverColor,
@ -63,9 +63,9 @@ class FlowyButton extends StatelessWidget {
children.add(Expanded(child: text)); children.add(Expanded(child: text));
if (rightIcon != null) { if (rightIcon != null) {
children.add(const HSpace(6)); children.add(const HSpace(10));
children.add( // No need to define the size of rightIcon. Just use its intrinsic width
SizedBox.fromSize(size: const Size.square(16), child: rightIcon!)); children.add(rightIcon!);
} }
Widget child = Row( Widget child = Row(