chore: bump echarts to 5.3.0 (apache#18162)

* chore: bump echarts to 5.3.0 * change to official 5.3.0 and reintroduce bold effect
ancasarb · Jan 27, 2022 · dbe0a8b · dbe0a8b
1 parent a2bad75
commit dbe0a8b
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 18 deletions.
diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
diff --git a/superset-frontend/plugins/plugin-chart-echarts/package.json b/superset-frontend/plugins/plugin-chart-echarts/package.json
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "d3-array": "^1.2.0",
-    "echarts": "^5.2.2",
+    "echarts": "^5.3.0",
     "lodash": "^4.17.15",
     "moment": "^2.26.0"
   },

diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx
@@ -244,6 +244,7 @@ function createCustomizeSection(
             [1, t('Secondary')],
           ],
           default: yAxisIndex,
+          clearable: false,
           renderTrigger: true,
           description: t('Primary or secondary y-axis'),
         },

diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
@@ -266,6 +266,7 @@ export default function transformProps(
   }, {}) as Record<string, DataRecordValue[]>;
 
   const { setDataMask = () => {} } = hooks;
+  const alignTicks = yAxisIndex !== yAxisIndexB;
 
   const echartOptions: EChartsCoreOption = {
     useUTC: true,
@@ -296,6 +297,7 @@ export default function transformProps(
         name: yAxisTitle,
         nameGap: yAxisTitleMargin,
         nameLocation: yAxisTitlePosition === 'Left' ? 'middle' : 'end',
+        alignTicks,
       },
       {
         ...defaultYAxis,
@@ -308,6 +310,7 @@ export default function transformProps(
         axisLabel: { formatter: formatterSecondary },
         scale: truncateYAxis,
         name: yAxisTitleSecondary,
+        alignTicks,
       },
     ],
     tooltip: {

diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts
@@ -198,7 +198,15 @@ export function transformSeries(
             opacity: opacity * areaOpacity,
           }
         : undefined,
-    emphasis,
+    emphasis: {
+      // bold on hover as required since 5.3.0 to retain backwards feature parity:
+      // https://apache.github.io/echarts-handbook/en/basics/release-note/5-3-0/#removing-the-default-bolding-emphasis-effect-in-the-line-chart
+      // TODO: should consider only adding emphasis to currently hovered series
+      lineStyle: {
+        width: 'bolder',
+      },
+      ...emphasis,
+    },
     showSymbol,
     symbolSize: markerSize,
     label: {