Skip to content

Commit ecc52ac

Browse files
committed
upgrade prettier, apply new lint rules throughout
1 parent 28f5a2b commit ecc52ac

File tree

15 files changed

+1400
-1232
lines changed

15 files changed

+1400
-1232
lines changed

.size-snapshot.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{
22
"dist/cjs/react-popper-tooltip.js": {
3-
"bundled": 12761,
4-
"minified": 7781,
5-
"gzipped": 2222
3+
"bundled": 12816,
4+
"minified": 7779,
5+
"gzipped": 2223
66
},
77
"dist/esm/react-popper-tooltip.js": {
8-
"bundled": 12722,
9-
"minified": 7753,
10-
"gzipped": 2209,
8+
"bundled": 12777,
9+
"minified": 7751,
10+
"gzipped": 2211,
1111
"treeshaked": {
1212
"rollup": {
1313
"code": 187,
1414
"import_statements": 167
1515
},
1616
"webpack": {
17-
"code": 8420
17+
"code": 8418
1818
}
1919
}
2020
}

babel.config.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
module.exports = {
2-
presets: ['@babel/typescript', '@babel/react', ['@babel/env', {loose: true}]],
3-
plugins: [['@babel/proposal-class-properties', {loose: true}]]
2+
presets: [
3+
'@babel/preset-typescript',
4+
'@babel/preset-react',
5+
['@babel/preset-env', { bugfixes: true, loose: true }],
6+
],
7+
plugins: [['@babel/plugin-proposal-class-properties', { loose: true }]],
48
};

docs/examples/BasicTooltipTrigger.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import React, {memo} from 'react';
1+
import React, { memo } from 'react';
22
import TooltipTrigger from '../../src';
33
import '../../src/styles.css';
4-
import {ChildrenArg, TooltipArg} from '../../src/types';
5-
import {BasicTooltipTriggerProps} from './types';
4+
import { ChildrenArg, TooltipArg } from '../../src';
5+
import { BasicTooltipTriggerProps } from './types';
66

77
const Trigger = (children: React.ReactNode) => ({
88
triggerRef,
9-
getTriggerProps
9+
getTriggerProps,
1010
}: ChildrenArg) => (
1111
<span
1212
{...getTriggerProps({
13-
ref: triggerRef
13+
ref: triggerRef,
1414
})}
1515
>
1616
{children}
@@ -22,20 +22,20 @@ const Tooltip = (tooltip: React.ReactNode, hideArrow?: boolean) => ({
2222
tooltipRef,
2323
getArrowProps,
2424
getTooltipProps,
25-
placement
25+
placement,
2626
}: TooltipArg) => (
2727
<div
2828
{...getTooltipProps({
2929
className: 'tooltip-container',
30-
ref: tooltipRef
30+
ref: tooltipRef,
3131
})}
3232
>
3333
{!hideArrow && (
3434
<div
3535
{...getArrowProps({
3636
className: 'tooltip-arrow',
3737
'data-placement': placement,
38-
ref: arrowRef
38+
ref: arrowRef,
3939
})}
4040
/>
4141
)}
@@ -44,7 +44,7 @@ const Tooltip = (tooltip: React.ReactNode, hideArrow?: boolean) => ({
4444
);
4545

4646
const BasicTooltipTrigger = memo(
47-
({tooltip, children, hideArrow, ...props}: BasicTooltipTriggerProps) => (
47+
({ tooltip, children, hideArrow, ...props }: BasicTooltipTriggerProps) => (
4848
<TooltipTrigger {...props} tooltip={Tooltip(tooltip, hideArrow)}>
4949
{Trigger(children)}
5050
</TooltipTrigger>

docs/examples/EscapeToClose.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22

3-
class EscapeToClose extends React.Component<{closeTooltip: () => void}> {
3+
class EscapeToClose extends React.Component<{ closeTooltip: () => void }> {
44
public componentDidMount() {
55
document.addEventListener('keydown', this.handleKeyDown);
66
}
@@ -10,7 +10,7 @@ class EscapeToClose extends React.Component<{closeTooltip: () => void}> {
1010
public render() {
1111
return this.props.children;
1212
}
13-
private handleKeyDown = ({key}: {key: string}) => {
13+
private handleKeyDown = ({ key }: { key: string }) => {
1414
if (key === 'Escape') {
1515
this.props.closeTooltip();
1616
}

docs/examples/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export interface StateContainerProps {
1111
children: ({
1212
on,
1313
set,
14-
toggle
14+
toggle,
1515
}: {
1616
on: boolean;
1717
set: (on: boolean) => void;

docs/examples/utils.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
import React from 'react';
2-
import {StateContainerProps, StateContainerState} from './types';
2+
import { StateContainerProps, StateContainerState } from './types';
33

44
class StateContainer extends React.Component<
55
StateContainerProps,
66
StateContainerState
77
> {
88
public state: StateContainerState = {
9-
on: false
9+
on: false,
1010
};
1111

1212
public render() {
1313
return this.props.children({
1414
on: this.state.on,
1515
set: this.set,
16-
toggle: this.toggle
16+
toggle: this.toggle,
1717
});
1818
}
1919

20-
private set = (on: boolean) => this.setState({on});
21-
private toggle = () => this.setState(prevState => ({on: !prevState.on}));
20+
private set = (on: boolean) => this.setState({ on });
21+
private toggle = () => this.setState((prevState) => ({ on: !prevState.on }));
2222
}
2323

24-
export {StateContainer};
24+
export { StateContainer };

doczrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default {
22
title: 'react-popper-tooltip',
33
description: 'Documentation for react-popper-tooltip',
4-
typescript: true
4+
typescript: true,
55
};

package.json

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"docs:build": "docz build",
2626
"typecheck": "tsc --noEmit",
2727
"lint": "eslint src/**/*.{ts,tsx}",
28-
"test": "jest"
28+
"test": "jest tests/"
2929
},
3030
"husky": {
3131
"hooks": {
@@ -36,9 +36,6 @@
3636
"src/**/*.(ts|tsx)": [
3737
"prettier --write",
3838
"yarn lint --fix"
39-
],
40-
"*": [
41-
"git add"
4239
]
4340
},
4441
"keywords": [
@@ -56,35 +53,35 @@
5653
"react-dom": "^16.6.0"
5754
},
5855
"dependencies": {
59-
"@babel/runtime": "^7.8.7",
56+
"@babel/runtime": "^7.9.2",
6057
"react-popper": "^1.3.7"
6158
},
6259
"devDependencies": {
6360
"@babel/cli": "^7.8.4",
64-
"@babel/core": "^7.8.7",
61+
"@babel/core": "^7.9.0",
6562
"@babel/plugin-proposal-class-properties": "^7.8.3",
66-
"@babel/plugin-transform-runtime": "^7.8.3",
67-
"@babel/preset-env": "^7.8.7",
68-
"@babel/preset-react": "^7.8.3",
69-
"@babel/preset-typescript": "^7.8.3",
63+
"@babel/plugin-transform-runtime": "^7.9.0",
64+
"@babel/preset-env": "^7.9.0",
65+
"@babel/preset-react": "^7.9.4",
66+
"@babel/preset-typescript": "^7.9.0",
7067
"@testing-library/react": "^10.0.1",
7168
"@types/jest": "^25.1.4",
72-
"@types/react": "^16.9.23",
69+
"@types/react": "^16.9.26",
7370
"@types/react-dom": "^16.9.5",
74-
"@typescript-eslint/eslint-plugin": "^2.24.0",
75-
"@typescript-eslint/parser": "^2.24.0",
71+
"@typescript-eslint/eslint-plugin": "^2.25.0",
72+
"@typescript-eslint/parser": "^2.25.0",
7673
"docz": "^2.2.0",
7774
"eslint": "^6.8.0",
78-
"eslint-config-prettier": "^6.10.0",
75+
"eslint-config-prettier": "^6.10.1",
7976
"eslint-plugin-prettier": "^3.1.2",
8077
"eslint-plugin-react": "^7.19.0",
8178
"husky": "^4.2.3",
82-
"jest": "^25.1.0",
83-
"lint-staged": "^10.0.8",
84-
"prettier": "^1.19.1",
79+
"jest": "^25.2.3",
80+
"lint-staged": "^10.0.9",
81+
"prettier": "^2.0.2",
8582
"react": "^16.12.0",
8683
"react-dom": "^16.12.0",
87-
"rollup": "^2.0.6",
84+
"rollup": "^2.2.0",
8885
"rollup-plugin-babel": "^4.4.0",
8986
"rollup-plugin-node-resolve": "^5.2.0",
9087
"rollup-plugin-size-snapshot": "^0.11.0",

rollup.config.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import babel from 'rollup-plugin-babel';
22
import resolve from 'rollup-plugin-node-resolve';
3-
import {sizeSnapshot} from 'rollup-plugin-size-snapshot';
3+
import { sizeSnapshot } from 'rollup-plugin-size-snapshot';
44
import pkg from './package.json';
55

66
const input = 'src/index.ts';
7-
const external = id => !id.startsWith('.') && !id.startsWith('/');
7+
const external = (id) => !id.startsWith('.') && !id.startsWith('/');
88
const getBabelOptions = (useESModules = true) => ({
99
extensions: ['.ts', '.tsx'],
1010
runtimeHelpers: true,
11-
plugins: [['@babel/plugin-transform-runtime', {useESModules}]]
11+
plugins: [['@babel/plugin-transform-runtime', { useESModules }]],
1212
});
1313

1414
export default [
@@ -18,27 +18,27 @@ export default [
1818
file: pkg.main,
1919
format: 'cjs',
2020
interop: false,
21-
sourcemap: true
21+
sourcemap: true,
2222
},
2323
external,
2424
plugins: [
25-
resolve({extensions: ['.ts', '.tsx']}),
25+
resolve({ extensions: ['.ts', '.tsx'] }),
2626
babel(getBabelOptions(false)),
27-
sizeSnapshot()
28-
]
27+
sizeSnapshot(),
28+
],
2929
},
3030
{
3131
input,
3232
output: {
3333
file: pkg.module,
3434
format: 'esm',
35-
sourcemap: true
35+
sourcemap: true,
3636
},
3737
external,
3838
plugins: [
39-
resolve({extensions: ['.ts', '.tsx']}),
39+
resolve({ extensions: ['.ts', '.tsx'] }),
4040
babel(getBabelOptions()),
41-
sizeSnapshot()
42-
]
43-
}
41+
sizeSnapshot(),
42+
],
43+
},
4444
];

src/Tooltip.tsx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import {
33
GetArrowPropsArg,
44
GetTooltipPropsArg,
55
TooltipProps,
6-
TriggerTypes
6+
TriggerTypes,
77
} from './types';
88
import { callAll, TooltipContext, setRef } from './utils';
99

1010
const MUTATION_OBSERVER_CONFIG: MutationObserverInit = {
1111
childList: true,
12-
subtree: true
12+
subtree: true,
1313
};
1414

1515
class Tooltip extends Component<TooltipProps> {
@@ -31,7 +31,7 @@ class Tooltip extends Component<TooltipProps> {
3131
) {
3232
const {
3333
removeParentOutsideClickHandler,
34-
removeParentOutsideRightClickHandler
34+
removeParentOutsideRightClickHandler,
3535
} = this.context;
3636
this.addOutsideClickHandler();
3737
this.addOutsideRightClickHandler();
@@ -63,7 +63,7 @@ class Tooltip extends Component<TooltipProps> {
6363
const {
6464
isParentNoneTriggered,
6565
addParentOutsideClickHandler,
66-
addParentOutsideRightClickHandler
66+
addParentOutsideRightClickHandler,
6767
} = this.context;
6868
this.removeOutsideClickHandler();
6969
this.removeOutsideRightClickHandler();
@@ -88,7 +88,7 @@ class Tooltip extends Component<TooltipProps> {
8888
getArrowProps: this.getArrowProps,
8989
getTooltipProps: this.getTooltipProps,
9090
placement,
91-
tooltipRef: this.getTooltipRef
91+
tooltipRef: this.getTooltipRef,
9292
})}
9393
</TooltipContext.Provider>
9494
);
@@ -101,7 +101,7 @@ class Tooltip extends Component<TooltipProps> {
101101
);
102102
}
103103

104-
private handleOutsideClick?: EventListener = event => {
104+
private handleOutsideClick?: EventListener = (event) => {
105105
if (this.tooltipRef && !this.tooltipRef.contains(event.target as Node)) {
106106
const { parentOutsideClickHandler } = this.context;
107107
const { hideTooltip, clearScheduled } = this.props;
@@ -114,7 +114,7 @@ class Tooltip extends Component<TooltipProps> {
114114
}
115115
};
116116

117-
private handleOutsideRightClick?: EventListener = event => {
117+
private handleOutsideRightClick?: EventListener = (event) => {
118118
if (this.tooltipRef && !this.tooltipRef.contains(event.target as Node)) {
119119
const { parentOutsideRightClickHandler } = this.context;
120120
const { hideTooltip, clearScheduled } = this.props;
@@ -156,16 +156,16 @@ class Tooltip extends Component<TooltipProps> {
156156

157157
private getArrowProps = (props: GetArrowPropsArg = {}) => ({
158158
...props,
159-
style: { ...props.style, ...this.props.arrowProps.style }
159+
style: { ...props.style, ...this.props.arrowProps.style },
160160
});
161161

162162
private getTooltipProps = (props: GetTooltipPropsArg = {}) => ({
163163
...props,
164164
...(this.isTriggeredBy('hover') && {
165165
onMouseEnter: callAll(this.props.clearScheduled, props.onMouseEnter),
166-
onMouseLeave: callAll(this.props.hideTooltip, props.onMouseLeave)
166+
onMouseLeave: callAll(this.props.hideTooltip, props.onMouseLeave),
167167
}),
168-
style: { ...props.style, ...this.props.style }
168+
style: { ...props.style, ...this.props.style },
169169
});
170170

171171
private contextValue = {
@@ -175,7 +175,7 @@ class Tooltip extends Component<TooltipProps> {
175175
parentOutsideClickHandler: this.handleOutsideClick,
176176
parentOutsideRightClickHandler: this.handleOutsideRightClick,
177177
removeParentOutsideClickHandler: this.removeOutsideClickHandler,
178-
removeParentOutsideRightClickHandler: this.removeOutsideRightClickHandler
178+
removeParentOutsideRightClickHandler: this.removeOutsideRightClickHandler,
179179
};
180180
}
181181

0 commit comments

Comments
 (0)