GitHub Sync (nullability support sync)

charts_common/charts_common.gwsq

@@ -0,0 +1,6 @@
+send_cls_to('dart-charts-team+reviews');
+send_cls_to('dart-charts-team');
+
+define Main {
+  reassign_to_list(from_owners_file('third_party/dart/charts_common/OWNERS'));
+}

charts_common/lib/common.dart

@@ -30,6 +30,8 @@ export 'src/chart/bar/bar_renderer_decorator.dart' show BarRendererDecorator;
 export 'src/chart/bar/bar_target_line_renderer.dart' show BarTargetLineRenderer;
 export 'src/chart/bar/bar_target_line_renderer_config.dart'
     show BarTargetLineRendererConfig;
+export 'src/chart/bar/base_bar_renderer.dart'
+    show barGroupIndexKey, barGroupCountKey, barGroupWeightKey;
 export 'src/chart/bar/base_bar_renderer_config.dart'
     show BarGroupingType, BaseBarRendererConfig;
 export 'src/chart/cartesian/axis/axis.dart'
@@ -38,6 +40,7 @@ export 'src/chart/cartesian/axis/axis.dart'
         measureAxisIdKey,
         measureAxisKey,
         Axis,
+        ImmutableAxis,
         AxisOrientation,
         NumericAxis,
         OrdinalAxis,
@@ -179,6 +182,8 @@ export 'src/chart/common/behavior/slider/slider.dart'
         SliderListenerDragState,
         SliderStyle;
 export 'src/chart/common/behavior/sliding_viewport.dart' show SlidingViewport;
+export 'src/chart/common/behavior/sunburst_ring_expander.dart'
+    show SunburstRingExpander;
 export 'src/chart/common/behavior/zoom/initial_hint_behavior.dart'
     show InitialHintBehavior;
 export 'src/chart/common/behavior/zoom/pan_and_zoom_behavior.dart'
@@ -242,6 +247,12 @@ export 'src/chart/scatter_plot/point_renderer_decorator.dart'
 export 'src/chart/scatter_plot/scatter_plot_chart.dart' show ScatterPlotChart;
 export 'src/chart/scatter_plot/symbol_annotation_renderer.dart'
     show SymbolAnnotationRenderer;
+export 'src/chart/sunburst/sunburst_chart.dart' show SunburstChart;
+export 'src/chart/sunburst/sunburst_arc_renderer.dart' show SunburstArcRenderer;
+export 'src/chart/sunburst/sunburst_arc_renderer_config.dart'
+    show SunburstArcRendererConfig, SunburstColorStrategy;
+export 'src/chart/sunburst/sunburst_arc_label_decorator.dart'
+    show SunburstArcLabelDecorator;
 export 'src/chart/scatter_plot/symbol_annotation_renderer_config.dart'
     show SymbolAnnotationRendererConfig;
 export 'src/chart/time_series/time_series_chart.dart' show TimeSeriesChart;
@@ -259,6 +270,7 @@ export 'src/common/gesture_listener.dart' show GestureListener;
 export 'src/common/graphics_factory.dart' show GraphicsFactory;
 export 'src/common/line_style.dart' show LineStyle;
 export 'src/common/material_palette.dart' show MaterialPalette;
+export 'src/common/math.dart' show NullablePoint;
 export 'src/common/performance.dart' show Performance;
 export 'src/common/proxy_gesture_listener.dart' show ProxyGestureListener;
 export 'src/common/rtl_spec.dart' show AxisDirection, RTLSpec;

charts_common/lib/src/chart/bar/bar_chart.dart

@@ -23,11 +23,11 @@ import '../layout/layout_config.dart' show LayoutConfig;
 
 class BarChart extends OrdinalCartesianChart {
   BarChart(
-      {bool vertical,
-      LayoutConfig layoutConfig,
-      NumericAxis primaryMeasureAxis,
-      NumericAxis secondaryMeasureAxis,
-      LinkedHashMap<String, NumericAxis> disjointMeasureAxes})
+      {bool? vertical,
+      LayoutConfig? layoutConfig,
+      NumericAxis? primaryMeasureAxis,
+      NumericAxis? secondaryMeasureAxis,
+      LinkedHashMap<String, NumericAxis>? disjointMeasureAxes})
       : super(
             vertical: vertical,
             layoutConfig: layoutConfig,

charts_common/lib/src/chart/bar/bar_error_decorator.dart

@@ -48,42 +48,50 @@ class BarErrorDecorator<D> extends BarRendererDecorator<D> {
       this.outlineColor = _defaultOutlineColor});
 
   @override
