Clean code (#8)

* Refine flow types

* Clean code

src/Sparkline.js

@@ -10,7 +10,7 @@ import * as typed from './typed'
 
 type Props = typed.GraphProps
 
-const makeContext = ({
+const createHelpers = ({
   data,
   width,
   height,
@@ -38,18 +38,12 @@ const makeContext = ({
   return {
     scaleX,
     scaleY,
-    points,
-    width,
-    height,
-    padding,
-    data,
-    max,
-    min
+    points
   }
 }
 
-const Sparkline = (props: Props) => {
-  const context = makeContext(props)
+const Sparkline = ({ children, ...props }: Props) => {
+  const drawHelpers = createHelpers(props)
 
   return (
     // prettier-ignore
@@ -58,11 +52,11 @@ const Sparkline = (props: Props) => {
       height={props.height}
       style={props.style}
     >
-      {React.Children.map(props.children, child =>
+      {React.Children.map(children, child =>
         React.cloneElement(child, {
-          ...helper.filterProps(props),
-          ...helper.filterProps(child.props),
-          ...context
+          ...props,
+          ...child.props,
+          ...drawHelpers
         })
       )}
     </ART.Surface>

src/helper.js

@@ -81,33 +81,3 @@ export function sample<T> (xs: T[], sampling: number): T[] {
     return i === cursor
   })
 }
-
-const acceptedProps = [
-  'sampling', // sampling rate
-  'height', // maybe we should drop it
-  'width', // maybe we should drop it
-  'color', // fallback color
-  'stroke',
-  'strokeWidth',
-  'strokeDash',
-  'strokeCap',
-  'strokeJoin',
-  'opacity',
-  'fill'
-]
-
-/**
- * Pick shape style
- *
- * @param {{[string]:any}} props
- * @return {{[string]:any}}
- */
-export function filterProps (props: Object): Object {
-  return acceptedProps.reduce((obj, key) => {
-    if (key in props) {
-      obj[key] = props[key]
-    }
-
-    return obj
-  }, {})
-}

src/typed.js

@@ -15,19 +15,19 @@ export type GraphProps = {
   sampling?: number,
   limit?: number,
   max?: number,
-  min?: number
-}
+  min?: number,
 
-export type GraphStyle = {
   color?: string,
   stroke?: string,
   strokeWidth?: number,
   opacity?: number,
   fill?: string
 }
 
-export type ShareProps = {
+export type DrawHelpers = {
   scaleX: number => number,
   scaleY: number => number,
   points: Point[]
-} & GraphProps
+}
+
+export type ShareProps = GraphProps & DrawHelpers