Skip to content

Commit f6a4fe8

Browse files
[Super Editor] - Fix KeyboardScaffoldSafeArea so that when there's only a single scope, that scope is used instead of MediaQuery (Resolves #2502) (#2503)
1 parent 3795c2d commit f6a4fe8

File tree

4 files changed

+216
-53
lines changed

4 files changed

+216
-53
lines changed

super_editor/clones/quill/pubspec.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ packages:
3939
path: "../../../attributed_text"
4040
relative: true
4141
source: path
42-
version: "0.4.0"
42+
version: "0.4.1"
4343
boolean_selector:
4444
dependency: transitive
4545
description:
@@ -474,21 +474,21 @@ packages:
474474
path: "../.."
475475
relative: true
476476
source: path
477-
version: "0.3.0-dev.12"
477+
version: "0.3.0-dev.13"
478478
super_editor_markdown:
479479
dependency: "direct main"
480480
description:
481481
path: "../../../super_editor_markdown"
482482
relative: true
483483
source: path
484-
version: "0.1.6"
484+
version: "0.1.7"
485485
super_editor_quill:
486486
dependency: "direct main"
487487
description:
488488
path: "../../../super_editor_quill"
489489
relative: true
490490
source: path
491-
version: "0.1.0-dev.7"
491+
version: "0.1.0-dev.8"
492492
super_keyboard:
493493
dependency: transitive
494494
description:
@@ -503,7 +503,7 @@ packages:
503503
path: "../../../super_text_layout"
504504
relative: true
505505
source: path
506-
version: "0.1.17"
506+
version: "0.1.18"
507507
term_glyph:
508508
dependency: transitive
509509
description:

super_editor/example_docs/pubspec.lock

Lines changed: 35 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@ packages:
55
dependency: transitive
66
description:
77
name: _fe_analyzer_shared
8-
sha256: "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77"
8+
sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
99
url: "https://pub.dev"
1010
source: hosted
11-
version: "73.0.0"
11+
version: "76.0.0"
1212
_macros:
1313
dependency: transitive
1414
description: dart
1515
source: sdk
16-
version: "0.3.2"
16+
version: "0.3.3"
1717
analyzer:
1818
dependency: transitive
1919
description:
2020
name: analyzer
21-
sha256: "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a"
21+
sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
2222
url: "https://pub.dev"
2323
source: hosted
24-
version: "6.8.0"
24+
version: "6.11.0"
2525
args:
2626
dependency: transitive
2727
description:
@@ -44,7 +44,7 @@ packages:
4444
path: "../../attributed_text"
4545
relative: true
4646
source: path
47-
version: "0.3.3"
47+
version: "0.4.1"
4848
boolean_selector:
4949
dependency: transitive
5050
description:
@@ -167,6 +167,14 @@ packages:
167167
url: "https://pub.dev"
168168
source: hosted
169169
version: "0.0.24"
170+
flutter_test_runners:
171+
dependency: transitive
172+
description:
173+
name: flutter_test_runners
174+
sha256: cc575117ed66a79185a26995399d7048341517a1bd21188cb43753739627832d
175+
url: "https://pub.dev"
176+
source: hosted
177+
version: "0.0.4"
170178
flutter_web_plugins:
171179
dependency: transitive
172180
description: flutter
@@ -248,18 +256,18 @@ packages:
248256
dependency: transitive
249257
description:
250258
name: leak_tracker
251-
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
259+
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
252260
url: "https://pub.dev"
253261
source: hosted
254-
version: "10.0.5"
262+
version: "10.0.7"
255263
leak_tracker_flutter_testing:
256264
dependency: transitive
257265
description:
258266
name: leak_tracker_flutter_testing
259-
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
267+
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
260268
url: "https://pub.dev"
261269
source: hosted
262-
version: "3.0.5"
270+
version: "3.0.8"
263271
leak_tracker_testing:
264272
dependency: transitive
265273
description:
@@ -296,10 +304,10 @@ packages:
296304
dependency: transitive
297305
description:
298306
name: macros
299-
sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
307+
sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
300308
url: "https://pub.dev"
301309
source: hosted
302-
version: "0.1.2-main.4"
310+
version: "0.1.3-main.0"
303311
markdown:
304312
dependency: transitive
305313
description:
@@ -525,10 +533,10 @@ packages:
525533
dependency: transitive
526534
description:
527535
name: stack_trace
528-
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
536+
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
529537
url: "https://pub.dev"
530538
source: hosted
531-
version: "1.11.1"
539+
version: "1.12.0"
532540
stream_channel:
533541
dependency: transitive
534542
description:
@@ -551,21 +559,29 @@ packages:
551559
path: ".."
552560
relative: true
553561
source: path
554-
version: "0.3.0-dev.10"
562+
version: "0.3.0-dev.13"
555563
super_editor_markdown:
556564
dependency: "direct overridden"
557565
description:
558566
path: "../../super_editor_markdown"
559567
relative: true
560568
source: path
561-
version: "0.1.6"
569+
version: "0.1.7"
570+
super_keyboard:
571+
dependency: transitive
572+
description:
573+
name: super_keyboard
574+
sha256: c8e303cd7bc1fc62732213f0f2660273a078be23eae7a4219d0ab3dd0b0ccb9a
575+
url: "https://pub.dev"
576+
source: hosted
577+
version: "0.1.0"
562578
super_text_layout:
563579
dependency: "direct main"
564580
description:
565581
path: "../../super_text_layout"
566582
relative: true
567583
source: path
568-
version: "0.1.15"
584+
version: "0.1.18"
569585
term_glyph:
570586
dependency: transitive
571587
description:
@@ -690,10 +706,10 @@ packages:
690706
dependency: transitive
691707
description:
692708
name: vm_service
693-
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
709+
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
694710
url: "https://pub.dev"
695711
source: hosted
696-
version: "14.2.5"
712+
version: "14.3.0"
697713
watcher:
698714
dependency: transitive
699715
description:

super_editor/lib/src/infrastructure/keyboard_panel_scaffold.dart

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,11 +1080,9 @@ class _KeyboardScaffoldSafeAreaState extends State<KeyboardScaffoldSafeArea> {
10801080
// There's no ancestor KeyboardScaffoldSafeArea, but there might be an ancestor
10811081
// KeyboardScaffoldSafeAreaScope, whose insets we should use.
10821082
final inheritedGeometry = _ancestorSafeAreaScope?.geometry;
1083-
final keyboardSafeArea = inheritedGeometry ??
1084-
KeyboardSafeAreaGeometry(
1085-
bottomInsets: MediaQuery.viewInsetsOf(context).bottom,
1086-
bottomPadding: MediaQuery.paddingOf(context).bottom,
1087-
);
1083+
1084+
// Either use the ancestor geometry, or use our own.
1085+
final keyboardSafeArea = inheritedGeometry ?? KeyboardScaffoldSafeAreaScope.of(safeAreaContext).geometry;
10881086

10891087
// Get the current keyboard safe area bottom insets, and then adjust that
10901088
// value based on our global bottom y-value. When this widget appears at

0 commit comments

Comments
 (0)