[Lens] Remove background from lens embeddable (elastic#83061)

mbondyra · Nov 12, 2020 · 968f563 · 968f563
1 parent 2c1d0ca
commit 968f563
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 38 deletions.
diff --git a/x-pack/plugins/lens/public/pie_visualization/render_function.tsx b/x-pack/plugins/lens/public/pie_visualization/render_function.tsx
@@ -253,7 +253,12 @@ export function PieComponent(
 
             onClickValue(desanitizeFilterContext(context));
           }}
-          theme={chartTheme}
+          theme={{
+            ...chartTheme,
+            background: {
+              color: undefined, // removes background for embeddables
+            },
+          }}
           baseTheme={chartBaseTheme}
         />
         <Partition

diff --git a/x-pack/plugins/lens/public/xy_visualization/__snapshots__/expression.test.tsx.snap b/x-pack/plugins/lens/public/xy_visualization/__snapshots__/expression.test.tsx.snap
diff --git a/x-pack/plugins/lens/public/xy_visualization/expression.tsx b/x-pack/plugins/lens/public/xy_visualization/expression.tsx
@@ -20,8 +20,6 @@ import {
   GeometryValue,
   XYChartSeriesIdentifier,
   StackMode,
-  RecursivePartial,
-  Theme,
   VerticalAlignment,
   HorizontalAlignment,
 } from '@elastic/charts';
@@ -222,36 +220,23 @@ export const getXyChartRenderer = (dependencies: {
   },
 });
 
-function mergeThemeWithValueLabelsStyling(
-  theme: RecursivePartial<Theme>,
-  valuesLabelMode: string = 'hide',
-  isHorizontal: boolean
-) {
+function getValueLabelsStyling(isHorizontal: boolean) {
   const VALUE_LABELS_MAX_FONTSIZE = 15;
   const VALUE_LABELS_MIN_FONTSIZE = 10;
   const VALUE_LABELS_VERTICAL_OFFSET = -10;
   const VALUE_LABELS_HORIZONTAL_OFFSET = 10;
 
-  if (valuesLabelMode === 'hide') {
-    return theme;
-  }
   return {
-    ...theme,
-    ...{
-      barSeriesStyle: {
-        ...theme.barSeriesStyle,
-        displayValue: {
-          fontSize: { min: VALUE_LABELS_MIN_FONTSIZE, max: VALUE_LABELS_MAX_FONTSIZE },
-          fill: { textInverted: true, textBorder: 2 },
-          alignment: isHorizontal
-            ? {
-                vertical: VerticalAlignment.Middle,
-              }
-            : { horizontal: HorizontalAlignment.Center },
-          offsetX: isHorizontal ? VALUE_LABELS_HORIZONTAL_OFFSET : 0,
-          offsetY: isHorizontal ? 0 : VALUE_LABELS_VERTICAL_OFFSET,
-        },
-      },
+    displayValue: {
+      fontSize: { min: VALUE_LABELS_MIN_FONTSIZE, max: VALUE_LABELS_MAX_FONTSIZE },
+      fill: { textInverted: true, textBorder: 2 },
+      alignment: isHorizontal
+        ? {
+            vertical: VerticalAlignment.Middle,
+          }
+        : { horizontal: HorizontalAlignment.Center },
+      offsetX: isHorizontal ? VALUE_LABELS_HORIZONTAL_OFFSET : 0,
+      offsetY: isHorizontal ? 0 : VALUE_LABELS_VERTICAL_OFFSET,
     },
   };
 }
@@ -445,9 +430,8 @@ export function XYChart({
     // No histogram charts
     !isHistogramViz;
 
-  const baseThemeWithMaybeValueLabels = !shouldShowValueLabels
-    ? chartTheme
-    : mergeThemeWithValueLabelsStyling(chartTheme, valueLabels, shouldRotate);
+  const valueLabelsStyling =
+    shouldShowValueLabels && valueLabels !== 'hide' && getValueLabelsStyling(shouldRotate);
 
   const colorAssignments = getColorAssignments(args.layers, data, formatFactory);
 
@@ -461,7 +445,16 @@ export function XYChart({
         }
         legendPosition={legend.position}
         showLegendExtra={false}
-        theme={baseThemeWithMaybeValueLabels}
+        theme={{
+          ...chartTheme,
+          barSeriesStyle: {
+            ...chartTheme.barSeriesStyle,
+            ...valueLabelsStyling,
+          },
+          background: {
+            color: undefined, // removes background for embeddables
+          },
+        }}
         baseTheme={chartBaseTheme}
         tooltip={{
           headerFormatter: (d) => safeXAccessorLabelRenderer(d.value),