dsfr-view-components 5.0.2 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aab49185db5dee4de6e32f79d10a3dd6866ad6d23b8876ecc97bd6f4305e0a12
-  data.tar.gz: 7af84ab6aa6fe038867c1100bfd8daa190ee82e56f43c75af0b377e28b5a1717
+  metadata.gz: 21e22399b4567acc732e6e9342628199bcb79a955e62d290e61ceb38155b5e35
+  data.tar.gz: 057c755a202b248f06db84e28dc4610a11ebf2b64b9c4cf1e8fd69dbc3948707
 SHA512:
-  metadata.gz: f9b187588c9246ae6f6c45363b50dc1d329d78a9d3b658ce413e6e40c94eff16793bc669dada0caecc8586c6f2e211f366839c40a816d0a789f4b12a4ba79150
-  data.tar.gz: 6a7317e0de48d0c434252284f6fb8c9e6fbf4accfb56beb79216f5544a88e954ec6930a7ca57a4f8aba1f35d8b09ce89592873c9b9526668102a24532cd16508
+  metadata.gz: 925d4e06a574a2a2a682a0d0f3e742323aed826d830055497084a293dd79d745ce4200c8a88776aaa81ae51930686e529a32e537125fc3134ed80ca570faa63b
+  data.tar.gz: bf238c5a514fb9a4672928235b70b53bc2a57fc76fceb24c50d25540b56239ed62429bc42e670baf4bf4b426a8693b9e9fe5b7b733119c6c28db4ba7d23f2992

data/app/components/dsfr_component/badge_component.rb

@@ -4,32 +4,39 @@ module DsfrComponent
     SIZES = %i[md sm].freeze
 
     # @param status [BadgeComponent::STATUSES]
-    def initialize(status: nil, size: :md, html_attributes: {})
+    # @param size [BadgeComponent::SIZES] taille du badge : `:md` (par défaut) ou `:sm` (optionnel)
+    # @param has_icon [Boolean] `false` retire l'icône d'un badge système, nécessite un `status` (optionnel)
+    # @param ellipsis [Boolean] tronque le libellé avec une ellipse s'il est trop long (optionnel)
+    def initialize(status: nil, size: :md, has_icon: true, ellipsis: false, html_attributes: {})
       validate_status!(status)
       validate_size!(size)
+      validate_has_icon!(has_icon, status)
 
       @status = status
       @size = size
+      @has_icon = has_icon
+      @ellipsis = ellipsis
 
       super(html_attributes: html_attributes)
     end
 
     def call
-      tag.div(**html_attributes) do
-        content
+      tag.p(**html_attributes) do
+        ellipsis ? tag.span(content, class: 'fr-ellipsis') : content
       end
     end
 
   private
 
-    attr_reader :status, :size
+    attr_reader :status, :size, :has_icon, :ellipsis
 
     def default_attributes
       {
         class: class_names(
           'fr-badge',
           "fr-badge--#{status}" => status.present?,
-          "fr-badge--sm" => size == :sm
+          "fr-badge--sm" => size == :sm,
+          "fr-badge--no-icon" => !has_icon
         )
       }
     end
@@ -39,7 +46,11 @@ module DsfrComponent
     end
 
     def validate_size!(size)
-      raise(ArgumentError, "`size` should be one of #{SIZES} (received: `#{status}`") if !SIZES.include?(size)
+      raise(ArgumentError, "`size` should be one of #{SIZES} (received: `#{size}`)") if !SIZES.include?(size)
+    end
+
+    def validate_has_icon!(has_icon, status)
+      raise(ArgumentError, "`has_icon: false` can only be used with a `status`") if !has_icon && status.blank?
     end
   end
 end

data/app/components/dsfr_component/france_connect_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">FranceConnect</span>
+  <% end %>
+
+  <p>
+    <%= link_to info_link_label, info_link_href, target: "_blank", rel: "noopener", title: "#{info_link_label} - nouvelle fenêtre" %>
+  </p>
+<% end %>

data/app/components/dsfr_component/france_connect_button_component.rb

