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
562b6f76
Unverified
Commit
562b6f76
authored
May 07, 2021
by
xubaolin
Committed by
GitHub
May 07, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix a MaterialApp NNBD issue (#81529)
parent
9cc8d78e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
2 deletions
+16
-2
app.dart
packages/flutter/lib/src/material/app.dart
+1
-1
app.dart
packages/flutter/lib/src/widgets/app.dart
+1
-1
material_test.dart
packages/flutter/test/material/material_test.dart
+14
-0
No files found.
packages/flutter/lib/src/material/app.dart
View file @
562b6f76
...
...
@@ -815,7 +815,7 @@ class _MaterialAppState extends State<MaterialApp> {
return
widget
.
builder
!(
context
,
child
);
},
)
:
child
!
,
:
child
??
const
SizedBox
.
shrink
()
,
),
);
}
...
...
packages/flutter/lib/src/widgets/app.dart
View file @
562b6f76
...
...
@@ -1170,7 +1170,7 @@ class _WidgetsAppState extends State<WidgetsApp> with WidgetsBindingObserver {
assert
(!
_usesRouter
);
_defaultRouteInformationProvider
?.
dispose
();
_defaultRouteInformationProvider
=
null
;
if
(
oldWidget
==
null
||
widget
.
navigatorKey
!=
oldWidget
.
navigatorKey
)
{
if
(
_navigator
==
null
||
widget
.
navigatorKey
!=
oldWidget
!
.
navigatorKey
)
{
_navigator
=
widget
.
navigatorKey
??
GlobalObjectKey
<
NavigatorState
>(
this
);
}
assert
(
_navigator
!=
null
);
...
...
packages/flutter/test/material/material_test.dart
View file @
562b6f76
...
...
@@ -64,6 +64,20 @@ class ElevationColor {
}
void
main
(
)
{
// Regression test for https://github.com/flutter/flutter/issues/81504
testWidgets
(
'MaterialApp.home nullable and update test'
,
(
WidgetTester
tester
)
async
{
// _WidgetsAppState._usesNavigator == true
await
tester
.
pumpWidget
(
const
MaterialApp
(
home:
SizedBox
.
shrink
()));
// _WidgetsAppState._usesNavigator == false
await
tester
.
pumpWidget
(
const
MaterialApp
());
// Do not crash!
// _WidgetsAppState._usesNavigator == true
await
tester
.
pumpWidget
(
const
MaterialApp
(
home:
SizedBox
.
shrink
()));
// Do not crash!
expect
(
tester
.
takeException
(),
null
);
});
testWidgets
(
'default Material debugFillProperties'
,
(
WidgetTester
tester
)
async
{
final
DiagnosticPropertiesBuilder
builder
=
DiagnosticPropertiesBuilder
();
const
Material
().
debugFillProperties
(
builder
);
...
...
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