decidim-core 0.29.4 → 0.29.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c870efc9a61fb35a4d203542d3c151236fa734857034cd0218962c0d8a5889a2
-  data.tar.gz: 870b0671cef65194a32e2fc33e430b92bab41f347c8b1068fe954dcc8e5b2990
+  metadata.gz: a294fcf54a5fa31a1d5e44af9a717e30ab8eab2df35ae131b9873e0d600dc630
+  data.tar.gz: 41703d211fa0d4d30c760cf00629bfebda559481e039298ac6a30679a46fe77c
 SHA512:
-  metadata.gz: 3370c446ba0ebc647b221e031500993fd56719e96908a38832d62497103893295a46a33da7eadb42f110f119a4f4abf634cfd8c5a8ae707009c9a186ca31352b
-  data.tar.gz: babce000ab8d7cd3fa51f6c8f81a2e5d6791817dda5e3336369af31316d8d7ba061e85cb38fd5f97885100b74f06f61e05b109d91fc9d1b67c2f49dc77e96c34
+  metadata.gz: 28e137934317b858031cda83491fb067b5ee54349fb50f037c1c0e4aa6f223afeb13899e28df90492ee53b5097a09a3d7c1add57e4d0aa0b080997a706646c89
+  data.tar.gz: 2e153e8e591bd91f1c6fb0ec14b5a7de5ce126191aa89ba698bf64a9a4389d4fb5e8bceb84cc5d43dc77f669b2549971c7d4e2cdfaed4cca6b8dce17172a3829

data/app/cells/decidim/activity/show.erb

@@ -1,19 +1,19 @@
 <div class="activity" data-activity>
-  <div class="activity__time">
+  <p class="activity__time">
     <%= created_at %>
-  </div>
+  </p>
   <div class="activity__content">
-    <span>
+    <div>
       <% if title.present? %>
-        <span>
+        <p>
           <%= title_icon %>
           <%= title %>
-        </span>
+        </p>
       <% end %>
       <a href="<%= resource_link_path %>">
         <%= html_truncate decidim_sanitize(resource_link_text, strip_tags: true), length: 80 %>
       </a>
-    </span>
+    </div>
     <% unless hide_participatory_space? %>
       <span>
         <%= participatory_space_link %>

data/app/cells/decidim/content_blocks/participatory_space_main_data/title.erb

@@ -11,11 +11,11 @@
   <div class="content-block__description editor-content" <%= "data-component='accordion'" if should_truncate %>>
     <% if should_truncate %>
       <% seed = SecureRandom.hex(4) %>
-      <div id="panel-view-more-<%= seed %>" aria-hidden="true">
+      <div id="panel-view-more-<%= seed %>" aria-hidden="true" inert>
         <%= description_text %>
       </div>
 
-      <button class="button button__sm button__text-secondary mt-2" data-controls="panel-view-more-<%= seed %>" aria-expanded="false">
+      <button class="button button__sm button__text-secondary mt-2" data-controls="panel-view-more-<%= seed %>" aria-expanded="false" onclick="document.querySelector('div[id^=panel-view-more]').toggleAttribute('inert')">
         <span>
           <%= t("view_more", scope: "layouts.decidim.announcements") %>
         </span>
@@ -30,3 +30,12 @@
     <% end %>
   </div>
 <% end %>
+<script>
+  const button = document.querySelector('button[data-controls^="panel-view-more"]')
+  button.addEventListener('keydown', function(e){
+    // press space or enter
+    if (e.keyCode === 32 || e.keyCode === 13){
+      document.querySelector('div[id^=panel-view-more]').toggleAttribute('inert')
+    }
+  })
+</script>

data/app/cells/decidim/footer_topics/show.erb

@@ -1,5 +1,5 @@
-<nav role="navigation" aria-label="Help">
-  <h2 class="h4 mb-4">Help</h2>
+<nav role="navigation" aria-label="<%= t("layouts.decidim.footer.help") %>">
+  <h2 class="h4 mb-4"><%= t("layouts.decidim.footer.help") %></h2>
   <ul class="space-y-4 break-inside-avoid">
     <% topics.each do |topic| %>
       <%= topic_item(topic, class: "font-semibold underline") %>

data/app/cells/decidim/group_admins/show.erb

