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
237ddcc3
Unverified
Commit
237ddcc3
authored
Sep 08, 2023
by
Polina Cherkasova
Committed by
GitHub
Sep 08, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove non needed controllers in SegmentedButton. (#134064)
parent
161c7090
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
71 additions
and
5 deletions
+71
-5
segmented_button.dart
packages/flutter/lib/src/material/segmented_button.dart
+25
-5
segmented_button_test.dart
packages/flutter/test/material/segmented_button_test.dart
+46
-0
No files found.
packages/flutter/lib/src/material/segmented_button.dart
View file @
237ddcc3
...
...
@@ -236,12 +236,32 @@ class SegmentedButton<T> extends StatefulWidget {
final
Widget
?
selectedIcon
;
@override
State
<
SegmentedButton
<
T
>>
createState
()
=>
_
SegmentedButtonState
<
T
>();
State
<
SegmentedButton
<
T
>>
createState
()
=>
SegmentedButtonState
<
T
>();
}
class
_SegmentedButtonState
<
T
>
extends
State
<
SegmentedButton
<
T
>>
{
/// State for [SegmentedButton].
@visibleForTesting
class
SegmentedButtonState
<
T
>
extends
State
<
SegmentedButton
<
T
>>
{
bool
get
_enabled
=>
widget
.
onSelectionChanged
!=
null
;
final
Map
<
ButtonSegment
<
T
>,
MaterialStatesController
>
_statesControllers
=
<
ButtonSegment
<
T
>,
MaterialStatesController
>{};
/// Controllers for the [ButtonSegment]s.
@visibleForTesting
final
Map
<
ButtonSegment
<
T
>,
MaterialStatesController
>
statesControllers
=
<
ButtonSegment
<
T
>,
MaterialStatesController
>{};
@override
void
didUpdateWidget
(
covariant
SegmentedButton
<
T
>
oldWidget
)
{
super
.
didUpdateWidget
(
oldWidget
);
if
(
oldWidget
!=
widget
)
{
statesControllers
.
removeWhere
((
ButtonSegment
<
T
>
segment
,
MaterialStatesController
controller
)
{
if
(
widget
.
segments
.
contains
(
segment
))
{
return
false
;
}
else
{
controller
.
dispose
();
return
true
;
}
});
}
}
void
_handleOnPressed
(
T
segmentValue
)
{
if
(!
_enabled
)
{
...
...
@@ -325,7 +345,7 @@ class _SegmentedButtonState<T> extends State<SegmentedButton<T>> {
:
segment
.
label
!=
null
?
segment
.
icon
:
null
;
final
MaterialStatesController
controller
=
_
statesControllers
.
putIfAbsent
(
segment
,
()
=>
MaterialStatesController
());
final
MaterialStatesController
controller
=
statesControllers
.
putIfAbsent
(
segment
,
()
=>
MaterialStatesController
());
controller
.
value
=
<
MaterialState
>{
if
(
segmentSelected
)
MaterialState
.
selected
,
};
...
...
@@ -391,7 +411,7 @@ class _SegmentedButtonState<T> extends State<SegmentedButton<T>> {
@override
void
dispose
()
{
for
(
final
MaterialStatesController
controller
in
_
statesControllers
.
values
)
{
for
(
final
MaterialStatesController
controller
in
statesControllers
.
values
)
{
controller
.
dispose
();
}
super
.
dispose
();
...
...
packages/flutter/test/material/segmented_button_test.dart
View file @
237ddcc3
...
...
@@ -21,6 +21,52 @@ Widget boilerplate({required Widget child}) {
}
void
main
(
)
{
testWidgetsWithLeakTracking
(
'SegmentedButton releases state controllers for deleted segments'
,
(
WidgetTester
tester
)
async
{
final
ThemeData
theme
=
ThemeData
(
useMaterial3:
true
);
final
Key
key
=
UniqueKey
();
Widget
buildApp
(
Widget
button
)
{
return
MaterialApp
(
theme:
theme
,
home:
Scaffold
(
body:
Center
(
child:
button
,
),
),
);
}
await
tester
.
pumpWidget
(
buildApp
(
SegmentedButton
<
int
>(
key:
key
,
segments:
const
<
ButtonSegment
<
int
>>[
ButtonSegment
<
int
>(
value:
1
,
label:
Text
(
'1'
)),
ButtonSegment
<
int
>(
value:
2
,
label:
Text
(
'2'
)),
],
selected:
const
<
int
>{
2
},
),
),
);
await
tester
.
pumpWidget
(
buildApp
(
SegmentedButton
<
int
>(
key:
key
,
segments:
const
<
ButtonSegment
<
int
>>[
ButtonSegment
<
int
>(
value:
2
,
label:
Text
(
'2'
)),
ButtonSegment
<
int
>(
value:
3
,
label:
Text
(
'3'
)),
],
selected:
const
<
int
>{
2
},
),
),
);
final
SegmentedButtonState
<
int
>
state
=
tester
.
state
(
find
.
byType
(
SegmentedButton
<
int
>));
expect
(
state
.
statesControllers
,
hasLength
(
2
));
expect
(
state
.
statesControllers
.
keys
.
first
.
value
,
2
);
expect
(
state
.
statesControllers
.
keys
.
last
.
value
,
3
);
});
testWidgetsWithLeakTracking
(
'SegmentedButton is built with Material of type MaterialType.transparency'
,
(
WidgetTester
tester
)
async
{
final
ThemeData
theme
=
ThemeData
(
useMaterial3:
true
);
...
...
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