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

Remove GlobalKey removal listeners (#9143)

Browse Source 
These where used only by the old focus system. Let's remove them before
they grow more clients.
This commit is contained in:
Adam Barth 2017-04-03 21:12:47 -07:00 committed by GitHub
parent d88ff90753
commit b564b4ccac
2 changed files with 0 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
packages/flutter/lib/src/widgets/framework.dart
View File

@ -129,11 +129,6 @@ class ObjectKey extends LocalKey {
} }
} }
/// Signature for a callback when a global key is removed from the tree.
///
/// Used by [GlobalKey.registerRemoveListener].
typedef void GlobalKeyRemoveListener(GlobalKey key);
/// A key that is unique across the entire app. /// A key that is unique across the entire app.
/// ///
/// Global keys uniquely identify elements. Global keys provide access to other /// Global keys uniquely identify elements. Global keys provide access to other
@ -168,7 +163,6 @@ abstract class GlobalKey<T extends State<StatefulWidget>> extends Key {
const GlobalKey.constructor() : super._(); const GlobalKey.constructor() : super._();
static final Map<GlobalKey, Element> _registry = <GlobalKey, Element>{}; static final Map<GlobalKey, Element> _registry = <GlobalKey, Element>{};
static final Map<GlobalKey, Set<GlobalKeyRemoveListener>> _removeListeners = <GlobalKey, Set<GlobalKeyRemoveListener>>{};
static final Set<GlobalKey> _removedKeys = new HashSet<GlobalKey>(); static final Set<GlobalKey> _removedKeys = new HashSet<GlobalKey>();
static final Set<Element> _debugIllFatedElements = new HashSet<Element>(); static final Set<Element> _debugIllFatedElements = new HashSet<Element>();
static final Map<GlobalKey, Element> _debugReservations = <GlobalKey, Element>{}; static final Map<GlobalKey, Element> _debugReservations = <GlobalKey, Element>{};
@ -297,53 +291,6 @@ abstract class GlobalKey<T extends State<StatefulWidget>> extends Key {
} }
return null; return null;
} }
/// Calls `listener` whenever a widget with the given global key is removed
/// from the tree.
///
/// Listeners can be removed with [unregisterRemoveListener].
static void registerRemoveListener(GlobalKey key, GlobalKeyRemoveListener listener) {
assert(key != null);
final Set<GlobalKeyRemoveListener> listeners =
_removeListeners.putIfAbsent(key, () => new HashSet<GlobalKeyRemoveListener>());
final bool added = listeners.add(listener);
assert(added);
}
/// Stop calling `listener` whenever a widget with the given global key is
/// removed from the tree.
///
/// Listeners can be added with [registerRemoveListener].
static void unregisterRemoveListener(GlobalKey key, GlobalKeyRemoveListener listener) {
assert(key != null);
assert(_removeListeners.containsKey(key));
assert(_removeListeners[key].contains(listener));
final bool removed = _removeListeners[key].remove(listener);
if (_removeListeners[key].isEmpty)
_removeListeners.remove(key);
assert(removed);
}
static void _notifyListeners() {
if (_removedKeys.isEmpty)
return;
try {
for (GlobalKey key in _removedKeys) {
if (!_registry.containsKey(key) && _removeListeners.containsKey(key)) {
final Set<GlobalKeyRemoveListener> localListeners = new HashSet<GlobalKeyRemoveListener>.from(_removeListeners[key]);
for (GlobalKeyRemoveListener listener in localListeners) {
try {
listener(key);
} catch (e, stack) {
_debugReportException('while notifying GlobalKey listener', e, stack);
}
}
}
}
} finally {
_removedKeys.clear();
}
}
} }
/// A global key with a debugging label. /// A global key with a debugging label.
@ -2082,7 +2029,6 @@ class BuildOwner {
} }
return true; return true;
}); });
scheduleMicrotask(GlobalKey._notifyListeners);
} catch (e, stack) { } catch (e, stack) {
_debugReportException('while finalizing the widget tree', e, stack); _debugReportException('while finalizing the widget tree', e, stack);
} finally { } finally {

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

@ -403,28 +403,6 @@ void main() {
expect(count, 2); expect(count, 2);
}); });
testWidgets('GlobalKey notification exception handling', (WidgetTester tester) async {
final GlobalKey key = new GlobalKey();
await tester.pumpWidget(new Container(key: key));
GlobalKey.registerRemoveListener(key, (GlobalKey key) {
throw new Exception('Misbehaving listener');
});
bool didReceiveCallback = false;
GlobalKey.registerRemoveListener(key, (GlobalKey key) {
expect(didReceiveCallback, isFalse);
didReceiveCallback = true;
});
await tester.pumpWidget(new Placeholder());
expect(tester.takeException(), isNotNull);
expect(didReceiveCallback, isTrue);
});
testWidgets('Defunct setState throws exception', (WidgetTester tester) async { testWidgets('Defunct setState throws exception', (WidgetTester tester) async {
StateSetter setState; StateSetter setState;