Skip to content

Commit

Permalink
Update from View.propTypes to ViewPropTypes to match RN v0.44.0 (reac…
Browse files Browse the repository at this point in the history
…t-native-maps#1323)

* Upd from View.propTypes to ViewPropTypes

* Rm View component
  • Loading branch information
TBouder authored and patricio committed Sep 27, 2017
1 parent 023dba4 commit e8f1aae
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions lib/components/MapCallout.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import React, { PropTypes } from 'react';
import {
View,
StyleSheet,
ViewPropTypes,
} from 'react-native';
import decorateMapComponent, {
SUPPORTED,
USES_DEFAULT_IMPLEMENTATION,
} from './decorateMapComponent';

const propTypes = {
...View.propTypes,
...ViewPropTypes,
tooltip: PropTypes.bool,
onPress: PropTypes.func,
};
Expand Down
4 changes: 2 additions & 2 deletions lib/components/MapCircle.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import React, { PropTypes } from 'react';
import {
View,
ViewPropTypes,
} from 'react-native';
import decorateMapComponent, {
USES_DEFAULT_IMPLEMENTATION,
SUPPORTED,
} from './decorateMapComponent';

const propTypes = {
...View.propTypes,
...ViewPropTypes,

/**
* The coordinate of the center of the circle
Expand Down
4 changes: 2 additions & 2 deletions lib/components/MapMarker.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React, { PropTypes } from 'react';
import {
View,
StyleSheet,
Platform,
NativeModules,
Animated,
findNodeHandle,
ViewPropTypes,
} from 'react-native';

import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource';
Expand All @@ -22,7 +22,7 @@ const viewConfig = {
};

const propTypes = {
...View.propTypes,
...ViewPropTypes,

// TODO(lmr): get rid of these?
identifier: PropTypes.string,
Expand Down
4 changes: 2 additions & 2 deletions lib/components/MapPolygon.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import React, { PropTypes } from 'react';
import {
View,
ViewPropTypes,
} from 'react-native';
import decorateMapComponent, {
USES_DEFAULT_IMPLEMENTATION,
SUPPORTED,
} from './decorateMapComponent';

const propTypes = {
...View.propTypes,
...ViewPropTypes,

/**
* An array of coordinates to describe the polygon
Expand Down
4 changes: 2 additions & 2 deletions lib/components/MapPolyline.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import React, { PropTypes } from 'react';
import {
View,
ViewPropTypes,
} from 'react-native';
import decorateMapComponent, {
USES_DEFAULT_IMPLEMENTATION,
SUPPORTED,
} from './decorateMapComponent';

const propTypes = {
...View.propTypes,
...ViewPropTypes,

/**
* An array of coordinates to describe the polygon
Expand Down
4 changes: 2 additions & 2 deletions lib/components/MapUrlTile.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { PropTypes } from 'react';

import {
View,
ViewPropTypes,
} from 'react-native';

import decorateMapComponent, {
Expand All @@ -10,7 +10,7 @@ import decorateMapComponent, {
} from './decorateMapComponent';

const propTypes = {
...View.propTypes,
...ViewPropTypes,

/**
* The url template of the tile server. The patterns {x} {y} {z} will be replaced at runtime
Expand Down
6 changes: 3 additions & 3 deletions lib/components/MapView.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import React, { PropTypes } from 'react';
import {
EdgeInsetsPropType,
Platform,
View,
Animated,
requireNativeComponent,
NativeModules,
ColorPropType,
findNodeHandle,
ViewPropTypes,
} from 'react-native';
import MapMarker from './MapMarker';
import MapPolyline from './MapPolyline';
Expand Down Expand Up @@ -45,7 +45,7 @@ const viewConfig = {
};

const propTypes = {
...View.propTypes,
...ViewPropTypes,
/**
* When provider is "google", we will use GoogleMaps.
* Any value other than "google" will default to using
Expand All @@ -59,7 +59,7 @@ const propTypes = {
* Used to style and layout the `MapView`. See `StyleSheet.js` and
* `ViewStylePropTypes.js` for more info.
*/
style: View.propTypes.style,
style: ViewPropTypes.style,

/**
* A json object that describes the style of the map. This is transformed to a string
Expand Down

0 comments on commit e8f1aae

Please sign in to comment.