@@ -0,0 +1,50 @@
+module DsfrComponent
+  class FranceConnectButtonComponent < DsfrComponent::Base
+    using HTMLAttributesUtils
+
+    # @param target [String] la cible où POST le formulaire/bouton
+    # @param use_plus_version [Boolean] utiliser la variante FranceConnect+
+    # @param button_overrides [Hash] attributs pour surcharger le bouton
+    def initialize(target:, use_plus_version: false, button_overrides: {}, html_attributes: {})
+      @target = target
+      @use_plus_version = use_plus_version
+      @button_overrides = button_overrides
+
+      super(html_attributes: html_attributes)
+    end
+
+  private
+
+    attr_reader :target, :use_plus_version, :button_overrides
+
+    def use_plus_version?
+      use_plus_version
+    end
+
+    def info_link_href
+      use_plus_version? ? "https://www.franceconnect.gouv.fr/franceconnect-plus/" : "https://www.franceconnect.gouv.fr/"
+    end
+
+    def info_link_label
+      use_plus_version? ? "Qu’est-ce que FranceConnect+ ?" : "Qu’est-ce que FranceConnect ?"
+    end
+
+    def button_attributes
+      default_button_attributes
+        .deep_merge_html_attributes(button_overrides)
+    end
+
+    def default_button_attributes
+      {
+        method: :post,
+        remote: false,
+        class: use_plus_version? ? "fr-connect fr-connect--plus" : "fr-connect",
+        data: { turbo: false }
+      }
+    end
+
+    def default_attributes
+      { class: "fr-connect-group" }
+    end
+  end
+end

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

@@ -5,6 +5,6 @@
   <% 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" %>
+    <%= 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

@@ -24,7 +24,7 @@ module DsfrComponent
       {
         method: :post,
         remote: false,
-        class: "fr-connect fr-proconnect",
+        class: "fr-connect fr-connect--pro",
         data: { turbo: false }
       }
     end

data/app/helpers/dsfr_components_helper.rb

@@ -22,6 +22,7 @@ module DsfrComponentsHelper
     dsfr_notice: 'DsfrComponent::NoticeComponent',
     dsfr_search: 'DsfrComponent::SearchComponent',
     dsfr_proconnect_button: 'DsfrComponent::ProconnectButtonComponent',
+    dsfr_france_connect_button: 'DsfrComponent::FranceConnectButtonComponent',
     dsfr_side_menu: 'DsfrComponent::SideMenuComponent',
     dsfr_side_menu_item: 'DsfrComponent::SideMenuComponent::ItemComponent',
     dsfr_card: 'DsfrComponent::CardComponent',

data/app/helpers/dsfr_link_helper.rb

@@ -52,12 +52,9 @@ private
   end
 
   def add_size(opts)
-    size = opts['size']
+    size = opts.delete(:size)
 
-    if size.present? && size.in?(SIZES)
-      opts = inject_class(opts, class_name: "fr-link--#{size}")
-      opts.delete(:size)
-    end
+    opts = inject_class(opts, class_name: "fr-link--#{size}") if size.present? && size.to_s.in?(SIZES)
 
     opts
   end

data/lib/dsfr/components/version.rb

@@ -1,5 +1,5 @@
 module Dsfr
   module Components
-    VERSION = '5.0.2'.freeze
+    VERSION = '5.1.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dsfr-view-components
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.1.0
 platform: ruby
 authors:
 - BetaGouv developers
@@ -41,20 +41,14 @@ dependencies:
   name: dsfr-assets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.13.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.13.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
@@ -131,16 +125,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.90'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.90'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -349,6 +343,8 @@ files:
 - app/components/dsfr_component/callout_component.rb
 - app/components/dsfr_component/card_component.html.erb
 - app/components/dsfr_component/card_component.rb
+- app/components/dsfr_component/france_connect_button_component.html.erb
+- app/components/dsfr_component/france_connect_button_component.rb
 - app/components/dsfr_component/header_component.html.erb
 - app/components/dsfr_component/header_component.rb
 - app/components/dsfr_component/header_component/direct_link_component.rb