From fc07df1413150ecaf334d6fc60e0bc2396b35652 Mon Sep 17 00:00:00 2001
From: Abhishek Aggarwal <66322306+abhi-agg@users.noreply.github.com>
Date: Fri, 22 Mar 2024 19:27:37 +0100
Subject: [PATCH] [Bug 1886159] Use improved click events from Glean (#2159)

* Updated package @mozilla/glean to 5.0.0-pre.0
* Remove "pointer-events:none" instrumentation for nested elements
* Ran formatter and linter
---
 package-lock.json        | 14 +++++++-------
 package.json             |  2 +-
 src/pages/AppList.svelte | 16 ++--------------
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b4beed1fa..30866620a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
         "@babel/plugin-transform-runtime": "7.23.9",
         "@babel/preset-env": "^7.23.9",
         "@mozilla-protocol/core": "^17.0.1",
-        "@mozilla/glean": "^4.1.0-pre.0",
+        "@mozilla/glean": "^5.0.0-pre.0",
         "@playwright/test": "^1.41.2",
         "@rollup/plugin-commonjs": "25.0.7",
         "@rollup/plugin-node-resolve": "15.2.3",
@@ -4173,9 +4173,9 @@
       "dev": true
     },
     "node_modules/@mozilla/glean": {
-      "version": "4.1.0-pre.0",
-      "resolved": "https://registry.npmjs.org/@mozilla/glean/-/glean-4.1.0-pre.0.tgz",
-      "integrity": "sha512-3ri0ucijAsNgbMfY1IQS4TXKwqfx+y6kVCZE7p7O1LQPUkpdXEHenhPw4LpwPS842dvJGeziFul41rup0gyUAA==",
+      "version": "5.0.0-pre.0",
+      "resolved": "https://registry.npmjs.org/@mozilla/glean/-/glean-5.0.0-pre.0.tgz",
+      "integrity": "sha512-kn3cWRJt08yEla9miubARaOt3JPmZvjRaxaakQAjD1Cb7iJmdfKxXMQ1qRsZDvX30H5DmuwO7D6fRQJDhRZW9g==",
       "dev": true,
       "dependencies": {
         "fflate": "^0.8.0",
@@ -29294,9 +29294,9 @@
       "dev": true
     },
     "@mozilla/glean": {
-      "version": "4.1.0-pre.0",
-      "resolved": "https://registry.npmjs.org/@mozilla/glean/-/glean-4.1.0-pre.0.tgz",
-      "integrity": "sha512-3ri0ucijAsNgbMfY1IQS4TXKwqfx+y6kVCZE7p7O1LQPUkpdXEHenhPw4LpwPS842dvJGeziFul41rup0gyUAA==",
+      "version": "5.0.0-pre.0",
+      "resolved": "https://registry.npmjs.org/@mozilla/glean/-/glean-5.0.0-pre.0.tgz",
+      "integrity": "sha512-kn3cWRJt08yEla9miubARaOt3JPmZvjRaxaakQAjD1Cb7iJmdfKxXMQ1qRsZDvX30H5DmuwO7D6fRQJDhRZW9g==",
       "dev": true,
       "requires": {
         "fflate": "^0.8.0",
diff --git a/package.json b/package.json
index 325862692..a42796142 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@babel/plugin-transform-runtime": "7.23.9",
     "@babel/preset-env": "^7.23.9",
     "@mozilla-protocol/core": "^17.0.1",
-    "@mozilla/glean": "^4.1.0-pre.0",
+    "@mozilla/glean": "^5.0.0-pre.0",
     "@playwright/test": "^1.41.2",
     "@rollup/plugin-commonjs": "25.0.7",
     "@rollup/plugin-node-resolve": "15.2.3",
diff --git a/src/pages/AppList.svelte b/src/pages/AppList.svelte
index c420201c5..d61673b15 100644
--- a/src/pages/AppList.svelte
+++ b/src/pages/AppList.svelte
@@ -86,15 +86,7 @@
             id="media-block"
             data-glean-label="Home page: {app.app_name}"
           >
-            <div
-              class="mzp-c-card-media-wrapper"
-              id="media-wrapper"
-              style="pointer-events:none"
-            >
-              <!-- Setting style attribute is required above to allow capturing clicks on all nested elements
-                via Glean. Once https://bugzilla.mozilla.org/show_bug.cgi?id=1885504 is fixed it can be removed
-                from div tag above.
-              -->
+            <div class="mzp-c-card-media-wrapper" id="media-wrapper">
               <img
                 class="mzp-c-card-imgage"
                 src={app.logo || "/img/app-logos/mozilla.png"}
@@ -110,11 +102,7 @@
                 />
               {/if}
             </div>
-            <div class="mzp-c-card-content" style="pointer-events:none">
-              <!-- Setting style attribute is required above to allow capturing clicks on all nested elements
-                via Glean. Once https://bugzilla.mozilla.org/show_bug.cgi?id=1885504 is fixed it can be removed
-                from div tag above.
-              -->
+            <div class="mzp-c-card-content">
               <h2 class="mzp-c-card-title">{app.canonical_app_name}</h2>
               {#if app.deprecated}
                 <Label text="deprecated" />