fix: forward map ref

digidem · Oct 7, 2019 · 005a454 · 005a454
1 parent a7a6169
commit 005a454
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/src/MapView/MapView.js b/src/MapView/MapView.js
@@ -1,22 +1,28 @@
 // @flow
 import React from 'react'
 
-import MapViewContent, { type MapViewContentProps } from './MapViewContent'
+import MapViewContent, {
+  type MapViewContentProps,
+  type MapInstance
+} from './MapViewContent'
 import ViewWrapper, { type CommonViewProps } from '../ViewWrapper'
 
 type Props = {
   ...$Exact<CommonViewProps>,
   ...$Exact<MapViewContentProps>
 }
 
-const MapView = ({
-  observations,
-  onUpdateObservation,
-  presets,
-  filter,
-  getMediaUrl,
-  ...otherProps
-}: Props) => {
+const MapView = (
+  {
+    observations,
+    onUpdateObservation,
+    presets,
+    filter,
+    getMediaUrl,
+    ...otherProps
+  }: Props,
+  ref
+) => {
   return (
     <ViewWrapper
       observations={observations}
@@ -26,6 +32,7 @@ const MapView = ({
       getMediaUrl={getMediaUrl}>
       {({ onClickObservation, filteredObservations, getPreset, getMedia }) => (
         <MapViewContent
+          ref={ref}
           onClick={onClickObservation}
           observations={filteredObservations}
           getPreset={getPreset}
@@ -37,4 +44,4 @@ const MapView = ({
   )
 }
 
-export default MapView
+export default React.forwardRef<Props, MapInstance>(MapView)
diff --git a/src/MapView/MapViewContent.js b/src/MapView/MapViewContent.js
@@ -42,7 +42,7 @@ type Props = {
   print?: boolean
 }
 
-type Instance = {
+export type MapInstance = {
   fitBounds: () => any,
   flyTo: () => any
 }
@@ -263,7 +263,7 @@ const MapViewContent = (
   )
 }
 
-export default React.forwardRef<Props, Instance>(MapViewContent)
+export default React.forwardRef<Props, MapInstance>(MapViewContent)
 
 function getBounds(
   observations: Observation[]