Delay jumpTo* final return until actually complete

amake · Dec 19, 2024 · e9e04a7 · e9e04a7
1 parent f3ef4da
commit e9e04a7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/lib/src/locator.dart b/lib/src/locator.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:org_flutter/src/controller.dart';
 import 'package:org_flutter/src/locatable.dart';
@@ -84,14 +86,14 @@ class _OrgLocatorState extends State<OrgLocator> {
     // Target widget is probably not currently visible, so make it visible and
     // then listen for its key to become available.
     _controller.ensureVisible(result.path);
-    _radioTargetKeys.listenOnce(() async {
+    return await _radioTargetKeys.listenOnce(() async {
       final key = _radioTargetKeys.value[id];
       if (await _makeVisible(key)) {
         key!.currentState?.doHighlight();
+        return true;
       }
+      return false;
     });
-
-    return true;
   }
 
   Future<bool> _jumpToLinkTarget(String body) async {
@@ -109,14 +111,14 @@ class _OrgLocatorState extends State<OrgLocator> {
     // Target widget is probably not currently visible, so make it visible and
     // then listen for its key to become available.
     _controller.ensureVisible(result.path);
-    _linkTargetKeys.listenOnce(() async {
+    return await _linkTargetKeys.listenOnce(() async {
       final key = _linkTargetKeys.value[keyId];
       if (await _makeVisible(key)) {
         key!.currentState?.doHighlight();
+        return true;
       }
+      return false;
     });
-
-    return true;
   }
 
   Future<bool> _jumpToName(String name) async {
@@ -135,14 +137,14 @@ class _OrgLocatorState extends State<OrgLocator> {
     // Target widget is probably not currently visible, so make it visible and
     // then listen for its key to become available.
     _controller.ensureVisible(result.path);
-    _nameKeys.listenOnce(() async {
+    return await _nameKeys.listenOnce(() async {
       final key = _nameKeys.value[keyId];
       if (await _makeVisible(key)) {
         key!.currentState?.doHighlight();
+        return true;
       }
+      return false;
     });
-
-    return true;
   }
 
   @override

diff --git a/lib/src/util/value_notifier.dart b/lib/src/util/value_notifier.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/foundation.dart';
 
 class SafeValueNotifier<T> extends ValueNotifier<T> {
@@ -15,12 +17,16 @@ class SafeValueNotifier<T> extends ValueNotifier<T> {
 }
 
 extension ValueNotifierUtil<T> on ValueNotifier<T> {
-  void listenOnce(VoidCallback callback) {
+  Future<U> listenOnce<U>(FutureOr<U> Function() callback) {
+    final result = Completer<U>();
+
     void listener() {
-      callback();
+      result.complete(callback());
       removeListener(listener);
     }
 
     addListener(listener);
+
+    return result.future;
   }
 }