Fully support Wagtail 7.3 (#20)

Author: zerolab

.github/workflows/test.yml

@@ -49,7 +49,7 @@ jobs:
 
       - name: Test
         env:
-          TOXENV: py${{ matrix.python-version }}-django${{ matrix.django }}-wagtail${{ matrix.wagtail }}-sqlite
+          TOXENV: py${{ matrix.python-version }}-django${{ matrix.django }}-wagtail${{ matrix.wagtail }}
         run: tox --installpkg ./dist/*.whl
 
       - name: ⬆️ Upload coverage data
@@ -75,7 +75,14 @@ jobs:
           POSTGRES_PASSWORD: postgres
         ports:
           - 5432:5432
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+        # Use a very short interval to avoid getting out of sync with GHA's
+        # orchestration. This healthcheck controls how Docker determines the
+        # container's status, but the job orchestrator polls Docker with
+        # exponential backoff. When the healthcheck lands just after the
+        # orchestrator polls, you can get unreasonably long waits. This is a
+        # little dumb, but in practice cuts wait times by more than half.
+        # For more, see: https://github.com/actions/runner/issues/496
+        options: --health-cmd pg_isready --health-interval 1s --health-timeout 5s --health-retries 12
 
     steps:
       - uses: actions/checkout@v4

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+### Added
+
+- Support for Wagtail 7.3.
+
 ## [0.4.0] - 2025-12-10
 
 ### Added

ruff.toml

@@ -19,7 +19,7 @@ extend-select = [
 ]
 
 extend-ignore = [
-    "E501",  # no line lenght errors
+    "E501",  # no line length errors
 ]
 fixable = ["C4", "E", "F", "I", "UP"]
 

src/wagtail_tinytableblock/blocks.py

@@ -1,11 +1,12 @@
 import json
 
+from collections.abc import Iterable
 from typing import Any
 
 from django import forms
 from django.forms import Media
 from django.utils.functional import cached_property
-from wagtail.blocks import FieldBlock, StructBlock
+from wagtail.blocks import Block, FieldBlock, StructBlock
 from wagtail.blocks.field_block import CharBlock, FieldBlockAdapter
 
 from .utils import html_table_to_dict
@@ -17,6 +18,9 @@
     from wagtail.telepath import register
 
 
+type BlockDefinitions = Iterable[tuple[str, Block] | list[str | Block]]
+
+
 class TinyTableFieldBlock(FieldBlock):
     def __init__(
         self, *, required: bool = True, help_text: str | None = None, **kwargs: Any
@@ -86,16 +90,27 @@ class TinyTableBlock(StructBlock):
     title = CharBlock(required=False)
     caption = CharBlock(required=False)
 
-    def __init__(self, *, local_blocks=None, search_index=True, **kwargs):
-        super().__init__(local_blocks=local_blocks, search_index=search_index, **kwargs)
-        # manually define the data block so we can pass on configuration kwargs
-        block = TinyTableFieldBlock(
+    def __init__(
+        self,
+        local_blocks: BlockDefinitions | None = None,
+        search_index: bool = True,  # noqa: FBT001,FBT002
+        *,
+        allow_links: bool = False,
+        enable_context_menu: bool = False,
+        **kwargs
+    ) -> None:
+        if local_blocks is None:
+            local_blocks = ()
+
+        # Manually define the data block so we can pass on configuration kwargs.
+        data_block = TinyTableFieldBlock(
             required=False,
-            allow_links=kwargs.get("allow_links", False),
-            enable_context_menu=kwargs.get("enable_context_menu", False),
+            allow_links=allow_links,
+            enable_context_menu=enable_context_menu,
         )
-        block.set_name("data")
-        self.child_blocks["data"] = block
+
+        local_blocks = (*local_blocks, ("data", data_block))
+        super().__init__(local_blocks=local_blocks, search_index=search_index, **kwargs)
 
     class Meta:
         icon = "table"

tests/test_blocks.py

@@ -1,4 +1,7 @@
+from unittest import skipIf
+
 from django.test import TestCase
+from wagtail import VERSION as WAGTAIL_VERSION
 
 from wagtail_tinytableblock.blocks import TinyTableBlock
 
@@ -69,3 +72,9 @@ def test_render_block__with_links(self):
         )
         self.assertInHTML('<a href="#">header cell</a>', rendered)
         self.assertInHTML('<a href="#">row cell</a>', rendered)
+
+    @skipIf(WAGTAIL_VERSION < (7, 3), "Wagtail 7.3+ feature")
+    def test_form_layout_includes_all_fields(self):
+        block = TinyTableBlock(allow_links=True)
+        form_children = block.get_form_layout().children
+        self.assertEqual(["title", "caption", "data"], form_children)

tests/testapp/templates/testapp/table_page.html

@@ -1,3 +1,4 @@
+<!doctype html>
 <html>
 <body>
 <h1>{{ page.title }}</h1>

tox.ini

@@ -3,8 +3,8 @@ min_version = 4.30
 
 envlist =
     py{3.12,3.13}-django{4.2}-wagtail{6.3,7.0}
-    py{3.13,3.14}-django{5.2}-wagtail{7.2}
-    py{3.14}-django{6.0}-wagtail{7.2}
+    py{3.13,3.14}-django{5.2}-wagtail{7.2,7.3}
+    py{3.14}-django{6.0}-wagtail{7.2,7.3}
 
 [gh-actions]
 python =
@@ -44,6 +44,7 @@ deps =
     wagtail6.3: wagtail>=6.3,<6.4
     wagtail7.0: wagtail>=7.0,<7.1
     wagtail7.2: wagtail>=7.2,<7.3
+    wagtail7.3: wagtail>=7.3,<7.4
     wagtailmain: git+https://github.com/wagtail/wagtail.git
 
     postgres: psycopg