Merge branch 'master' of github.com:flutter/devtools into dcm-3

kenzieschmoll · kenzieschmoll · commit d5afc50615f4 · 2026-07-27T15:16:57.000-07:00
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -169,7 +169,6 @@ dart_code_metrics:
       - lib/src/shared/diagnostics/diagnostics_node.dart
       
       - lib/src/service/**
-      - lib/src/standalone_ui/**
       - test/**
   rules:
 #    - arguments-ordering Too strict
diff --git a/packages/devtools_app/lib/src/shared/charts/flame_chart.dart b/packages/devtools_app/lib/src/shared/charts/flame_chart.dart
@@ -233,6 +233,9 @@ abstract class FlameChartState<
       verticalControllerGroup.resetScroll();
       zoomController.reset();
       verticalExtentDelegate.recompute();
+    } else if (widget.containerWidth != oldWidget.containerWidth) {
+      initFlameChartElements();
+      verticalExtentDelegate.recompute();
     }
     FocusScope.of(context).requestFocus(focusNode);
     super.didUpdateWidget(oldWidget);
diff --git a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_controller.dart b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_controller.dart
@@ -47,8 +47,6 @@ class PropertyEditorController extends DisposableController
       _editableWidgetData;
   final _editableWidgetData = ValueNotifier<EditableWidgetData?>(null);
 
-  List<EditableProperty> get allProperties =>
-      _editableWidgetData.value?.properties ?? [];
   String? get widgetName => _editableWidgetData.value?.name;
   String? get widgetDocumentation => _editableWidgetData.value?.documentation;
   String? get fileUri => _editableWidgetData.value?.fileUri;
diff --git a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_panel.dart b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_panel.dart
@@ -62,11 +62,9 @@ class _PropertyEditorPanelState extends State<PropertyEditorPanel> {
         future: _editor,
         builder: (context, snapshot) =>
             switch ((snapshot.connectionState, snapshot.data)) {
-              (ConnectionState.done, final editor?) =>
-                _PropertyEditorConnectedPanel(
-                  editor,
-                  controller: _propertyEditorController!,
-                ),
+              (ConnectionState.done, final _) => _PropertyEditorConnectedPanel(
+                controller: _propertyEditorController!,
+              ),
               _ => const CenteredCircularProgressIndicator(),
             },
       ),
@@ -76,9 +74,8 @@ class _PropertyEditorPanelState extends State<PropertyEditorPanel> {
 
 /// The property editor panel shown once we know an editor is available.
 class _PropertyEditorConnectedPanel extends StatefulWidget {
-  const _PropertyEditorConnectedPanel(this.editor, {required this.controller});
+  const _PropertyEditorConnectedPanel({required this.controller});
 
-  final EditorClient editor;
   final PropertyEditorController controller;
 
   @override
diff --git a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/utils/_utils_desktop.dart b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/utils/_utils_desktop.dart
diff --git a/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/utils/_utils_web.dart b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/utils/_utils_web.dart
diff --git a/packages/devtools_app/lib/src/standalone_ui/vs_code/debug_sessions.dart b/packages/devtools_app/lib/src/standalone_ui/vs_code/debug_sessions.dart
@@ -17,7 +17,6 @@ class DebugSessions extends StatelessWidget {
   const DebugSessions({
     required this.editor,
     required this.sessions,
-    required this.devices,
     super.key,
   });
 
@@ -26,9 +25,6 @@ class DebugSessions extends StatelessWidget {
   /// A map of debug session IDs to their debug sessions.
   final Map<String, EditorDebugSession> sessions;
 
-  /// A map of device IDs to their devices.
-  final Map<String, EditorDevice> devices;
-
   @override
   Widget build(BuildContext context) {
     return Column(
diff --git a/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/devtools_view.dart b/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/devtools_view.dart
@@ -118,7 +118,6 @@ class SidebarDevToolsScreens extends StatelessWidget {
             (s) => createDevToolsScreenRow(
               dataLeft: _buttonDataFromScreen(s),
               dataRight: null,
-              editor: editor,
               singleColumn: singleColumn,
               hasDebugSessions: debugSessions.isNotEmpty,
               onPressed: (data) => openDevToolsScreen(
@@ -140,7 +139,6 @@ class SidebarDevToolsScreens extends StatelessWidget {
         createDevToolsScreenRow(
           dataLeft: _buttonDataFromScreen(first),
           dataRight: second != null ? _buttonDataFromScreen(second) : null,
-          editor: editor,
           singleColumn: singleColumn,
           hasDebugSessions: debugSessions.isNotEmpty,
           onPressed: (data) => openDevToolsScreen(
diff --git a/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/extensions_view.dart b/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/extensions_view.dart
@@ -107,7 +107,6 @@ class _SidebarDevToolsExtensionsState extends State<SidebarDevToolsExtensions>
           // because we do not have control over how long the names
           // will be and we want to avoid ugly text wrapping.
           singleColumn: true,
-          editor: widget.editor,
           hasDebugSessions: widget.debugSessions.isNotEmpty,
           onPressed: (data) {
             ga.select(
diff --git a/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/shared.dart b/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/shared.dart
@@ -25,7 +25,6 @@ TableRow createDevToolsScreenRow({
   required DevToolsButtonData? dataRight,
   required bool singleColumn,
   required bool hasDebugSessions,
-  required EditorClient editor,
   required void Function(DevToolsButtonData data) onPressed,
 }) {
   assert(
@@ -35,7 +34,6 @@ TableRow createDevToolsScreenRow({
   final cellRight = dataRight != null
       ? _DevToolsScreenButton(
           data: dataRight,
-          editor: editor,
           hasDebugSessions: hasDebugSessions,
           onPressed: onPressed,
         )
@@ -44,7 +42,6 @@ TableRow createDevToolsScreenRow({
     children: [
       _DevToolsScreenButton(
         data: dataLeft,
-        editor: editor,
         hasDebugSessions: hasDebugSessions,
         onPressed: onPressed,
       ),
@@ -56,13 +53,11 @@ TableRow createDevToolsScreenRow({
 class _DevToolsScreenButton extends StatelessWidget {
   const _DevToolsScreenButton({
     required this.data,
-    required this.editor,
     required this.hasDebugSessions,
     required this.onPressed,
   });
 
   final DevToolsButtonData data;
-  final EditorClient editor;
   final bool hasDebugSessions;
   final void Function(DevToolsButtonData data) onPressed;
 
diff --git a/packages/devtools_app/lib/src/standalone_ui/vs_code/flutter_panel.dart b/packages/devtools_app/lib/src/standalone_ui/vs_code/flutter_panel.dart
@@ -174,11 +174,7 @@ class _EditorConnectedPanelState extends State<_EditorConnectedPanel>
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              DebugSessions(
-                editor: widget.editor,
-                sessions: debugSessions,
-                devices: devices,
-              ),
+              DebugSessions(editor: widget.editor, sessions: debugSessions),
               const SizedBox(height: defaultSpacing),
               if (widget.editor.supportsSelectDevice) ...[
                 Devices(
diff --git a/packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md b/packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md
@@ -27,7 +27,9 @@ TODO: Remove this section if there are not any updates.
 
 ## CPU profiler updates
 
-TODO: Remove this section if there are not any updates.
+* Fixed a bug where resizing the CPU flame chart changes the timing values
+  across the top of the chart.
+  [#9915](https://github.com/flutter/devtools/pull/9915)
 
 ## Memory updates
 
@@ -40,7 +42,7 @@ TODO: Remove this section if there are not any updates.
 
 ## Network profiler updates
 
-- Fixed exported response status in HAR files so that they parse as integers
+* Fixed exported response status in HAR files so that they parse as integers
   instead of strings. [#9900](https://github.com/flutter/devtools/pull/9900)
 
 ## Logging updates
diff --git a/packages/devtools_app/test/shared/charts/flame_chart_test.dart b/packages/devtools_app/test/shared/charts/flame_chart_test.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'package:devtools_app/devtools_app.dart';
+import 'package:devtools_app/src/screens/profiler/cpu_profile_transformer.dart';
 import 'package:devtools_app/src/screens/profiler/cpu_profiler_controller.dart';
 import 'package:devtools_app/src/screens/profiler/panes/cpu_flame_chart.dart';
 import 'package:devtools_app/src/shared/charts/flame_chart.dart';
@@ -624,6 +625,56 @@ void main() {
         );
       });
     });
+
+    testWidgets('re-lays out elements when container width changes', (
+      WidgetTester tester,
+    ) async {
+      final transformer = CpuProfileTransformer();
+      final cpuProfileData = CpuProfileData.fromJson(cpuProfileResponseJson);
+      await tester.runAsync(() async {
+        await transformer.processData(cpuProfileData, processId: 'test');
+      });
+
+      flameChart = CpuProfileFlameChart(
+        data: cpuProfileData,
+        width: 1000.0,
+        height: 1000.0,
+        selectionNotifier: ValueNotifier<CpuStackFrame?>(null),
+        searchMatchesNotifier: controller.searchMatches,
+        activeSearchMatchNotifier: controller.activeSearchMatch,
+        onDataSelected: (_) {},
+      );
+
+      await pumpFlameChart(tester);
+      expect(find.byWidget(flameChart), findsOneWidget);
+      final FlameChartState state = tester.state(find.byWidget(flameChart));
+
+      // Find first row that has nodes.
+      final rowWithNodes = state.rows.firstWhere((row) => row.nodes.isNotEmpty);
+      final node = rowWithNodes.nodes[0];
+      final initialNodeWidth = node.rect.width;
+      expect(initialNodeWidth, greaterThan(0.0));
+
+      // Update the flame chart with a new width.
+      flameChart = CpuProfileFlameChart(
+        data: cpuProfileData,
+        width: 2000.0,
+        height: 1000.0,
+        selectionNotifier: ValueNotifier<CpuStackFrame?>(null),
+        searchMatchesNotifier: controller.searchMatches,
+        activeSearchMatchNotifier: controller.activeSearchMatch,
+        onDataSelected: (_) {},
+      );
+      await pumpFlameChart(tester);
+      await tester.pumpAndSettle();
+
+      final updatedRowWithNodes = state.rows.firstWhere(
+        (row) => row.nodes.isNotEmpty,
+      );
+      final updatedNode = updatedRowWithNodes.nodes[0];
+      expect(updatedNode.rect.width, isNot(equals(initialNodeWidth)));
+      expect(updatedNode.rect.width, greaterThan(initialNodeWidth));
+    });
   });
 
   group('ScrollingFlameChartRow', () {
diff --git a/packages/devtools_app/test/standalone_ui/vs_code/debug_sessions_test.dart b/packages/devtools_app/test/standalone_ui/vs_code/debug_sessions_test.dart
@@ -4,7 +4,6 @@
 
 import 'package:devtools_app/devtools_app.dart';
 import 'package:devtools_app/src/shared/constants.dart';
-import 'package:devtools_app/src/shared/editor/api_classes.dart';
 import 'package:devtools_app/src/standalone_ui/vs_code/debug_sessions.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
@@ -14,22 +13,17 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
-import '../../test_infra/scenes/standalone_ui/editor_service/simulated_editor.dart';
 import '../../test_infra/utils/sidebar_utils.dart';
 
 void main() {
   const windowSize = Size(2000.0, 2000.0);
 
   late MockEditorClient mockEditorClient;
-  late final Map<String, EditorDevice> deviceMap;
 
   setUpAll(() {
     // Set test mode so that the debug list of extensions will be used.
     setTestMode();
     setGlobal(ServiceConnectionManager, FakeServiceConnectionManager());
-
-    final devices = stubbedDevices.map((d) => MapEntry(d.id, d));
-    deviceMap = {for (final d in devices) d.key: d.value};
   });
 
   setUp(() {
@@ -52,7 +46,6 @@ void main() {
           sessions: Map.fromEntries(
             _debugSessions.map((s) => MapEntry(s.id, s)),
           ),
-          devices: deviceMap,
         ),
       ),
     );
