Skip to content

Commit dc2f6f8

Browse files
committed
update implementation and add prettier for code formatting
1 parent 1ce42d8 commit dc2f6f8

File tree

8 files changed

+38
-33
lines changed

8 files changed

+38
-33
lines changed

.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"es6": true,
44
"node": true
55
},
6-
"extends": ["eslint:recommended", "plugin:react/recommended"],
6+
"extends": ["plugin:prettier/recommended", "plugin:react/recommended"],
77
"parser": "babel-eslint",
88
"parserOptions": {
99
"ecmaVersion": 6

.prettierrc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"singleQuote": true,
3+
"trailingComma": "es5",
4+
"proseWrap": "always",
5+
"arrowParens": "always"
6+
}

RNAdMobBanner.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1+
import { arrayOf, func, string } from 'prop-types';
12
import React, { Component } from 'react';
23
import {
4+
findNodeHandle,
35
requireNativeComponent,
46
UIManager,
5-
findNodeHandle,
67
ViewPropTypes,
78
} from 'react-native';
8-
import { string, func, arrayOf } from 'prop-types';
9-
109
import { createErrorFromErrorData } from './utils';
1110

1211
class AdMobBanner extends Component {
13-
1412
constructor() {
1513
super();
1614
this.handleSizeChange = this.handleSizeChange.bind(this);
@@ -28,7 +26,7 @@ class AdMobBanner extends Component {
2826
UIManager.dispatchViewManagerCommand(
2927
findNodeHandle(this._bannerView),
3028
UIManager.getViewManagerConfig('RNGADBannerView').Commands.loadBanner,
31-
null,
29+
null
3230
);
3331
}
3432

@@ -42,7 +40,9 @@ class AdMobBanner extends Component {
4240

4341
handleAdFailedToLoad(event) {
4442
if (this.props.onAdFailedToLoad) {
45-
this.props.onAdFailedToLoad(createErrorFromErrorData(event.nativeEvent.error));
43+
this.props.onAdFailedToLoad(
44+
createErrorFromErrorData(event.nativeEvent.error)
45+
);
4646
}
4747
}
4848

@@ -53,7 +53,7 @@ class AdMobBanner extends Component {
5353
style={[this.props.style, this.state.style]}
5454
onSizeChange={this.handleSizeChange}
5555
onAdFailedToLoad={this.handleAdFailedToLoad}
56-
ref={el => (this._bannerView = el)}
56+
ref={(el) => (this._bannerView = el)}
5757
/>
5858
);
5959
}

RNAdMobInterstitial.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
import {
2-
NativeModules,
3-
NativeEventEmitter,
4-
} from 'react-native';
5-
1+
import { NativeEventEmitter, NativeModules } from 'react-native';
62
import { createErrorFromErrorData } from './utils';
73

84
const RNAdMobInterstitial = NativeModules.RNAdMobInterstitial;
@@ -24,7 +20,9 @@ const addEventListener = (event, handler) => {
2420
if (mappedEvent) {
2521
let listener;
2622
if (event === 'adFailedToLoad') {
27-
listener = eventEmitter.addListener(mappedEvent, error => handler(createErrorFromErrorData(error)));
23+
listener = eventEmitter.addListener(mappedEvent, (error) =>
24+
handler(createErrorFromErrorData(error))
25+
);
2826
} else {
2927
listener = eventEmitter.addListener(mappedEvent, handler);
3028
}

RNAdMobRewarded.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
import {
2-
NativeModules,
3-
NativeEventEmitter,
4-
} from 'react-native';
1+
import { NativeModules, NativeEventEmitter } from 'react-native';
52

63
import { createErrorFromErrorData } from './utils';
74

@@ -27,7 +24,9 @@ const addEventListener = (event, handler) => {
2724
if (mappedEvent) {
2825
let listener;
2926
if (event === 'adFailedToLoad') {
30-
listener = eventEmitter.addListener(mappedEvent, error => handler(createErrorFromErrorData(error)));
27+
listener = eventEmitter.addListener(mappedEvent, (error) =>
28+
handler(createErrorFromErrorData(error))
29+
);
3130
} else {
3231
listener = eventEmitter.addListener(mappedEvent, handler);
3332
}

RNPublisherBanner.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1+
import { arrayOf, func, string } from 'prop-types';
12
import React, { Component } from 'react';
23
import {
4+
findNodeHandle,
35
requireNativeComponent,
46
UIManager,
5-
findNodeHandle,
67
ViewPropTypes,
78
} from 'react-native';
8-
import { string, func, arrayOf } from 'prop-types';
9-
109
import { createErrorFromErrorData } from './utils';
1110

1211
class PublisherBanner extends Component {
13-
1412
constructor() {
1513
super();
1614
this.handleSizeChange = this.handleSizeChange.bind(this);
@@ -29,7 +27,7 @@ class PublisherBanner extends Component {
2927
UIManager.dispatchViewManagerCommand(
3028
findNodeHandle(this._bannerView),
3129
UIManager.getViewManagerConfig('RNDFPBannerView').Commands.loadBanner,
32-
null,
30+
null
3331
);
3432
}
3533

@@ -50,7 +48,9 @@ class PublisherBanner extends Component {
5048

5149
handleAdFailedToLoad(event) {
5250
if (this.props.onAdFailedToLoad) {
53-
this.props.onAdFailedToLoad(createErrorFromErrorData(event.nativeEvent.error));
51+
this.props.onAdFailedToLoad(
52+
createErrorFromErrorData(event.nativeEvent.error)
53+
);
5454
}
5555
}
5656

@@ -62,7 +62,7 @@ class PublisherBanner extends Component {
6262
onSizeChange={this.handleSizeChange}
6363
onAdFailedToLoad={this.handleAdFailedToLoad}
6464
onAppEvent={this.handleAppEvent}
65-
ref={el => (this._bannerView = el)}
65+
ref={(el) => (this._bannerView = el)}
6666
/>
6767
);
6868
}
@@ -116,6 +116,9 @@ PublisherBanner.propTypes = {
116116
onAppEvent: func,
117117
};
118118

119-
const RNDFPBannerView = requireNativeComponent('RNDFPBannerView', PublisherBanner);
119+
const RNDFPBannerView = requireNativeComponent(
120+
'RNDFPBannerView',
121+
PublisherBanner
122+
);
120123

121124
export default PublisherBanner;

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
"devDependencies": {
1919
"babel-eslint": "^7.2.3",
2020
"eslint": "^4.19.1",
21-
"eslint-plugin-react": "^7.14.3"
21+
"eslint-config-prettier": "^6.3.0",
22+
"eslint-plugin-react": "^7.14.3",
23+
"prettier": "^1.18.2"
2224
}
2325
}

utils.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
export const createErrorFromErrorData = (errorData) => {
2-
const {
3-
message,
4-
...extraErrorInfo
5-
} = errorData || {};
2+
const { message, ...extraErrorInfo } = errorData || {};
63
const error = new Error(message);
74
error.framesToPop = 1;
85
return Object.assign(error, extraErrorInfo);
9-
}
6+
};

0 commit comments

Comments
 (0)