dsfr-view-components 3.0.1 → 3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8780041bae859ed3e40f83a06d62b0cbec970d9d7e1e6d29a40d2b2a6b1f1f3b
-  data.tar.gz: 300b8e5270fc91042b0e915b29cf477a9c4b7f1c609173856b7a9518c5c14d5b
+  metadata.gz: 6ad464710e4c2bcddb1c49cab5cbc7fe7dac3508dc90e09b55be83adaf0302fc
+  data.tar.gz: a2c78fd736e9a21d0953e7205c9c0d62c3d9027d256d60035b0556da0e3de72a
 SHA512:
-  metadata.gz: 914f18a7ced8fdebc65797384cba976c8ed9586ba521b54020041e3a6c7653f6eb7ffca61c98bf4246564c0d2a4cecfce9f66fb404f8819c14232e53be4acb63
-  data.tar.gz: 0f528525221c610318711fd2b7cb505e23f4a47d771137dd4d80ce8abbaff1b790c9e188c4beed20b5e02e42c87b95b472547bda7d3ecead11f36ca42b8e236f
+  metadata.gz: c3728eb72aeee052f246550071ec38f2f11dd7194a9ebfe001fe8dbef41e02494ec983626a262e9ef0b25dca64e1c2b48eecdd5be69260e9bb515f3f06ad6466
+  data.tar.gz: f08bdd10f57d02d956c128ff65304829488a4fe7d41138deeeafe8e15ac72bdd9f0d95803a6b08e1313aa1d9dff8c21bf69a3954d785f57aa3f4e3936ba48acd

data/app/components/dsfr_component/alert_component.rb

@@ -1,18 +1,32 @@
 class DsfrComponent::AlertComponent < DsfrComponent::Base
+  include DsfrComponent::Traits::HeaderSizeable
+
   TYPES = %i[error success info warning].freeze
   SIZES = %i[sm md].freeze
 
-  # @param type [Symbol] alert type (and matching color) `:success`, `:info`, `:warning` ou `:error`
-  # @param title [String] alert title. cannot be set in size `:sm`
-  # @param size [Symbol] alert size : `:md` (default) or `:sm`
-  # @param close_button [Boolean] display a close button to remove the alert
-  # @note in size MD the title is required but the content is optional. In size SM there should be not title but the content is required
-  def initialize(type: nil, title: nil, size: :md, close_button: false, icon_name: nil, html_attributes: {})
+  # @param type [AlertComponent::TYPES]
+  # @param title [String] le titre de l'alerte, sauf pour la taille `:sm`
+  # @param size [AlertComponent::SIZES]
+  # @param close_button [Boolean] contrôle l'affichage d'un bouton de fermeture
+  # @param icon_name [String] un nom d'icône à afficher, seulement disponible pour le type par défaut
+  # @param starting_header_level [Integer] Le niveau de titre
+  # @note La taille `:md` requiert un titre mais le contenu est
+  # optionel ; la taille `sm` requiert un contenu, mais pas de titre.
+  def initialize(
+    type: nil,
+    title: nil,
+    size: :md,
+    close_button: false,
+    icon_name: nil,
+    starting_header_level: nil,
+    html_attributes: {}
+  )
     @title = title
     @type = type
     @size = size
     @close_button = close_button
     @icon_name = icon_name
+    @starting_header_level = starting_header_level
 
     super(html_attributes: html_attributes)
   end
@@ -63,7 +77,7 @@ private
   def title_tag
     return nil if title.blank?
 
-    tag.h3(class: "fr-alert__title") { title }
+    tag.send(starting_header_tag, class: "fr-alert__title") { title }
   end
 
   def content_tag

data/app/components/dsfr_component/header_component.html.erb

@@ -12,7 +12,7 @@
               <%= operator_image %>
             <% end %>
 
-            <% if search? || tool_links? || direct_links? %>
+            <% if with_navbar? %>
               <div class="fr-header__navbar">
                 <% if search? %>
                   <button class="fr-btn--search fr-btn" data-fr-opened="false" aria-controls="modal-header-search" id="button-header-search" title="Rechercher">
@@ -20,7 +20,7 @@
                   </button>
                 <% end %>
 
-                <% if tool_links? || direct_links? %>
+                <% if with_menu? %>
                   <button class="fr-btn--menu fr-btn" data-fr-opened="false" aria-controls="modal-header-menu" aria-haspopup="menu" id="button-header-menu" title="Menu">
                     Menu
                   </button>
@@ -41,9 +41,9 @@
           <% end %>
         </div>
 
-        <% if tool_links? || search? %>
+        <% if with_tools? %>
           <div class="fr-header__tools">
-            <% if tool_links? %>
+            <% if tool_links? || custom_tool_links? %>
               <div class="fr-header__tools-links">
                 <ul class="fr-btns-group">
                   <% tool_links.each do |tool_link| %>
@@ -51,6 +51,11 @@
                       <%= tool_link %>
                     </li>
                   <% end %>
+                  <% custom_tool_links.each do |custom_tool_link| %>
+                    <li>
+                      <%= custom_tool_link %>
+                    </li>
+                  <% end %>
                 </ul>
               </div>
             <% end %>
@@ -73,7 +78,7 @@
     </div>
   </div>
 
-  <% if tool_links? || direct_links? %>
+  <% if with_menu? %>
     <div class="fr-header__menu fr-modal" id="modal-header-menu" aria-labelledby="button-header-menu" role="navigation">
       <div class="fr-container">
         <button class="fr-btn--close fr-btn" aria-controls="modal-header-menu" title="Fermer">

