Skip to content
This repository was archived by the owner on Jan 9, 2023. It is now read-only.

Commit 1a00e94

Browse files
cbbraunnolankellyGooglermehmetfsrawlins
authored
GitHub Sync (#605)
* Internal changes PiperOrigin-RevId: 298455490 * Internal changes PiperOrigin-RevId: 299212474 * Internal changes PiperOrigin-RevId: 299384685 * Internal changes PiperOrigin-RevId: 299911795 * Apply sort_child_properties_last lint so we can enable it in google3. This enhances readability in *majority* of the cases by moving properties of a widget to the top. See: https://dart-lang.github.io/linter/lints/sort_child_properties_last.html Tested: TAP --sample ran all affected tests and none failed http://test/OCL:300415528:BASE:300394685:1583970262840:214ae086 PiperOrigin-RevId: 300472053 * Internal changes PiperOrigin-RevId: 300583916 * Internal changes PiperOrigin-RevId: 301253904 * Internal changes PiperOrigin-RevId: 301413179 * Correct the point location computation to be inside of scale's range if it is outside of scale range but only outside by less than epsilon in order to avoid potential mislocation caused by floating point computation. PiperOrigin-RevId: 301644128 * Internal changes PiperOrigin-RevId: 301919359 * Internal changes PiperOrigin-RevId: 305070616 * Point renderer has now the option to select all points overlapping the interaction point PiperOrigin-RevId: 306413187 * Internal Changes PiperOrigin-RevId: 306960748 * Fix missing_return errors for anonymous closures. These are mostly closures whose type dictates that a Future of something-or-other be returned. Fixes include: * Make the closure async * Add a return statement Tested: TAP for global presubmit queue http://test/OCL:307493015:BASE:307542828:1587474095828:2c1a77e8 PiperOrigin-RevId: 308003343 * Internal change PiperOrigin-RevId: 308058514 * Allow using up/down arrow keys to change the hovered bar in a chart. Also add preventDefault so the page doesn't scroll. PiperOrigin-RevId: 308932972 * Internal change PiperOrigin-RevId: 309073218 * Internal changes PiperOrigin-RevId: 309494957 * Add TriangleSymbolRenderer PiperOrigin-RevId: 310472091 * Expose additional classes PiperOrigin-RevId: 310943783 * Change MaterialGray shade900 from blue to correct gray PiperOrigin-RevId: 311587781 * Pass `DateTimeFactory` to `TimeSeriesChart` PiperOrigin-RevId: 311764962 * Add setting to allow series to be always visible and unclickable in the chart legend. PiperOrigin-RevId: 314159954 * Export additional classes PiperOrigin-RevId: 314565994 * Add custom legend ordering by sorting the behaviors series list based on a list with ordered series IDs. PiperOrigin-RevId: 315910283 * Add custom axis renderer for range ticks. PiperOrigin-RevId: 315976899 * Internal changes. PiperOrigin-RevId: 318221788 * Set datum index for legend entry PiperOrigin-RevId: 319291348 * Internal changes PiperOrigin-RevId: 322200941 * Internal changes PiperOrigin-RevId: 322451897 * Internal changes. PiperOrigin-RevId: 322661249 * Internal changes PiperOrigin-RevId: 322671049 * Internal changes PiperOrigin-RevId: 322827055 * Override setState fn with mounted check in baseChartState. PiperOrigin-RevId: 325307554 * Internal changes PiperOrigin-RevId: 326067746 * Internal changes PiperOrigin-RevId: 328177790 * Internal changes PiperOrigin-RevId: 331718263 * Internal changes PiperOrigin-RevId: 331738992 * Internal changes PiperOrigin-RevId: 331765706 * Automated g4 rollback of changelist 331765706. *** Reason for rollback *** Manually rolled back on behalf of: oreflow. Reason Given: This CL auto rolled back a rollback. Rolling forward to a broken revision *** Original change description *** Automated g4 rollback of changelist 331738992. *** Reason for rollback *** TAP has detected 10 or more targets failed to build at cl/331738992. TO ROLLFORWARD (without additional approval): Use go/undo-autorollback and consider filing a go/autorollback-bug. To see all broken targets visit http://test/331738992 or go/newly-broken?p=cl:331738992 if the former is slow to load. To prevent noise from flakes, TAP double-checked the following target fails to build: https://sponge.corp.google.com/in... *** PiperOrigin-RevId: 331767278 * Internal changes PiperOrigin-RevId: 336974207 * Internal changes PiperOrigin-RevId: 337212864 * Test-only change to prepare for new Flutter version PiperOrigin-RevId: 339319134 * Internal changes PiperOrigin-RevId: 340251505 * Internal changes PiperOrigin-RevId: 340463455 * Internal changes PiperOrigin-RevId: 340658840 * Internal changes PiperOrigin-RevId: 342347503 * Internal changes PiperOrigin-RevId: 345724352 * Internal changes PiperOrigin-RevId: 347872889 * Internal changes PiperOrigin-RevId: 350249482 * Clean up violations of Dart lint unnecessary_parenthesis In preparation for null safety migration, I'm first fixing numerous analysis complaints in the hope that it will make the migration go a little bit more smoothly. Remove unnecessary parentheses. PiperOrigin-RevId: 360550907 * Clean up violations of Dart lint annotate_overrides Add missing `@override` annotations. This caught a bug where `hashCode` was not overridden as intended because it was accidentally mistyped as `hashcode`. PiperOrigin-RevId: 360551084 * Clean up violations of Dart lint unnecessary_getters_setters Replace trivial getters and setters with fields. PiperOrigin-RevId: 360551490 * Clean up violations of Dart lint prefer_collection_literals Use collection literals where possible. Because a lot of this code explicitly uses `LinkedHashMap` to indicate that order is important, add appropriate `// ignore` comments until https://github.com/dart-lang/linter/issues/1649 is addressed. PiperOrigin-RevId: 360552809 * Clean up less trivial violations of miscellaneous Dart lints * prefer_null_aware_operators * hash_and_equals * only_throw_errors * avoid_bool_literals_in_conditional_expressions Also replace usage of the deprecated zero-argument `List` constructor. PiperOrigin-RevId: 360552940 * Clean up trivial violations of miscellaneous Dart lints * unnecessary_this * prefer_final_fields * avoid_single_cascade_in_expression_statements * avoid_renaming_method_parameters Also: * Remove unused variables. * Fix some cases where fields were implicitly `dynamic` because their type was omitted. PiperOrigin-RevId: 360553040 * bump intl version to 0.18.0 intl: ">=0.15.2 < 0.18.0" Closes #598 PiperOrigin-RevId: 361636495 * Internal changes PiperOrigin-RevId: 361680107 Co-authored-by: nolankelly <[email protected]> Co-authored-by: Googler <[email protected]> Co-authored-by: mehmetf <[email protected]> Co-authored-by: srawlins <[email protected]> Co-authored-by: rearnshaw <[email protected]> Co-authored-by: jiamingc <[email protected]> Co-authored-by: jamesdlin <[email protected]> Co-authored-by: Artyom Sasin <[email protected]> Co-authored-by: lorrainekan <[email protected]>
1 parent 8dd8fa5 commit 1a00e94

File tree

119 files changed

+3948
-966
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+3948
-966
lines changed

charts_common/intellij_linux.blazeproject

Lines changed: 0 additions & 32 deletions
This file was deleted.

charts_common/lib/common.dart

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export 'src/chart/bar/bar_label_decorator.dart'
1919
show BarLabelAnchor, BarLabelDecorator, BarLabelPlacement, BarLabelPosition;
2020
export 'src/chart/bar/bar_lane_renderer_config.dart' show BarLaneRendererConfig;
2121
export 'src/chart/bar/bar_renderer.dart'
22-
show BarRenderer, ImmutableBarRendererElement;
22+
show BarRenderer, BarRendererElement, ImmutableBarRendererElement;
2323
export 'src/chart/bar/bar_renderer_config.dart'
2424
show
2525
BarRendererConfig,
@@ -38,15 +38,22 @@ export 'src/chart/cartesian/axis/axis.dart'
3838
measureAxisIdKey,
3939
measureAxisKey,
4040
Axis,
41+
AxisOrientation,
4142
NumericAxis,
4243
OrdinalAxis,
4344
OrdinalViewport;
45+
export 'src/chart/cartesian/axis/draw_strategy/base_tick_draw_strategy.dart'
46+
show BaseRenderSpec, BaseTickDrawStrategy;
4447
export 'src/chart/cartesian/axis/draw_strategy/gridline_draw_strategy.dart'
4548
show GridlineRendererSpec;
4649
export 'src/chart/cartesian/axis/draw_strategy/none_draw_strategy.dart'
4750
show NoneRenderSpec;
51+
export 'src/chart/cartesian/axis/draw_strategy/range_tick_draw_strategy.dart'
52+
show RangeTickRendererSpec;
4853
export 'src/chart/cartesian/axis/draw_strategy/small_tick_draw_strategy.dart'
4954
show SmallTickRendererSpec;
55+
export 'src/chart/cartesian/axis/draw_strategy/tick_draw_strategy.dart'
56+
show TickDrawStrategy;
5057
export 'src/chart/cartesian/axis/numeric_extents.dart' show NumericExtents;
5158
export 'src/chart/cartesian/axis/spec/axis_spec.dart'
5259
show
@@ -93,17 +100,26 @@ export 'src/chart/cartesian/axis/spec/ordinal_axis_spec.dart'
93100
OrdinalTickFormatterSpec,
94101
OrdinalTickProviderSpec,
95102
OrdinalScaleSpec,
103+
RangeOrdinalTickProviderSpec,
96104
SimpleOrdinalScaleSpec,
97105
StaticOrdinalTickProviderSpec;
98106
export 'src/chart/cartesian/axis/spec/percent_axis_spec.dart'
99107
show PercentAxisSpec;
108+
export 'src/chart/cartesian/axis/spec/range_tick_spec.dart' show RangeTickSpec;
100109
export 'src/chart/cartesian/axis/spec/tick_spec.dart' show TickSpec;
110+
export 'src/chart/cartesian/axis/tick.dart' show Tick;
101111
export 'src/chart/cartesian/axis/tick_formatter.dart'
102112
show SimpleTickFormatterBase, TickFormatter;
113+
export 'src/chart/cartesian/axis/time/auto_adjusting_date_time_tick_provider.dart'
114+
show AutoAdjustingDateTimeTickProvider;
115+
export 'src/chart/cartesian/axis/time/base_time_stepper.dart'
116+
show BaseTimeStepper;
103117
export 'src/chart/cartesian/axis/time/date_time_extents.dart'
104118
show DateTimeExtents;
105119
export 'src/chart/cartesian/axis/time/date_time_tick_formatter.dart'
106120
show DateTimeTickFormatter;
121+
export 'src/chart/cartesian/axis/time/time_range_tick_provider_impl.dart'
122+
show TimeRangeTickProviderImpl;
107123
export 'src/chart/cartesian/cartesian_chart.dart'
108124
show CartesianChart, NumericCartesianChart, OrdinalCartesianChart;
109125
export 'src/chart/cartesian/cartesian_renderer.dart' show BaseCartesianRenderer;
@@ -152,7 +168,7 @@ export 'src/chart/common/behavior/range_annotation.dart'
152168
export 'src/chart/common/behavior/selection/lock_selection.dart'
153169
show LockSelection;
154170
export 'src/chart/common/behavior/selection/select_nearest.dart'
155-
show SelectNearest;
171+
show SelectNearest, SelectionMode;
156172
export 'src/chart/common/behavior/selection/selection_trigger.dart'
157173
show SelectionTrigger;
158174
export 'src/chart/common/behavior/slider/slider.dart'
@@ -173,7 +189,8 @@ export 'src/chart/common/behavior/zoom/panning_tick_provider.dart'
173189
show PanningTickProviderMode;
174190
export 'src/chart/common/canvas_shapes.dart'
175191
show CanvasBarStack, CanvasPie, CanvasPieSlice, CanvasRect;
176-
export 'src/chart/common/chart_canvas.dart' show ChartCanvas, FillPatternType;
192+
export 'src/chart/common/chart_canvas.dart'
193+
show ChartCanvas, FillPatternType, BlendMode;
177194
export 'src/chart/common/chart_context.dart' show ChartContext;
178195
export 'src/chart/common/datum_details.dart'
179196
show DatumDetails, DomainFormatter, MeasureFormatter;
@@ -254,11 +271,16 @@ export 'src/common/symbol_renderer.dart'
254271
LineSymbolRenderer,
255272
PointSymbolRenderer,
256273
RectSymbolRenderer,
274+
RectangleRangeSymbolRenderer,
257275
RoundedRectSymbolRenderer,
258-
SymbolRenderer;
276+
SymbolRenderer,
277+
TriangleSymbolRenderer;
259278
export 'src/common/text_element.dart'
260279
show TextElement, TextDirection, MaxWidthStrategy;
261280
export 'src/common/text_measurement.dart' show TextMeasurement;
262281
export 'src/common/text_style.dart' show TextStyle;
263-
export 'src/data/series.dart' show Series, TypedAccessorFn;
282+
export 'src/data/series.dart' show AttributeKey, Series, TypedAccessorFn;
264283
export 'src/data/tree.dart' show Tree, TreeNode;
284+
//
285+
// DO NOT ADD ANYTHING BELOW THIS. IT WILL BREAK OPENSOURCE.
286+
//

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ class BarLabelDecorator<D> extends BarRendererDecorator<D> {
138138
// Get space available inside and outside the bar.
139139
final totalPadding = labelPadding * 2;
140140
final insideBarHeight = bounds.height - totalPadding;
141-
final outsideBarHeight = drawBounds.height - bounds.height - totalPadding;
142141

143142
var calculatedLabelPosition = labelPosition;
144143
if (calculatedLabelPosition == BarLabelPosition.auto) {

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@ import 'dart:collection' show LinkedHashMap;
1818
import '../../data/series.dart' show AttributeKey;
1919
import '../cartesian/axis/axis.dart'
2020
show ImmutableAxis, domainAxisKey, measureAxisKey;
21-
import '../cartesian/cartesian_chart.dart' show CartesianChart;
2221
import '../common/chart_canvas.dart' show ChartCanvas;
2322
import '../common/processed_series.dart' show ImmutableSeries, MutableSeries;
2423
import 'bar_lane_renderer_config.dart' show BarLaneRendererConfig;
2524
import 'bar_renderer.dart' show AnimatedBar, BarRenderer, BarRendererElement;
26-
import 'bar_renderer_decorator.dart' show BarRendererDecorator;
2725
import 'base_bar_renderer.dart'
2826
show
27+
allBarGroupWeightsKey,
2928
barGroupCountKey,
3029
barGroupIndexKey,
3130
barGroupWeightKey,
@@ -50,8 +49,6 @@ const domainValuesKey = AttributeKey<Set>('BarLaneRenderer.domainValues');
5049
/// swim lanes may optionally be merged together into one wide lane that covers
5150
/// the full domain range band width.
5251
class BarLaneRenderer<D> extends BarRenderer<D> {
53-
final BarRendererDecorator barRendererDecorator;
54-
5552
/// Store a map of domain+barGroupIndex+category index to bar lanes in a
5653
/// stack.
5754
///
@@ -63,10 +60,12 @@ class BarLaneRenderer<D> extends BarRenderer<D> {
6360
/// as the data was given to the chart. For the case where both grouping and
6461
/// stacking are disabled, this means that bars for data later in the series
6562
/// will be drawn "on top of" bars earlier in the series.
63+
// ignore: prefer_collection_literals, https://github.com/dart-lang/linter/issues/1649
6664
final _barLaneStackMap = LinkedHashMap<String, List<AnimatedBar<D>>>();
6765

6866
/// Store a map of flags to track whether all measure values for a given
6967
/// domain value are null, for every series on the chart.
68+
// ignore: prefer_collection_literals, https://github.com/dart-lang/linter/issues/1649
7069
final _allMeasuresForDomainNullMap = LinkedHashMap<D, bool>();
7170

7271
factory BarLaneRenderer({BarLaneRendererConfig config, String rendererId}) {
@@ -76,8 +75,7 @@ class BarLaneRenderer<D> extends BarRenderer<D> {
7675
}
7776

7877
BarLaneRenderer._internal({BarLaneRendererConfig config, String rendererId})
79-
: barRendererDecorator = config.barRendererDecorator,
80-
super.internal(config: config, rendererId: rendererId);
78+
: super.internal(config: config, rendererId: rendererId);
8179

8280
@override
8381
void preprocessSeries(List<MutableSeries<D>> seriesList) {
@@ -89,7 +87,7 @@ class BarLaneRenderer<D> extends BarRenderer<D> {
8987
final domainFn = series.domainFn;
9088
final measureFn = series.rawMeasureFn;
9189

92-
final domainValues = Set<D>();
90+
final domainValues = <D>{};
9391

9492
for (var barIndex = 0; barIndex < series.data.length; barIndex++) {
9593
final domain = domainFn(barIndex);
@@ -118,7 +116,7 @@ class BarLaneRenderer<D> extends BarRenderer<D> {
118116

119117
// Add gray bars to render under every bar stack.
120118
seriesList.forEach((ImmutableSeries<D> series) {
121-
Set<D> domainValues = series.getAttr(domainValuesKey) as Set<D>;
119+
var domainValues = series.getAttr(domainValuesKey) as Set<D>;
122120

123121
final domainAxis = series.getAttr(domainAxisKey) as ImmutableAxis<D>;
124122
final measureAxis = series.getAttr(measureAxisKey) as ImmutableAxis<num>;
@@ -127,6 +125,7 @@ class BarLaneRenderer<D> extends BarRenderer<D> {
127125
final barGroupIndex = series.getAttr(barGroupIndexKey);
128126
final previousBarGroupWeight = series.getAttr(previousBarGroupWeightKey);
129127
final barGroupWeight = series.getAttr(barGroupWeightKey);
128+
final allBarGroupWeights = series.getAttr(allBarGroupWeightsKey);
130129
final measureAxisPosition = measureAxis.getLocation(0.0);
131130
final maxMeasureValue = _getMaxMeasureValue(measureAxis);
132131

@@ -181,6 +180,7 @@ class BarLaneRenderer<D> extends BarRenderer<D> {
181180
barGroupIndex: barGroupIndex,
182181
previousBarGroupWeight: previousBarGroupWeight,
183182
barGroupWeight: barGroupWeight,
183+
allBarGroupWeights: allBarGroupWeights,
184184
color: (config as BarLaneRendererConfig).backgroundBarColor,
185185
details: BarRendererElement<D>(),
186186
domainValue: domainValue,
@@ -210,6 +210,7 @@ class BarLaneRenderer<D> extends BarRenderer<D> {
210210
barGroupIndex: barGroupIndex,
211211
previousBarGroupWeight: previousBarGroupWeight,
212212
barGroupWeight: barGroupWeight,
213+
allBarGroupWeights: allBarGroupWeights,
213214
color: (config as BarLaneRendererConfig).backgroundBarColor,
214215
details: BarRendererElement<D>(),
215216
domainValue: domainValue,
@@ -341,9 +342,11 @@ class BarLaneRenderer<D> extends BarRenderer<D> {
341342

342343
/// Gets the maximum measure value that will fit in the draw area.
343344
num _getMaxMeasureValue(ImmutableAxis<num> measureAxis) {
344-
final pos = (chart as CartesianChart).vertical
345+
final pos = chart.vertical
345346
? chart.drawAreaBounds.top
346-
: isRtl ? chart.drawAreaBounds.left : chart.drawAreaBounds.right;
347+
: isRtl
348+
? chart.drawAreaBounds.left
349+
: chart.drawAreaBounds.right;
347350

348351
return measureAxis.getDomain(pos.toDouble());
349352
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class BarLaneRendererConfig extends BarRendererConfig<String> {
5151
int layoutPaintOrder = LayoutViewPaintOrder.bar,
5252
this.mergeEmptyLanes = false,
5353
int minBarLengthPx = 0,
54-
double stackHorizontalSeparator,
54+
int stackedBarPaddingPx = 1,
5555
double strokeWidthPx = 0.0,
5656
BarRendererDecorator barRendererDecorator,
5757
SymbolRenderer symbolRenderer,
@@ -67,7 +67,7 @@ class BarLaneRendererConfig extends BarRendererConfig<String> {
6767
layoutPaintOrder: layoutPaintOrder,
6868
minBarLengthPx: minBarLengthPx,
6969
fillPattern: fillPattern,
70-
stackHorizontalSeparator: stackHorizontalSeparator,
70+
stackedBarPaddingPx: stackedBarPaddingPx,
7171
strokeWidthPx: strokeWidthPx,
7272
symbolRenderer: symbolRenderer,
7373
weightPattern: weightPattern,
@@ -89,7 +89,7 @@ class BarLaneRendererConfig extends BarRendererConfig<String> {
8989
return other.backgroundBarColor == backgroundBarColor &&
9090
other.emptyLaneLabel == emptyLaneLabel &&
9191
other.mergeEmptyLanes == mergeEmptyLanes &&
92-
super == (other);
92+
super == other;
9393
}
9494

9595
@override

0 commit comments

Comments
 (0)