govuk_design_system_formbuilder 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6cd261aede14003b41cba2f6d164a952e07daf37b18ce0cdddf553391fa335e
-  data.tar.gz: 72e545d0c8f00a97392ca6265f8ddbea7d3e28549889e9c6ec672c8560bcc503
+  metadata.gz: a461a934a644c5132053494bb2f7226da713744089d2d2685c2288abb203fbc6
+  data.tar.gz: 6015d09960437e4f7c3672738da64bc67ff7651135e0f8ce52f4e5c261ec1e27
 SHA512:
-  metadata.gz: a040500a96d4238db0dd79dff19d27304f6463ef790a7c71b83ba88b68391a4b9c5b2285e9d839e51f34ebfed2d1dc36ac40131cfeb31567f44d0356362b6b6a
-  data.tar.gz: 004f50ef512c190bfb96b4e1b772edf84bf73a8c33e8973542f6eca774842085889170f3dc3047df8fc21d3a76daa516ba978c2026c8cf6306ad4ec97622af84
+  metadata.gz: 50b788c0351f43d4919473f08cc4ba58da35a5e899fcdb1556a5ecf4edfbeb8ef327930a6a605fffee68b83d6db7cd90019ad525c86f88ce11a02eb0fd4284af
+  data.tar.gz: 36a30c7e31d409ef926726c0b2c56fda14c2c2606310c948810f288db2ef2a64637b9c9104d43f368e32bb5ebff4a38719a8e38a9fd76367f97e762d96b92fb7

data/lib/govuk_design_system_formbuilder/base.rb

@@ -68,6 +68,14 @@ module GOVUKDesignSystemFormBuilder
       build_id('supplemental')
     end
 
+    # Provides an id for use by the textual description of character and word limits.
+    #
+    # @note In order for the GOV.UK Frontend JavaScript to pick up this associated field
+    #   it has to have the same id as the text area with the additional suffix of '-info'
+    def limit_id
+      [field_id(link_errors: true), 'info'].join('-')
+    end
+
     def has_errors?
       @builder.object.errors.any? &&
         @builder.object.errors.messages.dig(@attribute_name).present?

data/lib/govuk_design_system_formbuilder/elements/text_area.rb

@@ -23,14 +23,11 @@ module GOVUKDesignSystemFormBuilder
                   id: field_id(link_errors: true),
                   class: govuk_textarea_classes,
                   aria: {
-                    describedby: described_by(
-                      hint_id,
-                      error_id,
-                      supplemental_id
-                    )
+                    describedby: described_by(hint_id, error_id, supplemental_id, limit_description_id)
                   },
                   **@extra_args.merge(rows: @rows)
-                )
+                ),
+                limit_description
               ].flatten.compact
             )
           end
@@ -49,6 +46,28 @@ module GOVUKDesignSystemFormBuilder
       def limit?
         @max_words || @max_chars
       end
+
+      def limit_description
+        return nil unless limit?
+
+        content_tag('span', id: limit_id, class: %w(govuk-hint govuk-character-count__message), aria: { live: 'polite' }) do
+          "You can enter up to #{limit_quantity} #{limit_type}"
+        end
+      end
+
+      def limit_quantity
+        @max_words || @max_chars
+      end
+
+      def limit_type
+        @max_words.present? ? 'words' : 'characters'
+      end
+
+      def limit_description_id
+        return nil unless limit?
+
+        limit_id
+      end
     end
   end
 end

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-19 00:00:00.000000000 Z
+date: 2019-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview