Skip to content

F
Front-End
Unverified Commit 496ef4f7 authored by chunhtai's avatar chunhtai Committed by GitHub
Browse files
Options

prevents sliver app bar from changing semantics tree when it is not necesaary (#61012)

parent 06b301cd
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 59 deletions
packages/flutter/lib/src/rendering/sliver_persistent_header.dart
View file @ 496ef4f7
...@@ -258,27 +258,10 @@ abstract class RenderSliverPersistentHeader extends RenderSliver with RenderObje ...@@ -258,27 +258,10 @@ abstract class RenderSliverPersistentHeader extends RenderSliver with RenderObje
} }
} }
/// Whether the [SemanticsNode]s associated with this [RenderSliver] should
/// be excluded from the semantic scrolling area.
///
/// [RenderSliver]s that stay on the screen even though the user has scrolled
/// past them (e.g. a pinned app bar) should set this to true.
@protected
bool get excludeFromSemanticsScrolling => _excludeFromSemanticsScrolling;
bool _excludeFromSemanticsScrolling = false;
set excludeFromSemanticsScrolling(bool value) {
if (_excludeFromSemanticsScrolling == value)
return;
_excludeFromSemanticsScrolling = value;
markNeedsSemanticsUpdate();
}
@override @override
void describeSemanticsConfiguration(SemanticsConfiguration config) { void describeSemanticsConfiguration(SemanticsConfiguration config) {
super.describeSemanticsConfiguration(config); super.describeSemanticsConfiguration(config);
config.addTagForChildren(RenderViewport.excludeFromScrolling);
if (_excludeFromSemanticsScrolling)
config.addTagForChildren(RenderViewport.excludeFromScrolling);
} }
@override @override
...@@ -375,7 +358,6 @@ abstract class RenderSliverPinnedPersistentHeader extends RenderSliverPersistent ...@@ -375,7 +358,6 @@ abstract class RenderSliverPinnedPersistentHeader extends RenderSliverPersistent
final SliverConstraints constraints = this.constraints; final SliverConstraints constraints = this.constraints;
final double maxExtent = this.maxExtent; final double maxExtent = this.maxExtent;
final bool overlapsContent = constraints.overlap > 0.0; final bool overlapsContent = constraints.overlap > 0.0;
excludeFromSemanticsScrolling = overlapsContent || (constraints.scrollOffset > maxExtent - minExtent);
layoutChild(constraints.scrollOffset, maxExtent, overlapsContent: overlapsContent); layoutChild(constraints.scrollOffset, maxExtent, overlapsContent: overlapsContent);
final double effectiveRemainingPaintExtent = math.max(0, constraints.remainingPaintExtent - constraints.overlap); final double effectiveRemainingPaintExtent = math.max(0, constraints.remainingPaintExtent - constraints.overlap);
final double layoutExtent = (maxExtent - constraints.scrollOffset).clamp(0.0, effectiveRemainingPaintExtent) as double; final double layoutExtent = (maxExtent - constraints.scrollOffset).clamp(0.0, effectiveRemainingPaintExtent) as double;
...@@ -575,7 +557,6 @@ abstract class RenderSliverFloatingPersistentHeader extends RenderSliverPersiste ...@@ -575,7 +557,6 @@ abstract class RenderSliverFloatingPersistentHeader extends RenderSliverPersiste
} else { } else {
_effectiveScrollOffset = constraints.scrollOffset; _effectiveScrollOffset = constraints.scrollOffset;
} }
excludeFromSemanticsScrolling = _effectiveScrollOffset <= constraints.scrollOffset;
final bool overlapsContent = _effectiveScrollOffset < constraints.scrollOffset; final bool overlapsContent = _effectiveScrollOffset < constraints.scrollOffset;
layoutChild( layoutChild(
......
packages/flutter/test/material/app_bar_test.dart
View file @ 496ef4f7
...@@ -1647,22 +1647,20 @@ void main() { ...@@ -1647,22 +1647,20 @@ void main() {
TestSemantics( TestSemantics(
children: <TestSemantics>[ children: <TestSemantics>[
TestSemantics( TestSemantics(
flags: <SemanticsFlag>[SemanticsFlag.hasImplicitScrolling],
children: <TestSemantics>[ children: <TestSemantics>[
TestSemantics( TestSemantics(
children: <TestSemantics>[ label: 'Leading',
TestSemantics( textDirection: TextDirection.ltr,
label: 'Leading', ),
textDirection: TextDirection.ltr, TestSemantics(
), label: 'Action 1',
TestSemantics( textDirection: TextDirection.ltr,
label: 'Action 1',
textDirection: TextDirection.ltr,
),
],
), ),
], ],
), ),
TestSemantics(
flags: <SemanticsFlag>[SemanticsFlag.hasImplicitScrolling],
),
], ],
), ),
], ],
......
packages/flutter/test/widgets/sliver_semantics_test.dart
View file @ 496ef4f7
...@@ -79,6 +79,20 @@ void _tests() { ...@@ -79,6 +79,20 @@ void _tests() {
TestSemantics( TestSemantics(
id: 2, id: 2,
children: <TestSemantics>[ children: <TestSemantics>[
TestSemantics(
id: 7,
children: <TestSemantics>[
TestSemantics(
id: 8,
flags: <SemanticsFlag>[
SemanticsFlag.namesRoute,
SemanticsFlag.isHeader,
],
label: 'Semantics Test with Slivers',
textDirection: TextDirection.ltr,
),
],
),
TestSemantics( TestSemantics(
id: 9, id: 9,
flags: <SemanticsFlag>[ flags: <SemanticsFlag>[
...@@ -86,20 +100,6 @@ void _tests() { ...@@ -86,20 +100,6 @@ void _tests() {
], ],
actions: <SemanticsAction>[SemanticsAction.scrollUp], actions: <SemanticsAction>[SemanticsAction.scrollUp],
children: <TestSemantics>[ children: <TestSemantics>[
TestSemantics(
id: 7,
children: <TestSemantics>[
TestSemantics(
id: 8,
flags: <SemanticsFlag>[
SemanticsFlag.namesRoute,
SemanticsFlag.isHeader,
],
label: 'Semantics Test with Slivers',
textDirection: TextDirection.ltr,
),
],
),
TestSemantics( TestSemantics(
id: 3, id: 3,
label: 'Item 0', label: 'Item 0',
...@@ -226,6 +226,20 @@ void _tests() { ...@@ -226,6 +226,20 @@ void _tests() {
TestSemantics( TestSemantics(
id: 2, id: 2,
children: <TestSemantics>[ children: <TestSemantics>[
TestSemantics(
id: 7,
children: <TestSemantics>[
TestSemantics(
id: 8,
flags: <SemanticsFlag>[
SemanticsFlag.namesRoute,
SemanticsFlag.isHeader,
],
label: 'Semantics Test with Slivers',
textDirection: TextDirection.ltr,
),
],
),
TestSemantics( TestSemantics(
id: 9, id: 9,
flags: <SemanticsFlag>[ flags: <SemanticsFlag>[
...@@ -236,20 +250,6 @@ void _tests() { ...@@ -236,20 +250,6 @@ void _tests() {
SemanticsAction.scrollDown, SemanticsAction.scrollDown,
], ],
children: <TestSemantics>[ children: <TestSemantics>[
TestSemantics(
id: 7,
children: <TestSemantics>[
TestSemantics(
id: 8,
flags: <SemanticsFlag>[
SemanticsFlag.namesRoute,
SemanticsFlag.isHeader,
],
label: 'Semantics Test with Slivers',
textDirection: TextDirection.ltr,
),
],
),
TestSemantics( TestSemantics(
id: 3, id: 3,
label: 'Item 0', label: 'Item 0',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab