Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
6eb601bc
Unverified
Commit
6eb601bc
authored
Apr 27, 2022
by
Kate Lovett
Committed by
GitHub
Apr 27, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix AppBar scrolledUnder initial state - the third (#102582)
parent
3edeb947
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
473 additions
and
290 deletions
+473
-290
app_bar.dart
packages/flutter/lib/src/material/app_bar.dart
+17
-4
scroll_notification_observer.dart
...flutter/lib/src/widgets/scroll_notification_observer.dart
+28
-6
app_bar_test.dart
packages/flutter/test/material/app_bar_test.dart
+426
-280
debug_test.dart
packages/flutter/test/material/debug_test.dart
+1
-0
scaffold_test.dart
packages/flutter/test/material/scaffold_test.dart
+1
-0
No files found.
packages/flutter/lib/src/material/app_bar.dart
View file @
6eb601bc
...
...
@@ -809,11 +809,24 @@ class _AppBarState extends State<AppBar> {
}
void
_handleScrollNotification
(
ScrollNotification
notification
)
{
if
(
notification
is
ScrollUpdateNotification
)
{
if
(
notification
is
ScrollUpdateNotification
&&
notification
.
depth
==
0
)
{
final
bool
oldScrolledUnder
=
_scrolledUnder
;
_scrolledUnder
=
notification
.
depth
==
0
&&
notification
.
metrics
.
extentBefore
>
0
&&
notification
.
metrics
.
axis
==
Axis
.
vertical
;
final
ScrollMetrics
metrics
=
notification
.
metrics
;
switch
(
metrics
.
axisDirection
)
{
case
AxisDirection
.
up
:
// Scroll view is reversed
_scrolledUnder
=
metrics
.
extentAfter
>
0
;
break
;
case
AxisDirection
.
down
:
_scrolledUnder
=
metrics
.
extentBefore
>
0
;
break
;
case
AxisDirection
.
right
:
case
AxisDirection
.
left
:
// Scrolled under is only supported in the vertical axis.
_scrolledUnder
=
false
;
break
;
}
if
(
_scrolledUnder
!=
oldScrolledUnder
)
{
setState
(()
{
// React to a change in MaterialState.scrolledUnder
...
...
packages/flutter/lib/src/widgets/scroll_notification_observer.dart
View file @
6eb601bc
...
...
@@ -9,6 +9,7 @@ import 'package:flutter/foundation.dart';
import
'framework.dart'
;
import
'notification_listener.dart'
;
import
'scroll_notification.dart'
;
import
'scroll_position.dart'
;
/// A [ScrollNotification] listener for [ScrollNotificationObserver].
///
...
...
@@ -151,14 +152,27 @@ class ScrollNotificationObserverState extends State<ScrollNotificationObserver>
@override
Widget
build
(
BuildContext
context
)
{
return
NotificationListener
<
ScrollNotification
>(
onNotification:
(
ScrollNotification
notification
)
{
_notifyListeners
(
notification
);
// A ScrollMetricsNotification allows listeners to be notified for an
// initial state, as well as if the content dimensions change without
// scrolling.
return
NotificationListener
<
ScrollMetricsNotification
>(
onNotification:
(
ScrollMetricsNotification
notification
)
{
_notifyListeners
(
_ConvertedScrollMetricsNotification
(
metrics:
notification
.
metrics
,
context:
notification
.
context
,
depth:
notification
.
depth
,
));
return
false
;
},
child:
_ScrollNotificationObserverScope
(
scrollNotificationObserverState:
this
,
child:
widget
.
child
,
child:
NotificationListener
<
ScrollNotification
>(
onNotification:
(
ScrollNotification
notification
)
{
_notifyListeners
(
notification
);
return
false
;
},
child:
_ScrollNotificationObserverScope
(
scrollNotificationObserverState:
this
,
child:
widget
.
child
,
),
),
);
}
...
...
@@ -170,3 +184,11 @@ class ScrollNotificationObserverState extends State<ScrollNotificationObserver>
super
.
dispose
();
}
}
class
_ConvertedScrollMetricsNotification
extends
ScrollUpdateNotification
{
_ConvertedScrollMetricsNotification
({
required
super
.
metrics
,
required
super
.
context
,
required
super
.
depth
,
});
}
packages/flutter/test/material/app_bar_test.dart
View file @
6eb601bc
This diff is collapsed.
Click to expand it.
packages/flutter/test/material/debug_test.dart
View file @
6eb601bc
...
...
@@ -349,6 +349,7 @@ void main() {
' Material
\n
'
' _ScrollNotificationObserverScope
\n
'
' NotificationListener<ScrollNotification>
\n
'
' NotificationListener<ScrollMetricsNotification>
\n
'
' ScrollNotificationObserver
\n
'
' _ScaffoldScope
\n
'
' Scaffold-[LabeledGlobalKey<ScaffoldState>#00000]
\n
'
...
...
packages/flutter/test/material/scaffold_test.dart
View file @
6eb601bc
...
...
@@ -2339,6 +2339,7 @@ void main() {
' Material
\n
'
' _ScrollNotificationObserverScope
\n
'
' NotificationListener<ScrollNotification>
\n
'
' NotificationListener<ScrollMetricsNotification>
\n
'
' ScrollNotificationObserver
\n
'
' _ScaffoldScope
\n
'
' Scaffold
\n
'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment