GitHub Sync (#710)

* Internal changes

PiperOrigin-RevId: 386374477

* Fix `getNearestDatumDetailPerSeries` function in `LineRenderer` for area charts. The measure distance of the first series above the given point is set to 0 to make sure the `SelectNearest` behavior selects the correct series in area charts.

PiperOrigin-RevId: 391045574

* Fix `getNearestDatumDetailPerSeries` function in `LineRenderer` for area charts. The measure distance of the first series above the given point is set to 0 to make sure the `SelectNearest` behavior selects the correct series in area charts.

PiperOrigin-RevId: 391058485

* Fix `getNearestDatumDetailPerSeries` function in `LineRenderer` for area charts. The measure distance of the first series above the given point is set to 0 to make sure the `SelectNearest` behavior selects the correct series in area charts.

PiperOrigin-RevId: 391240493

* Automated g4 rollback of changelist 391240493.

Internal changes.

*** Reason for rollback ***

Breaks play console ui scuba test.

*** Original change description ***

Automated g4 rollback of changelist 391058485.

*** Reason for rollback ***

Fix broken test

*** Original change description ***

Automated g4 rollback of changelist 391045574.

*** Reason for rollback ***

Causing continuous build failure

***

PiperOrigin-RevId: 391271021

* Internal changes

PiperOrigin-RevId: 392084061

* Fix getNearestDatumDetailPerSeries function in LineRenderer for area charts. The measure distance of the first series above the given point is set to 0 to make sure the SelectNearest behavior selects the correct series in area charts.

PiperOrigin-RevId: 392863701

* Fix exception caused by null y coordinate.

PiperOrigin-RevId: 393199512

* Add functions to draw horizontal or vertical links onto the dart charts web canvas.

PiperOrigin-RevId: 393802496

* Update code in preparation for the fix to dart-lang/language#1785 to roll out.

In short, this bug prevents implicitly typed condition variables from participating in type promotion in some circumstances (see the bug for more details).  Since the bug only occurs when the condition variable is implicitly typed, we can ensure a smooth rollout by giving explicit `bool` types to the condition variables affected by this bug.  Once the fix has fully rolled out to google3 we will be able to remove these explicit types once again.

Tested:
    TAP --sample ran all affected tests and none failed
    http://test/OCL:394261565:BASE:394223559:1630517438374:b19cc4e4
PiperOrigin-RevId: 394291389

* Internal changes

PiperOrigin-RevId: 394393084

* Update code in preparation for the fix to dart-lang/language#1785 to roll out.

In short, this bug prevents implicitly typed condition variables from participating in type promotion in some circumstances (see the bug for more details).  Since the bug only occurs when the condition variable is implicitly typed, we can ensure a smooth rollout by giving explicit `bool` types to the condition variables affected by this bug.  Once the fix has fully rolled out to google3 we will be able to remove these explicit types once again.

Tested:
    Some test failures are present, but the CL author has decided to mail the change anyway
PiperOrigin-RevId: 394482159

* Add barGroupInnerPaddingPx in BarRendererConfig to allow configuration of padding between grouped bars

PiperOrigin-RevId: 394589317

* Internal changes

PiperOrigin-RevId: 394593125

* Create `AutoAdjustingStatickTickProvider` for bar charts, which selects a tick increment (from a list of available increments) such that the ticks don't collide on the chart.

PiperOrigin-RevId: 394645415

* Internal changes

PiperOrigin-RevId: 395812304

* Internal changes

PiperOrigin-RevId: 395954739

* Internal changes

PiperOrigin-RevId: 396359518

* Internal changes

PiperOrigin-RevId: 396414170

* Internal changes

PiperOrigin-RevId: 396573153

* Internal changes

PiperOrigin-RevId: 396579689

* Internal changes

PiperOrigin-RevId: 396581475

* Internal changes

PiperOrigin-RevId: 396587541

* Add skeleton of Sankey Chart files to be used in static Sankey diagram.

PiperOrigin-RevId: 397091086

* Add generic graph class initializers

PiperOrigin-RevId: 401770789

* Add ingoing and outgoing node links and toSeriesList conversion.

PiperOrigin-RevId: 401774582

* Internal changes

PiperOrigin-RevId: 401812322

* Add barGroupInnerPaddingPx in BarTargetLineRendererConfig to allow configuration of padding between grouped target lines

PiperOrigin-RevId: 402968313

* Convert from Travis to GitHub Actions for external CI

PiperOrigin-RevId: 403395009

* Skip daylight saving tests on unsupported configurations

The tests of time zone handling expect the local machine to use PST (or equivalent) time zones, since DateTime doesn't have a concept of a set, non-local time zone. That causes these tests to fail when run in any other time zone, which can frequently happen with external CI such as Travis or GitHub actions.

This conditionally skips those tests on machines that don't have the necessary local time zone behavior, so that the rest of the unit tests can be run in external CI.

PiperOrigin-RevId: 403509608

* Add Sankey specific links and nodes

PiperOrigin-RevId: 404285533

* Add topological graph sort with cycle detection

PiperOrigin-RevId: 404804722

* internal changes

PiperOrigin-RevId: 406857881

* Update CHANGELOGs and pubspec.yamls

PiperOrigin-RevId: 407073944

Co-authored-by: Googler <[email protected]>
Co-authored-by: paulberry <[email protected]>

Author: 3 people

.github/workflows/ci.yml

@@ -0,0 +1,42 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        channel: [master, stable]
+      # Disable fail-fast; we want results from all channels even if one fails.
+      fail-fast: false
+
+    steps:
+    - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+      with:
+        path: charts
+    - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+      with:
+        path: flutter
+        repository: flutter/flutter
+        ref: ${{ matrix.channel }}
+        # Shallow clones don't work; see https://github.com/flutter/flutter/issues/18532
+        fetch-depth: 0
+    - name: Add Flutter tags
+      # Add tags, which are also necessary for version checks to work.
+      run: git fetch origin +refs/tags/*:refs/tags/*
+      working-directory: ${{ github.workspace }}/flutter
+    - name: Add Flutter to path
+      run: echo "$GITHUB_WORKSPACE/flutter/bin" >> $GITHUB_PATH
+    - name: Doctor
+      # Run doctor, for ease of debugging any issues.
+      run: flutter doctor -v
+    - name: charts_common tests
+      run: |
+        dart pub get
+        dart pub run test
+      working-directory: ${{ github.workspace }}/charts/charts_common
+    - name: charts_flutter tests
+      run: flutter test
+      working-directory: ${{ github.workspace }}/charts/charts_flutter
+

.travis.yml

@@ -1,3 +1,12 @@
+# 0.12.0
+* Expose `NumericScale`, `LinearScale` and `ScaleSpec`
+* Add functions to draw horizontal or vertical links.
+* Added more padding options.
+* Create `AutoAdjustingStatickTickProvider` for bar charts.
+* Add generic graph class initializers.
+* Add ingoing and outgoing node links and toSeriesList conversion.
+* Bug fixes.
+
 # 0.11.0
 * Null support
 * Update to latest from internal repo

charts_common/CHANGELOG.md

@@ -16,7 +16,12 @@
 export 'src/chart/bar/bar_chart.dart' show BarChart;
 export 'src/chart/bar/bar_error_decorator.dart' show BarErrorDecorator;
 export 'src/chart/bar/bar_label_decorator.dart'
-    show BarLabelAnchor, BarLabelDecorator, BarLabelPlacement, BarLabelPosition;
+    show
+        BarLabelAnchor,
+        BarLabelDecorator,
+        BarLabelPlacement,
+        BarLabelPosition,
+        BarLabelVerticalPosition;
 export 'src/chart/bar/bar_lane_renderer_config.dart' show BarLaneRendererConfig;
 export 'src/chart/bar/bar_renderer.dart'
     show BarRenderer, BarRendererElement, ImmutableBarRendererElement;
@@ -57,12 +62,15 @@ export 'src/chart/cartesian/axis/draw_strategy/small_tick_draw_strategy.dart'
     show SmallTickRendererSpec;
 export 'src/chart/cartesian/axis/draw_strategy/tick_draw_strategy.dart'
     show TickDrawStrategy;
+export 'src/chart/cartesian/axis/linear/linear_scale.dart' show LinearScale;
 export 'src/chart/cartesian/axis/numeric_extents.dart' show NumericExtents;
+export 'src/chart/cartesian/axis/numeric_scale.dart' show NumericScale;
 export 'src/chart/cartesian/axis/spec/axis_spec.dart'
     show
         AxisSpec,
         LineStyleSpec,
         RenderSpec,
+        ScaleSpec,
         TextStyleSpec,
         TickLabelAnchor,
         TickLabelJustification,
@@ -95,6 +103,7 @@ export 'src/chart/cartesian/axis/spec/numeric_axis_spec.dart'
         StaticNumericTickProviderSpec;
 export 'src/chart/cartesian/axis/spec/ordinal_axis_spec.dart'
     show
+        AutoAdjustingStaticOrdinalTickProviderSpec,
         BasicOrdinalTickProviderSpec,
         BasicOrdinalTickFormatterSpec,
         FixedPixelOrdinalScaleSpec,
@@ -195,7 +204,7 @@ export 'src/chart/common/behavior/zoom/panning_tick_provider.dart'
 export 'src/chart/common/canvas_shapes.dart'
     show CanvasBarStack, CanvasPie, CanvasPieSlice, CanvasRect;
 export 'src/chart/common/chart_canvas.dart'
-    show ChartCanvas, FillPatternType, BlendMode;
+    show ChartCanvas, FillPatternType, BlendMode, LinkOrientation, Link;
 export 'src/chart/common/chart_context.dart' show ChartContext;
 export 'src/chart/common/datum_details.dart'
     show DatumDetails, DomainFormatter, MeasureFormatter;
@@ -263,7 +272,11 @@ export 'src/chart/treemap/treemap_label_decorator.dart'
     show TreeMapLabelDecorator;
 export 'src/chart/treemap/treemap_renderer_config.dart'
     show TreeMapRendererConfig, TreeMapTileType;
+export 'src/chart/sankey/sankey_chart.dart' show SankeyChart;
+export 'src/chart/sankey/sankey_renderer_config.dart' show SankeyRendererConfig;
 export 'src/common/color.dart' show Color;
+export 'src/chart/link/link_chart.dart' show LinkChart;
+export 'src/chart/link/link_renderer_config.dart' show LinkRendererConfig;
 export 'src/common/date_time_factory.dart'
     show DateTimeFactory, LocalDateTimeFactory, UTCDateTimeFactory;
 export 'src/common/gesture_listener.dart' show GestureListener;
@@ -293,6 +306,8 @@ export 'src/common/text_measurement.dart' show TextMeasurement;
 export 'src/common/text_style.dart' show TextStyle;
 export 'src/data/series.dart' show AttributeKey, Series, TypedAccessorFn;
 export 'src/data/tree.dart' show Tree, TreeNode;
+export 'src/data/graph.dart' show Graph;
+export 'src/data/sankey_graph.dart' show SankeyGraph;
 //
 // DO NOT ADD ANYTHING BELOW THIS. IT WILL BREAK OPENSOURCE.
 //

charts_common/lib/common.dart

@@ -32,6 +32,7 @@ class BarLabelDecorator<D> extends BarRendererDecorator<D> {
   static const _defaultLabelPlacement = BarLabelPlacement.followMeasureAxis;
   static const _defaultHorizontalLabelAnchor = BarLabelAnchor.start;
   static const _defaultVerticalLabelAnchor = BarLabelAnchor.end;
+  static const _defaultlabelVerticalPosition = BarLabelVerticalPosition.middle;
   static final _defaultInsideLabelStyle =
       TextStyleSpec(fontSize: 12, color: Color.white);
   static final _defaultOutsideLabelStyle =
@@ -54,17 +55,21 @@ class BarLabelDecorator<D> extends BarRendererDecorator<D> {
   /// For labels drawn inside the bar, configures label anchor position.
   final BarLabelAnchor? labelAnchor;
 
+  /// For labels on horizontal bars, configures the label's vertical position.
+  final BarLabelVerticalPosition? labelVerticalPosition;
+
   /// Space before and after the label text.
   final int labelPadding;
 
-  BarLabelDecorator(
-      {TextStyleSpec? insideLabelStyleSpec,
-      TextStyleSpec? outsideLabelStyleSpec,
-      this.labelAnchor,
-      this.labelPosition = _defaultLabelPosition,
-      this.labelPlacement = _defaultLabelPlacement,
-      this.labelPadding = _defaultLabelPadding})
-      : insideLabelStyleSpec = insideLabelStyleSpec ?? _defaultInsideLabelStyle,
+  BarLabelDecorator({
+    TextStyleSpec? insideLabelStyleSpec,
+    TextStyleSpec? outsideLabelStyleSpec,
+    this.labelAnchor,
+    this.labelPosition = _defaultLabelPosition,
+    this.labelPlacement = _defaultLabelPlacement,
+    this.labelPadding = _defaultLabelPadding,
+    this.labelVerticalPosition = _defaultlabelVerticalPosition,
+  })  : insideLabelStyleSpec = insideLabelStyleSpec ?? _defaultInsideLabelStyle,
         outsideLabelStyleSpec =
             outsideLabelStyleSpec ?? _defaultOutsideLabelStyle;
 
@@ -287,16 +292,19 @@ class BarLabelDecorator<D> extends BarRendererDecorator<D> {
         labelElement.textStyle = datumInsideLabelStyle;
         labelElement.maxWidth = insideBarWidth;
       } else {
-        // calculatedLabelPosition == LabelPosition.outside
+        // this block for...
+        // calculatedLabelPosition == LabelPosition.outside ||
+        // calculatedLabelPosition == LabelPosition.right
         labelElement.textStyle = datumOutsideLabelStyle;
         labelElement.maxWidth = outsideBarWidth;
       }
 
       // Only calculate and draw label if there's actually space for the label.
-      if (labelElement.maxWidth! < 0 ||
-          (labelElement.maxWidthStrategy == null &&
-              labelElement.measurement.horizontalSliceWidth >
-                  labelElement.maxWidth!)) {
+      if ((labelElement.maxWidth! < 0 ||
+              (labelElement.maxWidthStrategy == null &&
+                  labelElement.measurement.horizontalSliceWidth >
+                      labelElement.maxWidth!)) &&
+          labelVerticalPosition != BarLabelVerticalPosition.top) {
         return;
       }
 
@@ -331,8 +339,7 @@ class BarLabelDecorator<D> extends BarRendererDecorator<D> {
             }
             break;
         }
-      } else {
-        // calculatedLabelPosition == LabelPosition.outside
+      } else if (calculatedLabelPosition == BarLabelPosition.outside) {
         if (measure < 0 &&
             labelPlacement == BarLabelPlacement.opposeAxisBaseline) {
           labelX = bounds.left - labelPadding;
@@ -341,13 +348,35 @@ class BarLabelDecorator<D> extends BarRendererDecorator<D> {
           labelX = bounds.right + labelPadding;
           labelElement.textDirection = TextDirection.ltr;
         }
+      } else {
+        // calculatedLabelPosition == BarLabelPosition.right
+        if (measure < 0) {
+          labelX =
+              (bounds.right - labelElement.measurement.horizontalSliceWidth)
+                  .round();
+        } else {
+          labelX = (bounds.left +
+                  drawBounds.width -
+                  labelElement.measurement.horizontalSliceWidth)
+              .round();
+        }
       }
 
-      // Center the label inside the bar.
-      final labelY = (bounds.top +
-              (bounds.bottom - bounds.top) / 2 -
-              labelElement.measurement.verticalSliceWidth / 2)
-          .round();
+      // Calculate label's y position based on BarLabelVerticalPosition.
+      final labelY;
+      if (labelVerticalPosition == BarLabelVerticalPosition.middle) {
+        // Center the label inside the bar.
+        labelY = (bounds.top +
+                (bounds.bottom - bounds.top) / 2 -
+                labelElement.measurement.verticalSliceWidth / 2)
+            .round();
+      } else {
+        /// labelVerticalPosition == BarLabelVerticalPosition.top
+        labelY = (bounds.top -
+                labelElement.measurement.verticalSliceWidth -
+                labelPadding)
+            .round();
+      }
 
       canvas.drawText(labelElement, labelX, labelY);
     }
@@ -368,7 +397,8 @@ class BarLabelDecorator<D> extends BarRendererDecorator<D> {
       ..color = labelSpec?.color ?? Color.black
       ..fontFamily = labelSpec?.fontFamily
       ..fontSize = labelSpec?.fontSize ?? 12
-      ..lineHeight = labelSpec?.lineHeight;
+      ..lineHeight = labelSpec?.lineHeight
+      ..fontWeight = labelSpec?.fontWeight ?? "400";
   }
 
   /// Helper function to get datum specific style
@@ -409,6 +439,10 @@ enum BarLabelPosition {
 
   /// Always place label on the inside.
   inside,
+
+  /// Right align the label with the horizontal bars. The label will be inside
+  /// or above the bar based on the BarLabelVerticalPosition.
+  right,
 }
 
 /// Configures where to place the label relative to the axis.
@@ -435,3 +469,12 @@ enum BarLabelAnchor {
   /// Anchor to the measure end.
   end,
 }
+
+/// Configures where to place labels vertically on horizontal bars.
+enum BarLabelVerticalPosition {
+  /// Anchors label to be on top of bar
+  top,
+
+  /// Anchors label to be inline with bar
+  middle,
+}

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

@@ -133,7 +133,7 @@ class BarLaneRenderer<D> extends BarRenderer<D> {
       final barGroupWeight = series.getAttr(barGroupWeightKey);
       final allBarGroupWeights = series.getAttr(allBarGroupWeightsKey);
       final measureAxisPosition = measureAxis.getLocation(0.0);
-      final maxMeasureValue = _getMaxMeasureValue(measureAxis);
+      final measureFn = series.measureFn;
 
       // Create a fake series for [BarLabelDecorator] to use when looking up the
       // index of each datum.
@@ -173,6 +173,14 @@ class BarLaneRenderer<D> extends BarRenderer<D> {
         var animatingBar =
             barStackList.firstWhereOrNull((bar) => bar.key == barKey);
 
+        final renderNegativeLanes =
+            (config as BarLaneRendererConfig).renderNegativeLanes;
+
+        final measureValue = measureFn(0);
+        final measureIsNegative = measureValue != null && measureValue < 0;
+        final maxMeasureValue = _getMaxMeasureValue(
+            measureAxis, measureIsNegative && renderNegativeLanes);
+
         // If we don't have any existing bar element, create a new bar and have
         // it animate in from the domain axis.
         if (animatingBar == null) {
@@ -197,7 +205,7 @@ class BarLaneRenderer<D> extends BarRenderer<D> {
               numBarGroups: barGroupCount,
               strokeWidthPx: config.strokeWidthPx,
               measureIsNull: false,
-              measureIsNegative: false);
+              measureIsNegative: renderNegativeLanes && measureIsNegative);
 
           barStackList.add(animatingBar);
         } else {
@@ -227,7 +235,7 @@ class BarLaneRenderer<D> extends BarRenderer<D> {
             numBarGroups: barGroupCount,
             strokeWidthPx: config.strokeWidthPx,
             measureIsNull: false,
-            measureIsNegative: false);
+            measureIsNegative: renderNegativeLanes && measureIsNegative);
 
         animatingBar.setNewTarget(barElement);
 
@@ -245,7 +253,7 @@ class BarLaneRenderer<D> extends BarRenderer<D> {
           seriesList[0].getAttr(measureAxisKey) as ImmutableAxis<num>;
 
       final measureAxisPosition = measureAxis.getLocation(0.0);
-      final maxMeasureValue = _getMaxMeasureValue(measureAxis);
+      final maxMeasureValue = _getMaxMeasureValue(measureAxis, false);
 
       final barGroupIndex = 0;
       final previousBarGroupWeight = 0.0;
@@ -344,10 +352,10 @@ class BarLaneRenderer<D> extends BarRenderer<D> {
   }
 
   /// Gets the maximum measure value that will fit in the draw area.
-  num _getMaxMeasureValue(ImmutableAxis<num> measureAxis) {
+  num _getMaxMeasureValue(ImmutableAxis<num> measureAxis, bool laneIsNegative) {
     final pos = chart.vertical
         ? chart.drawAreaBounds.top
-        : isRtl
+        : ((isRtl && !laneIsNegative) || (!isRtl && laneIsNegative))
             ? chart.drawAreaBounds.left
             : chart.drawAreaBounds.right;