Unverified Commit 9fa9fd36 authored by Kostia Sokolovskyi's avatar Kostia Sokolovskyi Committed by GitHub

_DefaultTabControllerState should dispose all created TabContoller instances. (#136608)

parent 0abb017c
......@@ -132,8 +132,11 @@ class TabController extends ChangeNotifier {
}) : _index = index,
_previousIndex = previousIndex,
_animationController = animationController,
_animationDuration = animationDuration;
_animationDuration = animationDuration {
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
}
}
/// Creates a new [TabController] with `index`, `previousIndex`, `length`, and
/// `animationDuration` if they are non-null.
......@@ -142,7 +145,10 @@ class TabController extends ChangeNotifier {
///
/// When [DefaultTabController.length] is updated, this method is called to
/// create a new [TabController] without creating a new [AnimationController].
TabController _copyWith({
///
/// This instance of [TabController] will be disposed and must not be used
/// anymore.
TabController _copyWithAndDispose({
required int? index,
required int? length,
required int? previousIndex,
......@@ -151,13 +157,20 @@ class TabController extends ChangeNotifier {
if (index != null) {
_animationController!.value = index.toDouble();
}
return TabController._(
final TabController newController = TabController._(
index: index ?? _index,
length: length ?? this.length,
animationController: _animationController,
previousIndex: previousIndex ?? _previousIndex,
animationDuration: animationDuration ?? _animationDuration,
);
// Nulling _animationController to not dispose it. It will be disposed by
// the newly created instance of the TabController.
_animationController = null;
dispose();
return newController;
}
/// An animation whose value represents the current position of the [TabBar]'s
......@@ -485,7 +498,7 @@ class _DefaultTabControllerState extends State<DefaultTabController> with Single
newIndex = math.max(0, widget.length - 1);
previousIndex = _controller.index;
}
_controller = _controller._copyWith(
_controller = _controller._copyWithAndDispose(
length: widget.length,
animationDuration: widget.animationDuration,
index: newIndex,
......@@ -494,7 +507,7 @@ class _DefaultTabControllerState extends State<DefaultTabController> with Single
}
if (oldWidget.animationDuration != widget.animationDuration) {
_controller = _controller._copyWith(
_controller = _controller._copyWithAndDispose(
length: widget.length,
animationDuration: widget.animationDuration,
index: _controller.index,
......
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