dsfr-view-components 3.1 → 4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ad464710e4c2bcddb1c49cab5cbc7fe7dac3508dc90e09b55be83adaf0302fc
-  data.tar.gz: a2c78fd736e9a21d0953e7205c9c0d62c3d9027d256d60035b0556da0e3de72a
+  metadata.gz: 952489c459b0e459b926500dbd5dffa0ead338ddd8c5e7196546bcaf9627f09c
+  data.tar.gz: 60ea4e318eb64e00070ed7858ab53f4429d177489f3fab88379535f9dedda488
 SHA512:
-  metadata.gz: c3728eb72aeee052f246550071ec38f2f11dd7194a9ebfe001fe8dbef41e02494ec983626a262e9ef0b25dca64e1c2b48eecdd5be69260e9bb515f3f06ad6466
-  data.tar.gz: f08bdd10f57d02d956c128ff65304829488a4fe7d41138deeeafe8e15ac72bdd9f0d95803a6b08e1313aa1d9dff8c21bf69a3954d785f57aa3f4e3936ba48acd
+  metadata.gz: e3cd015504d4b42841a05b7a2e0969906f7ca99abdf7dae1ec8f4441608ca54b99b4b41d6023da179618a773e6e346147844c0783e2514e88e64b3e059036f60
+  data.tar.gz: 2aa09072f0d92e5e6f3e21d315f5eb9bfff1f71e82dcae5f1db910e6721c965f0dccb5c555ebca471930d149cd9695026ea7ec50286218a9500b3bab80b99dd0

data/app/components/dsfr_component/accordion_component/section_component.html.erb

@@ -1,6 +1,7 @@
 <%= tag.section(**html_attributes) do %>
-  <%= tag.send(starting_header_tag, class: "fr-accordion__title") do %>
+  <%= tag.send(header_tag, class: "fr-accordion__title") do %>
     <button
+        type="button"
         class="fr-accordion__btn"
         aria-expanded="<%= expanded? ? "true" : "false" %>"
         aria-controls="<%= id %>"

data/app/components/dsfr_component/accordion_component/section_component.rb

@@ -1,7 +1,7 @@
 class DsfrComponent::AccordionComponent::SectionComponent < DsfrComponent::Base
   include DsfrComponent::Traits::HeaderSizeable
 
-  attr_reader :title, :expanded, :starting_header_level
+  attr_reader :title, :expanded
 
   alias_method :expanded?, :expanded
 
@@ -10,7 +10,7 @@ class DsfrComponent::AccordionComponent::SectionComponent < DsfrComponent::Base
   # @param id [String] the HTML id, optional if you want to reuse the anchor
   def initialize(
     title:,
-    starting_header_level:,
+    header_level:,
     expanded: false,
     id: nil,
     html_attributes: {}
@@ -18,7 +18,7 @@ class DsfrComponent::AccordionComponent::SectionComponent < DsfrComponent::Base
     @title = title
     @expanded = expanded
     @id = id
-    @starting_header_level = starting_header_level
+    self.header_level = header_level
 
     super(html_attributes: html_attributes)
   end

data/app/components/dsfr_component/accordion_component.rb

@@ -7,13 +7,13 @@ class DsfrComponent::AccordionComponent < DsfrComponent::Base
       html_attributes: html_attributes,
       title: title,
       id: id,
-      starting_header_level: starting_header_level,
+      header_level: header_level,
       &block
     )
   end
 
-  def initialize(html_attributes: {}, starting_header_level: nil)
-    @starting_header_level = starting_header_level
+  def initialize(html_attributes: {}, header_level: nil)
+    self.header_level = header_level
 
     super(html_attributes: html_attributes)
   end

data/app/components/dsfr_component/alert_component.rb

@@ -9,7 +9,7 @@ class DsfrComponent::AlertComponent < DsfrComponent::Base
   # @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
+  # @param 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(
@@ -18,7 +18,7 @@ class DsfrComponent::AlertComponent < DsfrComponent::Base
     size: :md,
     close_button: false,
     icon_name: nil,
-    starting_header_level: nil,
+    header_level: nil,
     html_attributes: {}
   )
     @title = title
@@ -26,7 +26,7 @@ class DsfrComponent::AlertComponent < DsfrComponent::Base
     @size = size
     @close_button = close_button
     @icon_name = icon_name
-    @starting_header_level = starting_header_level
+    self.header_level = header_level
 
     super(html_attributes: html_attributes)
   end
@@ -77,7 +77,7 @@ private
   def title_tag
     return nil if title.blank?
 
-    tag.send(starting_header_tag, class: "fr-alert__title") { title }
+    tag.send(header_tag, class: "fr-alert__title") { title }
   end
 
   def content_tag

data/app/components/dsfr_component/callout_component.rb