@@ -21,7 +21,9 @@
       <%= link_to(
         decidim.demote_group_manage_user_path(model.nickname, membership),
         method: :post,
-        data: { confirm: t("decidim.group_admins.actions.are_you_sure") },
+        data: { confirm: t("decidim.group_admins.actions.confirm_remove_from_admin"),
+                confirm_title: t("decidim.group_admins.actions.confirm_modal.title_remove"),
+                confirm_button: t("decidim.group_admins.actions.confirm_modal.ok_remove") },
         class: "button button__sm button__transparent-secondary"
       ) do %>
         <span><%= t("decidim.group_admins.actions.demote_admin") %></span>

data/app/cells/decidim/group_members/show.erb

@@ -24,14 +24,18 @@
         t("decidim.group_members.actions.promote_to_admin"),
         decidim.promote_group_manage_user_path(model.nickname, membership),
         method: :post,
-        data: { confirm: t("decidim.group_members.actions.are_you_sure") },
+        data: { confirm: t("decidim.group_members.actions.confirm_promote_to_admin"),
+                confirm_title: t("decidim.group_admins.actions.confirm_modal.title_add"),
+                confirm_button: t("decidim.group_admins.actions.confirm_modal.ok_add") },
         class: "button button__sm button__transparent-secondary"
       ) %>
 
       <%= link_to(
         decidim.group_manage_user_path(model.nickname, membership),
         method: :delete,
-        data: { confirm: t("decidim.group_members.actions.are_you_sure") },
+        data: { confirm: t("decidim.group_members.actions.confirm_remove_from_group"),
+                confirm_title: t("decidim.group_members.actions.confirm_modal.title_remove"),
+                confirm_button: t("decidim.group_members.actions.confirm_modal.ok_remove") },
         class: "button button__sm button__transparent-secondary"
       ) do %>
         <span><%= t("decidim.group_members.actions.remove_from_group") %></span>

data/app/cells/decidim/images_panel/show.erb

@@ -1,7 +1,10 @@
 <div class="grid grid-cols-1 md:grid-cols-4 gap-6">
-  <% photos.each_with_index do |photo, index| %>
+  <% photos.each_with_index do |photo| %>
     <%= link_to photo.big_url, target: "_blank", rel: "noopener", class: "overflow-hidden rounded aspect-video" do %>
-      <%= image_tag photo.thumbnail_url, class:"w-full h-full object-cover", alt: strip_tags(translated_attribute(photo.title)) %>
+      <%= image_tag photo.thumbnail_url,
+                    class: "w-full h-full object-cover",
+                    role: "presentation",
+                    "data-filename": strip_tags(translated_attribute(photo.title)) %>
     <% end %>
   <% end %>
 </div>

data/app/cells/decidim/report_button/flag_modal.erb

@@ -6,16 +6,18 @@
       <div>
         <div class="form__wrapper flag-modal__form">
           <p id="dialog-desc-<%= modal_id %>" class="flag-modal__form-description"><%= t("decidim.shared.flag_modal.description") %></p>
-          <p class="flag-modal__form-reason"><%= t("decidim.shared.flag_modal.reason") %>:</p>
-          <%= f.collection_radio_buttons :reason, [
-            [:spam, t("decidim.shared.flag_modal.spam")],
-            [:offensive, t("decidim.shared.flag_modal.offensive")],
-            [:does_not_belong, t("decidim.shared.flag_modal.does_not_belong", organization_name: current_organization_name)]
-          ], :first, :last do |builder|
-            builder.label(for: nil, class: "form__wrapper-checkbox-label") { builder.radio_button(id: nil) + builder.text }
-          end %>
+          <fieldset class="mt-6">
+            <legend class="flag-modal__form-reason"><%= t("decidim.shared.flag_modal.reason") %>:</legend>
+            <%= f.collection_radio_buttons :reason, [
+              [:spam, t("decidim.shared.flag_modal.spam")],
+              [:offensive, t("decidim.shared.flag_modal.offensive")],
+              [:does_not_belong, t("decidim.shared.flag_modal.does_not_belong", organization_name: current_organization_name)]
+            ], :first, :last do |builder|
+              builder.label(for: "#{builder.value.to_s}-#{modal_id}", class: "form__wrapper-checkbox-label") { builder.radio_button(id: "#{builder.value.to_s}-#{modal_id}") + builder.text }
+            end %>
+          </fieldset>
 
