alexeyinkin commented on code in PR #23776:
URL: https://github.com/apache/beam/pull/23776#discussion_r1015091568
##########
learning/tour-of-beam/frontend/lib/pages/tour/controllers/content_tree.dart:
##########
@@ -17,33 +17,88 @@
*/
import 'package:flutter/widgets.dart';
+import 'package:get_it/get_it.dart';
import 'package:playground_components/playground_components.dart';
+import '../../../cache/content_tree.dart';
+import '../../../models/group.dart';
import '../../../models/node.dart';
+import '../../../models/unit.dart';
class ContentTreeController extends ChangeNotifier {
String _sdkId;
List<String> _treeIds;
NodeModel? _currentNode;
+ final _contentTreeCache = GetIt.instance.get<ContentTreeCache>();
+ final expandedIds = <String>{};
ContentTreeController({
required String initialSdkId,
List<String> initialTreeIds = const [],
}) : _sdkId = initialSdkId,
- _treeIds = initialTreeIds;
+ _treeIds = initialTreeIds {
+ expandedIds.addAll(initialTreeIds);
+ _contentTreeCache.addListener(_onContentTreeCacheChange);
+ _onContentTreeCacheChange();
+ }
Sdk get sdk => Sdk.parseOrCreate(_sdkId);
String get sdkId => _sdkId;
List<String> get treeIds => _treeIds;
NodeModel? get currentNode => _currentNode;
- void onNodeTap(NodeModel node) {
+ void openNode(NodeModel node) {
+ if (!expandedIds.contains(node.id)) {
+ expandedIds.add(node.id);
+ }
+
if (node == _currentNode) {
return;
}
- _currentNode = node;
- // TODO(alexeyinkin): Set _treeIds from node.
+ if (node is GroupModel) {
+ openNode(node.nodes.first);
Review Comment:
`return` after this line would cut redundant `notifyListeners()` calls.
##########
learning/tour-of-beam/frontend/lib/pages/tour/controllers/content_tree.dart:
##########
@@ -17,33 +17,88 @@
*/
import 'package:flutter/widgets.dart';
+import 'package:get_it/get_it.dart';
import 'package:playground_components/playground_components.dart';
+import '../../../cache/content_tree.dart';
+import '../../../models/group.dart';
import '../../../models/node.dart';
+import '../../../models/unit.dart';
class ContentTreeController extends ChangeNotifier {
String _sdkId;
List<String> _treeIds;
NodeModel? _currentNode;
+ final _contentTreeCache = GetIt.instance.get<ContentTreeCache>();
+ final expandedIds = <String>{};
ContentTreeController({
required String initialSdkId,
List<String> initialTreeIds = const [],
}) : _sdkId = initialSdkId,
- _treeIds = initialTreeIds;
+ _treeIds = initialTreeIds {
+ expandedIds.addAll(initialTreeIds);
+ _contentTreeCache.addListener(_onContentTreeCacheChange);
+ _onContentTreeCacheChange();
+ }
Sdk get sdk => Sdk.parseOrCreate(_sdkId);
String get sdkId => _sdkId;
List<String> get treeIds => _treeIds;
NodeModel? get currentNode => _currentNode;
- void onNodeTap(NodeModel node) {
+ void openNode(NodeModel node) {
+ if (!expandedIds.contains(node.id)) {
+ expandedIds.add(node.id);
+ }
+
if (node == _currentNode) {
return;
}
- _currentNode = node;
- // TODO(alexeyinkin): Set _treeIds from node.
+ if (node is GroupModel) {
+ openNode(node.nodes.first);
+ } else if (node is UnitModel) {
+ _currentNode = node;
+ }
+
+ if (_currentNode != null) {
+ _treeIds = _getNodeAncestors(_currentNode!, [_currentNode!.id]);
+ }
notifyListeners();
}
+
+ void markGroupAsCollapsed(GroupModel group) {
Review Comment:
`collapseGroup`?
##########
learning/tour-of-beam/frontend/lib/pages/tour/widgets/group.dart:
##########
@@ -36,23 +36,42 @@ class GroupWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return ExpansionTileWrapper(
- ExpansionTile(
- tilePadding: EdgeInsets.zero,
- title: GroupTitleWidget(
- group: group,
- onTap: () => contentTreeController.onNodeTap(group),
- ),
- childrenPadding: const EdgeInsets.only(
- left: BeamSizes.size24,
- ),
- children: [
- GroupNodesWidget(
- nodes: group.nodes,
- contentTreeController: contentTreeController,
+ return AnimatedBuilder(
+ animation: contentTreeController,
+ 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) {
+ /// Since expandedIds is also used for expansion,
+ /// it needs to be updated to prevent the tile from
+ /// remaining collapsed after taps on title.
Review Comment:
This comment feels redundant.
##########
learning/tour-of-beam/frontend/lib/pages/tour/controllers/content_tree.dart:
##########
@@ -17,33 +17,88 @@
*/
import 'package:flutter/widgets.dart';
+import 'package:get_it/get_it.dart';
import 'package:playground_components/playground_components.dart';
+import '../../../cache/content_tree.dart';
+import '../../../models/group.dart';
import '../../../models/node.dart';
+import '../../../models/unit.dart';
class ContentTreeController extends ChangeNotifier {
String _sdkId;
List<String> _treeIds;
NodeModel? _currentNode;
+ final _contentTreeCache = GetIt.instance.get<ContentTreeCache>();
+ final expandedIds = <String>{};
Review Comment:
This is better made private + getter.
##########
learning/tour-of-beam/frontend/lib/pages/tour/widgets/tour_progress_indicator.dart:
##########
@@ -32,7 +37,16 @@ class TourProgressIndicator extends StatelessWidget {
left: BeamSizes.size4,
right: BeamSizes.size8,
),
- child: SvgPicture.asset(assetPath),
+ child: SvgPicture.asset(
+ assetPath,
+ color: isSelected
+ ? Theme.of(context)
+ .extension<BeamThemeExtension>()!
+ .selectedProgressColor
+ : Theme.of(context)
+ .extension<BeamThemeExtension>()!
+ .unselectedProgressColor,
Review Comment:
If `Theme.of(context).extension...` is repeated, it's better to grab it
early like `final ext = Theme.of(context).extension...`
##########
learning/tour-of-beam/frontend/lib/pages/tour/widgets/unit.dart:
##########
@@ -35,17 +35,34 @@ class UnitWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return ClickableWidget(
- onTap: () => contentTreeController.onNodeTap(unit),
- child: Padding(
- padding: const EdgeInsets.symmetric(vertical: BeamSizes.size10),
- child: Row(
- children: [
- TourProgressIndicator(assetPath: Assets.svg.unitProgress0),
- Expanded(child: Text(unit.title)),
- ],
- ),
- ),
+ return AnimatedBuilder(
+ animation: contentTreeController,
+ builder: (context, child) {
+ final bool isSelected =
Review Comment:
No `bool` here.
##########
learning/tour-of-beam/frontend/lib/pages/tour/widgets/group.dart:
##########
@@ -36,23 +36,42 @@ class GroupWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return ExpansionTileWrapper(
- ExpansionTile(
- tilePadding: EdgeInsets.zero,
- title: GroupTitleWidget(
- group: group,
- onTap: () => contentTreeController.onNodeTap(group),
- ),
- childrenPadding: const EdgeInsets.only(
- left: BeamSizes.size24,
- ),
- children: [
- GroupNodesWidget(
- nodes: group.nodes,
- contentTreeController: contentTreeController,
+ return AnimatedBuilder(
+ animation: contentTreeController,
+ 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) {
+ /// Since expandedIds is also used for expansion,
+ /// it needs to be updated to prevent the tile from
+ /// remaining collapsed after taps on title.
+ if (!isExpanding) {
+ contentTreeController.markGroupAsCollapsed(group);
+ }
Review Comment:
What about the opposite case? If the tile is expanded with an icon tap, how
is `expandedIds` updated?
##########
learning/tour-of-beam/frontend/lib/pages/tour/widgets/group.dart:
##########
@@ -36,23 +36,42 @@ class GroupWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return ExpansionTileWrapper(
- ExpansionTile(
- tilePadding: EdgeInsets.zero,
- title: GroupTitleWidget(
- group: group,
- onTap: () => contentTreeController.onNodeTap(group),
- ),
- childrenPadding: const EdgeInsets.only(
- left: BeamSizes.size24,
- ),
- children: [
- GroupNodesWidget(
- nodes: group.nodes,
- contentTreeController: contentTreeController,
+ return AnimatedBuilder(
+ animation: contentTreeController,
+ builder: (context, child) {
+ final isExpanded =
contentTreeController.expandedIds.contains(group.id);
+
+ return ExpansionTileWrapper(
+ ExpansionTile(
Review Comment:
This can be encapsulated in `StatelessExpanstionTile` widget. It should take
`bool isExpanded` and only be guided by it and not its internal state.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
