Skip to content

Fix source loading condition #2513

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

Merged
Pessimistress merged 1 commit into from
Mar 28, 2025
Merged

Fix source loading condition #2513

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
4 changes: 2 additions & 2 deletions examples/vite.config.local.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ export default defineConfig(async () => {
resolve: {
alias: {
// Use root dependencies
'react-map-gl/mapbox': join(rootDir, './modules/main/src/mapbox.ts'),
'react-map-gl/maplibre': join(rootDir, './modules/main/src/maplibre.ts'),
'react-map-gl/mapbox': join(rootDir, './modules/react-mapbox/src'),
'react-map-gl/maplibre': join(rootDir, './modules/react-maplibre/src'),
react: join(rootDir, './node_modules/react'),
'react-dom': join(rootDir, './node_modules/react-dom')
}
Expand Down
3 changes: 2 additions & 1 deletion modules/react-mapbox/src/components/source.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ export type SourceProps = (SourceSpecification | CanvasSourceSpecification) & {
let sourceCounter = 0;

function createSource(map: MapInstance, id: string, props: SourceProps) {
// @ts-ignore
if (map.isStyleLoaded()) {
const options = {...props};
delete options.id;
Expand Down Expand Up @@ -89,10 +88,12 @@ export function Source(props: SourceProps) {
if (map) {
/* global setTimeout */
const forceUpdate = () => setTimeout(() => setStyleLoaded(version => version + 1), 0);
map.on('load', forceUpdate);
map.on('styledata', forceUpdate);
forceUpdate();

return () => {
map.off('load', forceUpdate);
map.off('styledata', forceUpdate);
// @ts-ignore
if (map.style && map.style._loaded && map.getSource(id)) {
Expand Down
Loading