Support for katalyst-govuk-formbuilder 2.0

.github/workflows/release.yml

@@ -15,6 +15,10 @@ jobs:
       contents: write
       id-token: write
     steps:
+      - name: Install dependencies
+        env:
+          DEPENDENCIES: libvips
+        run: sudo apt-get install -y $DEPENDENCIES || (sudo apt-get update && sudo apt-get install -y $DEPENDENCIES)
       - uses: actions/checkout@v6
       - uses: ruby/setup-ruby@v1
         with:

.github/workflows/test.yml

@@ -6,6 +6,10 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
+      - name: Install dependencies
+        env:
+          DEPENDENCIES: libvips
+        run: sudo apt-get install -y $DEPENDENCIES || (sudo apt-get update && sudo apt-get install -y $DEPENDENCIES)
       - uses: actions/checkout@v6
       - uses: ruby/setup-ruby@v1
         with:

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    katalyst-content (3.2.1)
+    katalyst-content (3.2.2)
       active_storage_validations
       activerecord
       katalyst-govuk-formbuilder
@@ -57,11 +57,11 @@ GEM
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    active_storage_validations (3.0.6)
-      activejob (>= 6.1.4)
-      activemodel (>= 6.1.4)
-      activestorage (>= 6.1.4)
-      activesupport (>= 6.1.4)
+    active_storage_validations (4.0.0)
+      activejob (>= 7.0.1)
+      activemodel (>= 7.0.1)
+      activestorage (>= 7.0.1)
+      activesupport (>= 7.0.1)
       marcel (>= 1.0.3)
     activejob (8.1.3.1)
       activesupport (= 8.1.3.1)
@@ -174,7 +174,8 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.21.2)
-    katalyst-govuk-formbuilder (1.30.1)
+    katalyst-govuk-formbuilder (2.0.0)
+      activestorage (>= 8.0.0)
       govuk_design_system_formbuilder (>= 6.2.0)
     katalyst-html-attributes (1.1.2)
       activesupport
@@ -276,7 +277,7 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.4.2)
-    rbs (4.1.1)
+    rbs (4.1.2)
       logger
       prism (>= 1.6.0)
       tsort

app/views/katalyst/content/figures/_figure.html+form.erb

@@ -1,9 +1,8 @@
 <%# locals: (form:, figure:) %>
 
-<%= form.govuk_image_field(:image) do %>
-  <%= form.govuk_text_field(:heading, label: { text: "Alternate text" }) %>
-  <%= form.govuk_text_field(:caption, label: { text: "Caption (optional)" }, optional: true) %>
-<% end %>
+<%= form.govuk_image_field(:image) %>
+<%= form.govuk_text_field(:heading, label: { text: "Alternate text" }) %>
+<%= form.govuk_text_field(:caption, label: { text: "Caption (optional)" }) %>
 
 <%= form.content_theme_field %>
 <%= form.content_visible_field %>

katalyst-content.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name    = "katalyst-content"
-  spec.version = "3.2.1"
+  spec.version = "3.2.2"
   spec.authors = ["Katalyst Interactive"]
   spec.email   = ["developers@katalyst.com.au"]
 

spec/dummy/app/assets/javascripts/controllers/index.js

@@ -1,9 +1,11 @@
 import { application } from "controllers/application";
 
 import content from "@katalyst/content";
-import govuk from "@katalyst/govuk-formbuilder";
 import tables from "@katalyst/tables";
 
 application.load(content);
-application.load(govuk);
 application.load(tables);
+
+import govuk from "@katalyst/govuk-formbuilder";
+
+govuk.start(application);

spec/dummy/app/assets/stylesheets/blocks/button.css

@@ -1,4 +1,5 @@
-.button {
+.button,
+:where(.govuk-button) {
   /* Configuration */
   --button-padding: 0.5em 1em;
   --button-gap: 0.5em;
@@ -33,7 +34,7 @@
   font-weight: var(--button-font-weight, 500);
   font-size: var(--button-font-size, 1em);
   letter-spacing: 0.05ch;
-  font-family: sans-serif;
+  font-family: var(--font-base);
   line-height: 1.1;
 
   /* Interactive */
@@ -72,7 +73,8 @@
     --button-padding: 0.5em;
   }
 
-  &[data-ghost-button] {
+  &[data-ghost-button],
+  &:where(.govuk-button--secondary) {
     --button-bg: transparent;
     --button-border-color: currentColor;
     --button-color: currentColor;

spec/dummy/app/assets/stylesheets/forms/checkboxes.css

@@ -32,6 +32,8 @@
   grid-area: input;
   margin-block-start: calc(-0.5 * var(--input-size));
   translate: 0 calc(var(--stroke-input-width) + 0.25 * var(--input-size));
+  /* Firefox fix - unable to calculate baseline from dynamic height */
+  min-block-size: var(--input-size);
 }
 
 .govuk-checkboxes__item::after {
@@ -55,7 +57,7 @@
   cursor: pointer;
   touch-action: manipulation;
   margin-block-end: 0;
-  min-height: var(--input-size);
+  min-block-size: var(--input-size);
 }
 
 .govuk-checkboxes__hint {