govuk_publishing_components 57.0.0 → 57.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50bbd34ad9dc438f04744bb32de8cb56cb59f593009f15ebd401e2e720586571
-  data.tar.gz: ec69cb3d9394362344d1dc291cb21150c825bbe22f9a84c9be1cb43729e66efc
+  metadata.gz: a8767b5e700d2cf0da57d46943ed8ed4e645f510fb872ecc422293270abf339b
+  data.tar.gz: 375137a4c58f557ae925e83cb03bd59e80da2198f87c846c26ed608741e141fe
 SHA512:
-  metadata.gz: 791b028d9e1ffddae346e2689e7f5bfbce4a4c1b1ea7bf70d61663e78c6f757d453b93cbfd6fde9cca7eb11b6cc6b6728f55b1da836b8cd31e6c56d264c05b87
-  data.tar.gz: aa9e66a15fa8a93681bdb5a2979a9684b6e1d127884e303704cf6ffd2722c28851288c1c3e036b3998a51a32eed087399c588f651923e7d6df54fc38131426a6
+  metadata.gz: 4d6b71754931f043138955f7762a252c0763cf5e59f01fa168589268586e92f83d2e50ec7908d249815ab0132467af7cbd4b6132ecbf8c67b62ba2012eb36cab
+  data.tar.gz: 93b9a850cef309bfb5f37ceef3e7716f958186c26bad463681a3f6419a9eb570209e75fe7c0361186aa1bf940868887e2719a0ed840fd1bf23a251c42c856009

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-copy-tracker.js

@@ -16,8 +16,15 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
         if (!text) {
           return // do nothing if no text has been selected
         }
-        var target = event.target.tagName
-        if (target === 'INPUT' || target === 'TEXTAREA') {
+
+        var target = event.target
+
+        if (target.closest && target.closest('[data-ga4-no-copy]')) {
+          return // do nothing if data-ga4-no-copy present
+        }
+
+        var tagName = target.tagName
+        if (tagName === 'INPUT' || tagName === 'TEXTAREA') {
           return // do nothing if text is being copied from an input
         }
 

data/lib/govuk_publishing_components/middleware/ga4_optimise.rb

@@ -0,0 +1,33 @@
+module GovukPublishingComponents
+  module Middleware
+    class Ga4Optimise
+      DATA_GA4_REGEX = /data-ga4-(?:link|event|form|focus-loss)=("[^"]*")/
+
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        status, headers, response = @app.call(env)
+        return [status, headers, safe_body_from_response(response)] unless headers["content-type"]&.start_with?("text/html")
+
+        body = response.each.first
+        matched_sections = body.scan(DATA_GA4_REGEX)
+
+        if matched_sections.any?
+          matched_sections.each do |section|
+            body.sub!(section.first, section.first.gsub('"', "'").gsub("&quot\;", '"'))
+          end
+        end
+
+        [status, headers, [body]]
+      end
+
+      def safe_body_from_response(response)
+        return [response.body] if response.respond_to?(:body)
+
+        response
+      end
+    end
+  end
+end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "57.0.0".freeze
+  VERSION = "57.1.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 57.0.0
+  version: 57.1.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -961,6 +961,7 @@ files:
 - lib/govuk_publishing_components/app_helpers/taxon_breadcrumbs.rb
 - lib/govuk_publishing_components/config.rb
 - lib/govuk_publishing_components/engine.rb
+- lib/govuk_publishing_components/middleware/ga4_optimise.rb
 - lib/govuk_publishing_components/minitest/component_guide_test.rb
 - lib/govuk_publishing_components/presenters/absolute_links_helper.rb
 - lib/govuk_publishing_components/presenters/accordion_helper.rb