Skip to content

Commit

Permalink
Fixed Issues React Native Update 04-11-2022
Browse files Browse the repository at this point in the history
  • Loading branch information
mvits committed Nov 24, 2022
1 parent e3549d6 commit bf8a508
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 23 deletions.
4 changes: 2 additions & 2 deletions .project
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>react-native-maps-osmdroid</name>
<name>react-native-maps</name>
<comment>Project react-native-maps-osmdroid created by Buildship.</comment>
<projects>
</projects>
Expand All @@ -16,7 +16,7 @@
</natures>
<filteredResources>
<filter>
<id>1669237602922</id>
<id>0</id>
<name></name>
<type>30</type>
<matcher>
Expand Down
9 changes: 6 additions & 3 deletions lib/components/MapCircle.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import PropTypes from 'prop-types';
import React from 'react';
import { ColorPropType, View } from 'react-native';
import { ViewPropTypes } from 'deprecated-react-native-prop-types';
import { View } from 'react-native';
import {
ViewPropTypes,
ColorPropType,
} from 'deprecated-react-native-prop-types';
import decorateMapComponent, {
USES_DEFAULT_IMPLEMENTATION,
SUPPORTED,
Expand Down Expand Up @@ -129,7 +132,7 @@ class MapCircle extends React.Component {
return (
<AIRMapCircle
{...this.props}
ref={(ref) => {
ref={ref => {
this.circle = ref;
}}
/>
Expand Down
10 changes: 6 additions & 4 deletions lib/components/MapMarker.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import PropTypes from 'prop-types';
import React from 'react';
import {
ColorPropType,
StyleSheet,
Platform,
NativeModules,
Expand All @@ -11,7 +10,10 @@ import {
View,
} from 'react-native';

import { ViewPropTypes } from 'deprecated-react-native-prop-types';
import {
ViewPropTypes,
ColorPropType,
} from 'deprecated-react-native-prop-types';

import decorateMapComponent, {
SUPPORTED,
Expand Down Expand Up @@ -328,14 +330,14 @@ class MapMarker extends React.Component {

return (
<AIRMapMarker
ref={(ref) => {
ref={ref => {
this.marker = ref;
}}
{...this.props}
image={image}
icon={icon}
style={[styles.marker, this.props.style]}
onPress={(event) => {
onPress={event => {
if (this.props.stopPropagation) {
event.stopPropagation();
}
Expand Down
9 changes: 6 additions & 3 deletions lib/components/MapPolygon.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import PropTypes from 'prop-types';
import React from 'react';
import { ColorPropType, View } from 'react-native';
import { ViewPropTypes } from 'deprecated-react-native-prop-types';
import { View } from 'react-native';
import {
ViewPropTypes,
ColorPropType,
} from 'deprecated-react-native-prop-types';

import decorateMapComponent, {
USES_DEFAULT_IMPLEMENTATION,
Expand Down Expand Up @@ -157,7 +160,7 @@ class MapPolygon extends React.Component {
return (
<AIRMapPolygon
{...this.props}
ref={(ref) => {
ref={ref => {
this.polygon = ref;
}}
/>
Expand Down
9 changes: 6 additions & 3 deletions lib/components/MapPolyline.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import PropTypes from 'prop-types';
import React from 'react';
import { ColorPropType, View } from 'react-native';
import { ViewPropTypes } from 'deprecated-react-native-prop-types';
import { View } from 'react-native';
import {
ViewPropTypes,
ColorPropType,
} from 'deprecated-react-native-prop-types';

import decorateMapComponent, {
USES_DEFAULT_IMPLEMENTATION,
Expand Down Expand Up @@ -149,7 +152,7 @@ class MapPolyline extends React.Component {
return (
<AIRMapPolyline
{...this.props}
ref={(ref) => {
ref={ref => {
this.polyline = ref;
}}
/>
Expand Down
18 changes: 10 additions & 8 deletions lib/components/MapView.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
import PropTypes from 'prop-types';
import React from 'react';
import {
EdgeInsetsPropType,
PointPropType,
Platform,
Animated as RNAnimated,
requireNativeComponent,
NativeModules,
ColorPropType,
findNodeHandle,
View,
} from 'react-native';
import { ViewPropTypes } from 'deprecated-react-native-prop-types';
import {
ViewPropTypes,
PointPropType,
ColorPropType,
EdgeInsetsPropType,
} from 'deprecated-react-native-prop-types';
import MapMarker from './MapMarker';
import MapPolyline from './MapPolyline';
import MapPolygon from './MapPolygon';
Expand Down Expand Up @@ -981,7 +983,7 @@ class MapView extends React.Component {
if (Platform.OS === 'android' && this.props.liteMode) {
return (
<AIRMapLite
ref={(ref) => {
ref={ref => {
this.map = ref;
}}
{...props}
Expand All @@ -993,7 +995,7 @@ class MapView extends React.Component {

return (
<AIRMap
ref={(ref) => {
ref={ref => {
this.map = ref;
}}
{...props}
Expand All @@ -1008,7 +1010,7 @@ MapView.childContextTypes = childContextTypes;

MapView.MAP_TYPES = MAP_TYPES;

const nativeComponent = (Component) =>
const nativeComponent = Component =>
requireNativeComponent(Component, MapView, {
nativeOnly: {
onChange: true,
Expand Down Expand Up @@ -1038,7 +1040,7 @@ if (Platform.OS === 'android') {
'react-native-maps: AirGoogleMaps dir must be added to your xCode project to support GoogleMaps on iOS.'
); // eslint-disable-line max-len
}
const getAirMapComponent = (provider) => airMaps[provider || 'default'];
const getAirMapComponent = provider => airMaps[provider || 'default'];

let AIRMapLite;
if (!NativeModules.UIManager.getViewManagerConfig) {
Expand Down

0 comments on commit bf8a508

Please sign in to comment.