Skip to content

Commit 0d879a6

Browse files
authored
Fix/select option filter (#1530)
* fix: multi select filter bugs * fix: single select bugs Co-authored-by: nathan <[email protected]>
1 parent 806a924 commit 0d879a6

File tree

8 files changed

+217
-87
lines changed

8 files changed

+217
-87
lines changed

frontend/app_flowy/lib/plugins/board/application/card/board_text_cell_bloc.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'package:app_flowy/plugins/grid/application/cell/cell_service/cell_service.dart';
2-
import 'package:flutter/foundation.dart';
32
import 'package:flutter_bloc/flutter_bloc.dart';
43
import 'package:freezed_annotation/freezed_annotation.dart';
54
import 'dart:async';

frontend/app_flowy/lib/plugins/grid/application/field/field_service.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import 'package:flowy_sdk/dispatch/dispatch.dart';
33
import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';
44
import 'package:flowy_sdk/protobuf/flowy-grid/field_entities.pb.dart';
55
import 'package:flowy_sdk/protobuf/flowy-grid/grid_entities.pb.dart';
6-
import 'package:flutter/foundation.dart';
76
import 'package:freezed_annotation/freezed_annotation.dart';
87

98
part 'field_service.freezed.dart';

frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/select_option/select_option.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class _SelectOptionFilterChoicechipState
6161
builder: (blocContext, state) {
6262
return AppFlowyPopover(
6363
controller: PopoverController(),
64-
constraints: BoxConstraints.loose(const Size(200, 160)),
64+
constraints: BoxConstraints.loose(const Size(240, 160)),
6565
direction: PopoverDirection.bottomWithCenterAligned,
6666
popupBuilder: (BuildContext context) {
6767
return SelectOptionFilterEditor(bloc: bloc);

frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/filter_button.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import 'package:app_flowy/plugins/grid/application/filter/filter_menu_bloc.dart'
33
import 'package:appflowy_popover/appflowy_popover.dart';
44
import 'package:easy_localization/easy_localization.dart';
55
import 'package:flowy_infra/color_extension.dart';
6-
import 'package:flowy_infra/size.dart';
76
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
87
import 'package:flowy_infra_ui/style_widget/button.dart';
98
import 'package:flutter/material.dart';
@@ -35,7 +34,7 @@ class _FilterButtonState extends State<FilterButton> {
3534
height: 26,
3635
child: FlowyTextButton(
3736
LocaleKeys.grid_settings_filter.tr(),
38-
fontSize: FontSizes.s14,
37+
fontSize: 13,
3938
fontColor: textColor,
4039
fillColor: Colors.transparent,
4140
hoverColor: AFThemeExtension.of(context).lightGreyHover,

frontend/app_flowy/lib/plugins/grid/presentation/widgets/toolbar/setting_button.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import 'package:app_flowy/plugins/grid/application/setting/setting_bloc.dart';
44
import 'package:appflowy_popover/appflowy_popover.dart';
55
import 'package:easy_localization/easy_localization.dart';
66
import 'package:flowy_infra/color_extension.dart';
7-
import 'package:flowy_infra/size.dart';
87
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
98
import 'package:flowy_infra_ui/style_widget/button.dart';
109
import 'package:flutter/material.dart';
@@ -50,7 +49,7 @@ class _SettingButtonState extends State<SettingButton> {
5049
triggerActions: PopoverTriggerFlags.none,
5150
child: FlowyTextButton(
5251
LocaleKeys.settings_title.tr(),
53-
fontSize: FontSizes.s14,
52+
fontSize: 13,
5453
fillColor: Colors.transparent,
5554
hoverColor: AFThemeExtension.of(context).lightGreyHover,
5655
padding: const EdgeInsets.symmetric(vertical: 2, horizontal: 6),

frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/checklist_filter.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ impl ChecklistFilterPB {
1414
.map(|option| option.id.as_str())
1515
.collect::<Vec<&str>>();
1616

17-
return match self.condition {
17+
match self.condition {
1818
ChecklistFilterCondition::IsComplete => {
1919
if selected_option_ids.is_empty() {
2020
return false;
@@ -31,6 +31,6 @@ impl ChecklistFilterPB {
3131
all_option_ids.retain(|option_id| !selected_option_ids.contains(option_id));
3232
!all_option_ids.is_empty()
3333
}
34-
};
34+
}
3535
}
3636
}

0 commit comments

Comments
 (0)