Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: support react 17 #1

Merged
merged 2 commits into from
Sep 25, 2023
Merged

feat: support react 17 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad7c9cb
feat: support react 17
mihkeleidast Sep 22, 2023
ddd3c2e
feat: update example
mihkeleidast Sep 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19,024 changes: 18,929 additions & 95 deletions example/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"dependencies": {
"es6-promisify": "5.0.0",
"raw.macro": "^0.3.0",
"react": "^16.11.0",
"react-dom": "^16.11.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-live": "2.2.1",
"react-markdown": "2.5.1",
"react-router": "3.0.5",
Expand All @@ -42,8 +42,8 @@
"devDependencies": {
"@types/enzyme": "3.1.14",
"@types/es6-promisify": "5.0.0",
"@types/react": "^16.9.11",
"@types/react-dom": "^16.9.3",
"@types/react": "^17.0.39",
"@types/react-dom": "^17.0.11",
"@types/react-router": "3.0.13",
"@types/xml2js": "0.4.0",
"gh-pages": "1.0.0"
Expand Down
3 changes: 2 additions & 1 deletion example/src/demos/heatmap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';
import { HeatmapPaint } from 'mapbox-gl';
import ReactMapboxGl, { Layer, Feature } from '../../../';

// tslint:disable-next-line:no-var-requires
Expand All @@ -17,7 +18,7 @@ export interface Props {
onStyleLoad?: (map: any) => any;
}

const layerPaint = {
const layerPaint: HeatmapPaint = {
'heatmap-weight': {
property: 'priceIndicator',
type: 'exponential',
Expand Down
6 changes: 3 additions & 3 deletions example/src/demos/htmlCluster.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const StyledPopup = styled.div`

export interface State {
popup?: {
coordinates: GeoJSON.Position;
coordinates: [number, number];
total: number;
leaves: Array<React.ReactElement<any>>;
};
Expand All @@ -67,7 +67,7 @@ class HtmlCluster extends React.Component<Props, State> {
private zoom: [number] = [4];

private clusterMarker = (
coordinates: GeoJSON.Position,
coordinates: [number, number],
pointCount: number,
getLeaves: (
limit?: number,
Expand All @@ -91,7 +91,7 @@ class HtmlCluster extends React.Component<Props, State> {
};

private clusterClick = (
coordinates: GeoJSON.Position,
coordinates: [number, number],
total: number,
getLeaves: (
limit?: number,
Expand Down
21 changes: 18 additions & 3 deletions example/src/demos/londonCycle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,24 @@ export default class LondonCycle extends React.Component<Props, State> {
{Object.keys(stations).map((stationK, index) => (
<Feature
key={stationK}
onMouseEnter={this.onToggleHover.bind(this, 'pointer')}
onMouseLeave={this.onToggleHover.bind(this, '')}
onClick={this.markerClick.bind(this, stations[stationK])}
onMouseEnter={
(this.onToggleHover.bind(
this,
'pointer'
) as unknown) as React.MouseEventHandler<HTMLElement>
}
onMouseLeave={
(this.onToggleHover.bind(
this,
''
) as unknown) as React.MouseEventHandler<HTMLElement>
}
onClick={
(this.markerClick.bind(
this,
stations[stationK]
) as unknown) as React.MouseEventHandler<HTMLElement>
}
coordinates={stations[stationK].position}
/>
))}
Expand Down
2 changes: 1 addition & 1 deletion example/src/demos/londonCycleData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import promisify from 'es6-promisify';
export interface Station {
id: string;
name: string;
position: number[];
position: [number, number];
bikes: number;
slots: number;
}
Expand Down
3 changes: 2 additions & 1 deletion example/src/demos/raws/heatmap.raw
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';
import { HeatmapPaint } from 'mapbox-gl';
import ReactMapboxGl, { Layer, Feature } from '../../../';

// tslint:disable-next-line:no-var-requires
Expand All @@ -17,7 +18,7 @@ export interface Props {
onStyleLoad?: (map: any) => any;
}

const layerPaint = {
const layerPaint: HeatmapPaint = {
'heatmap-weight': {
property: 'priceIndicator',
type: 'exponential',
Expand Down
6 changes: 3 additions & 3 deletions example/src/demos/raws/htmlCluster.raw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const StyledPopup = styled.div`

export interface State {
popup?: {
coordinates: GeoJSON.Position;
coordinates: [number, number];
total: number;
leaves: Array<React.ReactElement<any>>;
};
Expand All @@ -67,7 +67,7 @@ class HtmlCluster extends React.Component<Props, State> {
private zoom: [number] = [4];

private clusterMarker = (
coordinates: GeoJSON.Position,
coordinates: [number, number],
pointCount: number,
getLeaves: (
limit?: number,
Expand All @@ -91,7 +91,7 @@ class HtmlCluster extends React.Component<Props, State> {
};

private clusterClick = (
coordinates: GeoJSON.Position,
coordinates: [number, number],
total: number,
getLeaves: (
limit?: number,
Expand Down
21 changes: 18 additions & 3 deletions example/src/demos/raws/londonCycle.raw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,24 @@ export default class LondonCycle extends React.Component<Props, State> {
{Object.keys(stations).map((stationK, index) => (
<Feature
key={stationK}
onMouseEnter={this.onToggleHover.bind(this, 'pointer')}
onMouseLeave={this.onToggleHover.bind(this, '')}
onClick={this.markerClick.bind(this, stations[stationK])}
onMouseEnter={
(this.onToggleHover.bind(
this,
'pointer'
) as unknown) as React.MouseEventHandler<HTMLElement>
}
onMouseLeave={
(this.onToggleHover.bind(
this,
''
) as unknown) as React.MouseEventHandler<HTMLElement>
}
onClick={
(this.markerClick.bind(
this,
stations[stationK]
) as unknown) as React.MouseEventHandler<HTMLElement>
}
coordinates={stations[stationK].position}
/>
))}
Expand Down
2 changes: 1 addition & 1 deletion example/src/demos/raws/vectorLayer.raw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export default class VectorLayer extends React.Component<Props> {
<Layer
id="mapillary"
type="line"
source="mapillary"
sourceId="mapillary"
sourceLayer="mapillary-sequences"
layout={lineLayout}
paint={linePaint}
Expand Down
2 changes: 1 addition & 1 deletion example/src/demos/vectorLayer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export default class VectorLayer extends React.Component<Props> {
<Layer
id="mapillary"
type="line"
source="mapillary"
sourceId="mapillary"
sourceLayer="mapillary-sequences"
layout={lineLayout}
paint={linePaint}
Expand Down
Loading