Parameter subchart_axis_x_show is now working (#2806)

Co-authored-by: Marco Giuliano <marco.giuliano@tesisquare.com>
c3js · Aug 8, 2020 · fdc4c86 · fdc4c86
1 parent 062a185
commit fdc4c86
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/docs/reference.html.haml b/docs/reference.html.haml
@@ -154,6 +154,7 @@
           = partial :reference_menu_item, locals: { id: 'subchart.show', experimental: true }
           = partial :reference_menu_item, locals: { id: 'subchart.size.height', experimental: true }
           = partial :reference_menu_item, locals: { id: 'subchart.onbrush', experimental: true }
+          = partial :reference_menu_item, locals: { id: 'subchart.axis.x.show', experimental: true }
 
           %li Zoom
           = partial :reference_menu_item, locals: { id: 'zoom.enabled', experimental: true }
@@ -3009,6 +3010,25 @@
               }
       %hr
 
+      %section
+        %h3
+          = partial :reference_item_link, locals: { id: 'subchart.axis.x.show', experimental: true }
+        %p Show or hide x axis of subchart.
+        %h5 Default:
+        <code>true</code>
+        %h5 Format:
+        %div.sourcecode
+          %pre
+            %code.html.javascript
+              subchart: {
+              &nbsp;&nbsp;axis: {
+              &nbsp;&nbsp;&nbsp;&nbsp;x: {
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;show: true
+              &nbsp;&nbsp;&nbsp;&nbsp;}
+              &nbsp;&nbsp;}
+              }
+      %hr
+
       %section
         %h3
           = partial :reference_item_link, locals: { id: 'zoom.enabled', experimental: true }

diff --git a/src/core.ts b/src/core.ts
@@ -421,9 +421,10 @@ ChartInternal.prototype.updateSizes = function() {
     hasArc = $$.hasArcType(),
     xAxisHeight =
       config.axis_rotated || hasArc ? 0 : $$.getHorizontalAxisHeight('x'),
+    subchartXAxisHeight = config.axis_rotated || hasArc ? 0 : $$.getHorizontalAxisHeight('x',true),
     subchartHeight =
       config.subchart_show && !hasArc
-        ? config.subchart_size_height + xAxisHeight
+        ? config.subchart_size_height + subchartXAxisHeight
         : 0
 
   $$.currentWidth = $$.getCurrentWidth()
@@ -462,7 +463,7 @@ ChartInternal.prototype.updateSizes = function() {
     : {
         top: $$.currentHeight - subchartHeight - legendHeightForBottom,
         right: NaN,
-        bottom: xAxisHeight + legendHeightForBottom,
+        bottom: subchartXAxisHeight + legendHeightForBottom,
         left: $$.margin.left
       }
 

diff --git a/src/size.ts b/src/size.ts
@@ -1,6 +1,6 @@
 import CLASS from './class'
 import { ChartInternal } from './core'
-import { isValue, ceil10 } from './util'
+import { isValue, ceil10, isDefined } from './util'
 
 ChartInternal.prototype.getCurrentWidth = function() {
   var $$ = this,
@@ -127,11 +127,11 @@ ChartInternal.prototype.getAxisWidthByAxisId = function(id, withoutRecompute) {
     $$.axis.getMaxTickWidth(id, withoutRecompute) + (position.isInner ? 20 : 40)
   )
 }
-ChartInternal.prototype.getHorizontalAxisHeight = function(axisId) {
+ChartInternal.prototype.getHorizontalAxisHeight = function(axisId, isSubchart) {
   var $$ = this,
     config = $$.config,
     h = 30
-  if (axisId === 'x' && !config.axis_x_show) {
+  if (axisId === 'x' && !(isDefined(isSubchart) && isSubchart ? config.subchart_axis_x_show : config.axis_x_show)) {
     return 8
   }
   if (axisId === 'x' && config.axis_x_height) {

diff --git a/src/subchart.ts b/src/subchart.ts
@@ -120,6 +120,7 @@ ChartInternal.prototype.initSubchart = function() {
     .attr('class', CLASS.axisX)
     .attr('transform', $$.getTranslate('subx'))
     .attr('clip-path', config.axis_rotated ? '' : $$.clipPathForXAxis)
+    .style('visibility', config.subchart_axis_x_show ? 'visible' : 'hidden');
 }
 ChartInternal.prototype.initSubchartBrush = function() {
   var $$ = this