feat(container): add ability to disable interactivity

plouc · Aug 10, 2017 · 73a33f9 · 73a33f9
1 parent c3a997b
commit 73a33f9
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/src/components/charts/Container.js b/src/components/charts/Container.js
@@ -1,3 +1,11 @@
+/*
+ * This file is part of the nivo project.
+ *
+ * Copyright 2016-present, Raphaël Benitte.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 
@@ -11,24 +19,35 @@ const tooltipStyle = {
     zIndex: 10,
     top: 0,
     left: 0,
-    borderRadius: '3px',
+    borderRadius: '2px',
     boxShadow: '0 1px 2px rgba(0, 0, 0, 0.25)',
-    padding: '7px 12px',
+    padding: '5px 9px',
+    fontSize: '14px',
 }
 
 const Tooltip = ({ x, y, children }) =>
     <div style={{ ...tooltipStyle, top: y, left: x }}>
         {children}
     </div>
 
+const noop = {
+    showTooltip: () => {},
+    hideTooltip: () => {},
+}
+
 export default class Container extends Component {
     static propTypes = {
         children: PropTypes.func.isRequired,
+        isInteractive: PropTypes.bool.isRequired,
+    }
+
+    static defaultProps = {
+        isInteractive: true,
     }
 
     state = {
-        isTooltipVisible: true,
-        tooltipContent: 'crap',
+        isTooltipVisible: false,
+        tooltipContent: null,
         tooltipX: 0,
         tooltipY: 0,
     }
@@ -50,9 +69,11 @@ export default class Container extends Component {
     }
 
     render() {
-        const { children } = this.props
+        const { children, isInteractive } = this.props
         const { isTooltipVisible, tooltipContent, tooltipX, tooltipY } = this.state
 
+        if (!isInteractive) return children(noop)
+
         return (
             <div
                 style={containerStyle}

diff --git a/src/components/charts/stream/Stream.js b/src/components/charts/stream/Stream.js
@@ -123,7 +123,7 @@ const Stream = ({
                     />
                     <Axes
                         xScale={xScale}
-                        yScale={yScale.domain([0, Math.abs(minValue) + Math.abs(maxValue)])}
+                        yScale={yScale}
                         width={width}
                         height={height}
                         theme={theme}

diff --git a/src/props/stack.js b/src/props/stack.js
@@ -27,7 +27,7 @@ export const stackOrderPropMapping = {
     descending: stackOrderDescending,
     insideOut: stackOrderInsideOut,
     none: stackOrderNone,
-    revers: stackOrderReverse,
+    reverse: stackOrderReverse,
 }
 
 export const stackOrderPropKeys = Object.keys(stackOrderPropMapping)