Skip to content

Commit

Permalink
Remove navigator.geolocation, use Geolocation
Browse files Browse the repository at this point in the history
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
  • Loading branch information
cpojer authored and facebook-github-bot committed Apr 1, 2019
1 parent 11ac06f commit 45bd2b5
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Libraries/Core/InitializeCore.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ require('setUpRegeneratorRuntime');
require('setUpTimers');
require('setUpXHR');
require('setUpAlert');
require('setUpGeolocation');
require('setUpNavigator');
require('setUpBatchedBridge');
require('setUpSegmentFetcher');
if (__DEV__) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,10 @@

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 = {};
}

// see https://github.com/facebook/react-native/issues/10881
polyfillObjectProperty(navigator, 'product', () => 'ReactNative');
polyfillObjectProperty(navigator, 'geolocation', () => require('Geolocation'));
4 changes: 2 additions & 2 deletions Libraries/Geolocation/Geolocation.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

Expand Down
9 changes: 5 additions & 4 deletions RNTester/js/GeolocationExample.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -23,22 +24,22 @@ class GeolocationExample extends React.Component<{}, $FlowFixMeState> {
watchID: ?number = null;

componentDidMount() {
navigator.geolocation.getCurrentPosition(
Geolocation.getCurrentPosition(
position => {
const initialPosition = JSON.stringify(position);
this.setState({initialPosition});
},
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() {
Expand Down Expand Up @@ -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 />;
},
Expand Down

0 comments on commit 45bd2b5

Please sign in to comment.