katalyst-koi 5.12.0 → 5.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afee7b805fac88ecb5a44d5c133496622e254163996ff365dfd25a80c61bf280
-  data.tar.gz: 23245c78eba9d5cf35c489811939c290c54ad0e3ec3adca50fb99cac612f394b
+  metadata.gz: 0ee6f6dd8952331431fc4b34ade062f65e05214b54a849da44ceab6386da29e0
+  data.tar.gz: dc3b64a9a28ea629bbb33395503b93b5ea0bb0d71de684413bd22aaef170a72d
 SHA512:
-  metadata.gz: 474bfc88b55a6666838dfe870359e3c647d099120b48673e17242666ea30f60a0a82d25ec02e7277cf220be45b1f250a8bd8a1f02e86580e8b9042e8b7a74503
-  data.tar.gz: bda368a27d974f89bfa75371643c74a2bbf424202fc6304a1f1fee7b61173a574e1134b19eb8e9269259691d6cec46db06f3c47a58f6317be7c3a0d8f207c3e5
+  metadata.gz: f3e26dbbaed72d8e62291d8a54e70fdfd99f5f4758e764c48da2fac9ef3e9d9824cb60b3eaafbbdc1db781089927dd63ebdbc4cc3faa505e9b89a454dde5dbf4
+  data.tar.gz: afbf62273a0914eee5d5adee0c5b7060bddc8edcfcfa9e195662e7103b45374f634a60ded46a68b35666b83f90aba0ad91c0c9141477a8fad61f76208047fe9f

data/lib/koi/engine.rb

@@ -118,10 +118,5 @@ module Koi
         )
       end
     end
-
-    # Koi uses table_query_with() which requires a capture patch for form and view_component interoperability
-    initializer "koi.view_component", before: "view_component.enable_capture_patch" do |app|
-      app.config.view_component.enable_capture_patch = true
-    end
   end
 end

data/lib/koi/form/builder.rb

@@ -40,7 +40,7 @@ module Koi
       # @api internal
       # @see GOVUKDesignSystemFormBuilder::Builder#govuk_document_field
       def govuk_document_field(attribute_name, hint: {}, **, &)
-        if hint.is_a?(Hash)
+        if hint.is_a?(Hash) && !localised_hint?(attribute_name)
           max_size      = hint.fetch(:max_size, Koi.config.document_size_limit)
           hint[:text] ||= @template.t("helpers.hint.default.document",
                                       max_size: @template.number_to_human_size(max_size))
@@ -52,9 +52,9 @@ module Koi
       # @api internal
       # @see GOVUKDesignSystemFormBuilder::Builder#govuk_image_field
       def govuk_image_field(attribute_name, hint: {}, **, &)
-        if hint.is_a?(Hash)
+        if hint.is_a?(Hash) && !localised_hint?(attribute_name)
           max_size      = hint.fetch(:max_size, Koi.config.image_size_limit)
-          hint[:text] ||= @template.t("helpers.hint.default.document",
+          hint[:text] ||= @template.t("helpers.hint.default.image",
                                       max_size: @template.number_to_human_size(max_size))
         end
 
@@ -91,6 +91,13 @@ module Koi
 
       private
 
+      # True when the GOV.UK form builder will find a hint in the locale files,
+      # e.g. helpers.hint.banner.image, so Koi's size limit default doesn't
+      # replace it.
+      def localised_hint?(attribute_name)
+        GOVUKDesignSystemFormBuilder::Elements::Hint.new(self, object_name, attribute_name).active?
+      end
+
       def direct_upload_url
         if @template.respond_to?(:admin_direct_uploads_url)
           @template.admin_direct_uploads_url

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-koi
 version: !ruby/object:Gem::Version
-  version: 5.12.0
+  version: 5.13.1
 platform: ruby
 authors:
 - Katalyst Interactive
@@ -183,14 +183,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: katalyst-content
   requirement: !ruby/object:Gem::Requirement