From 8da29cad96cb0e167396dd865894024ba939862c Mon Sep 17 00:00:00 2001
From: Mehrdad Hedayati <mehrdad@team.interaction-design.org>
Date: Mon, 26 Feb 2024 14:20:17 +0330
Subject: [PATCH] Set data-layer values before initialization

---
 resources/views/body.blade.php | 4 ----
 resources/views/head.blade.php | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/resources/views/body.blade.php b/resources/views/body.blade.php
index a540710..0f10e76 100644
--- 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
index c636c94..06eebb5 100644
--- 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'});