Merge pull request #40 from FrittenKeeZ/master

Prevent dataLayer entries from being reset
spatie · Nov 17, 2021 · d28e9b9 · d28e9b9
2 parents 0264f97 + c662bf8
commit d28e9b9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/resources/views/head.blade.php b/resources/views/head.blade.php
@@ -1,9 +1,11 @@
 @if($enabled)
 <script>
 window.dataLayer = window.dataLayer || [];
-dataLayer = [{!! $dataLayer->toJson() !!}];
+@unless(empty($dataLayer->toArray()))
+window.dataLayer.push({!! $dataLayer->toJson() !!});
+@endunless
 @foreach($pushData as $item)
-dataLayer.push({!! $item->toJson() !!});
+window.dataLayer.push({!! $item->toJson() !!});
 @endforeach
 </script>
 <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':

diff --git a/src/GoogleTagManager.php b/src/GoogleTagManager.php
@@ -2,6 +2,7 @@
 
 namespace Spatie\GoogleTagManager;
 
+use Illuminate\Support\Collection;
 use Illuminate\Support\Traits\Macroable;
 
 class GoogleTagManager
@@ -41,7 +42,7 @@ public function __construct($id)
         $this->id = $id;
         $this->dataLayer = new DataLayer();
         $this->flashDataLayer = new DataLayer();
-        $this->pushDataLayer = new \Illuminate\Support\Collection();
+        $this->pushDataLayer = new Collection();
 
         $this->enabled = true;
     }
@@ -59,7 +60,7 @@ public function id()
     public function setId($id)
     {
         $this->id = $id;
-        
+
         return $this;
     }
 
@@ -160,7 +161,7 @@ public function getPushData()
     public function clear()
     {
         $this->dataLayer = new DataLayer();
-        $this->pushDataLayer = new \Illuminate\Support\Collection();
+        $this->pushDataLayer = new Collection();
     }
 
     /**