primefaces#6812 fix horizontal bar chart

christophs78 · Mar 19, 2021 · 12bb010 · 12bb010
1 parent a2c5e8c
commit 12bb010
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 8 deletions.
diff --git a/src/main/java/org/primefaces/component/barchart/BarChartRenderer.java b/src/main/java/org/primefaces/component/barchart/BarChartRenderer.java
@@ -31,6 +31,7 @@
 
 import org.primefaces.component.charts.ChartRenderer;
 import org.primefaces.model.charts.bar.BarChartOptions;
+import org.primefaces.util.LangUtils;
 import org.primefaces.util.WidgetBuilder;
 
 public class BarChartRenderer extends ChartRenderer {
@@ -70,6 +71,10 @@ protected void encodeOptions(FacesContext context, String type, Object options)
 
         writer.write("\"barPercentage\":" + barOptions.getBarPercentage());
 
+        if (LangUtils.isNotBlank(barOptions.getIndexAxis())) {
+            writer.write(",\"indexAxis\":\"" + barOptions.getIndexAxis() + "\"");
+        }
+
         if (barOptions.getCategoryPercentage() != null) {
             writer.write(",\"categoryPercentage\":" + barOptions.getCategoryPercentage());
         }

diff --git a/src/main/java/org/primefaces/model/charts/bar/BarChartOptions.java b/src/main/java/org/primefaces/model/charts/bar/BarChartOptions.java
@@ -40,6 +40,8 @@ public class BarChartOptions extends ChartOptions {
     private boolean offsetGridLines = true;
     private CartesianScales scales;
 
+    private String indexAxis = "x";
+
     /**
      * Gets the barPercentage
      *
@@ -152,4 +154,20 @@ public CartesianScales getScales() {
     public void setScales(CartesianScales scales) {
         this.scales = scales;
     }
+
+    /**
+     * Vertical bar chart (x) or horizontal bar char (y)
+     * @return
+     */
+    public String getIndexAxis() {
+        return indexAxis;
+    }
+
+    /**
+     * Switches between vertical and horizontal Bar Chart
+     * @param indexAxis x (=vertical bar chart) or y (=horizontal bar chart)
+     */
+    public void setIndexAxis(String indexAxis) {
+        this.indexAxis = indexAxis;
+    }
 }
diff --git a/src/main/java/org/primefaces/model/charts/hbar/HorizontalBarChartDataSet.java b/src/main/java/org/primefaces/model/charts/hbar/HorizontalBarChartDataSet.java
@@ -39,7 +39,7 @@ public class HorizontalBarChartDataSet extends BarChartDataSet {
      */
     @Override
     public String getType() {
-        return "horizontalBar";
+        return "bar";
     }
 }
 
diff --git a/src/main/java/org/primefaces/model/charts/hbar/HorizontalBarChartModel.java b/src/main/java/org/primefaces/model/charts/hbar/HorizontalBarChartModel.java
@@ -24,21 +24,24 @@
 package org.primefaces.model.charts.hbar;
 
 import org.primefaces.model.charts.bar.BarChartModel;
+import org.primefaces.model.charts.bar.BarChartOptions;
 
 /**
- * Defines the horizontalBar model used to create horizontalBar chart component.
+ * Defines the horizontalBar model used to create bar chart component with indexAxis=y.
  */
 public class HorizontalBarChartModel extends BarChartModel {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * Gets the type
-     *
-     * @return type of current chart
-     */
     @Override
     public String getType() {
-        return "horizontalBar";
+        return "bar";
+    }
+
+    @Override
+    public BarChartOptions getOptions() {
+        BarChartOptions barChartOptions = super.getOptions();
+        barChartOptions.setIndexAxis("y");
+        return  barChartOptions;
     }
 }