comments

Author: szakarias

app/lib/frontend/dom/material.dart

@@ -439,16 +439,16 @@ d.Node option({
 
 d.Node radioButtons({
   required String name,
-  required List<({String id, String value})> idsAndValues,
-  String? checkedId,
+  required List<({String label, String value, String id})> radios,
+  String? initialValue,
   Iterable<String>? classes,
   String? leadingText,
 }) {
   final nodes = <d.Node>[];
   if (leadingText != null) {
     nodes.add(d.strong(text: leadingText));
   }
-  idsAndValues.forEach((e) {
+  radios.forEach((e) {
     nodes.add(d.input(
       id: e.id,
       type: 'radio',
@@ -457,9 +457,9 @@ d.Node radioButtons({
       classes: [
         ...?classes,
       ],
-      attributes: {if (e.id == checkedId) 'checked': ''},
+      attributes: {if (e.value == initialValue) 'checked': ''},
     ));
-    nodes.add(d.label(attributes: {'for': e.id}, child: d.text(e.value)));
+    nodes.add(d.label(attributes: {'for': e.id}, child: d.text(e.label)));
   });
 
   return d.div(classes: ['mdc-form-field'], children: nodes);

app/lib/frontend/templates/views/pkg/score_tab.dart

@@ -186,13 +186,13 @@ d.Node _downloadsChart(WeeklyVersionDownloadCounts weeklyVersionDownloads) {
       radioButtons(
           leadingText: 'By versions: ',
           name: 'version-modes',
-          idsAndValues: [
-            (id: 'major', value: 'Major'),
-            (id: 'minor', value: 'Minor'),
-            (id: 'patch', value: 'Patch')
+          radios: [
+            (id: 'version-modes-major', value: 'major', label: 'Major'),
+            (id: 'version-modes-minor', value: 'minor', label: 'Minor'),
+            (id: 'version-modes-patch', value: 'patch', label: 'Patch')
           ],
           classes: ['downloads-chart-radio-button'],
-          checkedId: 'major')
+          initialValue: 'major')
     ],
   );
   final container = d.div(

pkg/web_app/lib/src/widget/downloads_chart/widget.dart

@@ -9,6 +9,7 @@ import 'package:_pub_shared/data/download_counts_data.dart';
 import 'package:_pub_shared/format/date_format.dart';
 import 'package:_pub_shared/format/number_format.dart';
 import 'package:web/web.dart';
+import 'package:web_app/src/web_util.dart';
 
 import 'computations.dart';
 
@@ -64,20 +65,24 @@ void create(HTMLElement element, Map<String, String> options) {
   );
 
   final versionModesLists = {
-    'Major': majorDisplayLists,
-    'Minor': minorDisplayLists,
-    'Patch': patchDisplayLists
+    'major': majorDisplayLists,
+    'minor': minorDisplayLists,
+    'patch': patchDisplayLists
   };
 
-  final versionModes = document.getElementsByName(versionsRadio);
-  for (int i = 0; i < versionModes.length; i++) {
-    final radioButton = versionModes.item(i) as HTMLInputElement;
-    if (versionModesLists[radioButton.value] != null) {
-      radioButton.onClick.listen((e) {
-        drawChart(svg, versionModesLists[radioButton.value]!, data.newestDate);
-      });
+  final versionModes = document.getElementsByName(versionsRadio).toList();
+  versionModes.forEach((i) {
+    final radioButton = i as HTMLInputElement;
+    final value = radioButton.value;
+    final displayList = versionModesLists[value];
+
+    if (displayList == null) {
+      throw UnsupportedError('Unsupported versions-radio value: "$value"');
     }
-  }
+    radioButton.onClick.listen((e) {
+      drawChart(svg, displayList, data.newestDate);
+    });
+  });
 
   drawChart(svg, majorDisplayLists, data.newestDate);
 }