firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "ShortcutManager should dispatch creation in constructor." (#133472)

Browse Source 
Reverts flutter/flutter#133356

Tree is failing on customer_testing on this PR.
https://ci.chromium.org/ui/p/flutter/builders/prod/Mac%20customer_testing/14646/overview
This commit is contained in:
Victoria Ashworth 2023-08-28 12:34:23 -05:00 committed by GitHub
parent 05259ca938
commit ec387a467a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/flutter/lib/src/widgets/shortcuts.dart
View File

@ -747,11 +747,7 @@ class ShortcutManager with Diagnosticable, ChangeNotifier {
ShortcutManager({ ShortcutManager({
Map<ShortcutActivator, Intent> shortcuts = const <ShortcutActivator, Intent>{}, Map<ShortcutActivator, Intent> shortcuts = const <ShortcutActivator, Intent>{},
this.modal = false, this.modal = false,
}) : _shortcuts = shortcuts { }) : _shortcuts = shortcuts;
if (kFlutterMemoryAllocationsEnabled) {
maybeDispatchObjectCreation();
}
}
/// True if the [ShortcutManager] should not pass on keys that it doesn't /// True if the [ShortcutManager] should not pass on keys that it doesn't
/// handle to any key-handling widgets that are ancestors to this one. /// handle to any key-handling widgets that are ancestors to this one.
@ -1444,7 +1440,6 @@ class _ShortcutRegistrarState extends State<ShortcutRegistrar> {
void dispose() { void dispose() {
registry.removeListener(_shortcutsChanged); registry.removeListener(_shortcutsChanged);
registry.dispose(); registry.dispose();
manager.dispose();
super.dispose(); super.dispose();
} }

22
packages/flutter/test/widgets/shortcuts_test.dart
View File

@ -666,19 +666,6 @@ void main() {
expect(pressedKeys, isEmpty); expect(pressedKeys, isEmpty);
}); });
test('$ShortcutManager dispatches object creation in constructor', () {
int eventCount = 0;
void listener(ObjectEvent event) => eventCount++;
MemoryAllocations.instance.addListener(listener);
final ShortcutManager registry = ShortcutManager();
expect(eventCount, 1);
registry.dispose();
MemoryAllocations.instance.removeListener(listener);
});
testWidgets("Shortcuts passes to the next Shortcuts widget if it doesn't map the key", (WidgetTester tester) async { testWidgets("Shortcuts passes to the next Shortcuts widget if it doesn't map the key", (WidgetTester tester) async {
final GlobalKey containerKey = GlobalKey(); final GlobalKey containerKey = GlobalKey();
final List<LogicalKeyboardKey> pressedKeys = <LogicalKeyboardKey>[]; final List<LogicalKeyboardKey> pressedKeys = <LogicalKeyboardKey>[];
@ -1866,17 +1853,20 @@ void main() {
token.dispose(); token.dispose();
}); });
test('dispatches object creation in constructor', () { testWidgets('dispatches object creation in constructor', (WidgetTester tester) async {
final MemoryAllocations ma = MemoryAllocations.instance;
assert(!ma.hasListeners);
int eventCount = 0; int eventCount = 0;
void listener(ObjectEvent event) => eventCount++; void listener(ObjectEvent event) => eventCount++;
MemoryAllocations.instance.addListener(listener); ma.addListener(listener);
final ShortcutRegistry registry = ShortcutRegistry(); final ShortcutRegistry registry = ShortcutRegistry();
expect(eventCount, 1); expect(eventCount, 1);
registry.dispose(); registry.dispose();
MemoryAllocations.instance.removeListener(listener); ma.removeListener(listener);
assert(!ma.hasListeners);
}); });
}); });
} }