-          <%= f.text_area :details, rows: 4, label_options: { class: "flag-modal__form-textarea-label", for: nil }, id: nil %>
+          <%= f.text_area :details, rows: 4, label_options: { class: "flag-modal__form-textarea-label", for: "additional-comments-#{modal_id}" }, id: "additional-comments-#{modal_id}" %>
 
           <% if frontend_administrable? %>
             <%= f.check_box :hide,

data/app/cells/decidim/report_user_button/flag_modal.erb

@@ -6,16 +6,17 @@
       <div>
         <div class="form__wrapper flag-modal__form">
           <p class="flag-modal__form-description"><%= t("decidim.shared.flag_user_modal.description") %></p>
-          <p class="flag-modal__form-reason"><%= t("decidim.shared.flag_modal.reason") %>:</p>
-          <%= f.collection_radio_buttons :reason, [
-            [:spam, t("decidim.shared.flag_user_modal.spam")],
-            [:offensive, t("decidim.shared.flag_user_modal.offensive")],
-            [:does_not_belong, t("decidim.shared.flag_user_modal.does_not_belong", organization_name: current_organization_name)]
-          ], :first, :last do |builder|
-            builder.label(for: nil, class: "form__wrapper-checkbox-label") { builder.radio_button(id: nil) + builder.text }
-          end %>
-
-          <%= f.text_area :details, rows: 4, label_options: { class: "flag-modal__form-textarea-label", for: nil }, id: nil %>
+          <fieldset class="mt-6">
+            <legend class="flag-modal__form-reason"><%= t("decidim.shared.flag_modal.reason") %>:</legend>
+            <%= f.collection_radio_buttons :reason, [
+              [:spam, t("decidim.shared.flag_user_modal.spam")],
+              [:offensive, t("decidim.shared.flag_user_modal.offensive")],
+              [:does_not_belong, t("decidim.shared.flag_user_modal.does_not_belong", organization_name: current_organization_name)]
+            ], :first, :last do |builder|
+              builder.label(for: "#{builder.value.to_s}-#{modal_id}", class: "form__wrapper-checkbox-label") { builder.radio_button(id: "#{builder.value.to_s}-#{modal_id}") + builder.text }
+            end %>
+          </fieldset>
+          <%= f.text_area :details, rows: 4, label_options: { class: "flag-modal__form-textarea-label", for: "additional-comments-#{modal_id}" }, id: "additional-comments-#{modal_id}" %>
 
           <% if frontend_administrable? %>
             <%= f.check_box :block,

data/app/cells/decidim/upload_modal/files.erb

@@ -25,19 +25,19 @@
 
         <div class="attachment-details" data-attachment-id="<%= attachment.id %>" data-title="<%= title_for(attachment) %>" data-filename="<%= file_name_for(attachment) %>" data-state="uploaded">
           <% if file_attachment_path(attachment) && blob(attachment).image? %>
-            <div><%= image_tag(file_attachment_path(attachment), alt: title_for(attachment) || file_name_for(attachment)) %></div>
+            <div><%= image_tag(file_attachment_path(attachment), alt: "") %></div>
           <% elsif uploader_default_image_path(attribute).present? %>
             <div><%= image_tag uploader_default_image_path(attribute) %></div>
           <% end %>
 
           <% if has_title? %>
-            <span><%= title_for(attachment) %> (<%= truncated_file_name_for(attachment) %>)</span>
+            <span><%= title_for(attachment) %></span>
             <%= form.hidden_field attribute, multiple: true, value: attachment.id, id: attachment.id %>
           <% else %>
             <% if blob(attachment).image? %>
-              <span><%= truncated_file_name_for(attachment, 15) %></span>
+              <span><%= title_for(attachment) %></span>
             <% else %>
-              <%= link_to truncated_file_name_for(attachment), file_attachment_path(attachment) %>
+              <%= link_to title_for(attachment), file_attachment_path(attachment), class: "w-full break-all mb-2" %>
             <% end %>
           <% end %>
         </div>

data/app/cells/decidim/upload_modal_cell.rb

@@ -132,9 +132,11 @@ module Decidim
     end
 
     def title_for(attachment)
