Merge pull request #52 from mithredate/main

Set data-layer values before initialization
spatie · Mar 1, 2024 · 3581f09 · 3581f09
2 parents df0fdbc + 8da29ca
commit 3581f09
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/resources/views/body.blade.php b/resources/views/body.blade.php
@@ -10,9 +10,6 @@
 @if($enabled)
     <script>
         function gtmPush() {
-            @unless(empty($dataLayer->toArray()))
-            window.dataLayer.push({!! $dataLayer->toJson() !!});
-            @endunless
             @foreach($pushData as $item)
             window.dataLayer.push({!! $item->toJson() !!});
             @endforeach
@@ -28,4 +25,3 @@ function gtmPush() {
         ></iframe>
     </noscript>
 @endif
-
diff --git a/resources/views/head.blade.php b/resources/views/head.blade.php
@@ -3,11 +3,16 @@
  * @var bool $enabled
  * @var string $id
  * @var string $domain
+ * @var \Spatie\GoogleTagManager\DataLayer $dataLayer
+ * @var iterable<\Spatie\GoogleTagManager\DataLayer> $pushData
  */
 ?>
 @if($enabled)
     <script>
         window.dataLayer = window.dataLayer || [];
+        @unless(empty($dataLayer->toArray()))
+        window.dataLayer.push({!! $dataLayer->toJson() !!});
+        @endunless
     </script>
     <script>
         (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': new Date().getTime(),event:'gtm.js'});