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

Merge pull request #823 from ChiragKr04/feat/close-dialog-on-esc-press

Browse Source 
fix: closing rename dialog on escape key press
This commit is contained in:
Vincent Chan 2022-08-11 19:22:44 +08:00 committed by GitHub
commit f913e00856
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
frontend/app_flowy/packages/flowy_infra_ui/lib/widget/dialog/styled_dialogs.dart
View File

@ -3,12 +3,26 @@ import 'package:flowy_infra/size.dart';
import 'package:flowy_infra/theme.dart'; import 'package:flowy_infra/theme.dart';
import 'package:flowy_infra_ui/widget/dialog/dialog_size.dart'; import 'package:flowy_infra_ui/widget/dialog/dialog_size.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'dart:ui'; import 'dart:ui';
extension IntoDialog on Widget { extension IntoDialog on Widget {
Future<dynamic> show(BuildContext context) async { Future<dynamic> show(BuildContext context) async {
await Dialogs.show(this, context); FocusNode dialogFocusNode = FocusNode();
await Dialogs.show(
RawKeyboardListener(
focusNode: dialogFocusNode,
onKey: (value) {
if (value.isKeyPressed(LogicalKeyboardKey.escape)) {
Navigator.of(context).pop();
}
},
child: this,
),
context,
);
dialogFocusNode.dispose();
} }
} }
@ -45,7 +59,8 @@ class StyledDialog extends StatelessWidget {
); );
if (shrinkWrap) { if (shrinkWrap) {
innerContent = IntrinsicWidth(child: IntrinsicHeight(child: innerContent)); innerContent =
IntrinsicWidth(child: IntrinsicHeight(child: innerContent));
} }
return FocusTraversalGroup( return FocusTraversalGroup(
@ -80,7 +95,8 @@ class Dialogs {
return await Navigator.of(context).push( return await Navigator.of(context).push(
StyledDialogRoute( StyledDialogRoute(
barrier: DialogBarrier(color: Colors.black.withOpacity(0.4)), barrier: DialogBarrier(color: Colors.black.withOpacity(0.4)),
pageBuilder: (BuildContext buildContext, Animation<double> animation, Animation<double> secondaryAnimation) { pageBuilder: (BuildContext buildContext, Animation<double> animation,
Animation<double> secondaryAnimation) {
return SafeArea(child: child); return SafeArea(child: child);
}, },
), ),
@ -132,7 +148,8 @@ class StyledDialogRoute<T> extends PopupRoute<T> {
final RouteTransitionsBuilder? _transitionBuilder; final RouteTransitionsBuilder? _transitionBuilder;
@override @override
Widget buildPage(BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation) { Widget buildPage(BuildContext context, Animation<double> animation,
Animation<double> secondaryAnimation) {
return Semantics( return Semantics(
child: _pageBuilder(context, animation, secondaryAnimation), child: _pageBuilder(context, animation, secondaryAnimation),
scopesRoute: true, scopesRoute: true,
@ -141,10 +158,12 @@ class StyledDialogRoute<T> extends PopupRoute<T> {
} }
@override @override
Widget buildTransitions( Widget buildTransitions(BuildContext context, Animation<double> animation,
BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation, Widget child) { Animation<double> secondaryAnimation, Widget child) {
if (_transitionBuilder == null) { if (_transitionBuilder == null) {
return FadeTransition(opacity: CurvedAnimation(parent: animation, curve: Curves.easeInOut), child: child); return FadeTransition(
opacity: CurvedAnimation(parent: animation, curve: Curves.easeInOut),
child: child);
} else { } else {
return _transitionBuilder!(context, animation, secondaryAnimation, child); return _transitionBuilder!(context, animation, secondaryAnimation, child);
} // Some default transition } // Some default transition