-      return unless has_title?
-
-      decidim_html_escape(decidim_sanitize(translated_attribute(attachment.title)))
+      if has_title?
+        decidim_html_escape(decidim_sanitize(translated_attribute(attachment.title)))
+      else
+        decidim_html_escape(decidim_sanitize(determine_filename(attachment)))
+      end
     end
 
     def truncated_file_name_for(attachment, max_length = 31)

data/app/commands/decidim/amendable/accept.rb

@@ -62,7 +62,8 @@ module Decidim
           @amendable.save!
           @amendable
         end
-        @amendable.add_coauthor(@amender, user_group: @user_group)
+
+        @amendable.add_coauthor(@amender, user_group: @user_group) if @amendable.is_a?(Decidim::Coauthorable)
       end
 
       def notify_emendation_state_change!

data/app/controllers/concerns/decidim/headers/browser_feature_permissions.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Headers
+    # This module controls the "Permissions-Policy" header to define the
+    # specific sets of browser features that the website is able to use.
+    module BrowserFeaturePermissions
+      extend ActiveSupport::Concern
+
+      included do
+        after_action :define_permissions_policy
+      end
+
+      private
+
+      def define_permissions_policy
+        return if response.media_type != "text/html"
+        return if response.headers["Permissions-Policy"].present?
+
+        # Allow the "unload" and "onbeforeunload" events to be used at the
+        # current domain to prevent the user unintentionally changing the page
+        # when they have something important to do on the page, such as an
+        # unsaved form.
+        #
+        # This header is required because Chrome is phasing this event out due
+        # to some performance issues with the back/forward cache feature of the
+        # browser. However, currently there are no alternative events that would
+        # allow preventing accidental page reloads, tab closing or window
+        # closing.
+        #
+        # For further information, see:
+        # https://developer.chrome.com/docs/web-platform/deprecating-unload
+        # https://github.com/fergald/docs/blob/master/explainers/permissions-policy-unload.md
+        #
+        # Note that even Google suggests using the "beforeunload" for this
+        # particular use case:
+        # https://developer.chrome.com/docs/web-platform/page-lifecycle-api#events
+        #
+        # beforeunload
+        #   Important: the beforeunload event should only be used to alert the
+        #   user of unsaved changes. Once those changes are saved, the event
+        #   should be removed. It should never be added unconditionally to the
+        #   page, as doing so can hurt performance in some cases.
+        response.headers["Permissions-Policy"] = "unload=(self)"
+      end
+    end
+  end
+end

data/app/controllers/decidim/amendments_controller.rb

@@ -107,7 +107,7 @@ module Decidim
     end
 
     def reject
-      enforce_permission_to :reject, :amendment, current_component: amendable.component
+      enforce_permission_to :reject, :amendment, amendable:, current_component: amendable.component
 
       @form = form(Decidim::Amendable::RejectForm).from_model(amendment)
 
@@ -143,13 +143,13 @@ module Decidim
     end
 
     def review
-      enforce_permission_to :accept, :amendment, current_component: amendable.component
+      enforce_permission_to :accept, :amendment, amendable:, current_component: amendable.component
 
       @form = form(Decidim::Amendable::ReviewForm).from_params(params)
     end
 
     def accept
-      enforce_permission_to :accept, :amendment, current_component: amendable.component
+      enforce_permission_to :accept, :amendment, amendable:, current_component: amendable.component
 
       @form = form(Decidim::Amendable::ReviewForm).from_params(params)
 

data/app/controllers/decidim/application_controller.rb

@@ -16,6 +16,7 @@ module Decidim
     include NeedsTosAccepted
     include Headers::HttpCachingDisabler
     include Headers::ContentSecurityPolicy
+    include Headers::BrowserFeaturePermissions
     include ActionAuthorization
     include ForceAuthentication
     include SafeRedirect

data/app/helpers/decidim/amendments_helper.rb

@@ -70,8 +70,9 @@ module Decidim
     # Checks if the user can accept and reject the emendation
     def allowed_to_accept_and_reject?(emendation)
       return unless emendation.amendment.evaluating?
+      return current_user.admin? if emendation.amendable.respond_to?(:official?) && emendation.amendable.official?
 
-      emendation.amendable.created_by?(current_user) || current_user.admin?
+      emendation.amendable.created_by?(current_user)
     end
 
     # Checks if the user can promote the emendation

data/app/helpers/decidim/filters_helper.rb

@@ -32,6 +32,31 @@ module Decidim
       end
     end
 
