Flow Fixes

Author: emeeks

src/components/FacetController.js

@@ -148,15 +148,15 @@ class FacetController extends React.Component<Props, State> {
     originalAnnotations: Array<Object>
   }) => {
     const frameType = child.type.displayName
+    const annotations = this.generateChildAnnotations({
+      state,
+      originalAnnotations
+    })
     const customProps = { ...props, annotations }
 
     if (!frameType) {
       return React.cloneElement(child, { facetProps: customProps })
     }
-    const annotations = this.generateChildAnnotations({
-      state,
-      originalAnnotations
-    })
 
     // pieceHoverAnnotation could be an object, so we need to be explicit in checking for true
     if (props.hoverAnnotation === true || props.pieceHoverAnnotation === true) {

src/components/Frame.js

@@ -59,7 +59,7 @@ type Props = {
   adjustedSize?: Array<number>,
   renderPipeline: Object,
   projectedCoordinateNames: Object,
-  matte?: Node,
+  matte?: boolean | Object | Node | Function,
   axes?: Array<AxisType>,
   axesTickLines?: Node,
   renderOrder: $ReadOnlyArray<| "pieces"
@@ -228,17 +228,17 @@ class Frame extends React.Component<Props, State> {
       marginGraphic = matte({ size, margin })
     } else if (React.isValidElement(matte)) {
       marginGraphic = matte
-    } else if (matte) {
+    } else if (matte === true) {
       marginGraphic = (
         <path
           fill="white"
           transform={`translate(${-margin.left},${-margin.top})`}
           d={drawMarginPath({
             margin,
             size: size,
-            inset: matte.inset
+            inset: 0
           })}
-          className="xyframe-matte"
+          className={`${name}-matte`}
         />
       )
     }