dsfr-view-components 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d96c1649ad5d80d6e9bf3dcf0e9f2568fadf5ac00f71394d364ccb6f045c50b
-  data.tar.gz: 528e0f59bd4d60e5f4d9e6bccccf16a946d96566f94c2155af65d58a00f055ff
+  metadata.gz: 03d38ef8a83c41d5ab9bf87104210ba23ba7575c895c2220ca07c139463b8c9e
+  data.tar.gz: 479342fcb5bdaffc4b164d62072b2abb5a16606be8009c2bc355701b70f3b89b
 SHA512:
-  metadata.gz: 29e0b94da6815594c486cb7a371d057dff823048295cf12590a3a7c4480d35e4b3508d626660354c8fd8f04e9bb6efa3082e9a2ffd6dfddd5b9169af848d9021
-  data.tar.gz: e2033b6c1691428a35ba522b2c8a13088f61176b0d1f566b8c6700f1488cede7babc7e4dfabea80468f640c76658027b524fd2145c2c83ae847dc07af5069337
+  metadata.gz: 64b0c74cef32df4432489d2f2f1a320a46fa20ab1c9235298869569d83edad665245f94df8ce113eb7635d615dd3a339aa66538fb17fc3e40cf414c41e51474f
+  data.tar.gz: cbb2749d28d8af2b8a42c142160c78035f111313cbc7fe60d8c526d24b4a638615611b6d26aeea302adbbcfc47acb168b36cc25804a6809e12f83be2527d1897

data/README.md

@@ -25,6 +25,8 @@ Pour utiliser cette gem dans votre application Rails, il faut ajouter cette lign
 require "dsfr/components"
 ```
 
+**NOTE:** depuis la version 2.1, la gem dépend de [`dsfr-assets`](https://github.com/betagouv/dsfr-assets) qui embarque les assets du DSFR pour vous. Pour laisser au temps aux équipes de vérifier cette intégration, l'inclusion des assets est optionnelle mais peut se faire en suivant [les instructions dans le README de dsfr-assets](https://github.com/betagouv/dsfr-assets?tab=readme-ov-file#installation).
+
 ## Composants disponibles
 
 Cette gem a pour but de supporter tous les composants proposés par le Design Système de l'État hormis ceux concernant les formulaires. Ceux-ci seront fournis dans une gem indépendante dans le futur.
@@ -75,12 +77,11 @@ Utilisez le générateur pour créer un nouveau composant :
 bin/rails g dsfr_component FancyButton --params title:String count:Integer
 ```
 
-
 Lancer la dummy app pour itérer sur les composants :
 
 ```sh
 cd spec/dummy
-bundle install && npm install
+bundle install
 bundle exec rails server
 ```
 
@@ -90,7 +91,6 @@ Déployer une nouvelle version de la gem :
 VERSION=1.3.2 make deploy_gem
 ```
 
-
 ## Licence
 
 Le code source et la gem sont ouverts sous la licence [MIT](https://opensource.org/licenses/MIT).

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

@@ -1,13 +1,13 @@
 <%= tag.section(**html_attributes) do %>
-  <h3 class="fr-accordion__title">
+  <%= tag.send("h#{starting_header_level}", class: "fr-accordion__title") do %>
     <button
-      class="fr-accordion__btn"
-      aria-expanded="<%= expanded? ? "true" : "false" %>"
-      aria-controls="<%= id %>"
+        class="fr-accordion__btn"
+        aria-expanded="<%= expanded? ? "true" : "false" %>"
+        aria-controls="<%= id %>"
     >
       <%= title %>
     </button>
-  </h3>
+  <% end %>
   <div
     id="<%= id %>"
     class="fr-collapse <%= "fr-collapse--expanded" if expanded? %>"

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

@@ -1,15 +1,23 @@
 class DsfrComponent::AccordionComponent::SectionComponent < DsfrComponent::Base
-  attr_reader :title, :expanded
+  attr_reader :title, :expanded, :starting_header_level
 
   alias_method :expanded?, :expanded
 
   # @param title [String] section title
   # @param expanded [Boolean] toggles section folding
   # @param id [String] the HTML id, optional if you want to reuse the anchor
-  def initialize(title:, expanded: false, id: nil, classes: [], html_attributes: {})
+  def initialize(
+    title:,
+    starting_header_level:,
+    expanded: false,
+    id: nil,
+    classes: [],
+    html_attributes: {}
+  )
     @title = title
     @expanded = expanded
     @id = id
+    @starting_header_level = starting_header_level
 
     super(classes: classes, html_attributes: html_attributes)
   end

data/app/components/dsfr_component/accordion_component.rb

@@ -1,4 +1,8 @@
 class DsfrComponent::AccordionComponent < DsfrComponent::Base
+  DEFAULT_HEADER_LEVEL = 3
+
+  attr_reader :starting_header_level
+
   renders_many :sections, ->(title: nil, expanded: false, id: nil, classes: [], html_attributes: {}, &block) do
     DsfrComponent::AccordionComponent::SectionComponent.new(
       classes: classes,
@@ -6,11 +10,14 @@ class DsfrComponent::AccordionComponent < DsfrComponent::Base
       html_attributes: html_attributes,
       title: title,
       id: id,
+      starting_header_level: starting_header_level,
       &block
     )
   end
 
-  def initialize(classes: [], html_attributes: {})
+  def initialize(classes: [], html_attributes: {}, starting_header_level: DEFAULT_HEADER_LEVEL)
+    @starting_header_level = starting_header_level
+
     super(classes: classes, html_attributes: html_attributes)
   end
 

data/lib/dsfr/components/version.rb

@@ -1,5 +1,5 @@
 module Dsfr
   module Components
-    VERSION = '2.0.1'.freeze
+    VERSION = '2.1.0'.freeze
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dsfr-view-components
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - BetaGouv developers
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-06 00:00:00.000000000 Z
+date: 2025-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-attributes-utils
@@ -52,6 +51,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: dsfr-assets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -408,7 +421,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -423,8 +435,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Composants ViewComponent pour le Système de Design de l'État (DSFR)
 test_files: []