markers with props

flow issues? ¯\_(ツ)_/¯
chrisdrackett · Jun 12, 2018 · a9e99d5 · a9e99d5
1 parent 707cc45
commit a9e99d5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/src/Marker.js b/src/Marker.js
@@ -5,6 +5,7 @@ import type MapKitType, {
   MarkerAnnotationConstructorOptions,
   Map,
   Annotation,
+  FeatureVisibility,
 } from 'mapkit'
 
 declare var mapkit: MapKitType
@@ -15,23 +16,25 @@ type Props = MarkerAnnotationConstructorOptions & {
   map: Map,
   latitude: number,
   longitude: number,
-
-  title?: string,
-  subtitle?: string,
 }
 
 class Marker extends React.Component<Props> {
   marker: Annotation
 
+  getMarkerConstructionProps = (props: Props) => {
+    const { map, latitude, longitude, ...otherProps } = props
+
+    return otherProps
+  }
+
   constructor(props: Props) {
     super(props)
 
+    const markerProps = this.getMarkerConstructionProps(props)
+
     this.marker = new mapkit.MarkerAnnotation(
       new mapkit.Coordinate(props.latitude, props.longitude),
-      {
-        title: props.title,
-        subtitle: props.subtitle,
-      },
+      markerProps,
     )
 
     this.props.map.addAnnotation(this.marker)
@@ -48,8 +51,11 @@ class Marker extends React.Component<Props> {
       )
     }
 
-    this.marker.title = nextProps.title
-    this.marker.subtitle = nextProps.subtitle
+    const markerProps = this.getMarkerConstructionProps(nextProps)
+
+    Object.keys(markerProps).forEach((key) => {
+      this.marker[key] = markerProps[key]
+    })
 
     return false
   }

diff --git a/stories/index.stories.js b/stories/index.stories.js
@@ -105,6 +105,9 @@ storiesOf('MapKit', module)
         longitude={number('marker longitude', -122.3308333)}
         title={text('title', 'marker title')}
         subtitle={text('subtitle', 'marker subtitle')}
+        glyphText={text('glyphText', '')}
+        color={text('color', '#ff5b40')}
+        glyphColor={text('glyphColor', 'white')}
       />
     </MapKit>
   ))