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

[fix] Fix mapbox/deck syncing issue #2355

Merged
merged 1 commit into from
Oct 5, 2023
Merged

[fix] Fix mapbox/deck syncing issue #2355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 1 addition & 5 deletions jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@ const config = {
// node_modules and pnp folders by default so that they are not transpiled
// Some libraries (even if transitive) are transitioning to ESM and need additional transpilation. Relevant issues:
// - tiny-sdf: https://github.com/visgl/deck.gl/issues/7735
// TODO For some reason transformIgnorePatterns are ignored in combination with TS, using moduleNameMapper instead.
// transformIgnorePatterns: ["/node_modules/(?!(@mapbox/tiny-sdf)/)", "\\.pnp\\.[^\\\/]+$"]
moduleNameMapper: {
'@mapbox/tiny-sdf': `<rootDir>/node_modules/@mapbox/tiny-sdf/index.cjs`
}
transformIgnorePatterns: ['/node_modules/(?!(.*@mapbox/tiny-sdf.*))', '\\.pnp\\.[^\\/]+$']
};

module.exports = config;
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@
"jest-environment-jsdom": "^29.5.0",
"jsdom": "^16.4.0",
"json-loader": "^0.5.4",
"mapbox-gl": "1.13.1",
"nyc": "^15.1.0",
"prettier": "1.19.1",
"progress-bar-webpack-plugin": "^2.1.0",
Expand Down
6 changes: 3 additions & 3 deletions src/components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"@types/react": "^18.0.28",
"@types/react-dom": "^18.0.11",
"@types/react-lifecycles-compat": "^3.0.1",
"@types/react-map-gl": "^6.1.2",
"@types/react-map-gl": "^6.1.3",
"@types/react-modal": "^3.13.1",
"@types/react-onclickoutside": "^6.7.4",
"@types/react-redux": "^7.1.23",
Expand Down Expand Up @@ -96,7 +96,7 @@
"lodash.uniq": "^4.0.1",
"lodash.uniqby": "^4.7.0",
"mapbox": "^1.0.0-beta10",
"mapbox-gl": "^1.0.0",
"mapbox-gl": "1.13.1",
"mjolnir.js": "^2.7.0",
"moment": "^2.10.6",
"moment-timezone": "^0.5.35",
Expand All @@ -108,7 +108,7 @@
"react-intl": "^6.3.0",
"react-json-pretty": "^2.2.0",
"react-lifecycles-compat": "^3.0.4",
"react-map-gl": "^5.0.3",
"react-map-gl": "7.0.25",
"react-markdown": "^5.0.2",
"react-modal": "^3.12.1",
"react-onclickoutside": "^6.7.1",
Expand Down
1 change: 1 addition & 0 deletions src/components/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ export {default as Checkbox} from './common/checkbox';
export {default as ColorLegend, LegendRow} from './common/color-legend';
export {default as LoadingSpinner} from './common/loading-spinner';
export {default as LoadingDialog} from './modals/loading-dialog';
export {MapViewStateContext, MapViewStateContextProvider} from './map-view-state-context';
export {default as FieldTokenFactory} from './common/field-token';
export {default as Portaled} from './common/portaled';
export {default as ProgressBar} from './common/progress-bar';
Expand Down
6 changes: 4 additions & 2 deletions src/components/src/kepler-gl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export const isViewportDisjointed = props => {
);
};

export const mapStateSelector = (props, index) => {
export const mapStateSelector = (props: any, index: number): any => {
if (!Number.isFinite(index)) {
// either no index arg or an invalid index was provided
// it is expected to be either 0 or 1 when in split mode
Expand Down Expand Up @@ -655,7 +655,9 @@ function KeplerGlFactory(
modifiers={DND_EMPTY_MODIFIERS}
>
{!uiState.readOnly && !readOnly && <SidePanel {...sideFields} />}
<MapsLayout className="maps">{mapContainers}</MapsLayout>
<MapsLayout className="maps" mapState={this.props.mapState}>
{mapContainers}
</MapsLayout>
{isSplit && (
<DragOverlay modifiers={DRAGOVERLAY_MODIFIERS} dropAnimation={null}>
{activeLayer !== undefined ? (
Expand Down
Loading