fix(bar): fix legend order in bar (#842)

plouc · Feb 25, 2020 · ced84ee · ced84ee
1 parent 793bebc
commit ced84ee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/packages/bar/src/Bar.js b/packages/bar/src/Bar.js
@@ -278,6 +278,7 @@ const Bar = props => {
                             from: legend.dataFrom,
                             bars: result.bars,
                             layout,
+                            direction: legend.direction,
                             groupMode,
                             reverse,
                         })

diff --git a/packages/bar/src/compute/legends.js b/packages/bar/src/compute/legends.js
@@ -8,7 +8,7 @@
  */
 import { uniqBy } from 'lodash'
 
-export const getLegendDataForKeys = (bars, layout, groupMode, reverse) => {
+export const getLegendDataForKeys = (bars, layout, direction, groupMode, reverse) => {
     const data = uniqBy(
         bars.map(bar => ({
             id: bar.data.id,
@@ -20,7 +20,10 @@ export const getLegendDataForKeys = (bars, layout, groupMode, reverse) => {
     )
 
     if (
-        (layout === 'vertical' && groupMode === 'stacked' && reverse !== true) ||
+        (layout === 'vertical' &&
+            groupMode === 'stacked' &&
+            direction === 'column' &&
+            reverse !== true) ||
         (layout === 'horizontal' && groupMode === 'stacked' && reverse === true)
     ) {
         data.reverse()
@@ -41,10 +44,10 @@ export const getLegendDataForIndexes = bars => {
     )
 }
 
-export const getLegendData = ({ from, bars, layout, groupMode, reverse }) => {
+export const getLegendData = ({ from, bars, layout, direction, groupMode, reverse }) => {
     if (from === 'indexes') {
         return getLegendDataForIndexes(bars)
     }
 
-    return getLegendDataForKeys(bars, layout, groupMode, reverse)
+    return getLegendDataForKeys(bars, layout, direction, groupMode, reverse)
 }