Restore axes labels (#139)

* Restore axes legends * Fix test
experience-experiments · Oct 26, 2018 · 0fc1d48 · 0fc1d48
1 parent a3ad54c
commit 0fc1d48
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/modules/bar-chart/index.js b/modules/bar-chart/index.js
@@ -266,8 +266,8 @@ export default class BarChart extends PureComponent {
         .attr('x', 0)
         .attr('y',
           (yAxisOrientRight)
-            ? -25 + m.right
-            : 10 - m.left)
+            ? -20 + m.right
+            : 5 - m.left)
         .attr('dy', '.9em')
         .style('text-anchor', 'end')
         .text(label);

diff --git a/modules/shared.js b/modules/shared.js
@@ -76,7 +76,9 @@ export const defaultStyles = {
     'font-size': '9px'
   },
   '.axis .label': {
-    font: '14px arial'
+    'font-size': '14px',
+    'font-family': 'dobra-light,Arial,sans-serif',
+    fill: '#000'
   },
   '.axis path, .axis line': {
     fill: 'none',

diff --git a/tests/bar-chart/bar-chart.test.js b/tests/bar-chart/bar-chart.test.js
@@ -551,7 +551,7 @@ describe('BarChart component', () => {
         expect(mockRoot.append.calledWith('text')).to.be.true;
         expect(mockRoot.attr.calledWith('class', 'label')).to.be.true;
         expect(mockRoot.attr.calledWith('x', 0)).to.be.true;
-        expect(mockRoot.attr.calledWith('y', 10)).to.be.true;
+        expect(mockRoot.attr.calledWith('y', 5)).to.be.true;
         expect(mockRoot.attr.calledWith('dy', '.9em')).to.be.true;
         expect(mockRoot.style.calledWith('text-anchor', 'end')).to.be.true;
         expect(mockRoot.text.calledWith('Mock Y Label')).to.be.true;
@@ -578,7 +578,7 @@ describe('BarChart component', () => {
         expect(mockRoot.append.calledWith('text')).to.be.true;
         expect(mockRoot.attr.calledWith('class', 'label')).to.be.true;
         expect(mockRoot.attr.calledWith('x', 0)).to.be.true;
-        expect(mockRoot.attr.calledWith('y', -25)).to.be.true;
+        expect(mockRoot.attr.calledWith('y', -20)).to.be.true;
         expect(mockRoot.attr.calledWith('dy', '.9em')).to.be.true;
         expect(mockRoot.style.calledWith('text-anchor', 'end')).to.be.true;
         expect(mockRoot.text.calledWith('Mock Y Label')).to.be.true;