From f7750e5f046ac6a8e093cce18e76f181118e6686 Mon Sep 17 00:00:00 2001 From: Knut Sveidqvist Date: Sun, 25 Apr 2021 10:41:59 +0200 Subject: [PATCH] Style fix for topAxis and added integration test --- cypress/integration/rendering/gantt.spec.js | 36 +++++++++++++++++++++ src/defaultConfig.js | 2 +- src/diagrams/gantt/ganttRenderer.js | 4 +-- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/cypress/integration/rendering/gantt.spec.js b/cypress/integration/rendering/gantt.spec.js index 422af1165..02a9305e4 100644 --- a/cypress/integration/rendering/gantt.spec.js +++ b/cypress/integration/rendering/gantt.spec.js @@ -258,4 +258,40 @@ describe('Gantt diagram', () => { expect(svg).to.not.have.attr('style'); }); }); + it('should render a gantt diagram with data labels at the top when topAxis is true', () => { + renderGraph( + ` + gantt + dateFormat YYYY-MM-DD + axisFormat %d/%m + title Adding GANTT diagram to mermaid + excludes weekdays 2014-01-10 + + section A section + Completed task :done, des1, 2014-01-06,2014-01-08 + Active task :active, des2, 2014-01-09, 3d + Future task : des3, after des2, 5d + Future task2 : des4, after des3, 5d + + section Critical tasks + Completed task in the critical line :crit, done, 2014-01-06,24h + Implement parser and jison :crit, done, after des1, 2d + Create tests for parser :crit, active, 3d + Future task in critical line :crit, 5d + Create tests for renderer :2d + Add to mermaid :1d + + section Documentation + Describe gantt syntax :active, a1, after des1, 3d + Add gantt diagram to demo page :after a1 , 20h + Add another diagram to demo page :doc1, after a1 , 48h + + section Last section + Describe gantt syntax :after doc1, 3d + Add gantt diagram to demo page : 20h + Add another diagram to demo page : 48h + `, + { gantt: { topAxis: true } } + ); + }); }); diff --git a/src/defaultConfig.js b/src/defaultConfig.js index 43e6a3f23..963aed81f 100644 --- a/src/defaultConfig.js +++ b/src/defaultConfig.js @@ -616,7 +616,7 @@ const config = { *| --- | --- | --- | --- | --- | *| topAxis | See notes | Boolean | 4 | True, False | * - ***Notes:**when this flag is set date labels will be added to the + ***Notes:** when this flag is set date labels will be added to the top of the chart * ***Default value false**. diff --git a/src/diagrams/gantt/ganttRenderer.js b/src/diagrams/gantt/ganttRenderer.js index 90234c581..e868424ca 100644 --- a/src/diagrams/gantt/ganttRenderer.js +++ b/src/diagrams/gantt/ganttRenderer.js @@ -377,8 +377,8 @@ export const draw = function(text, id) { .style('text-anchor', 'middle') .attr('fill', '#000') .attr('stroke', 'none') - .attr('font-size', 10) - .attr('dy', '1em'); + .attr('font-size', 10); + // .attr('dy', '1em'); } }