Skip to content

Commit 41c0d6b

Browse files
committed
lint: clean up
1 parent 6e88b8b commit 41c0d6b

51 files changed

Lines changed: 812 additions & 1311 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
dist
2+
node_modules
Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,15 @@
11
import { ComponentProps, createContext, useContext } from 'react';
22

33
export interface AdvancedMarkerContentContextData {
4-
setAdvancedMarkerContent: (
5-
content: google.maps.marker.PinElement | null,
6-
) => void;
4+
setAdvancedMarkerContent: (content: google.maps.marker.PinElement | null) => void;
75
}
86

9-
const AdvancedMarkerContentContext =
10-
createContext<AdvancedMarkerContentContextData>({
11-
setAdvancedMarkerContent: () => {},
12-
});
7+
const AdvancedMarkerContentContext = createContext<AdvancedMarkerContentContextData>({
8+
setAdvancedMarkerContent: () => {},
9+
});
1310

14-
export const useAdvancedMarkerContent = () =>
15-
useContext(AdvancedMarkerContentContext);
11+
export const useAdvancedMarkerContent = () => useContext(AdvancedMarkerContentContext);
1612

17-
export function AdvancedMarkerContentProvider({
18-
children,
19-
...props
20-
}: ComponentProps<typeof AdvancedMarkerContentContext.Provider>) {
21-
return (
22-
<AdvancedMarkerContentContext.Provider {...props}>
23-
{children}
24-
</AdvancedMarkerContentContext.Provider>
25-
);
13+
export function AdvancedMarkerContentProvider({ children, ...props }: ComponentProps<typeof AdvancedMarkerContentContext.Provider>) {
14+
return <AdvancedMarkerContentContext.Provider {...props}>{children}</AdvancedMarkerContentContext.Provider>;
2615
}

src/components/AdvancedMarker/index.tsx

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ import { forwardRef, useEffect, useMemo, useRef, useState } from 'react';
22

33
import { createPortal } from 'react-dom';
44

5-
import {
6-
AdvancedMarkerContentContextData,
7-
AdvancedMarkerContentProvider,
8-
} from './Context';
5+
import { AdvancedMarkerContentContextData, AdvancedMarkerContentProvider } from './Context';
96
import { AdvancedMarkerProps } from './type';
107
import { useApplyAdvancedMarkerEvent } from '../../hooks/useApplyAdvancedMarkerEvent';
118
import { useApplyAdvancedMarkerOptions } from '../../hooks/useApplyAdvancedMarkerOptions';
@@ -14,10 +11,7 @@ import { passRef } from '../../utils/passRef';
1411
import { useSetAnchor } from '../InfoWindow/Context';
1512
import { useMapContext } from '../Provider/MapProvider';
1613

17-
export const AdvancedMarker = forwardRef<
18-
google.maps.marker.AdvancedMarkerElement,
19-
AdvancedMarkerProps
20-
>(function AdvancedMarker(
14+
export const AdvancedMarker = forwardRef<google.maps.marker.AdvancedMarkerElement, AdvancedMarkerProps>(function AdvancedMarker(
2115
{
2216
children,
2317
lat,
@@ -34,24 +28,22 @@ export const AdvancedMarker = forwardRef<
3428
onDragStart,
3529
onGmpClick,
3630
},
37-
ref,
31+
ref
3832
) {
3933
const originalMap = useMapContext();
4034
const map = hidden ? null : originalMap;
4135
const markerLib = useImportLibrary('marker');
4236
const setAnchor = useSetAnchor();
4337

4438
const fragment = useRef<HTMLDivElement>(document.createElement('div'));
45-
const [advancedMarker, setAdvancedMarker] =
46-
useState<google.maps.marker.AdvancedMarkerElement | null>(null);
47-
const [pinElement, setPinElement] =
48-
useState<google.maps.marker.PinElement | null>(null);
39+
const [advancedMarker, setAdvancedMarker] = useState<google.maps.marker.AdvancedMarkerElement | null>(null);
40+
const [pinElement, setPinElement] = useState<google.maps.marker.PinElement | null>(null);
4941

5042
const value = useMemo<AdvancedMarkerContentContextData>(
5143
() => ({
5244
setAdvancedMarkerContent: setPinElement,
5345
}),
54-
[],
46+
[]
5547
);
5648

5749
useEffect(() => {
@@ -107,9 +99,5 @@ export const AdvancedMarker = forwardRef<
10799
onGmpClick,
108100
});
109101

110-
return (
111-
<AdvancedMarkerContentProvider value={value}>
112-
{createPortal(children, fragment.current)}
113-
</AdvancedMarkerContentProvider>
114-
);
102+
return <AdvancedMarkerContentProvider value={value}>{createPortal(children, fragment.current)}</AdvancedMarkerContentProvider>;
115103
});

src/components/AdvancedMarker/type.ts

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,14 @@
11
import { ReactNode } from 'react';
22

33
export interface AdvancedMarkerEvent {
4-
onClick?: (
5-
marker: google.maps.marker.AdvancedMarkerElement,
6-
event: google.maps.MapMouseEvent,
7-
) => void;
8-
onDrag?: (
9-
marker: google.maps.marker.AdvancedMarkerElement,
10-
event: google.maps.MapMouseEvent,
11-
) => void;
12-
onDragEnd?: (
13-
marker: google.maps.marker.AdvancedMarkerElement,
14-
event: google.maps.MapMouseEvent,
15-
) => void;
16-
onDragStart?: (
17-
marker: google.maps.marker.AdvancedMarkerElement,
18-
event: google.maps.MapMouseEvent,
19-
) => void;
20-
onGmpClick?: (
21-
marker: google.maps.marker.AdvancedMarkerElement,
22-
evnet: google.maps.marker.AdvancedMarkerClickEvent,
23-
) => void;
4+
onClick?: (marker: google.maps.marker.AdvancedMarkerElement, event: google.maps.MapMouseEvent) => void;
5+
onDrag?: (marker: google.maps.marker.AdvancedMarkerElement, event: google.maps.MapMouseEvent) => void;
6+
onDragEnd?: (marker: google.maps.marker.AdvancedMarkerElement, event: google.maps.MapMouseEvent) => void;
7+
onDragStart?: (marker: google.maps.marker.AdvancedMarkerElement, event: google.maps.MapMouseEvent) => void;
8+
onGmpClick?: (marker: google.maps.marker.AdvancedMarkerElement, evnet: google.maps.marker.AdvancedMarkerClickEvent) => void;
249
}
2510

26-
export interface AdvancedMarkerProps
27-
extends Omit<
28-
google.maps.marker.AdvancedMarkerElementOptions,
29-
'position' | 'map'
30-
>,
31-
AdvancedMarkerEvent {
11+
export interface AdvancedMarkerProps extends Omit<google.maps.marker.AdvancedMarkerElementOptions, 'position' | 'map'>, AdvancedMarkerEvent {
3212
lat: number;
3313
lng: number;
3414
children?: Exclude<ReactNode, Iterable<ReactNode>>;

src/components/Circle/index.tsx

Lines changed: 51 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -6,57 +6,32 @@ import { useApplyCircleOptions } from '../../hooks/useApplyCircleOptions';
66
import { passRef } from '../../utils/passRef';
77
import { useMapContext } from '../Provider/MapProvider';
88

9-
export const Circle = forwardRef<google.maps.Circle, CircleProps>(
10-
function Circle(
11-
{
12-
center,
13-
clickable,
14-
draggable,
15-
editable,
16-
fillColor,
17-
fillOpacity,
18-
radius,
19-
strokeColor,
20-
strokeOpacity,
21-
strokePosition,
22-
strokeWeight,
23-
visible,
24-
zIndex,
25-
...events
26-
},
27-
ref,
28-
) {
29-
const map = useMapContext();
30-
31-
const [Circle, setCircle] = useState<google.maps.Circle | null>(null);
32-
33-
useEffect(() => {
34-
const Circle = new google.maps.Circle({
35-
map,
36-
center,
37-
clickable,
38-
draggable,
39-
editable,
40-
fillColor,
41-
fillOpacity,
42-
radius,
43-
strokeColor,
44-
strokeOpacity,
45-
strokePosition,
46-
strokeWeight,
47-
visible,
48-
zIndex,
49-
});
50-
51-
setCircle(Circle);
52-
passRef(ref, Circle);
9+
export const Circle = forwardRef<google.maps.Circle, CircleProps>(function Circle(
10+
{
11+
center,
12+
clickable,
13+
draggable,
14+
editable,
15+
fillColor,
16+
fillOpacity,
17+
radius,
18+
strokeColor,
19+
strokeOpacity,
20+
strokePosition,
21+
strokeWeight,
22+
visible,
23+
zIndex,
24+
...events
25+
},
26+
ref
27+
) {
28+
const map = useMapContext();
5329

54-
return () => {
55-
Circle.setMap(null);
56-
};
57-
}, []);
30+
const [Circle, setCircle] = useState<google.maps.Circle | null>(null);
5831

59-
useApplyCircleOptions(Circle, {
32+
useEffect(() => {
33+
const Circle = new google.maps.Circle({
34+
map,
6035
center,
6136
clickable,
6237
draggable,
@@ -71,8 +46,31 @@ export const Circle = forwardRef<google.maps.Circle, CircleProps>(
7146
visible,
7247
zIndex,
7348
});
74-
useApplyCircleEvent(Circle, events);
7549

76-
return null;
77-
},
78-
);
50+
setCircle(Circle);
51+
passRef(ref, Circle);
52+
53+
return () => {
54+
Circle.setMap(null);
55+
};
56+
}, []);
57+
58+
useApplyCircleOptions(Circle, {
59+
center,
60+
clickable,
61+
draggable,
62+
editable,
63+
fillColor,
64+
fillOpacity,
65+
radius,
66+
strokeColor,
67+
strokeOpacity,
68+
strokePosition,
69+
strokeWeight,
70+
visible,
71+
zIndex,
72+
});
73+
useApplyCircleEvent(Circle, events);
74+
75+
return null;
76+
});

src/components/Circle/type.ts

Lines changed: 13 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,17 @@
11
export interface CircleEvent {
22
onCenterChanged?: (circle: google.maps.Circle) => void;
3-
onClick?: (
4-
circle: google.maps.Circle,
5-
event: google.maps.PolyMouseEvent,
6-
) => void;
7-
onContextmenu?: (
8-
circle: google.maps.Circle,
9-
event: google.maps.PolyMouseEvent,
10-
) => void;
11-
onDblClick?: (
12-
circle: google.maps.Circle,
13-
event: google.maps.PolyMouseEvent,
14-
) => void;
15-
onDrag?: (
16-
circle: google.maps.Circle,
17-
event: google.maps.MapMouseEvent,
18-
) => void;
19-
onDragEnd?: (
20-
circle: google.maps.Circle,
21-
event: google.maps.MapMouseEvent,
22-
) => void;
23-
onDragStart?: (
24-
circle: google.maps.Circle,
25-
event: google.maps.MapMouseEvent,
26-
) => void;
27-
onMouseDown?: (
28-
circle: google.maps.Circle,
29-
event: google.maps.PolyMouseEvent,
30-
) => void;
31-
onMouseMove?: (
32-
circle: google.maps.Circle,
33-
event: google.maps.PolyMouseEvent,
34-
) => void;
35-
onMouseOut?: (
36-
circle: google.maps.Circle,
37-
event: google.maps.PolyMouseEvent,
38-
) => void;
39-
onMouseOver?: (
40-
circle: google.maps.Circle,
41-
event: google.maps.PolyMouseEvent,
42-
) => void;
43-
onMouseUp?: (
44-
circle: google.maps.Circle,
45-
event: google.maps.PolyMouseEvent,
46-
) => void;
47-
onRadiusChanged?: (
48-
circle: google.maps.Circle,
49-
event: google.maps.PolyMouseEvent,
50-
) => void;
3+
onClick?: (circle: google.maps.Circle, event: google.maps.PolyMouseEvent) => void;
4+
onContextmenu?: (circle: google.maps.Circle, event: google.maps.PolyMouseEvent) => void;
5+
onDblClick?: (circle: google.maps.Circle, event: google.maps.PolyMouseEvent) => void;
6+
onDrag?: (circle: google.maps.Circle, event: google.maps.MapMouseEvent) => void;
7+
onDragEnd?: (circle: google.maps.Circle, event: google.maps.MapMouseEvent) => void;
8+
onDragStart?: (circle: google.maps.Circle, event: google.maps.MapMouseEvent) => void;
9+
onMouseDown?: (circle: google.maps.Circle, event: google.maps.PolyMouseEvent) => void;
10+
onMouseMove?: (circle: google.maps.Circle, event: google.maps.PolyMouseEvent) => void;
11+
onMouseOut?: (circle: google.maps.Circle, event: google.maps.PolyMouseEvent) => void;
12+
onMouseOver?: (circle: google.maps.Circle, event: google.maps.PolyMouseEvent) => void;
13+
onMouseUp?: (circle: google.maps.Circle, event: google.maps.PolyMouseEvent) => void;
14+
onRadiusChanged?: (circle: google.maps.Circle, event: google.maps.PolyMouseEvent) => void;
5115
}
5216

53-
export interface CircleProps
54-
extends Partial<Omit<google.maps.CircleOptions, 'map'>>,
55-
CircleEvent {}
17+
export interface CircleProps extends Partial<Omit<google.maps.CircleOptions, 'map'>>, CircleEvent {}

src/components/Control/index.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ export function Control({ position, children, ...props }: ControlProps) {
1919
targetControls.push(fragment.current);
2020

2121
return () => {
22-
const idx = targetControls
23-
.getArray()
24-
.findIndex((v) => v === fragment.current);
22+
const idx = targetControls.getArray().findIndex((v) => v === fragment.current);
2523

2624
targetControls.removeAt(idx);
2725
};

0 commit comments

Comments
 (0)