Skip to content

Commit a8d36d2

Browse files
committed
Eslint fix
1 parent 8138374 commit a8d36d2

File tree

5 files changed

+30
-20
lines changed

5 files changed

+30
-20
lines changed

src/button/Button.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ const factory = (ripple, FontIcon) => {
4848
onMouseLeave: this.handleMouseLeave,
4949
};
5050

51-
return React.createElement(element, props,
51+
return React.createElement(
52+
element, props,
5253
icon ? this.getIcon(icon, iconAlignment, theme) : null,
5354
children,
5455
);
@@ -61,4 +62,4 @@ const factory = (ripple, FontIcon) => {
6162
const Button = factory(rippleFactory({ centered: false }), InjectFontIcon);
6263
export default themr('CBBUTTON')(Button);
6364
export { factory as buttonFactory };
64-
export { Button };
65+
export { Button };

src/ripple/Ripple.js

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ const rippleFactory = (options = {}) => {
8484
* @return {Object} Descriptor element including position and size of the element
8585
*/
8686
getDescriptor(x, y) {
87-
const { left, top, height, width } = ReactDOM.findDOMNode(this).getBoundingClientRect();
87+
const {
88+
left, top, height, width,
89+
} = ReactDOM.findDOMNode(this).getBoundingClientRect();
8890
const { rippleCentered: centered, rippleSpread: spread } = this.props;
8991
return {
9092
left: centered ? 0 : x - left - (width / 2),
@@ -152,15 +154,19 @@ const rippleFactory = (options = {}) => {
152154
? this.getNextKey()
153155
: this.getLastKey();
154156
const endRipple = this.addRippleDeactivateEventListener(isTouch, key);
155-
const initialState = { active: false, restarting: true, top, left, width, endRipple };
157+
const initialState = {
158+
active: false, restarting: true, top, left, width, endRipple,
159+
};
156160
const runningState = { active: true, restarting: false };
157161
const ripples = { ...this.state.ripples, [key]: initialState };
158162
this.setState({ ripples }, () => {
159163
if (this.rippleNodes[key]) this.rippleNodes[key].offsetWidth; // eslint-disable-line
160-
this.setState({ ripples: {
161-
...this.state.ripples,
162-
[key]: Object.assign({}, this.state.ripples[key], runningState),
163-
} });
164+
this.setState({
165+
ripples: {
166+
...this.state.ripples,
167+
[key]: Object.assign({}, this.state.ripples[key], runningState),
168+
},
169+
});
164170
});
165171
}
166172
}
@@ -215,10 +221,12 @@ const rippleFactory = (options = {}) => {
215221
const self = this;
216222
return function endRipple() {
217223
document.removeEventListener(eventType, endRipple);
218-
self.setState({ ripples: {
219-
...self.state.ripples,
220-
[rippleKey]: Object.assign({}, self.state.ripples[rippleKey], { active: false }),
221-
} });
224+
self.setState({
225+
ripples: {
226+
...self.state.ripples,
227+
[rippleKey]: Object.assign({}, self.state.ripples[rippleKey], { active: false }),
228+
},
229+
});
222230
};
223231
}
224232

@@ -240,7 +248,9 @@ const rippleFactory = (options = {}) => {
240248
}
241249
};
242250

243-
renderRipple(key, className, { active, left, restarting, top, width }) {
251+
renderRipple(key, className, {
252+
active, left, restarting, top, width,
253+
}) {
244254
const scale = restarting ? 0 : 1;
245255
const transform = `translate3d(${(-width / 2) + left}px, ${(-width / 2) + top}px, 0) scale(${scale})`;
246256
const _className = classnames(this.props.theme.ripple, {
@@ -273,8 +283,7 @@ const rippleFactory = (options = {}) => {
273283
} = this.props;
274284
const { ripples } = this.state;
275285
const childRipples = Object.keys(ripples).map(key =>
276-
this.renderRipple(key, rippleClassName, ripples[key]),
277-
);
286+
this.renderRipple(key, rippleClassName, ripples[key]));
278287
const childProps = {
279288
onMouseDown: this.handleMouseDown,
280289
onTouchStart: this.handleTouchStart,

src/ripple/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
import rippleFactory from './Ripple';
22
import theme from './theme.scss';
33

4-
export default options => rippleFactory({ ...options, theme });
4+
export default options => rippleFactory({ ...options, theme });

src/utils/prefixer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function addPrefixesTo(style, property, value) {
2929

3030
function prefixer(style, defaultValue = {}) {
3131
const _style = defaultValue;
32-
for (const property in style) { // eslint-disable-line no-restricted-syntax
32+
for (const property in style) { // eslint-disable-line no-restricted-syntax
3333
if ({}.hasOwnProperty.call(style, property)) {
3434
_style[property] = style[property];
3535
if (properties[property]) {
@@ -41,4 +41,4 @@ function prefixer(style, defaultValue = {}) {
4141
return _style;
4242
}
4343

44-
export default prefixer;
44+
export default prefixer;

webpack.common.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ module.exports = {
3838
include: path.resolve(__dirname, './src'),
3939
use: [
4040
'style-loader',
41-
require.resolve('css-loader') + '?sourceMap&modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]',
42-
require.resolve('sass-loader') + '?sourceMap'
41+
`${require.resolve('css-loader')}?sourceMap&modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]`,
42+
`${require.resolve('sass-loader')}?sourceMap`,
4343
],
4444
},
4545
],

0 commit comments

Comments
 (0)