Merge pull request #371 from davidwebca/v4

Fix Google Maps api load order + provide an extra callback for devs to hook into

Author: Tam

src/services/EmbedService.php

@@ -105,6 +105,7 @@ private function _embedGoogle (EmbedOptions $options, Settings $settings): strin
 	{
 		$view = Craft::$app->getView();
 		$callbackName = 'init_' . $options->id;
+		$loadedCallbackName =  $options->id . '_loaded';
 
 		$mapTypeId = match ($settings->mapTiles)
 		{
@@ -146,11 +147,6 @@ private function _embedGoogle (EmbedOptions $options, Settings $settings): strin
 			'callback' => $callbackName,
 		]);
 
-		$this->_js(
-			'https://maps.googleapis.com/maps/api/js?' . $params,
-			['async' => '', 'defer' => '']
-		);
-
 		$js = <<<JS
 let {$options->id};
 
@@ -165,10 +161,15 @@ function {$callbackName} () {
 }
 JS;
 
-		$css = $this->_getCss($options);
 
+		$view->registerScript($js, View::POS_END);
 
-		$view->registerJs($js, View::POS_END);
+		$this->_js(
+			'https://maps.googleapis.com/maps/api/js?' . $params,
+			['async' => '', 'defer' => '', 'onload' => "typeof {$loadedCallbackName} != 'undefined' && {$loadedCallbackName}()"]
+		);
+
+		$css = $this->_getCss($options);
 		$css && $view->registerCss($css);
 
 		return '<div id="' . $options->id . '"></div>';