Skip to content

Commit 28f5a2b

Browse files
committed
update lint preference and dependencies
1 parent ac4ebcc commit 28f5a2b

File tree

8 files changed

+3654
-3283
lines changed

8 files changed

+3654
-3283
lines changed

.prettierrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
{
2-
"singleQuote": true,
3-
"bracketSpacing": false
2+
"singleQuote": true
43
}

.size-snapshot.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{
22
"dist/cjs/react-popper-tooltip.js": {
3-
"bundled": 15217,
4-
"minified": 8547,
5-
"gzipped": 2448
3+
"bundled": 12761,
4+
"minified": 7781,
5+
"gzipped": 2222
66
},
77
"dist/esm/react-popper-tooltip.js": {
8-
"bundled": 15179,
9-
"minified": 8529,
10-
"gzipped": 2444,
8+
"bundled": 12722,
9+
"minified": 7753,
10+
"gzipped": 2209,
1111
"treeshaked": {
1212
"rollup": {
13-
"code": 236,
14-
"import_statements": 216
13+
"code": 187,
14+
"import_statements": 167
1515
},
1616
"webpack": {
17-
"code": 9196
17+
"code": 8420
1818
}
1919
}
2020
}

package.json

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"scripts": {
2121
"build": "rm -rf dist && rollup -c && cp src/styles.css dist && yarn tsc && rm -rf compiled",
2222
"prepublishOnly": "yarn typecheck && yarn lint && yarn build && yarn test",
23+
"prettier": "prettier --write src/**/*.{ts,tsx}",
2324
"docs": "docz dev",
2425
"docs:build": "docz build",
2526
"typecheck": "tsc --noEmit",
@@ -55,38 +56,38 @@
5556
"react-dom": "^16.6.0"
5657
},
5758
"dependencies": {
58-
"@babel/runtime": "^7.7.4",
59-
"react-popper": "^1.3.6"
59+
"@babel/runtime": "^7.8.7",
60+
"react-popper": "^1.3.7"
6061
},
6162
"devDependencies": {
62-
"@babel/cli": "^7.7.4",
63-
"@babel/core": "^7.7.4",
64-
"@babel/plugin-proposal-class-properties": "^7.7.4",
65-
"@babel/plugin-transform-runtime": "^7.7.4",
66-
"@babel/preset-env": "^7.7.4",
67-
"@babel/preset-react": "^7.7.4",
68-
"@babel/preset-typescript": "^7.7.4",
69-
"@testing-library/react": "^9.3.2",
70-
"@types/jest": "^24.0.23",
71-
"@types/react": "^16.9.13",
72-
"@types/react-dom": "^16.9.4",
73-
"@typescript-eslint/eslint-plugin": "^2.9.0",
74-
"@typescript-eslint/parser": "^2.9.0",
75-
"docz": "^2.1.1",
76-
"eslint": "^6.7.1",
77-
"eslint-config-prettier": "^6.7.0",
78-
"eslint-plugin-prettier": "^3.1.1",
79-
"eslint-plugin-react": "^7.16.0",
80-
"husky": "^3.1.0",
81-
"jest": "^24.9.0",
82-
"lint-staged": "^9.5.0",
63+
"@babel/cli": "^7.8.4",
64+
"@babel/core": "^7.8.7",
65+
"@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",
70+
"@testing-library/react": "^10.0.1",
71+
"@types/jest": "^25.1.4",
72+
"@types/react": "^16.9.23",
73+
"@types/react-dom": "^16.9.5",
74+
"@typescript-eslint/eslint-plugin": "^2.24.0",
75+
"@typescript-eslint/parser": "^2.24.0",
76+
"docz": "^2.2.0",
77+
"eslint": "^6.8.0",
78+
"eslint-config-prettier": "^6.10.0",
79+
"eslint-plugin-prettier": "^3.1.2",
80+
"eslint-plugin-react": "^7.19.0",
81+
"husky": "^4.2.3",
82+
"jest": "^25.1.0",
83+
"lint-staged": "^10.0.8",
8384
"prettier": "^1.19.1",
8485
"react": "^16.12.0",
8586
"react-dom": "^16.12.0",
86-
"rollup": "^1.27.5",
87-
"rollup-plugin-babel": "^4.3.3",
87+
"rollup": "^2.0.6",
88+
"rollup-plugin-babel": "^4.4.0",
8889
"rollup-plugin-node-resolve": "^5.2.0",
89-
"rollup-plugin-size-snapshot": "^0.10.0",
90-
"typescript": "^3.7.2"
90+
"rollup-plugin-size-snapshot": "^0.11.0",
91+
"typescript": "^3.8.3"
9192
}
9293
}