@@ -8,23 +8,23 @@ module DsfrComponent
 
     # @param title [String] Le titre de la mise en avant
     # @param icon_name [String] Le nom de l’icône à afficher (exemple `arrow-right-line`), ou `:none` pour la désactiver (optionnel)
-    # @param starting_header_level [Integer] Le niveau de titre (optionnel)
+    # @param header_level [Integer] Le niveau de titre (optionnel)
     def initialize(
       title:,
       icon_name: "information-line",
-      starting_header_level: nil,
+      header_level: nil,
       html_attributes: {}
     )
       @title = title
       @icon_name = icon_name
-      @starting_header_level = starting_header_level
+      self.header_level = header_level
 
       super(html_attributes: html_attributes)
     end
 
     def call
       tag.div(**html_attributes) do
-        concat content_tag(starting_header_tag, @title, class: 'fr-callout__title')
+        concat content_tag(header_tag, @title, class: 'fr-callout__title')
 
         concat content_tag(:p, content, class: 'fr-callout__text')
 

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

@@ -1,10 +1,10 @@
 <%= tag.div(**html_attributes) do %>
-  <h2 class="fr-stepper__title">
+  <%= tag.send(header_tag, class: "fr-stepper__title") do %>
     <%= title %>
     <span class="fr-stepper__state">
       Étape <%= value %> sur <%= max %>
     </span>
-  </h2>
+  <% end %>
   <div
     class="fr-stepper__steps"
     data-fr-current-step="<%= value %>"

data/app/components/dsfr_component/stepper_component.rb

@@ -1,14 +1,18 @@
 module DsfrComponent
   class StepperComponent < DsfrComponent::Base
+    include DsfrComponent::Traits::HeaderSizeable
+
     # @param title [String] Titre de l’étape en cours
     # @param value [Integer] Numéro de l’étape en cours (commence à 1)
     # @param max [Integer] Nombre d’étapes total
     # @param next_title [String] Titre de l’étape suivante (sauf pour la dernière étape)
-    def initialize(title:, value:, max:, next_title: nil, html_attributes: {})
+    # @param header_level [Integer] Niveau du titre
+    def initialize(title:, value:, max:, next_title: nil, header_level: 2, html_attributes: {})
       @title = title
       @value = value
       @max = max
       @next_title = next_title
+      self.header_level = header_level
 
       raise ArgumentError, "Les étapes doivent aller de 1 jusqu´à 8 au maximum" if @value < 1 || @value > @max || @max > 8
 

data/app/components/dsfr_component/traits/header_sizeable.rb

@@ -3,22 +3,35 @@
 module DsfrComponent
   module Traits
     # HeaderSizeable is meant for every component that exhibits a
-    # header, which level can be overriden via the
-    # `default_header_level` method. Make sure you store the attribute
-    # `@starting_header_level` in your component's constructor.
+    # header which level can be overriden. Make sure you use the
+    # setter (self.header_level) in your component's constructor.
     module HeaderSizeable
       DEFAULT_HEADER_LEVEL = 3
 
-      def starting_header_level
-        @starting_header_level || default_header_level
+      def header_level
+        @header_level || default_header_level
+      end
+
+      def header_level=(level)
+        return if level.nil?
+
+        raise ArgumentError, "Le niveau du titre doit être compris entre 1 et 6" if !correct?(level)
+
+        @header_level = level
       end
 
       def default_header_level
         DEFAULT_HEADER_LEVEL
       end
 
-      def starting_header_tag
-        ["h", starting_header_level].join
+      def header_tag
+        ["h", header_level].join
+      end
+
+    private
+
+      def correct?(level)
+        level.in?(DsfrComponent::Base::HEADING_LEVELS)
       end
     end
   end

data/lib/dsfr/components/version.rb

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

data/lib/generators/dsfr_component/templates/component.haml.erb

@@ -10,4 +10,4 @@ title: <%= name %>
   :markdown
     Le rendu de base du <%= name %>Component
 
-= render('/partials/related-info.haml', links: dsfr_component_doc_links("doc-id", "storybook-id"))
+= render('/partials/related-info.haml', links: dsfr_component_doc_links("doc-id"))

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsfr-view-components
 version: !ruby/object:Gem::Version
-  version: '3.1'
+  version: '4.0'
 platform: ruby
 authors:
 - BetaGouv developers
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-03 00:00:00.000000000 Z
+date: 2025-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-attributes-utils
@@ -394,6 +395,7 @@ metadata:
   homepage_uri: https://github.com/betagouv/dsfr-view-components
   source_code_uri: https://github.com/betagouv/dsfr-view-components
   rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -408,7 +410,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.5.13
+signing_key:
 specification_version: 4
 summary: Composants ViewComponent pour le Système de Design de l'État (DSFR)
 test_files: []