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: esc to close date picker dialog (#3648)

Browse Source
This commit is contained in:
Mathias Mogensen 2023-10-11 05:49:32 +02:00 committed by GitHub
parent 2a5d393c9f
commit f0d47ee50c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
frontend/appflowy_flutter/lib/workspace/presentation/widgets/date_picker/widgets/date_picker_dialog.dart
View File

@ -3,6 +3,7 @@ import 'package:appflowy_backend/protobuf/flowy-user/date_time.pbenum.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
import 'package:flowy_infra_ui/style_widget/decoration.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
/// Provides arguemnts for [AppFlowyCalender] when showing
/// a [DatePickerMenu]
@ -76,17 +77,19 @@ class DatePickerMenu extends DatePickerService {
}) {
dismiss();
final editorSize = editorState.renderBox!.size;
// Use MediaQuery, since Stack takes up all window space
// and not just the space of the current Editor
final windowSize = MediaQuery.of(context).size;
double offsetX = offset.dx;
double offsetY = offset.dy;
final showRight = (offset.dx + _datePickerWidth) < editorSize.width;
final showRight = (offset.dx + _datePickerWidth) < windowSize.width;
if (!showRight) {
offsetX = offset.dx - _datePickerWidth;
}
final showBelow = (offset.dy + _datePickerHeight) < editorSize.height;
final showBelow = (offset.dy + _datePickerHeight) < windowSize.height;
if (!showBelow) {
offsetY = offset.dy - _datePickerHeight;
}
@ -96,19 +99,28 @@ class DatePickerMenu extends DatePickerService {
return Material(
type: MaterialType.transparency,
child: SizedBox(
height: editorSize.height,
width: editorSize.width,
child: GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: dismiss,
child: Stack(
children: [
_AnimatedDatePicker(
offset: Offset(offsetX, offsetY),
showBelow: showBelow,
options: options,
),
],
height: windowSize.height,
width: windowSize.width,
child: RawKeyboardListener(
focusNode: FocusNode()..requestFocus(),
onKey: (event) {
if (event is RawKeyDownEvent &&
event.logicalKey == LogicalKeyboardKey.escape) {
dismiss();
}
},
child: GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: dismiss,
child: Stack(
children: [
_AnimatedDatePicker(
offset: Offset(offsetX, offsetY),
showBelow: showBelow,
options: options,
),
],
),
),
),
),