Skip to content

[Map][Google] Fix race conditions when loading Google Maps API, when rendering >=2 maps #2854

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
merged 1 commit into from
Jun 21, 2025
Merged

[Map][Google] Fix race conditions when loading Google Maps API, when rendering >=2 maps #2854

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
54 changes: 34 additions & 20 deletions src/Map/src/Bridge/Google/assets/dist/map_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,30 +120,44 @@ default_1.values = {
};

let _google;
let _loading = false;
let _loaded = false;
let _onLoadedCallbacks = [];
const parser = new DOMParser();
class map_controller extends default_1 {
async connect() {
if (!_google) {
_google = { maps: {} };
let { libraries = [], ...loaderOptions } = this.providerOptionsValue;
const loader = new Loader(loaderOptions);
libraries = ['core', ...libraries.filter((library) => library !== 'core')];
const librariesImplementations = await Promise.all(libraries.map((library) => loader.importLibrary(library)));
librariesImplementations.map((libraryImplementation, index) => {
if (typeof libraryImplementation !== 'object' || libraryImplementation === null) {
return;
}
const library = libraries[index];
if (['marker', 'places', 'geometry', 'journeySharing', 'drawing', 'visualization'].includes(library)) {
_google.maps[library] = libraryImplementation;
}
else {
_google.maps = { ..._google.maps, ...libraryImplementation };
}
});
const onLoaded = () => super.connect();
if (_loaded) {
onLoaded();
return;
}
if (_loading) {
_onLoadedCallbacks.push(onLoaded);
return;
}
super.connect();
this.parser = new DOMParser();
_loading = true;
_google = { maps: {} };
let { libraries = [], ...loaderOptions } = this.providerOptionsValue;
const loader = new Loader(loaderOptions);
libraries = ['core', ...libraries.filter((library) => library !== 'core')];
const librariesImplementations = await Promise.all(libraries.map((library) => loader.importLibrary(library)));
librariesImplementations.map((libraryImplementation, index) => {
if (typeof libraryImplementation !== 'object' || libraryImplementation === null) {
return;
}
const library = libraries[index];
if (['marker', 'places', 'geometry', 'journeySharing', 'drawing', 'visualization'].includes(library)) {
_google.maps[library] = libraryImplementation;
}
else {
_google.maps = { ..._google.maps, ...libraryImplementation };
}
});
_loading = false;
_loaded = true;
onLoaded();
_onLoadedCallbacks.forEach((callback) => callback());
_onLoadedCallbacks = [];
}
centerValueChanged() {
if (this.map && this.hasCenterValue && this.centerValue) {
Expand Down
75 changes: 46 additions & 29 deletions src/Map/src/Bridge/Google/assets/src/map_controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ type MapOptions = Pick<

let _google: typeof google;

// Loading the Google Maps API is an asynchronous operation, so we need to track the loading state to prevent race conditions.
let _loading = false;
let _loaded = false;
let _onLoadedCallbacks: Array<() => void> = [];

const parser = new DOMParser();

export default class extends AbstractMapController<
Expand All @@ -64,39 +69,51 @@ export default class extends AbstractMapController<
public parser: DOMParser;

async connect() {
if (!_google) {
_google = { maps: {} as typeof google.maps };

let { libraries = [], ...loaderOptions } = this.providerOptionsValue;

const loader = new Loader(loaderOptions);

// We could have used `loader.load()` to correctly load libraries, but this method is deprecated in favor of `loader.importLibrary()`.
// But `loader.importLibrary()` is not a 1-1 replacement for `loader.load()`, we need to re-build the `google.maps` object ourselves,
// see https://github.com/googlemaps/js-api-loader/issues/837 for more information.
libraries = ['core', ...libraries.filter((library) => library !== 'core')]; // Ensure 'core' is loaded first
const librariesImplementations = await Promise.all(
libraries.map((library) => loader.importLibrary(library))
);
librariesImplementations.map((libraryImplementation, index) => {
if (typeof libraryImplementation !== 'object' || libraryImplementation === null) {
return;
}
const onLoaded = () => super.connect();

const library = libraries[index];
if (_loaded) {
onLoaded();
return;
}

// The following libraries are in a sub-namespace
if (['marker', 'places', 'geometry', 'journeySharing', 'drawing', 'visualization'].includes(library)) {
// @ts-ignore
_google.maps[library] = libraryImplementation as any;
} else {
_google.maps = { ..._google.maps, ...libraryImplementation };
}
});
if (_loading) {
_onLoadedCallbacks.push(onLoaded);
return;
}

super.connect();
this.parser = new DOMParser();
_loading = true;
_google = { maps: {} as typeof google.maps };

let { libraries = [], ...loaderOptions } = this.providerOptionsValue;

const loader = new Loader(loaderOptions);

// We could have used `loader.load()` to correctly load libraries, but this method is deprecated in favor of `loader.importLibrary()`.
// But `loader.importLibrary()` is not a 1-1 replacement for `loader.load()`, we need to re-build the `google.maps` object ourselves,
// see https://github.com/googlemaps/js-api-loader/issues/837 for more information.
libraries = ['core', ...libraries.filter((library) => library !== 'core')]; // Ensure 'core' is loaded first
const librariesImplementations = await Promise.all(libraries.map((library) => loader.importLibrary(library)));
librariesImplementations.map((libraryImplementation, index) => {
if (typeof libraryImplementation !== 'object' || libraryImplementation === null) {
return;
}

const library = libraries[index];

// The following libraries are in a sub-namespace
if (['marker', 'places', 'geometry', 'journeySharing', 'drawing', 'visualization'].includes(library)) {
// @ts-ignore
_google.maps[library] = libraryImplementation as any;
} else {
_google.maps = { ..._google.maps, ...libraryImplementation };
}
});

_loading = false;
_loaded = true;
onLoaded();
_onLoadedCallbacks.forEach((callback) => callback());
_onLoadedCallbacks = [];
}

public centerValueChanged(): void {
Expand Down
Loading