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: close popover on add option button clicked and textfield focused

Browse Source
This commit is contained in:
Cyrine ben-abid 2022-10-26 11:39:41 +02:00 committed by Cyrine-benabid
parent c8044a92d1
commit 3e76fa8e42
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/app_flowy/lib/plugins/grid/presentation/widgets/common/text_field.dart
View File

@ -9,6 +9,7 @@ class InputTextField extends StatefulWidget {
final void Function(String)? onDone; final void Function(String)? onDone;
final void Function(String)? onChanged; final void Function(String)? onChanged;
final void Function() onCanceled; final void Function() onCanceled;
final void Function()? onFocused;
final bool autoClearWhenDone; final bool autoClearWhenDone;
final String text; final String text;
final int? maxLength; final int? maxLength;
@ -18,6 +19,7 @@ class InputTextField extends StatefulWidget {
this.onDone, this.onDone,
required this.onCanceled, required this.onCanceled,
this.onChanged, this.onChanged,
this.onFocused,
this.autoClearWhenDone = false, this.autoClearWhenDone = false,
this.maxLength, this.maxLength,
Key? key, Key? key,
@ -90,6 +92,10 @@ class _InputTextFieldState extends State<InputTextField> {
widget.onDone!(_controller.text); widget.onDone!(_controller.text);
} }
} }
} else {
if (widget.onFocused != null) {
widget.onFocused!();
}
} }
} }
} }

31
frontend/app_flowy/lib/plugins/grid/presentation/widgets/header/type_option/select_option.dart
View File

@ -43,11 +43,15 @@ class SelectOptionTypeOptionWidget extends StatelessWidget {
builder: (context, state) { builder: (context, state) {
List<Widget> children = [ List<Widget> children = [
const TypeOptionSeparator(), const TypeOptionSeparator(),
const OptionTitle(), OptionTitle(
popoverMutex: popoverMutex,
),
if (state.isEditingOption) if (state.isEditingOption)
const Padding( Padding(
padding: EdgeInsets.only(bottom: 10), padding: const EdgeInsets.only(bottom: 10),
child: _CreateOptionTextField(), child: _CreateOptionTextField(
popoverMutex: popoverMutex,
),
), ),
if (state.options.isEmpty && !state.isEditingOption) if (state.options.isEmpty && !state.isEditingOption)
const _AddOptionButton(), const _AddOptionButton(),
@ -62,7 +66,9 @@ class SelectOptionTypeOptionWidget extends StatelessWidget {
} }
class OptionTitle 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 @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -78,7 +84,9 @@ class OptionTitle extends StatelessWidget {
]; ];
if (state.options.isNotEmpty && !state.isEditingOption) { if (state.options.isNotEmpty && !state.isEditingOption) {
children.add(const Spacer()); children.add(const Spacer());
children.add(const _OptionTitleButton()); children.add(_OptionTitleButton(
popoverMutex: popoverMutex,
));
} }
return SizedBox( return SizedBox(
@ -91,7 +99,9 @@ class OptionTitle extends StatelessWidget {
} }
class _OptionTitleButton 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 @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -107,6 +117,7 @@ class _OptionTitleButton extends StatelessWidget {
), ),
hoverColor: theme.hover, hoverColor: theme.hover,
onTap: () { onTap: () {
popoverMutex?.close();
context context
.read<SelectOptionTypeOptionBloc>() .read<SelectOptionTypeOptionBloc>()
.add(const SelectOptionTypeOptionEvent.addingOption()); .add(const SelectOptionTypeOptionEvent.addingOption());
@ -252,7 +263,8 @@ class _AddOptionButton extends StatelessWidget {
} }
class _CreateOptionTextField 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 @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -273,6 +285,9 @@ class _CreateOptionTextField extends StatelessWidget {
.read<SelectOptionTypeOptionBloc>() .read<SelectOptionTypeOptionBloc>()
.add(SelectOptionTypeOptionEvent.createOption(optionName)); .add(SelectOptionTypeOptionEvent.createOption(optionName));
}, },
onFocused: () {
popoverMutex?.close();
},
); );
}, },
); );