dsfr-view-components 2.0.1 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d96c1649ad5d80d6e9bf3dcf0e9f2568fadf5ac00f71394d364ccb6f045c50b
-  data.tar.gz: 528e0f59bd4d60e5f4d9e6bccccf16a946d96566f94c2155af65d58a00f055ff
+  metadata.gz: 6fd43d49e7920aa1ae37d143b9503c68b1d44aad46e5a3acde610b7a0ae9da96
+  data.tar.gz: b3a7d11b90ff73cad4023f517bd3d567141648e25cdf200b1204daf2dcde8db7
 SHA512:
-  metadata.gz: 29e0b94da6815594c486cb7a371d057dff823048295cf12590a3a7c4480d35e4b3508d626660354c8fd8f04e9bb6efa3082e9a2ffd6dfddd5b9169af848d9021
-  data.tar.gz: e2033b6c1691428a35ba522b2c8a13088f61176b0d1f566b8c6700f1488cede7babc7e4dfabea80468f640c76658027b524fd2145c2c83ae847dc07af5069337
+  metadata.gz: 4508aef35cb1afd72ca39df0e89c74290f8a4f9ebfe47c8ff2b7ce8fbcb4fba3ff2d647ecfcc41eb585b515ef378716496c1355e917d2a7b59fc38ba3faa93a5
+  data.tar.gz: f9391b2ef8ddfcdd985305d823ded7fb73add4d05eb05c8be8d30cec1a7cdf2d07b6d1df44bbd5ae18a609b5fb7d9934b54c192715449321ff2493638919f570

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/app/components/dsfr_component/base.rb

@@ -7,6 +7,8 @@ class DsfrComponent::Base < ViewComponent::Base
 
   HEADING_LEVELS = [1, 2, 3, 4, 5, 6].freeze
 
+  SIZES = %i[sm md lg].freeze
+
   def initialize(classes:, html_attributes:)
     if classes.nil?
       Rails.logger.warn("classes is nil, if no custom classes are needed omit the param")

data/app/components/dsfr_component/highlight_component.rb

@@ -0,0 +1,30 @@
+module DsfrComponent
+  class HighlightComponent < DsfrComponent::Base
+    # @param text [String] Le contenu textuel du composant
+    # @param size [Symbol] La taille de la mise en exergue
+    def initialize(text:, size: :md, classes: [], html_attributes: {})
+      @text = text
+      @size = size
+
+      raise ArgumentError if not SIZES.include?(size)
+
+      super(classes: classes, html_attributes: html_attributes)
+    end
+
+    def call
+      tag.div(**html_attributes) do
+        tag.p(class: "fr-text--#{@size}") do
+          @text
+        end
+      end
+    end
+
+  private
+
+    attr_reader :text, :size
+
+    def default_attributes
+      { class: 'fr-highlight' }
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+<%= tag.div(**html_attributes) do %>
+  <nav class="fr-container" role="navigation" aria-label="<%= label %>">
+    <ul class="fr-skiplinks__list">
+      <% links.each do |link| %>
+        <li>
+          <%= link %>
+        </li>
+      <% end %>
+    </ul>
+  </nav>
+<% end %>

data/app/components/dsfr_component/skiplink_component.rb

@@ -0,0 +1,20 @@
+module DsfrComponent
+  class SkiplinkComponent < DsfrComponent::Base
+    # @param label [String] le texte utilisé pour le aria-label de la nav qui affiche les liens d’évitement (par exemple « Accès rapide »)
+    # @param links [Array] liste de liens HTML
+    def initialize(label:, links:, classes: [], html_attributes: {})
+      @label = label
+      @links = links
+
+      super(classes: classes, html_attributes: html_attributes)
+    end
+
+  private
+
+    attr_reader :label, :links
+
+    def default_attributes
+      { class: 'fr-skiplinks' }
+    end
+  end
+end

data/app/helpers/dsfr_components_helper.rb

@@ -16,6 +16,8 @@ module DsfrComponentsHelper
     dsfr_header_direct_link: 'DsfrComponent::HeaderComponent::DirectLinkComponent',
     dsfr_header_direct_dropdown_link: 'DsfrComponent::HeaderComponent::DirectLinkDropdownComponent',
     dsfr_tabs: 'DsfrComponent::TabsComponent',
+    dsfr_highlight: 'DsfrComponent::HighlightComponent',
+    dsfr_skiplink: 'DsfrComponent::SkiplinkComponent',
     # 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 = '2.0.1'.freeze
+    VERSION = '2.1.1'.freeze
   end
 end

data/lib/dsfr/components.rb

@@ -3,4 +3,3 @@ require "view_component"
 require "dsfr/components/helpers/css_utilities"
 require "dsfr/components/engine"
 require "html_attributes_utils"
-require "pagy"

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.1
 platform: ruby
 authors:
 - BetaGouv developers
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-06 00:00:00.000000000 Z
+date: 2025-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-attributes-utils
@@ -25,33 +24,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: pagy
+  name: view_component
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: view_component
+  name: dsfr-assets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -375,8 +374,11 @@ files:
 - app/components/dsfr_component/header_component/direct_link_dropdown_component.rb
 - app/components/dsfr_component/header_component/operator_image_component.rb
 - app/components/dsfr_component/header_component/tool_link_component.rb
+- app/components/dsfr_component/highlight_component.rb
 - app/components/dsfr_component/modal_component.html.erb
 - app/components/dsfr_component/modal_component.rb
+- app/components/dsfr_component/skiplink_component.html.erb
+- app/components/dsfr_component/skiplink_component.rb
 - app/components/dsfr_component/stepper_component.html.erb
 - app/components/dsfr_component/stepper_component.rb
 - app/components/dsfr_component/tabs_component.html.erb
@@ -408,7 +410,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -423,8 +424,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: []