src/Tooltip.tsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import React, {Component} from 'react';
1+
import React, { Component } from 'react';
22
import {
33
GetArrowPropsArg,
44
GetTooltipPropsArg,
55
TooltipProps,
66
TriggerTypes
77
} from './types';
8-
import {callAll, TooltipContext, setRef} from './utils';
8+
import { callAll, TooltipContext, setRef } from './utils';
99

1010
const MUTATION_OBSERVER_CONFIG: MutationObserverInit = {
1111
childList: true,
@@ -79,7 +79,7 @@ class Tooltip extends Component<TooltipProps> {
7979
}
8080

8181
public render() {
82-
const {arrowProps, placement, tooltip} = this.props;
82+
const { arrowProps, placement, tooltip } = this.props;
8383

8484
return (
8585
<TooltipContext.Provider value={this.contextValue}>
@@ -95,16 +95,16 @@ class Tooltip extends Component<TooltipProps> {
9595
}
9696

9797
private isTriggeredBy(event: TriggerTypes) {
98-
const {trigger} = this.props;
98+
const { trigger } = this.props;
9999
return (
100100
trigger === event || (Array.isArray(trigger) && trigger.includes(event))
101101
);
102102
}
103103

104104
private handleOutsideClick?: EventListener = event => {
105105
if (this.tooltipRef && !this.tooltipRef.contains(event.target as Node)) {
106-
const {parentOutsideClickHandler} = this.context;
107-
const {hideTooltip, clearScheduled} = this.props;
106+
const { parentOutsideClickHandler } = this.context;
107+
const { hideTooltip, clearScheduled } = this.props;
108108

109109
clearScheduled();
110110
hideTooltip();
@@ -116,8 +116,8 @@ class Tooltip extends Component<TooltipProps> {
116116

117117
private handleOutsideRightClick?: EventListener = event => {
118118
if (this.tooltipRef && !this.tooltipRef.contains(event.target as Node)) {
119-
const {parentOutsideRightClickHandler} = this.context;
120-
const {hideTooltip, clearScheduled} = this.props;
119+
const { parentOutsideRightClickHandler } = this.context;
120+
const { hideTooltip, clearScheduled } = this.props;
121121

122122
clearScheduled();
123123
hideTooltip();
@@ -156,7 +156,7 @@ 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 = {}) => ({
@@ -165,7 +165,7 @@ class Tooltip extends Component<TooltipProps> {
165165
onMouseEnter: callAll(this.props.clearScheduled, props.onMouseEnter),
166166
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 = {

src/TooltipTrigger.tsx

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
* @author Mohsin Ul Haq <[email protected]>
33
*/
44
import PopperJS from 'popper.js';
5-
import React, {Component} from 'react';
6-
import {createPortal} from 'react-dom';
7-
import {Manager, Popper, Reference} from 'react-popper';
5+
import React, { Component } from 'react';
6+
import { createPortal } from 'react-dom';
7+
import { Manager, Popper, Reference } from 'react-popper';
88
import Tooltip from './Tooltip';
99
import {
1010
GetTriggerPropsArg,
1111
TooltipTriggerProps,
1212
TooltipTriggerState,
1313
TriggerTypes
1414
} from './types';
15-
import {callAll, canUseDOM, noop} from './utils';
15+
import { callAll, canUseDOM, noop } from './utils';
1616

1717
const DEFAULT_MODIFIERS: PopperJS.Modifiers = {
1818
preventOverflow: {
@@ -95,8 +95,8 @@ class TooltipTrigger extends Component<
9595
scheduleUpdate
9696
}) => {
9797
if (followCursor && this.popperOffset) {
98-
const {pageX, pageY} = this.state;
99-
const {width, height} = this.popperOffset;
98+
const { pageX, pageY } = this.state;
99+
const { width, height } = this.popperOffset;
100100
const x =
101101
pageX! + width > window.scrollX + document.body.offsetWidth
102102
? pageX! - width
@@ -132,8 +132,8 @@ class TooltipTrigger extends Component<
132132
return (
133133
<Manager>
134134
<Reference innerRef={getTriggerRef}>
135-
{({ref}) =>
136-
children({getTriggerProps: this.getTriggerProps, triggerRef: ref})
135+
{({ ref }) =>
136+
children({ getTriggerProps: this.getTriggerProps, triggerRef: ref })
137137
}
138138
</Reference>
139139
{this.getState() &&
@@ -162,7 +162,13 @@ class TooltipTrigger extends Component<
162162
clearTimeout(this.showTimeout);
163163
};
164164

165-
private showTooltip = ({pageX, pageY}: {pageX: number; pageY: number}) => {
165+
private showTooltip = ({
166+
pageX,
167+
pageY
168+
}: {
169+
pageX: number;
170+
pageY: number;
171+
}) => {
166172
this.clearScheduled();
167173
let state: TooltipTriggerState = {
168174
tooltipShown: true
@@ -183,32 +189,38 @@ class TooltipTrigger extends Component<
183189
private hideTooltip = () => {
184190
this.clearScheduled();
185191
this.hideTimeout = window.setTimeout(
186-
() => this.setTooltipState({tooltipShown: false}),
192+
() => this.setTooltipState({ tooltipShown: false }),
187193
this.props.delayHide
188194
);
189195
};
190196

191-
private toggleTooltip = ({pageX, pageY}: {pageX: number; pageY: number}) => {
197+
private toggleTooltip = ({
198+
pageX,
199+
pageY
200+
}: {
201+
pageX: number;
202+
pageY: number;
203+
}) => {
192204
const action = this.getState() ? 'hideTooltip' : 'showTooltip';
193-
this[action]({pageX, pageY});
205+
this[action]({ pageX, pageY });
194206
};
195207

196208
private clickToggle: React.MouseEventHandler = (event: React.MouseEvent) => {
197209
event.preventDefault();
198-
const {pageX, pageY} = event;
210+
const { pageX, pageY } = event;
199211
const action = this.props.followCursor ? 'showTooltip' : 'toggleTooltip';
200-
this[action]({pageX, pageY});
212+
this[action]({ pageX, pageY });
201213
};
202214

203215
private contextMenuToggle: React.MouseEventHandler = event => {
204216
event.preventDefault();
205-
const {pageX, pageY} = event;
217+
const { pageX, pageY } = event;
206218
const action = this.props.followCursor ? 'showTooltip' : 'toggleTooltip';
207-
this[action]({pageX, pageY});
219+
this[action]({ pageX, pageY });
208220
};
209221

210222
private isTriggeredBy(event: TriggerTypes) {
211-
const {trigger} = this.props;
223+
const { trigger } = this.props;
212224
return (
213225
trigger === event || (Array.isArray(trigger) && trigger.includes(event))
214226
);

src/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export type TriggerTypes = 'none' | 'click' | 'right-click' | 'hover' | 'focus';
66
export type Trigger = TriggerTypes | TriggerTypes[];
77
export type Ref =
88
| ((element: HTMLElement | null) => void)
9-
| {current: HTMLElement | null}
9+
| { current: HTMLElement | null }
1010
| null;
1111

1212
export interface GetTriggerPropsArg {

src/utils.ts

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

44
export const TooltipContext = React.createContext({});
55

66
// eslint-disable-next-line @typescript-eslint/no-explicit-any
7-
type Fn = (...args: any[]) => void;
8-
type FnOrBool = undefined | Fn;
7+
type Fn = ((...args: any[]) => void) | undefined;
98

109
// eslint-disable-next-line @typescript-eslint/no-explicit-any
11-
export const callAll = (...fns: FnOrBool[]) => (...args: any[]) =>
10+
export const callAll = (...fns: Fn[]) => (...args: any[]) =>
1211
fns.forEach(fn => fn && fn(...args));
1312

14-
export const noop = () => {};
13+
export const noop = () => {
14+
// do nothing
15+
};
1516

1617
export const canUseDOM = () =>
1718
!!(

0 commit comments

Comments
 (0)