+    def filter_search_label(label, id)
+      I18n.t("decidim.searches.filters.resource", label:, collection: filter_for_resource(id))
+    end
+
+    def filter_for_resource(skip_to_id)
+      case skip_to_id
+      when "proposals"
+        I18n.t("decidim/proposals/proposal.other", scope: "activerecord.models")
+      when "meetings"
+        I18n.t("decidim/meetings/meeting.other", scope: "activerecord.models")
+      when "debates"
+        I18n.t("decidim/debates/debate.other", scope: "activerecord.models")
+      when "sortitions"
+        I18n.t("decidim/sortitions/sortition.other", scope: "activerecord.models")
+      when "surveys"
+        I18n.t("decidim/surveys/survey.other", scope: "activerecord.models")
+      when "projects"
+        I18n.t("decidim/budgets/project.other", scope: "activerecord.models")
+      when "initiatives"
+        I18n.t("decidim/initiative.other", scope: "activerecord.models")
+      else
+        ""
+      end
+    end
+
     private
 
     # Creates a unique namespace for a filter form to prevent duplicate IDs in

data/app/helpers/decidim/layout_helper.rb

@@ -60,6 +60,12 @@ module Decidim
       html_properties = options.with_indifferent_access.transform_keys(&:dasherize).slice("width", "height", "aria-label", "role", "aria-hidden", "class", "style")
       html_properties = default_html_properties.merge(html_properties)
 
+      if name == "wechat-line"
+        html_properties = html_properties.merge({ "aria-label" => I18n.t("decidim.author.comments.other") }).except("aria-hidden")
+      elsif name == "heart-line"
+        html_properties = html_properties.merge({ "aria-label" => I18n.t("decidim.author.endorsements.other") }).except("aria-hidden")
+      end
+
       href = Decidim.cors_enabled ? "" : asset_pack_path("media/images/remixicon.symbol.svg")
 
       content_tag :svg, html_properties do

data/app/packs/images/decidim/default-avatar.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" width="200" height="200" x="0" y="0" enable-background="new 0 0 200 200" version="1.1" viewBox="0 0 200 200" xml:space="preserve"><g><path fill="#C5C5C5" d="M200-0.5H0v200h26.099c2.885-35.293,24.07-64.381,52.419-74.319C64.372,117.596,54.75,102.674,54.75,85.5 c0-24.853,20.146-45,45-45c24.853,0,45,20.147,45,45c0,17.095-9.533,31.963-23.572,39.58c28.5,9.837,49.828,39.002,52.724,74.42 H200V-0.5z"/><path fill="#FFF" d="M121.178,125.08c14.039-7.617,23.572-22.485,23.572-39.58c0-24.853-20.147-45-45-45 c-24.854,0-45,20.147-45,45c0,17.174,9.622,32.096,23.768,39.681c-28.349,9.938-49.534,39.026-52.419,74.319h147.803 C171.006,164.082,149.678,134.917,121.178,125.08z"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" width="200" height="200" x="0" y="0" enable-background="new 0 0 200 200" version="1.1" viewBox="0 0 200 200" xml:space="preserve"><g><path fill="#908e8e" d="M200-0.5H0v200h26.099c2.885-35.293,24.07-64.381,52.419-74.319C64.372,117.596,54.75,102.674,54.75,85.5 c0-24.853,20.146-45,45-45c24.853,0,45,20.147,45,45c0,17.095-9.533,31.963-23.572,39.58c28.5,9.837,49.828,39.002,52.724,74.42 H200V-0.5z"/><path fill="#FFF" d="M121.178,125.08c14.039-7.617,23.572-22.485,23.572-39.58c0-24.853-20.147-45-45-45 c-24.854,0-45,20.147-45,45c0,17.174,9.622,32.096,23.768,39.681c-28.349,9.938-49.534,39.026-52.419,74.319h147.803 C171.006,164.082,149.678,134.917,121.178,125.08z"/></g></svg>

data/app/packs/src/decidim/callout.js

@@ -4,13 +4,18 @@
  * reload without this.
  */
 
