Skip to content

Commit 83986b4

Browse files
nissy-devfacebook-github-bot
nissy-dev
authored and
facebook-github-bot
committed
Remove var in RNTester (#22014)
Summary: I removed `var` in RNTester. - [x] npm run prettier - [x] npm run flow-check-ios - [x] npm run flow-check-android [GENERAL] [ENHANCEMENT] [RNTester] - remove `var` Pull Request resolved: react/react-native#22014 Differential Revision: D12843150 Pulled By: TheSavior fbshipit-source-id: 593adf141164cffe0ddc2db756721df26e38b4f5
1 parent b2123a3 commit 83986b4

10 files changed

Lines changed: 88 additions & 87 deletions

‎js/VibrationExample.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
'use strict';
1212

13-
var React = require('react');
14-
var ReactNative = require('react-native');
15-
var {
13+
const React = require('react');
14+
const ReactNative = require('react-native');
15+
const {
1616
StyleSheet,
1717
View,
1818
Text,
@@ -25,7 +25,7 @@ exports.framework = 'React';
2525
exports.title = 'Vibration';
2626
exports.description = 'Vibration API';
2727

28-
var pattern, patternLiteral, patternDescription;
28+
let pattern, patternLiteral, patternDescription;
2929
if (Platform.OS === 'android') {
3030
pattern = [0, 500, 200, 500];
3131
patternLiteral = '[0, 500, 200, 500]';
@@ -115,7 +115,7 @@ exports.examples = [
115115
},
116116
];
117117

118-
var styles = StyleSheet.create({
118+
const styles = StyleSheet.create({
119119
wrapper: {
120120
borderRadius: 5,
121121
marginBottom: 5,

‎js/ViewPagerAndroidExample.android.js‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
'use strict';
1111

12-
var React = require('react');
13-
var ReactNative = require('react-native');
14-
var {
12+
const React = require('react');
13+
const ReactNative = require('react-native');
14+
const {
1515
Image,
1616
StyleSheet,
1717
Text,
@@ -23,9 +23,9 @@ var {
2323

2424
import type {ViewPagerScrollState} from 'ViewPagerAndroid';
2525

26-
var PAGES = 5;
27-
var BGCOLOR = ['#fdc08e', '#fff6b9', '#99d1b7', '#dde5fe', '#f79273'];
28-
var IMAGE_URIS = [
26+
const PAGES = 5;
27+
const BGCOLOR = ['#fdc08e', '#fff6b9', '#99d1b7', '#dde5fe', '#f79273'];
28+
const IMAGE_URIS = [
2929
'https://apod.nasa.gov/apod/image/1410/20141008tleBaldridge001h990.jpg',
3030
'https://apod.nasa.gov/apod/image/1409/volcanicpillar_vetter_960.jpg',
3131
'https://apod.nasa.gov/apod/image/1409/m27_snyder_960.jpg',
@@ -43,7 +43,7 @@ class LikeCount extends React.Component {
4343
};
4444

4545
render() {
46-
var thumbsUp = '\uD83D\uDC4D';
46+
const thumbsUp = '\uD83D\uDC4D';
4747
return (
4848
<View style={styles.likeContainer}>
4949
<TouchableOpacity onPress={this.onClick} style={styles.likeButton}>
@@ -79,9 +79,10 @@ class Button extends React.Component {
7979

8080
class ProgressBar extends React.Component {
8181
render() {
82-
var fractionalPosition =
82+
const fractionalPosition =
8383
this.props.progress.position + this.props.progress.offset;
84-
var progressBarSize = (fractionalPosition / (PAGES - 1)) * this.props.size;
84+
const progressBarSize =
85+
(fractionalPosition / (PAGES - 1)) * this.props.size;
8586
return (
8687
<View style={[styles.progressBarContainer, {width: this.props.size}]}>
8788
<View style={[styles.progressBar, {width: progressBarSize}]} />
@@ -118,7 +119,7 @@ class ViewPagerAndroidExample extends React.Component {
118119
};
119120

120121
move = delta => {
121-
var page = this.state.page + delta;
122+
const page = this.state.page + delta;
122123
this.go(page);
123124
};
124125

@@ -133,9 +134,9 @@ class ViewPagerAndroidExample extends React.Component {
133134
};
134135

135136
render() {
136-
var pages = [];
137-
for (var i = 0; i < PAGES; i++) {
138-
var pageStyle = {
137+
const pages = [];
138+
for (let i = 0; i < PAGES; i++) {
139+
const pageStyle = {
139140
backgroundColor: BGCOLOR[i % BGCOLOR.length],
140141
alignItems: 'center',
141142
padding: 20,
@@ -150,7 +151,7 @@ class ViewPagerAndroidExample extends React.Component {
150151
</View>,
151152
);
152153
}
153-
var {page, animationsAreEnabled} = this.state;
154+
const {page, animationsAreEnabled} = this.state;
154155
return (
155156
<View style={styles.container}>
156157
<ViewPagerAndroid
@@ -222,7 +223,7 @@ class ViewPagerAndroidExample extends React.Component {
222223
}
223224
}
224225

225-
var styles = StyleSheet.create({
226+
const styles = StyleSheet.create({
226227
buttons: {
227228
flexDirection: 'row',
228229
height: 30,

‎js/WebViewExample.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
'use strict';
1212

13-
var React = require('react');
14-
var ReactNative = require('react-native');
15-
var {
13+
const React = require('react');
14+
const ReactNative = require('react-native');
15+
const {
1616
StyleSheet,
1717
Text,
1818
TextInput,
@@ -22,13 +22,13 @@ var {
2222
WebView,
2323
} = ReactNative;
2424

25-
var HEADER = '#3b5998';
26-
var BGWASH = 'rgba(255,255,255,0.8)';
27-
var DISABLED_WASH = 'rgba(255,255,255,0.25)';
25+
const HEADER = '#3b5998';
26+
const BGWASH = 'rgba(255,255,255,0.8)';
27+
const DISABLED_WASH = 'rgba(255,255,255,0.25)';
2828

29-
var TEXT_INPUT_REF = 'urlInput';
30-
var WEBVIEW_REF = 'webview';
31-
var DEFAULT_URL = 'https://m.facebook.com';
29+
const TEXT_INPUT_REF = 'urlInput';
30+
const WEBVIEW_REF = 'webview';
31+
const DEFAULT_URL = 'https://m.facebook.com';
3232
const FILE_SYSTEM_ORIGIN_WHITE_LIST = ['file://*', 'http://*', 'https://*'];
3333

3434
class WebViewExample extends React.Component<{}, $FlowFixMeState> {
@@ -44,7 +44,7 @@ class WebViewExample extends React.Component<{}, $FlowFixMeState> {
4444
inputText = '';
4545

4646
handleTextInputChange = event => {
47-
var url = event.nativeEvent.text;
47+
let url = event.nativeEvent.text;
4848
if (!/^[a-zA-Z-_]+:/.test(url)) {
4949
url = 'http://' + url;
5050
}
@@ -143,7 +143,7 @@ class WebViewExample extends React.Component<{}, $FlowFixMeState> {
143143
};
144144

145145
pressGoButton = () => {
146-
var url = this.inputText.toLowerCase();
146+
const url = this.inputText.toLowerCase();
147147
if (url === this.state.url) {
148148
this.reload();
149149
} else {
@@ -297,7 +297,7 @@ class InjectJS extends React.Component<{}> {
297297
}
298298
}
299299

300-
var styles = StyleSheet.create({
300+
const styles = StyleSheet.create({
301301
container: {
302302
flex: 1,
303303
backgroundColor: HEADER,

‎js/XHRExample.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010

1111
'use strict';
1212

13-
var React = require('react');
13+
const React = require('react');
1414

15-
var XHRExampleDownload = require('./XHRExampleDownload');
16-
var XHRExampleBinaryUpload = require('./XHRExampleBinaryUpload');
17-
var XHRExampleFormData = require('./XHRExampleFormData');
18-
var XHRExampleHeaders = require('./XHRExampleHeaders');
19-
var XHRExampleFetch = require('./XHRExampleFetch');
20-
var XHRExampleOnTimeOut = require('./XHRExampleOnTimeOut');
21-
var XHRExampleCookies = require('./XHRExampleCookies');
15+
const XHRExampleDownload = require('./XHRExampleDownload');
16+
const XHRExampleBinaryUpload = require('./XHRExampleBinaryUpload');
17+
const XHRExampleFormData = require('./XHRExampleFormData');
18+
const XHRExampleHeaders = require('./XHRExampleHeaders');
19+
const XHRExampleFetch = require('./XHRExampleFetch');
20+
const XHRExampleOnTimeOut = require('./XHRExampleOnTimeOut');
21+
const XHRExampleCookies = require('./XHRExampleCookies');
2222

2323
exports.framework = 'React';
2424
exports.title = 'XMLHttpRequest';

‎js/XHRExampleBinaryUpload.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ class XHRExampleBinaryUpload extends React.Component<{}, $FlowFixMeState> {
6262
Alert.alert('Upload failed', 'No response payload.');
6363
return;
6464
}
65-
var index = xhr.responseText.indexOf('http://www.posttestserver.com/');
65+
const index = xhr.responseText.indexOf('http://www.posttestserver.com/');
6666
if (index === -1) {
6767
Alert.alert('Upload failed', 'Invalid response payload.');
6868
return;
6969
}
70-
var url = xhr.responseText.slice(index).split('\n')[0];
70+
const url = xhr.responseText.slice(index).split('\n')[0];
7171
console.log('Upload successful: ' + url);
7272
Linking.openURL(url);
7373
}
@@ -77,7 +77,7 @@ class XHRExampleBinaryUpload extends React.Component<{}, $FlowFixMeState> {
7777
};
7878

7979
_upload = () => {
80-
var xhr = new XMLHttpRequest();
80+
const xhr = new XMLHttpRequest();
8181
xhr.open('POST', 'http://posttestserver.com/post.php');
8282
xhr.onload = () => XHRExampleBinaryUpload.handlePostTestServerUpload(xhr);
8383
xhr.setRequestHeader('Content-Type', 'text/plain');

‎js/XHRExampleCookies.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010

1111
'use strict';
1212

13-
var React = require('react');
14-
var ReactNative = require('react-native');
15-
var {StyleSheet, Text, TouchableHighlight, View, WebView} = ReactNative;
13+
const React = require('react');
14+
const ReactNative = require('react-native');
15+
const {StyleSheet, Text, TouchableHighlight, View, WebView} = ReactNative;
1616

17-
var RCTNetworking = require('RCTNetworking');
17+
const RCTNetworking = require('RCTNetworking');
1818

1919
class XHRExampleCookies extends React.Component<any, any> {
2020
cancelled: boolean;
@@ -30,8 +30,8 @@ class XHRExampleCookies extends React.Component<any, any> {
3030
}
3131

3232
setCookie(domain: string) {
33-
var {a, b} = this.state;
34-
var url = `https://${domain}/cookies/set?a=${a}&b=${b}`;
33+
const {a, b} = this.state;
34+
const url = `https://${domain}/cookies/set?a=${a}&b=${b}`;
3535
fetch(url).then(response => {
3636
this.setStatus(`Cookies a=${a}, b=${b} set`);
3737
this.refreshWebview();
@@ -130,7 +130,7 @@ class XHRExampleCookies extends React.Component<any, any> {
130130
}
131131
}
132132

133-
var styles = StyleSheet.create({
133+
const styles = StyleSheet.create({
134134
wrapper: {
135135
borderRadius: 5,
136136
marginBottom: 5,

‎js/XHRExampleFetch.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
'use strict';
1212

13-
var React = require('react');
14-
var ReactNative = require('react-native');
15-
var {StyleSheet, Text, TextInput, View, Platform} = ReactNative;
13+
const React = require('react');
14+
const ReactNative = require('react-native');
15+
const {StyleSheet, Text, TextInput, View, Platform} = ReactNative;
1616

1717
class XHRExampleFetch extends React.Component<any, any> {
1818
responseURL: ?string;
@@ -44,11 +44,11 @@ class XHRExampleFetch extends React.Component<any, any> {
4444
return null;
4545
}
4646

47-
var responseHeaders = [];
48-
var keys = Object.keys(this.responseHeaders.map);
49-
for (var i = 0; i < keys.length; i++) {
50-
var key = keys[i];
51-
var value = this.responseHeaders.get(key);
47+
const responseHeaders = [];
48+
const keys = Object.keys(this.responseHeaders.map);
49+
for (let i = 0; i < keys.length; i++) {
50+
const key = keys[i];
51+
const value = this.responseHeaders.get(key);
5252
responseHeaders.push(
5353
<Text>
5454
{key}: {value}
@@ -59,21 +59,21 @@ class XHRExampleFetch extends React.Component<any, any> {
5959
}
6060

6161
render() {
62-
var responseURL = this.responseURL ? (
62+
const responseURL = this.responseURL ? (
6363
<View style={{marginTop: 10}}>
6464
<Text style={styles.label}>Server response URL:</Text>
6565
<Text>{this.responseURL}</Text>
6666
</View>
6767
) : null;
6868

69-
var responseHeaders = this.responseHeaders ? (
69+
const responseHeaders = this.responseHeaders ? (
7070
<View style={{marginTop: 10}}>
7171
<Text style={styles.label}>Server response headers:</Text>
7272
{this._renderHeaders()}
7373
</View>
7474
) : null;
7575

76-
var response = this.state.responseText ? (
76+
const response = this.state.responseText ? (
7777
<View style={{marginTop: 10}}>
7878
<Text style={styles.label}>Server response:</Text>
7979
<TextInput
@@ -104,7 +104,7 @@ class XHRExampleFetch extends React.Component<any, any> {
104104
}
105105
}
106106

107-
var styles = StyleSheet.create({
107+
const styles = StyleSheet.create({
108108
textInput: {
109109
flex: 1,
110110
borderRadius: 3,

0 commit comments

Comments
 (0)