Merge pull request #10316 from mfo/US/better-error-message-on-siret-champ

ETQ usager, j'aimerais que les champs siret soient mieux verbalisés par le screen reader

app/components/dsfr/input_errorable.rb

@@ -75,9 +75,9 @@ module Dsfr
                                       }.merge(input_error_class_names)))
 
         if errors_on_attribute?
-          @opts.deep_merge!(aria: {
+          @opts.deep_merge!(aria: { describedby: describedby_id })
-            describedby: describedby_id
+        elsif hintable?
-          })
+          @opts.deep_merge!(aria: { describedby: hint_id })
         end
 
         if @required
@@ -130,6 +130,10 @@ module Dsfr
         false
       end
 
+      def hintable?
+        false
+      end
+
       def hint?
         return true if get_slot(:hint).present?
 

app/components/editable_champ/siret_component.rb

@@ -2,4 +2,12 @@ class EditableChamp::SiretComponent < EditableChamp::EditableChampBaseComponent
   def dsfr_input_classname
     'fr-input'
     end
+
+  def hint_id
+    dom_id(@champ, :siret_info)
+  end
+
+  def hintable?
+    true
+  end
 end

app/views/champs/siret/show.turbo_stream.haml

@@ -1 +1,8 @@
-= turbo_stream.update dom_id(@champ, :siret_info), partial: 'shared/champs/siret/etablissement', locals: { siret: @siret, etablissement: @champ.etablissement }
+- if @champ.etablissement_fetch_error_key.present?
+  = turbo_stream.update @champ.describedby_id, partial: 'shared/champs/siret/etablissement', locals: { siret: @siret, etablissement: @champ.etablissement }
+  = turbo_stream.show @champ.describedby_id
+  = turbo_stream.hide(dom_id(@champ, :siret_info))
+- else
+  = turbo_stream.update dom_id(@champ, :siret_info), partial: 'shared/champs/siret/etablissement', locals: { siret: @siret, etablissement: @champ.etablissement }
+  = turbo_stream.show dom_id(@champ, :siret_info)
+  = turbo_stream.hide(@champ.describedby_id)