Skip to content

fix: prefer topmost route when resolving tap/enter_text by text/key #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ReniDelonzek wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: prefer topmost route when resolving tap/enter_text by text/key #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 26 additions & 14 deletions lib/flutter_skill.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1040,14 +1040,12 @@ class FlutterSkillBinding {
// ==================== ELEMENT FINDING ====================

static Element? _findElementByKey(String key) {
Element? found;
final matches = <Element>[];
void visit(Element element) {
if (found != null) return;
final widget = element.widget;
if (widget.key is ValueKey<String> &&
(widget.key as ValueKey<String>).value == key) {
found = element;
return;
matches.add(element);
}
element.visitChildren(visit);
}
Expand All @@ -1057,21 +1055,17 @@ class FlutterSkillBinding {
if (binding.rootElement != null) {
visit(binding.rootElement!);
}
return found;
return _preferTopmostMatch(matches);
}

static Element? _findElementByText(String text) {
Element? found;
final matches = <Element>[];
void visit(Element element) {
if (found != null) return;
final widget = element.widget;
if (widget is Text && widget.data == text) {
found = element;
return;
}
if (widget is RichText && widget.text.toPlainText() == text) {
found = element;
return;
matches.add(element);
} else if (widget is RichText && widget.text.toPlainText() == text) {
matches.add(element);
}
element.visitChildren(visit);
}
Expand All @@ -1081,7 +1075,25 @@ class FlutterSkillBinding {
if (binding.rootElement != null) {
visit(binding.rootElement!);
}
return found;
return _preferTopmostMatch(matches);
}

/// Picks the best match among duplicates that can appear across stacked
/// routes/overlays.
///
/// The element tree is walked in pre-order, so a background route (mounted
/// first, still alive underneath a pushed route) is collected *before* the
/// foreground route. Returning the first match would therefore tap an element
/// that is invisible behind the current screen — e.g. a tab label on the
/// visible screen that also exists as a list subtitle on the screen behind it.
///
/// In Overlay/Navigator order the foreground route is mounted last, so it is
/// visited last. Returning the last match targets the screen the user actually
/// sees. (A hit-test at each candidate's center would be even more precise and
/// could be layered on top of this later.)
static Element? _preferTopmostMatch(List<Element> matches) {
if (matches.isEmpty) return null;
return matches.last;
}

static Element? _findElement({String? key, String? text}) {
Expand Down
40 changes: 26 additions & 14 deletions packaging/npm/dart/lib/flutter_skill.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,14 +485,12 @@ class FlutterSkillBinding {
// ==================== ELEMENT FINDING ====================

static Element? _findElementByKey(String key) {
Element? found;
final matches = <Element>[];
void visit(Element element) {
if (found != null) return;
final widget = element.widget;
if (widget.key is ValueKey<String> &&
(widget.key as ValueKey<String>).value == key) {
found = element;
return;
matches.add(element);
}
element.visitChildren(visit);
}
Expand All @@ -502,21 +500,17 @@ class FlutterSkillBinding {
if (binding.rootElement != null) {
visit(binding.rootElement!);
}
return found;
return _preferTopmostMatch(matches);
}

static Element? _findElementByText(String text) {
Element? found;
final matches = <Element>[];
void visit(Element element) {
if (found != null) return;
final widget = element.widget;
if (widget is Text && widget.data == text) {
found = element;
return;
}
if (widget is RichText && widget.text.toPlainText() == text) {
found = element;
return;
matches.add(element);
} else if (widget is RichText && widget.text.toPlainText() == text) {
matches.add(element);
}
element.visitChildren(visit);
}
Expand All @@ -526,7 +520,25 @@ class FlutterSkillBinding {
if (binding.rootElement != null) {
visit(binding.rootElement!);
}
return found;
return _preferTopmostMatch(matches);
}

/// Picks the best match among duplicates that can appear across stacked
/// routes/overlays.
///
/// The element tree is walked in pre-order, so a background route (mounted
/// first, still alive underneath a pushed route) is collected *before* the
/// foreground route. Returning the first match would therefore tap an element
/// that is invisible behind the current screen — e.g. a tab label on the
/// visible screen that also exists as a list subtitle on the screen behind it.
///
/// In Overlay/Navigator order the foreground route is mounted last, so it is
/// visited last. Returning the last match targets the screen the user actually
/// sees. (A hit-test at each candidate's center would be even more precise and
/// could be layered on top of this later.)
static Element? _preferTopmostMatch(List<Element> matches) {
if (matches.isEmpty) return null;
return matches.last;
}

static Element? _findElement({String? key, String? text}) {
Expand Down