sdkId getter & StatelessExpansionTile (apache#23593)

akvelon · Nov 9, 2022 · 57800ee · 57800ee
1 parent 2ab4b3b
commit 57800ee
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 32 deletions.
diff --git a/learning/tour-of-beam/frontend/lib/models/content_tree.dart b/learning/tour-of-beam/frontend/lib/models/content_tree.dart
@@ -22,27 +22,25 @@ import 'node.dart';
 import 'parent_node.dart';
 
 class ContentTreeModel extends ParentNodeModel {
-  final String sdk;
   final List<ModuleModel> modules;
 
-  String get sdkId => sdk;
+  String get sdkId => id;
 
   @override
   List<NodeModel> get nodes => modules;
 
   const ContentTreeModel({
-    required this.sdk,
+    required super.id,
     required this.modules,
   }) : super(
-          id: sdk,
           parent: null,
           title: '',
           nodes: modules,
         );
 
   ContentTreeModel.fromResponse(GetContentTreeResponse response)
       : this(
-          sdk: response.sdkId,
+          id: response.sdkId,
           modules: response.modules
               .map(ModuleModel.fromResponse)
               .toList(growable: false),

diff --git a/learning/tour-of-beam/frontend/lib/pages/tour/widgets/group.dart b/learning/tour-of-beam/frontend/lib/pages/tour/widgets/group.dart
@@ -41,35 +41,56 @@ class GroupWidget extends StatelessWidget {
       builder: (context, child) {
         final isExpanded = contentTreeController.expandedIds.contains(group.id);
 
-        return ExpansionTileWrapper(
-          ExpansionTile(
-            key: Key('${group.id}$isExpanded'),
-            initiallyExpanded: isExpanded,
-            tilePadding: EdgeInsets.zero,
-            onExpansionChanged: (isExpanding) {
-              contentTreeController.updateExpandedIds(
-                group,
-                isExpanding: isExpanding,
-              );
-            },
-            title: GroupTitleWidget(
-              group: group,
-              onTap: () {
-                contentTreeController.openNode(group);
-              },
-            ),
-            childrenPadding: const EdgeInsets.only(
-              left: BeamSizes.size24,
-            ),
-            children: [
-              GroupNodesWidget(
-                nodes: group.nodes,
-                contentTreeController: contentTreeController,
-              ),
-            ],
-          ),
+        return _StatelessExpansionTile(
+          contentTreeController: contentTreeController,
+          group: group,
+          isExpanded: isExpanded,
         );
       },
     );
   }
 }
+
+class _StatelessExpansionTile extends StatelessWidget {
+  final GroupModel group;
+  final ContentTreeController contentTreeController;
+  final bool isExpanded;
+
+  const _StatelessExpansionTile({
+    required this.group,
+    required this.contentTreeController,
+    required this.isExpanded,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ExpansionTileWrapper(
+      ExpansionTile(
+        key: Key('${group.id}$isExpanded'),
+        initiallyExpanded: isExpanded,
+        tilePadding: EdgeInsets.zero,
+        onExpansionChanged: (isExpanding) {
+          contentTreeController.updateExpandedIds(
+            group,
+            isExpanding: isExpanding,
+          );
+        },
+        title: GroupTitleWidget(
+          group: group,
+          onTap: () {
+            contentTreeController.openNode(group);
+          },
+        ),
+        childrenPadding: const EdgeInsets.only(
+          left: BeamSizes.size24,
+        ),
+        children: [
+          GroupNodesWidget(
+            nodes: group.nodes,
+            contentTreeController: contentTreeController,
+          ),
+        ],
+      ),
+    );
+  }
+}