-$(() => {
-  const $callout = $('.callout[role="alert"]:first');
-  if ($callout.length > 0) {
-    setTimeout(() => {
-      // The content insertion is to try to hint some of the screen readers
-      // that the alert content has changed and needs to be announced.
-      $callout.attr("tabindex", "0").focus().html(`${$callout.html()} `);
-    }, 500);
+document.addEventListener("turbo:load", () => {
+  const callout = document.querySelector(".flash[role='alert']");
+  if (!callout) {
+    return;
   }
+
+  setTimeout(() => {
+    callout.setAttribute("tabindex", "0");
+    callout.focus();
+
+    // The content insertion is to try to hint some of the screen readers
+    // that the alert content has changed and needs to be announced.
+    callout.innerHTML += " ";
+  }, 500);
 });

data/app/packs/src/decidim/confirm.js

@@ -5,12 +5,14 @@
  * it to gain control over the confirm events BEFORE rails-ujs is loaded.
  */
 
-import Rails from "@rails/ujs"
+const { Rails } = window;
 
 class ConfirmDialog {
   constructor(sourceElement) {
     this.$modal = $("#confirm-modal");
-    this.$source = sourceElement;
+    if (sourceElement) {
+      this.$source = $(sourceElement);
+    }
     this.$content = $("[data-confirm-modal-content]", this.$modal);
     this.$buttonConfirm = $("[data-confirm-ok]", this.$modal);
     this.$buttonCancel = $("[data-confirm-cancel]", this.$modal);
@@ -29,22 +31,37 @@ class ConfirmDialog {
       this.$buttonConfirm.on("click", (ev) => {
         ev.preventDefault();
 
-        window.Decidim.currentDialogs["confirm-modal"].close()
-        resolve(true);
-        this.$source.focus();
+        this.close(() => resolve(true));
       });
 
       this.$buttonCancel.on("click", (ev) => {
         ev.preventDefault();
 
-        window.Decidim.currentDialogs["confirm-modal"].close()
-        resolve(false);
-        this.$source.focus();
+        this.close(() => resolve(false));
       });
     });
   }
+
+  close(afterClose) {
+    window.Decidim.currentDialogs["confirm-modal"].close()
+    afterClose();
+    if (this.$source) {
+      this.$source.focus();
+    }
+  }
 }
 
+const runConfirm = (message, sourceElement = null) => new Promise((resolve) => {
+  const dialog = new ConfirmDialog(sourceElement);
+  dialog.confirm(message).then((answer) => {
+    let completed = true;
+    if (sourceElement) {
+      completed = Rails.fire(sourceElement, "confirm:complete", [answer]);
+    }
+    resolve(answer && completed);
+  });
+});
+
 // Override the default confirm dialog by Rails
 // See:
 // https://github.com/rails/rails/blob/fba1064153d8e2f4654df7762a7d3664b93e9fc8/actionview/app/assets/javascripts/rails-ujs/features/confirm.coffee
@@ -64,37 +81,35 @@ const allowAction = (ev, element) => {
     return false;
   }
 
-  const dialog = new ConfirmDialog(
-    $(element)
-  );
-  dialog.confirm(message).then((answer) => {
-    const completed = Rails.fire(element, "confirm:complete", [answer]);
-    if (answer && completed) {
-      // Allow the event to propagate normally and re-dispatch it without
-      // the confirm data attribute which the Rails internal method is
-      // checking.
-      $(element).data("confirm", null);
-      $(element).removeAttr("data-confirm");
-
-      // The submit button click events will not do anything if they are
-      // dispatched as is. In these cases, just submit the underlying form.
-      if (ev.type === "click" &&
-        (
-          $(element).is('button[type="submit"]') ||
-          $(element).is('input[type="submit"]')
-        )
-      ) {
-        $(element).parents("form").submit();
-      } else {
-        let origEv = ev.originalEvent || ev;
-        let newEv = origEv;
-        if (typeof Event === "function") {
-          // Clone the event because otherwise some click events may not
-          // work properly when re-dispatched.
-          newEv = new origEv.constructor(origEv.type, origEv);
-        }
-        ev.target.dispatchEvent(newEv);
+  runConfirm(message, element).then((answer) => {
+    if (!answer) {
+      return;
+    }
+
+    // Allow the event to propagate normally and re-dispatch it without
+    // the confirm data attribute which the Rails internal method is
+    // checking.
+    $(element).data("confirm", null);
+    $(element).removeAttr("data-confirm");
+
+    // The submit button click events will not do anything if they are
+    // dispatched as is. In these cases, just submit the underlying form.
+    if (ev.type === "click" &&
+      (
+        $(element).is('button[type="submit"]') ||
+        $(element).is('input[type="submit"]')
+      )
+    ) {
+      $(element).parents("form").submit();
+    } else {
+      let origEv = ev.originalEvent || ev;
+      let newEv = origEv;
+      if (typeof Event === "function") {
+        // Clone the event because otherwise some click events may not
+        // work properly when re-dispatched.
+        newEv = new origEv.constructor(origEv.type, origEv);
       }
+      ev.target.dispatchEvent(newEv);
     }
   });
 
@@ -129,26 +144,31 @@ const handleDocumentEvent = (ev, matchSelectors) => {
   });
 };
 
-document.addEventListener("click", (ev) => {
-  return handleDocumentEvent(ev, [
-    Rails.linkClickSelector,
-    Rails.buttonClickSelector,
-    Rails.formInputClickSelector
-  ]);
-});
-document.addEventListener("change", (ev) => {
-  return handleDocumentEvent(ev, [Rails.inputChangeSelector]);
-});
-document.addEventListener("submit", (ev) => {
-  return handleDocumentEvent(ev, [Rails.formSubmitSelector]);
-});
+// Note that this needs to be run **before** Rails.start()
+export const initializeConfirm = () => {
+  document.addEventListener("click", (ev) => {
+    return handleDocumentEvent(ev, [
+      Rails.linkClickSelector,
+      Rails.buttonClickSelector,
+      Rails.formInputClickSelector
+    ]);
+  });
+  document.addEventListener("change", (ev) => {
+    return handleDocumentEvent(ev, [Rails.inputChangeSelector]);
+  });
+  document.addEventListener("submit", (ev) => {
+    return handleDocumentEvent(ev, [Rails.formSubmitSelector]);
+  });
 
-// This is needed for the confirm dialog to work with Foundation Abide.
-// Abide registers its own submit click listeners since Foundation 5.6.x
-// which will be handled before the document listeners above. This would
-// break the custom confirm functionality when used with Foundation Abide.
-document.addEventListener("DOMContentLoaded", function() {
-  $(Rails.formInputClickSelector).on("click.confirm", (ev) => {
-    handleConfirm(ev, getMatchingEventTarget(ev, Rails.formInputClickSelector));
+  // This is needed for the confirm dialog to work with Foundation Abide.
+  // Abide registers its own submit click listeners since Foundation 5.6.x
+  // which will be handled before the document listeners above. This would
+  // break the custom confirm functionality when used with Foundation Abide.
+  document.addEventListener("DOMContentLoaded", function() {
+    $(Rails.formInputClickSelector).on("click.confirm", (ev) => {
+      handleConfirm(ev, getMatchingEventTarget(ev, Rails.formInputClickSelector));
+    });
   });
-});
+};
+
+export default runConfirm;

data/app/packs/src/decidim/datepicker/generate_datepicker.js

@@ -13,11 +13,13 @@ export default function generateDatePicker(input, row, formats) {
   const date = document.createElement("input");
   date.setAttribute("id", `${input.id}_date`);
   date.setAttribute("type", "text");
+  date.setAttribute("aria-label", input.dataset.dateLabel);
 
   const calendar = document.createElement("button");
   calendar.innerHTML = icon("calendar-line");
   calendar.setAttribute("class", "datepicker__calendar-button");
   calendar.setAttribute("type", "button");
+  calendar.setAttribute("aria-label", input.dataset.buttonDateLabel);
 
   dateColumn.appendChild(date);
   dateColumn.appendChild(calendar);

data/app/packs/src/decidim/datepicker/generate_timepicker.js

@@ -13,11 +13,13 @@ export default function generateTimePicker(input, row, formats) {
   const time = document.createElement("input");
   time.setAttribute("id", `${input.id}_time`);
   time.setAttribute("type", "text");
+  time.setAttribute("aria-label", input.dataset.timeLabel);
 
   const clock = document.createElement("button");
   clock.innerHTML = icon("time-line")
   clock.setAttribute("class", "datepicker__clock-button");
   clock.setAttribute("type", "button");
+  clock.setAttribute("aria-label", input.dataset.buttonTimeLabel);
 
   timeColumn.appendChild(time);
   timeColumn.appendChild(clock);