Skip to content

fix a lifecycle issue with where inspector tree controllers are disposed #8907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kenzieschmoll merged 5 commits into from
Feb 19, 2025
Merged

fix a lifecycle issue with where inspector tree controllers are disposed #8907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aa7773f
fix a lifecycle issue with where inspector tree controllers are disposed
kenzieschmoll Feb 18, 2025
6967a43
use legacy init
kenzieschmoll Feb 18, 2025
c59a490
remove file
kenzieschmoll Feb 18, 2025
4ed2677
v2 change
kenzieschmoll Feb 18, 2025
ae04a09
release notes
kenzieschmoll Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions packages/devtools_app/lib/src/screens/inspector/inspector_screen_body.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,6 @@ class InspectorScreenBodyState extends State<InspectorScreenBody>
static const minScreenWidthForTextBeforeScaling = 900.0;
static const serviceExtensionButtonsIncludeTextWidth = 1200.0;

@override
void dispose() {
_summaryTreeController.dispose();
if (controller.isSummaryTree && controller.details != null) {
_detailsTreeController.dispose();
}
super.dispose();
}

@override
void initState() {
super.initState();
Expand Down
54 changes: 37 additions & 17 deletions packages/devtools_app/lib/src/screens/inspector_shared/inspector_screen_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,47 @@ import '../inspector_v2/inspector_controller.dart' as v2;
import '../inspector_v2/inspector_tree_controller.dart' as v2;

class InspectorScreenController extends DisposableController {
@override
void dispose() {
v2InspectorController.dispose();
legacyInspectorController.dispose();
super.dispose();
InspectorScreenController() {
_init();
}

final v2InspectorController = v2.InspectorController(
inspectorTree: v2.InspectorTreeController(
late v2.InspectorController v2InspectorController;
late v2.InspectorTreeController v2InspectorTreeController;

late legacy.InspectorController legacyInspectorController;
late legacy.InspectorTreeController legacyInspectorTreeController;
late legacy.InspectorTreeController legacyDetailsTreeController;

void _init() {
v2InspectorTreeController = v2.InspectorTreeController(
gaId: InspectorScreenMetrics.summaryTreeGaId,
),
treeType: FlutterTreeType.widget,
);
);
v2InspectorController = v2.InspectorController(
inspectorTree: v2InspectorTreeController,
treeType: FlutterTreeType.widget,
);

final legacyInspectorController = legacy.InspectorController(
inspectorTree: legacy.InspectorTreeController(
legacyInspectorTreeController = legacy.InspectorTreeController(
gaId: InspectorScreenMetrics.summaryTreeGaId,
),
detailsTree: legacy.InspectorTreeController(
);
legacyDetailsTreeController = legacy.InspectorTreeController(
gaId: InspectorScreenMetrics.detailsTreeGaId,
),
treeType: FlutterTreeType.widget,
);
);
legacyInspectorController = legacy.InspectorController(
inspectorTree: legacyInspectorTreeController,
detailsTree: legacyDetailsTreeController,
treeType: FlutterTreeType.widget,
);
}

@override
void dispose() {
v2InspectorTreeController.dispose();
v2InspectorController.dispose();

legacyInspectorTreeController.dispose();
legacyDetailsTreeController.dispose();
legacyInspectorController.dispose();
super.dispose();
}
}
6 changes: 0 additions & 6 deletions packages/devtools_app/lib/src/screens/inspector_v2/inspector_screen_body.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,6 @@ class InspectorScreenBodyState extends State<InspectorScreenBody>

static const _welcomeShownStorageId = 'inspectorV2WelcomeShown';

@override
void dispose() {
_inspectorTreeController.dispose();
super.dispose();
}

@override
void initState() {
super.initState();
Expand Down
4 changes: 3 additions & 1 deletion packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ To learn more about DevTools, check out the

## General updates

* Fixed various memory leaks. - []()
* Fixed various memory leaks and lifecycle issues. -
[#8901](https://github.com/flutter/devtools/pull/8901),
[#8907](https://github.com/flutter/devtools/pull/8907)

## Inspector updates

Expand Down