Remove spans from within editable elements

CHANGELOG.md

@@ -7,6 +7,10 @@ All notable changes to this project will be documented in this file.
 ### Changed
 ### Fixed
 
+## [3.3.36] - 2023-04-29
+### Changed
+ - Removed <span> elements from within editable headings, as Editor has been updated to inject them 
+
 ## [3.3.35] - 2024-04-25
 ### Fixed
 - Fixed an issue with the back link in save and return pages and prevented an error when access email confirmation page when session cannot be loaded

app/helpers/metadata_presenter/application_helper.rb

@@ -6,7 +6,7 @@ module ApplicationHelper
 
     def main_title(component:, tag: :h1, classes: 'govuk-heading-xl')
       content_tag(tag, class: classes) do
-        content_tag(:span, component.humanised_title)
+        component.humanised_title
       end
     end
 

app/views/metadata_presenter/attribute/_heading.html.erb

@@ -1,9 +1,7 @@
-<h1>
-  <span class="fb-editable govuk-heading-xl"
-    data-fb-content-id="page[heading]"
-    data-fb-content-type="element"
-    data-fb-default-value="<%= default_page_title(@page.type) %>">
-    <%= @page.heading %>
-  </span>
+<h1 class="fb-editable govuk-heading-xl"
+  data-fb-content-id="page[heading]"
+  data-fb-content-type="element"
+  data-fb-default-value="<%= default_page_title(@page.type) %>">
+  <%= @page.heading %>
 </h1>
 

app/views/metadata_presenter/attribute/_lede.html.erb

@@ -3,8 +3,6 @@
         data-fb-content-id="page[lede]"
         data-fb-content-type="element"
         data-fb-default-text="<%= default_text('lede') %>">
-    <div class="html">
       <%= @page.lede %>
-    </div>
   </div>
 <%- end %>

app/views/metadata_presenter/page/checkanswers.html.erb

@@ -4,14 +4,12 @@
 
       <%= render partial:'metadata_presenter/component/conditional_component_banner'%>
 
-      <h1>
-        <span class="fb-editable govuk-heading-xl"
+        <h1 class="fb-editable govuk-heading-xl"
           data-fb-content-type="element"
           data-fb-content-id="page[heading]"
           data-fb-default-value="<%= default_page_title(@page.type) %>">
           <%= @page.heading %>
-        </span>
-      </h1>
+        </h1>
 
       <%= form_for @page, url: reserved_submissions_path, authenticity_token: false, html: { id: 'answers-form' } do |f| %>
         <%= hidden_field_tag :authenticity_token, form_authenticity_token -%>
@@ -65,13 +63,11 @@
         </dl>
 
         <% if @page.send_heading.present? %>
-          <h2>
-            <span class="fb-send-heading fb-editable govuk-heading-m"
+            <h2 class="fb-send-heading fb-editable govuk-heading-m"
               data-fb-content-type="element"
               data-fb-content-id="page[send_heading]">
               <%= @page.send_heading %>
-            </span>
-          </h2>
+            </h2>
         <% end %>
 
         <% if @page.send_body.present? %>

app/views/metadata_presenter/page/confirmation.html.erb

@@ -8,8 +8,7 @@
     <% else %>
       <div class="govuk-panel govuk-panel--confirmation govuk-grid-column-two-thirds">
       <% end %>
-      <h1>
-        <span class="fb-editable govuk-panel__title"
+        <h1 class="fb-editable govuk-panel__title"
           data-fb-content-type="element"
           data-fb-content-id="page[heading]"
           data-fb-default-value="<%= default_page_title(@page.type) %>">
@@ -18,8 +17,7 @@
           <% else %>
             <%= @page.heading %>
           <% end %>
-        </span>
-      </h1>
+        </h1>
 
       <div class="govuk-panel__body">
         <% if reference_number_enabled? %>

app/views/metadata_presenter/page/content.html.erb

@@ -9,13 +9,12 @@
 
       <%= render 'metadata_presenter/attribute/section_heading' %>
 
-      <h1>
-        <span class="fb-editable govuk-heading-xl"
+
+      <h1 class="fb-editable govuk-heading-xl"
           data-fb-content-id="page[heading]"
           data-fb-content-type="element"
           data-fb-default-value="<%= default_page_title(@page.type) %>">
           <%= @page.heading %>
-        </span>
       </h1>
 
       <%= render 'metadata_presenter/attribute/lede' %>

app/views/metadata_presenter/page/exit.html.erb

@@ -6,14 +6,12 @@
 
       <%= render 'metadata_presenter/attribute/section_heading' %>
 
-      <h1>
-        <span class="fb-editable govuk-heading-xl"
+        <h1 class="fb-editable govuk-heading-xl"
           data-fb-content-id="page[heading]"
           data-fb-content-type="element"
           data-fb-default-value="<%= default_page_title(@page.type) %>">
           <%= @page.heading %>
-        </span>
-      </h1>
+        </h1>
 
       <%= render 'metadata_presenter/attribute/lede' %>
 

app/views/metadata_presenter/page/standalone.html.erb

@@ -29,12 +29,11 @@
         <% end %>
        <%# ORIGINAL TEMPLATE: Uses content from form metadata %>
        <% if @page.heading %>
-         <h1> <span class="fb-editable govuk-heading-xl"
+         <h1 class="fb-editable govuk-heading-xl"
              data-fb-content-id="page[heading]"
              data-fb-content-type="element"
              data-fb-default-value="<%= t("presenter.footer.#{@page.id.gsub('page.','')}.heading") %>">
            <%= @page.heading %>
-           </span>
          </h1>
        <% end %>
        <%= render 'metadata_presenter/attribute/body' %>

lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '3.3.35'.freeze
+  VERSION = '3.3.36'.freeze
 end