-  void decorate(Iterable<ImmutableBarRendererElement<D>> barElements,
-      ChartCanvas canvas, GraphicsFactory graphicsFactory,
-      {Rectangle<num> drawBounds,
-      double animationPercent,
-      bool renderingVertically,
-      bool rtl = false}) {
+  void decorate(
+    Iterable<ImmutableBarRendererElement<D>> barElements,
+    ChartCanvas canvas,
+    GraphicsFactory graphicsFactory, {
+    required Rectangle<num> drawBounds,
+    required double animationPercent,
+    required bool renderingVertically,
+    bool rtl = false,
+  }) {
     // Only decorate the bars when animation is at 100%.
     if (animationPercent != 1.0) {
       return;
     }
 
     for (var element in barElements) {
-      final bounds = element.bounds;
+      final bounds = element.bounds!;
       final datumIndex = element.index;
 
-      final measureLowerBoundFn = element.series.measureLowerBoundFn;
-      final measureUpperBoundFn = element.series.measureUpperBoundFn;
+      final series = element.series!;
+
+      final measureLowerBoundFn = series.measureLowerBoundFn;
+      final measureUpperBoundFn = series.measureUpperBoundFn;
 
       if (measureLowerBoundFn != null && measureUpperBoundFn != null) {
-        final measureOffsetFn = element.series.measureOffsetFn;
+        final measureOffsetFn = series.measureOffsetFn!;
         final measureAxis =
-            element.series.getAttr(measureAxisKey) as ImmutableAxis<num>;
+            series.getAttr(measureAxisKey) as ImmutableAxis<num>;
 
         if (renderingVertically) {
           final startY = measureAxis.getLocation(
-              measureLowerBoundFn(datumIndex) + measureOffsetFn(datumIndex));
+              (measureLowerBoundFn(datumIndex) ?? 0) +
+                  measureOffsetFn(datumIndex)!)!;
           final endY = measureAxis.getLocation(
-              measureUpperBoundFn(datumIndex) + measureOffsetFn(datumIndex));
+              (measureUpperBoundFn(datumIndex) ?? 0) +
+                  measureOffsetFn(datumIndex)!)!;
 
           if (startY != endY) {
             final barWidth = bounds.right - bounds.left;
             final x = (bounds.left + bounds.right) / 2;
-            final rectWidth = min(strokeWidthPx + 2 * outlineWidthPx, barWidth);
+            final rectWidth =
+                min(strokeWidthPx + 2 * outlineWidthPx, barWidth.toDouble());
             final strokeWidth = rectWidth - 2 * outlineWidthPx;
             final rectEndpointLength =
-                min(endpointLengthPx + 2 * outlineWidthPx, barWidth);
+                min(endpointLengthPx + 2 * outlineWidthPx, barWidth.toDouble());
             final endpointLength = rectEndpointLength - 2 * outlineWidthPx;
 
             if (outlineWidthPx > 0) {
@@ -131,17 +139,20 @@ class BarErrorDecorator<D> extends BarRendererDecorator<D> {
           }
         } else {
           final startX = measureAxis.getLocation(
-              measureLowerBoundFn(datumIndex) + measureOffsetFn(datumIndex));
+              (measureLowerBoundFn(datumIndex) ?? 0) +
+                  measureOffsetFn(datumIndex)!)!;
           final endX = measureAxis.getLocation(
-              measureUpperBoundFn(datumIndex) + measureOffsetFn(datumIndex));
+              (measureUpperBoundFn(datumIndex) ?? 0) +
+                  measureOffsetFn(datumIndex)!)!;
 
           if (startX != endX) {
             final barWidth = bounds.bottom - bounds.top;
             final y = (bounds.top + bounds.bottom) / 2;
-            final rectWidth = min(strokeWidthPx + 2 * outlineWidthPx, barWidth);
+            final rectWidth =
+                min(strokeWidthPx + 2 * outlineWidthPx, barWidth.toDouble());
             final strokeWidth = rectWidth - 2 * outlineWidthPx;
             final rectEndpointLength =
-                min(endpointLengthPx + 2 * outlineWidthPx, barWidth);
+                min(endpointLengthPx + 2 * outlineWidthPx, barWidth.toDouble());
             final endpointLength = rectEndpointLength - 2 * outlineWidthPx;
 
             if (outlineWidthPx > 0) {

charts_common/lib/src/chart/bar/bar_label_decorator.dart

@@ -15,8 +15,6 @@
 
 import 'dart:math' show Rectangle;
 
-import 'package:meta/meta.dart' show required;
-
 import '../../common/color.dart' show Color;
 import '../../common/graphics_factory.dart' show GraphicsFactory;
 import '../../common/text_element.dart' show TextDirection, TextElement;
@@ -54,14 +52,14 @@ class BarLabelDecorator<D> extends BarRendererDecorator<D> {
   final BarLabelPlacement labelPlacement;
 
   /// For labels drawn inside the bar, configures label anchor position.
-  final BarLabelAnchor labelAnchor;
+  final BarLabelAnchor? labelAnchor;
 
   /// Space before and after the label text.
   final int labelPadding;
 
   BarLabelDecorator(
-      {TextStyleSpec insideLabelStyleSpec,
-      TextStyleSpec outsideLabelStyleSpec,
+      {TextStyleSpec? insideLabelStyleSpec,
+      TextStyleSpec? outsideLabelStyleSpec,
       this.labelAnchor,
       this.labelPosition = _defaultLabelPosition,
       this.labelPlacement = _defaultLabelPlacement,
@@ -73,9 +71,9 @@ class BarLabelDecorator<D> extends BarRendererDecorator<D> {
   @override
   void decorate(Iterable<ImmutableBarRendererElement<D>> barElements,
       ChartCanvas canvas, GraphicsFactory graphicsFactory,
-      {@required Rectangle drawBounds,
-      @required double animationPercent,
-      @required bool renderingVertically,
+      {required Rectangle<int> drawBounds,
+      required double animationPercent,
+      required bool renderingVertically,
       bool rtl = false}) {
     // Only decorate the bars when animation is at 100%.
     if (animationPercent != 1.0) {
@@ -95,7 +93,7 @@ class BarLabelDecorator<D> extends BarRendererDecorator<D> {
       Iterable<ImmutableBarRendererElement<D>> barElements,
       ChartCanvas canvas,
       GraphicsFactory graphicsFactory,
-      Rectangle drawBounds,
+      Rectangle<int> drawBounds,
       bool rtl) {
     // Create [TextStyle] from [TextStyleSpec] to be used by all the elements.
     // The [GraphicsFactory] is needed so it can't be created earlier.
@@ -105,21 +103,21 @@ class BarLabelDecorator<D> extends BarRendererDecorator<D> {
         _getTextStyle(graphicsFactory, outsideLabelStyleSpec);
 
     for (var element in barElements) {
-      final labelFn = element.series.labelAccessorFn;
-      final measureFn = element.series.measureFn;
+      final labelFn = element.series!.labelAccessorFn;
+      final measureFn = element.series!.measureFn;
       final datumIndex = element.index;
-      final label = (labelFn != null) ? labelFn(datumIndex) : null;
+      final label = labelFn?.call(datumIndex);
       final measure = measureFn(datumIndex) ?? 0.0;
 
       // If there are custom styles, use that instead of the default or the
       // style defined for the entire decorator.
       final datumInsideLabelStyle = _getDatumStyle(
-          element.series.insideLabelStyleAccessorFn,
+          element.series!.insideLabelStyleAccessorFn,
           datumIndex,
           graphicsFactory,
           defaultStyle: insideLabelStyle);
       final datumOutsideLabelStyle = _getDatumStyle(
-          element.series.outsideLabelStyleAccessorFn,
+          element.series!.outsideLabelStyleAccessorFn,
           datumIndex,
           graphicsFactory,
           defaultStyle: outsideLabelStyle);
@@ -133,7 +131,7 @@ class BarLabelDecorator<D> extends BarRendererDecorator<D> {
           .split(_labelSplitPattern)
           .map((labelPart) => graphicsFactory.createTextElement(labelPart));
 
-      final bounds = element.bounds;
+      final bounds = element.bounds!;
 
       // Get space available inside and outside the bar.
       final totalPadding = labelPadding * 2;
@@ -148,7 +146,7 @@ class BarLabelDecorator<D> extends BarRendererDecorator<D> {
         final labelMaxWidth = labelElements
             .map(
                 (labelElement) => labelElement.measurement.horizontalSliceWidth)
-            .fold(0, (max, current) => max > current ? max : current);
+            .fold<double>(0, (max, current) => max > current ? max : current);
 
         // Total label height depends on the label element's text style.
         final totalLabelHeight = _getTotalLabelHeight(labelElements);
@@ -174,7 +172,7 @@ class BarLabelDecorator<D> extends BarRendererDecorator<D> {
       var labelsDrawn = 0;
       for (var labelElement in labelElements) {
         // Calculate the start position of label based on [labelAnchor].
-        int labelY;
+        final int labelY;
         final labelHeight = labelElement.measurement.verticalSliceWidth.round();
         final offsetHeight =
             (labelHeight + _defaultMultiLineLabelPadding) * labelsDrawn;
@@ -227,7 +225,7 @@ class BarLabelDecorator<D> extends BarRendererDecorator<D> {
       Iterable<ImmutableBarRendererElement<D>> barElements,
       ChartCanvas canvas,
       GraphicsFactory graphicsFactory,
-      Rectangle drawBounds,
+      Rectangle<int> drawBounds,
       bool rtl) {
     // Create [TextStyle] from [TextStyleSpec] to be used by all the elements.
     // The [GraphicsFactory] is needed so it can't be created earlier.
@@ -237,21 +235,21 @@ class BarLabelDecorator<D> extends BarRendererDecorator<D> {
         _getTextStyle(graphicsFactory, outsideLabelStyleSpec);
 
     for (var element in barElements) {
-      final labelFn = element.series.labelAccessorFn;
-      final measureFn = element.series.measureFn;
+      final labelFn = element.series!.labelAccessorFn;
+      final measureFn = element.series!.measureFn;
       final datumIndex = element.index;
-      final label = (labelFn != null) ? labelFn(datumIndex) : null;
+      final label = labelFn?.call(datumIndex);
       final measure = measureFn(datumIndex) ?? 0.0;
 
       // If there are custom styles, use that instead of the default or the
       // style defined for the entire decorator.
       final datumInsideLabelStyle = _getDatumStyle(
-          element.series.insideLabelStyleAccessorFn,
+          element.series!.insideLabelStyleAccessorFn,
           datumIndex,
           graphicsFactory,
           defaultStyle: insideLabelStyle);
       final datumOutsideLabelStyle = _getDatumStyle(
-          element.series.outsideLabelStyleAccessorFn,
+          element.series!.outsideLabelStyleAccessorFn,
           datumIndex,
           graphicsFactory,
           defaultStyle: outsideLabelStyle);
@@ -261,7 +259,7 @@ class BarLabelDecorator<D> extends BarRendererDecorator<D> {
         continue;
       }
 
-      final bounds = element.bounds;
+      final bounds = element.bounds!;
 
       // Get space available inside and outside the bar.
       final totalPadding = labelPadding * 2;
@@ -295,15 +293,15 @@ class BarLabelDecorator<D> extends BarRendererDecorator<D> {
       }
 
       // Only calculate and draw label if there's actually space for the label.
-      if (labelElement.maxWidth < 0 ||
+      if (labelElement.maxWidth! < 0 ||
           (labelElement.maxWidthStrategy == null &&
               labelElement.measurement.horizontalSliceWidth >
-                  labelElement.maxWidth)) {
+                  labelElement.maxWidth!)) {
         return;
       }
 
       // Calculate the start position of label based on [labelAnchor].
-      int labelX;
+      final int labelX;
       if (calculatedLabelPosition == BarLabelPosition.inside) {
         final anchor = _resolveLabelAnchor(
             measure, labelAnchor ?? _defaultHorizontalLabelAnchor);
@@ -365,7 +363,7 @@ class BarLabelDecorator<D> extends BarRendererDecorator<D> {
 
   // Helper function that converts [TextStyleSpec] to [TextStyle].
   TextStyle _getTextStyle(
-      GraphicsFactory graphicsFactory, TextStyleSpec labelSpec) {
+      GraphicsFactory graphicsFactory, TextStyleSpec? labelSpec) {
     return graphicsFactory.createTextPaint()
       ..color = labelSpec?.color ?? Color.black
       ..fontFamily = labelSpec?.fontFamily
@@ -374,10 +372,13 @@ class BarLabelDecorator<D> extends BarRendererDecorator<D> {
   }
 
   /// Helper function to get datum specific style
-  TextStyle _getDatumStyle(AccessorFn<TextStyleSpec> labelFn, int datumIndex,
-      GraphicsFactory graphicsFactory,
-      {TextStyle defaultStyle}) {
-    final styleSpec = (labelFn != null) ? labelFn(datumIndex) : null;
+  TextStyle _getDatumStyle(
+    AccessorFn<TextStyleSpec>? labelFn,
+    int? datumIndex,
+    GraphicsFactory graphicsFactory, {
+    required TextStyle defaultStyle,
+  }) {
+    final styleSpec = labelFn?.call(datumIndex);
     return (styleSpec != null)
         ? _getTextStyle(graphicsFactory, styleSpec)
         : defaultStyle;