Merge branch 'master' into legend-keyboard

elastic · Dec 9, 2020 · 547f69d · 547f69d
2 parents a5acd93 + bda63f6
commit 547f69d
Show file tree

Hide file tree

Showing 16 changed files with 4,870 additions and 546 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# [24.4.0](https://github.com/elastic/elastic-charts/compare/v24.3.0...v24.4.0) (2020-12-09)
+
+
+### Bug Fixes
+
+* empty labels on debug state ([#940](https://github.com/elastic/elastic-charts/issues/940)) ([3c823fd](https://github.com/elastic/elastic-charts/commit/3c823fdbc8437c907c02b58c1aa8e084bc7611d1))
+
+
+### Features
+
+* allow use of functions for y, y0, split and stack accessors ([#943](https://github.com/elastic/elastic-charts/issues/943)) ([22425d3](https://github.com/elastic/elastic-charts/commit/22425d3b9819afde208c651abb6b017839556645))
+
 # [24.3.0](https://github.com/elastic/elastic-charts/compare/v24.2.0...v24.3.0) (2020-12-04)
 
 

diff --git a/api/charts.api.md b/api/charts.api.md
@@ -1474,11 +1474,11 @@ export type ScaleType = $Values<typeof ScaleType>;
 // @public (undocumented)
 export interface SeriesAccessors {
     markSizeAccessor?: Accessor | AccessorFn;
-    splitSeriesAccessors?: Accessor[];
-    stackAccessors?: Accessor[];
+    splitSeriesAccessors?: (Accessor | AccessorFn)[];
+    stackAccessors?: (Accessor | AccessorFn)[];
     xAccessor: Accessor | AccessorFn;
-    y0Accessors?: Accessor[];
-    yAccessors: Accessor[];
+    y0Accessors?: (Accessor | AccessorFn)[];
+    yAccessors: (Accessor | AccessorFn)[];
 }
 
 // @public (undocumented)
@@ -1870,7 +1870,11 @@ export interface TooltipValue {
 export type TooltipValueFormatter = (data: TooltipValue) => JSX.Element | string;
 
 // @public
-export type UnaryAccessorFn<Return = any> = (datum: Datum) => Return;
+export interface UnaryAccessorFn<Return = any> {
+    // (undocumented)
+    (datum: Datum): Return;
+    fieldName?: string;
+}
 
 // @public (undocumented)
 export type UnboundedDomainWithInterval = DomainBase;
@@ -1933,7 +1937,7 @@ export interface XYChartSeriesIdentifier extends SeriesIdentifier {
     // (undocumented)
     splitAccessors: Map<string | number, string | number>;
     // (undocumented)
-    yAccessor: string | number;
+    yAccessor: Accessor;
 }
 
 // @public

diff --git a/...or-all-stories-bar-chart-functional-accessors-visually-looks-correct-1-snap.png b/...or-all-stories-bar-chart-functional-accessors-visually-looks-correct-1-snap.png
diff --git a/...es-stories-functional-accessors-functional-accessors-with-field-name-1-snap.png b/...es-stories-functional-accessors-functional-accessors-with-field-name-1-snap.png
diff --git a/...nctional-accessors-functional-accessors-with-field-name-with-tooltip-1-snap.png b/...nctional-accessors-functional-accessors-with-field-name-with-tooltip-1-snap.png
diff --git a/...-series-stories-functional-accessors-y-1-accessors-and-y-0-accessors-1-snap.png b/...-series-stories-functional-accessors-y-1-accessors-and-y-0-accessors-1-snap.png
diff --git a/integration/tests/bar_stories.test.ts b/integration/tests/bar_stories.test.ts
@@ -200,4 +200,31 @@ describe('Bar series stories', () => {
       });
     });
   });
+
+  describe('functional accessors', () => {
+    it('functional accessors with fieldName', async () => {
+      await common.expectChartAtUrlToMatchScreenshot(
+        'http://localhost:9001/?path=/story/bar-chart--functional-accessors&knob-y fn name=testY&knob-split fn name=testSplit',
+      );
+    });
+
+    it('functional accessors with fieldName - with tooltip', async () => {
+      await common.expectChartWithMouseAtUrlToMatchScreenshot(
+        'http://localhost:9001/?path=/story/bar-chart--functional-accessors&knob-y fn name=testY&knob-split fn name=testSplit',
+        {
+          top: 60,
+          right: 180,
+        },
+        {
+          screenshotSelector: 'body',
+        },
+      );
+    });
+
+    it('y1Accessors and y0Accessors', async () => {
+      await common.expectChartAtUrlToMatchScreenshot(
+        'http://localhost:9001/?path=/story/bar-chart--band-bar-chart&knob-fit Y domain=true&knob-use fn accessors=true',
+      );
+    });
+  });
 });
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@elastic/charts",
   "description": "Elastic-Charts data visualization library",
-  "version": "24.3.0",
+  "version": "24.4.0",
   "author": "Marco Vettorello <[email protected]>",
   "license": "Apache-2.0",
   "main": "dist/index.js",