data/app/components/dsfr_component/header_component.rb

@@ -2,6 +2,7 @@ class DsfrComponent::HeaderComponent < DsfrComponent::Base
   renders_one :search
   renders_one :operator_image, "DsfrComponent::HeaderComponent::OperatorImageComponent"
   renders_many :tool_links, "DsfrComponent::HeaderComponent::ToolLinkComponent"
+  renders_many :custom_tool_links
   renders_many :direct_links, types: {
     simple: "DsfrComponent::HeaderComponent::DirectLinkComponent",
     dropdown: "DsfrComponent::HeaderComponent::DirectLinkDropdownComponent"
@@ -25,4 +26,16 @@ private
   def default_attributes
     { class: 'fr-header', role: 'banner' }
   end
+
+  def with_tools?
+    tool_links? || search? || custom_tool_links?
+  end
+
+  def with_navbar?
+    with_tools? || direct_links?
+  end
+
+  def with_menu?
+    tool_links? || direct_links?
+  end
 end

data/app/components/dsfr_component/notice_component.rb

@@ -1,6 +1,6 @@
 module DsfrComponent
   class NoticeComponent < DsfrComponent::Base
-    GENERIC_TYPES = %w[info waring alert].freeze
+    GENERIC_TYPES = %w[info warning alert].freeze
     WEATHER_TYPES = %w[weather-orange weather-red weather-purple].freeze
     ALERT_TYPES = %w[kidnapping cyberattack attack witness].freeze
     TYPES = GENERIC_TYPES + WEATHER_TYPES + ALERT_TYPES
@@ -11,7 +11,7 @@ module DsfrComponent
 
     # @param title [String] Titre du bandeau
     # @param description [String] Description du bandeau pour apporter du contexte (optionnel)
-    # @param type [String] Type de bandeau (info, waring, alert, weather-orange, weather-red, weather-purple, kidnapping, cyberattack, attack, witness)
+    # @param type [String] Type de bandeau (info, warning, alert, weather-orange, weather-red, weather-purple, kidnapping, cyberattack, attack, witness)
     # @param description_tag [Symbol] Balise HTML à utiliser pour la description (p, h1, h2, h3, h4, h5, h6)
     # @param use_icon [Boolean] Afficher ou non une icône, uniquement pour les bandeaux génériques
     # @param icon_name [String] Nom de l'icône à afficher

data/app/components/dsfr_component/proconnect_button_component.html.erb

@@ -0,0 +1,10 @@
+<%= content_tag(:div, class: "fr-connect-group", **html_attributes) do %>
+  <%= button_to(target, button_attributes) do %>
+    <span class="fr-connect__login">S'identifier avec</span>
+    <span class="fr-connect__brand">ProConnect</span>
+  <% end %>
+
+  <p>
+    <%= link_to "Qu'est-ce que ProConnect ?", "https://www.proconnect.gouv.fr/", target: "_blank", rel: "noopener", title: "Qu’est-ce que ProConnect ? - nouvelle fenêtre" %>
+  </p>
+<% end %>

data/app/components/dsfr_component/proconnect_button_component.rb

@@ -0,0 +1,36 @@
+module DsfrComponent
+  class ProconnectButtonComponent < DsfrComponent::Base
+    using HTMLAttributesUtils
+
+    # @param target [String] la cible où POST le formulaire/bouton
+    # @param button_overrides [Hash] attributs pour surcharger le bouton
+    def initialize(target:, button_overrides: {}, html_attributes: {})
+      @target = target
+      @button_overrides = button_overrides
+
+      super(html_attributes: html_attributes)
+    end
+
+  private
+
+    attr_reader :target, :button_overrides
+
+    def button_attributes
+      default_button_attributes
+        .deep_merge_html_attributes(button_overrides)
+    end
+
+    def default_button_attributes
+      {
+        method: :post,
+        remote: false,
+        class: "fr-connect fr-proconnect",
+        data: { turbo: false }
+      }
+    end
+
+    def default_attributes
+      { class: "fr-connect-group" }
+    end
+  end
+end

data/app/helpers/dsfr_components_helper.rb

@@ -21,6 +21,7 @@ module DsfrComponentsHelper
     dsfr_callout: 'DsfrComponent::CalloutComponent',
     dsfr_notice: 'DsfrComponent::NoticeComponent',
     dsfr_search: 'DsfrComponent::SearchComponent',
+    dsfr_proconnect_button: 'DsfrComponent::ProconnectButtonComponent',
     # DO NOT REMOVE: new component mapping here
   }.freeze
   HELPER_NAME_TO_CLASS_NAME.each do |name, klass|

data/lib/dsfr/components/version.rb

@@ -1,5 +1,5 @@
 module Dsfr
   module Components
-    VERSION = '3.0.1'.freeze
+    VERSION = '3.1'.freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dsfr-view-components
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: '3.1'
 platform: ruby
 authors:
 - BetaGouv developers
 bindir: bin
 cert_chain: []
-date: 2025-05-07 00:00:00.000000000 Z
+date: 2025-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-attributes-utils
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.13.2
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -352,6 +352,8 @@ files:
 - app/components/dsfr_component/modal_component.rb
 - app/components/dsfr_component/notice_component.html.erb
 - app/components/dsfr_component/notice_component.rb
+- app/components/dsfr_component/proconnect_button_component.html.erb
+- app/components/dsfr_component/proconnect_button_component.rb
 - app/components/dsfr_component/search_component.html.erb
 - app/components/dsfr_component/search_component.rb
 - app/components/dsfr_component/skiplink_component.html.erb