mirror of
https://github.com/zhigang1992/react-native.git
synced 2026-01-13 09:20:50 +08:00
Remove navigator.geolocation, use Geolocation
Summary: This is the first diff in an effort to remove Geolocation from React Native. This diff removes the globally injected navigator.geolocation feature and instead requires explicit importing of `Geolocation`. When using Web APIs, people will need to patch `navigator.geolocation` on their own from now on. Reviewed By: sahrens Differential Revision: D14692386 fbshipit-source-id: c57b290b49728101250d726d67b1956ff23a9a92
This commit is contained in:
committed by
Facebook Github Bot
parent
11ac06fda4
commit
45bd2b514b
@@ -37,7 +37,7 @@ require('setUpRegeneratorRuntime');
|
||||
require('setUpTimers');
|
||||
require('setUpXHR');
|
||||
require('setUpAlert');
|
||||
require('setUpGeolocation');
|
||||
require('setUpNavigator');
|
||||
require('setUpBatchedBridge');
|
||||
require('setUpSegmentFetcher');
|
||||
if (__DEV__) {
|
||||
|
||||
@@ -11,10 +11,6 @@
|
||||
|
||||
const {polyfillObjectProperty} = require('PolyfillFunctions');
|
||||
|
||||
/**
|
||||
* Set up Geolocation.
|
||||
* You can use this module directly, or just require InitializeCore.
|
||||
*/
|
||||
let navigator = global.navigator;
|
||||
if (navigator === undefined) {
|
||||
global.navigator = navigator = {};
|
||||
@@ -22,4 +18,3 @@ if (navigator === undefined) {
|
||||
|
||||
// see https://github.com/facebook/react-native/issues/10881
|
||||
polyfillObjectProperty(navigator, 'product', () => 'ReactNative');
|
||||
polyfillObjectProperty(navigator, 'geolocation', () => require('Geolocation'));
|
||||
@@ -29,11 +29,11 @@ type GeoConfiguration = {
|
||||
skipPermissionRequests: boolean,
|
||||
};
|
||||
|
||||
type GeoOptions = {
|
||||
export type GeoOptions = {
|
||||
timeout?: number,
|
||||
maximumAge?: number,
|
||||
enableHighAccuracy?: boolean,
|
||||
distanceFilter: number,
|
||||
distanceFilter?: number,
|
||||
useSignificantChanges?: boolean,
|
||||
};
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
|
||||
'use strict';
|
||||
|
||||
import Geolocation from 'Geolocation';
|
||||
const React = require('react');
|
||||
const ReactNative = require('react-native');
|
||||
const {StyleSheet, Text, View, Alert} = ReactNative;
|
||||
@@ -23,7 +24,7 @@ class GeolocationExample extends React.Component<{}, $FlowFixMeState> {
|
||||
watchID: ?number = null;
|
||||
|
||||
componentDidMount() {
|
||||
navigator.geolocation.getCurrentPosition(
|
||||
Geolocation.getCurrentPosition(
|
||||
position => {
|
||||
const initialPosition = JSON.stringify(position);
|
||||
this.setState({initialPosition});
|
||||
@@ -31,14 +32,14 @@ class GeolocationExample extends React.Component<{}, $FlowFixMeState> {
|
||||
error => Alert.alert('Error', JSON.stringify(error)),
|
||||
{enableHighAccuracy: true, timeout: 20000, maximumAge: 1000},
|
||||
);
|
||||
this.watchID = navigator.geolocation.watchPosition(position => {
|
||||
this.watchID = Geolocation.watchPosition(position => {
|
||||
const lastPosition = JSON.stringify(position);
|
||||
this.setState({lastPosition});
|
||||
});
|
||||
}
|
||||
|
||||
componentWillUnmount() {
|
||||
this.watchID != null && navigator.geolocation.clearWatch(this.watchID);
|
||||
this.watchID != null && Geolocation.clearWatch(this.watchID);
|
||||
}
|
||||
|
||||
render() {
|
||||
@@ -69,7 +70,7 @@ exports.description = 'Examples of using the Geolocation API.';
|
||||
|
||||
exports.examples = [
|
||||
{
|
||||
title: 'navigator.geolocation',
|
||||
title: 'Geolocation',
|
||||
render: function(): React.Element<any> {
|
||||
return <GeolocationExample />;
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user