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.

fix: close popover on add option button clicked and textfield focused

Cyrine ben-abid3e76fa8e4278
diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/common/text_field.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/common/text_field.dart
index abb0af7d58..b2cf30faea 100644
--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/common/text_field.dart
+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/common/text_field.dart
@@ -9,6 +9,7 @@ class InputTextField extends StatefulWidget {
final void Function(String)? onDone;
final void Function(String)? onChanged;
final void Function() onCanceled;
+ final void Function()? onFocused;
final bool autoClearWhenDone;
final String text;
final int? maxLength;
@@ -18,6 +19,7 @@ class InputTextField extends StatefulWidget {
this.onDone,
required this.onCanceled,
this.onChanged,
+ this.onFocused,
this.autoClearWhenDone = false,
this.maxLength,
Key? key,
@@ -90,6 +92,10 @@ class _InputTextFieldState extends State<InputTextField> {
widget.onDone!(_controller.text);
}
}
+ } else {
+ if (widget.onFocused != null) {
+ widget.onFocused!();
+ }
}
}
}
diff --git a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/select_option.dart b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/select_option.dart
index ee35d208f9..aabeca9646 100644
--- a/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/select_option.dart
+++ b/frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/select_option.dart
@@ -43,11 +43,15 @@ class SelectOptionTypeOptionWidget extends StatelessWidget {
builder: (context, state) {
List<Widget> children = [
const TypeOptionSeparator(),
- const OptionTitle(),
+ OptionTitle(
+ popoverMutex: popoverMutex,
+ ),
if (state.isEditingOption)
- const Padding(
- padding: EdgeInsets.only(bottom: 10),
- child: _CreateOptionTextField(),
+ Padding(
+ padding: const EdgeInsets.only(bottom: 10),
+ child: _CreateOptionTextField(
+ popoverMutex: popoverMutex,
+ ),
),
if (state.options.isEmpty && !state.isEditingOption)
const _AddOptionButton(),
@@ -62,7 +66,9 @@ class SelectOptionTypeOptionWidget extends StatelessWidget {
}
class OptionTitle extends StatelessWidget {
- const OptionTitle({Key? key}) : super(key: key);
+ final PopoverMutex? popoverMutex;
+
+ const OptionTitle({this.popoverMutex, Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
@@ -78,7 +84,9 @@ class OptionTitle extends StatelessWidget {
];
if (state.options.isNotEmpty && !state.isEditingOption) {
children.add(const Spacer());
- children.add(const _OptionTitleButton());
+ children.add(_OptionTitleButton(
+ popoverMutex: popoverMutex,
+ ));
}
return SizedBox(
@@ -91,7 +99,9 @@ class OptionTitle extends StatelessWidget {
}
class _OptionTitleButton extends StatelessWidget {
- const _OptionTitleButton({Key? key}) : super(key: key);
+ final PopoverMutex? popoverMutex;
+
+ const _OptionTitleButton({this.popoverMutex, Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
@@ -107,6 +117,7 @@ class _OptionTitleButton extends StatelessWidget {
),
hoverColor: theme.hover,
onTap: () {
+ popoverMutex?.close();
context
.read<SelectOptionTypeOptionBloc>()
.add(const SelectOptionTypeOptionEvent.addingOption());
@@ -252,7 +263,8 @@ class _AddOptionButton extends StatelessWidget {
}
class _CreateOptionTextField extends StatelessWidget {
- const _CreateOptionTextField({Key? key}) : super(key: key);
+ final PopoverMutex? popoverMutex;
+ const _CreateOptionTextField({this.popoverMutex, Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
@@ -273,6 +285,9 @@ class _CreateOptionTextField extends StatelessWidget {
.read<SelectOptionTypeOptionBloc>()
.add(SelectOptionTypeOptionEvent.createOption(optionName));
},
+ onFocused: () {
+ popoverMutex?.close();
+ },
);
},
);