Merge branch 'release/9.1.0'

Author: marteinn

.github/workflows/main.yml

@@ -7,18 +7,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
-        wagtail-version: ["6.3", "7.0", "7.1"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+        wagtail-version: ["6.3", "7.0", "7.1", "7.2"]
         django-version: ["4.2", "5.1", "5.2"]
         exclude:
           - python-version: "3.13"
             django-version: "4.2"
           - python-version: "3.13"
             django-version: "5.0"
-          - python-version: "3.9"
-            django-version: "5.1"
-          - python-version: "3.9"
-            django-version: "5.2"
     services:
       postgres:
         image: postgis/postgis:15-3.4

.gitignore

@@ -60,3 +60,6 @@ tests/media/*
 
 # Local env
 .env.local
+
+# Claude
+CLAUDE.local.md

CHANGELOG.md

@@ -6,6 +6,18 @@
 ### Fixed
 ### Removed
 
+## [9.1.0] - 2025.11.09
+### Added
+- Add support for Wagtail 7.2 (@marteinn)
+- Add support for Python 3.14 (@marteinn)
+
+### Fixed
+- Fix double initialization bug in Wagtail 7.1+ causing streamfield map blocks not to read existing values ending up only showing default (@marteinn)
+- Ignore CLAUDE.local.md config (@marteinn)
+
+### Removed
+- Drop support for EOL Python 3.9 (@marteinn)
+
 ## [9.0.0] - 2025.08.14
 ### Added
 - Add support for Wagtail 7.1 (@marteinn)

docs/getting-started-with-google-maps.md

@@ -2,7 +2,7 @@
 
 ### Requirements
 
-- Python 3.9+
+- Python 3.10+
 - Wagtail 6.3+ and Django 4.2+
 - A Google account
 

docs/getting-started-with-leaflet.md

@@ -2,7 +2,7 @@
 
 ### Requirements
 
-- Python 3.9+
+- Python 3.10+
 - Wagtail 6.3+ and Django 4.2+
 - Access to a tile provider for Leaflet, this library includes built in support for Open Street Map
 

setup.py

@@ -52,11 +52,11 @@
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3.14",
         "Topic :: Utilities",
     ],
     extras_require={"test": test_extras},

tests/test_widgets.py

@@ -1,11 +1,20 @@
+import unittest
+
 from django.test import TestCase
+from wagtail import VERSION as WAGTAIL_VERSION
 
 from wagtailgeowidget import app_settings, geocoders
-from wagtailgeowidget.widgets import GeocoderField, GoogleMapsField, LeafletField
+from wagtailgeowidget.widgets import (
+    GeocoderField,
+    GoogleMapsField,
+    GoogleMapsFieldAdapter,
+    LeafletField,
+    LeafletFieldAdapter,
+)
 
 
 class GoogleMapsFieldTestCase(TestCase):
-    def test_google_maps_field_contains_constuct(self):
+    def test_google_maps_field_contains_construct(self):
         widget = GoogleMapsField()
         html = widget.render(
             "field",
@@ -20,33 +29,99 @@ def test_google_maps_field_contains_constuct(self):
             html,
         )
 
+    def test_streamfield_widget_uses_empty_id_prefix(self):
+        """Test that StreamField widgets use empty id_prefix."""
 
-class LeafletFieldTestCase(TestCase):
-    def test_leaflet_field_contains_constuct(self):
-        widget = LeafletField()
+        widget = GoogleMapsField(srid=4326, id_prefix="")
+
+        self.assertEqual(widget.id_prefix, "")
+
+    def test_fieldpanel_widget_includes_stimulus_attributes(self):
+        """Test that FieldPanel widgets (id_prefix='id_') include Stimulus controller attributes."""
+
+        widget = GoogleMapsField(srid=4326, id_prefix="id_")
         html = widget.render(
             "field",
-            "",
+            "SRID=4326;POINT(18.0686 59.3293)",
             {
-                "id": "X",
+                "id": "test-field",
             },
         )
 
-        self.assertIn(
-            '<input type="hidden" name="field" id="X" data-controller="leaflet-field"',
-            html,
+        self.assertIn('data-controller="google-maps-field"', html)
+        self.assertIn("data-google-maps-field-options-value=", html)
+
+    def test_streamfield_widget_excludes_stimulus_attributes(self):
+        """Test that StreamField widgets (id_prefix='') exclude Stimulus controller attributes."""
+        widget = GoogleMapsField(srid=4326, id_prefix="")
+
+        html = widget.render(
+            "field",
+            "SRID=4326;POINT(18.0686 59.3293)",
+            {
+                "id": "test-field",
+            },
         )
 
-    def test_leaflet_field_js_init_contains_construct(self):
-        widget = LeafletField()
+        self.assertNotIn('data-controller="google-maps-field"', html)
+        self.assertNotIn("data-google-maps-field-options-value=", html)
+
+    @unittest.skipIf(WAGTAIL_VERSION < (7, 1), "Test only applicable for Wagtail 7.1+")
+    def test_telepath_adapter_js_args_structure(self):
+        """Test that the adapter returns correct js_args structure for Telepath."""
+
+        widget = GoogleMapsField(
+            srid=4326,
+            address_field="address",
+            zoom_field="zoom",
+        )
+        adapter = GoogleMapsFieldAdapter()
+
+        result = adapter.js_args(widget)
+
+        self.assertEqual(len(result), 2)
+
+        self.assertIsInstance(result[0], str)
+        self.assertIn('<input type="hidden"', result[0])
+
+        self.assertIsInstance(result[1], dict)
+        options = result[1]
+
+        self.assertIn("srid", options)
+        self.assertIn("addressField", options)
+        self.assertIn("zoomField", options)
+        self.assertIn("defaultLocation", options)
+        self.assertIn("zoom", options)
+        self.assertIn("mapId", options)
 
+        self.assertEqual(options["srid"], 4326)
+        self.assertEqual(options["addressField"], "address")
+        self.assertEqual(options["zoomField"], "zoom")
+
+    def test_telepath_adapter_streamfield_excludes_stimulus_attributes(self):
+        """Test that HTML by adapter for StreamField widget has no Stimulus attributes."""
+
+        widget = GoogleMapsField(srid=4326, id_prefix="")
+        adapter = GoogleMapsFieldAdapter()
+
+        result = adapter.js_args(widget)
+        html = result[0]
+
+        self.assertNotIn("data-controller=", html)
+        self.assertNotIn("data-google-maps-field-options-value=", html)
+
+
+class LeafletFieldTestCase(TestCase):
+    def test_leaflet_field_contains_construct(self):
+        widget = LeafletField()
         html = widget.render(
             "field",
             "",
             {
                 "id": "X",
             },
         )
+
         self.assertIn(
             '<input type="hidden" name="field" id="X" data-controller="leaflet-field"',
             html,
@@ -67,13 +142,94 @@ def test_value_are_parsed_properly(self):
         self.assertIn(escape('"lat": "13.0"'), html)
         self.assertIn(escape('"lng": "12.0"'), html)
 
+    def test_streamfield_widget_uses_empty_id_prefix(self):
+        """Test that StreamField widgets use empty id_prefix."""
+
+        widget = LeafletField(srid=4326, id_prefix="")
+
+        self.assertEqual(widget.id_prefix, "")
+
+    def test_fieldpanel_widget_includes_stimulus_attributes(self):
+        """Test that FieldPanel widgets (id_prefix='id_') include Stimulus controller attributes."""
+
+        widget = LeafletField(srid=4326, id_prefix="id_")
+        html = widget.render(
+            "field",
+            "SRID=4326;POINT(18.0686 59.3293)",
+            {
+                "id": "test-field",
+            },
+        )
+
+        self.assertIn('data-controller="leaflet-field"', html)
+        self.assertIn("data-leaflet-field-options-value=", html)
+
+    def test_streamfield_widget_excludes_stimulus_attributes(self):
+        """Test that StreamField widgets (id_prefix='') exclude Stimulus controller attributes."""
+
+        widget = LeafletField(srid=4326, id_prefix="")
+
+        html = widget.render(
+            "field",
+            "SRID=4326;POINT(18.0686 59.3293)",
+            {
+                "id": "test-field",
+            },
+        )
+
+        self.assertNotIn('data-controller="leaflet-field"', html)
+        self.assertNotIn("data-leaflet-field-options-value=", html)
+
+    @unittest.skipIf(WAGTAIL_VERSION < (7, 1), "Test only applicable for Wagtail 7.1+")
+    def test_telepath_adapter_js_args_structure(self):
+        """Test that the adapter returns correct js_args structure for Telepath."""
+
+        widget = LeafletField(
+            srid=4326,
+            address_field="address",
+            zoom_field="zoom",
+        )
+        adapter = LeafletFieldAdapter()
+
+        result = adapter.js_args(widget)
+
+        self.assertEqual(len(result), 2)
+
+        self.assertIsInstance(result[0], str)
+        self.assertIn('<input type="hidden"', result[0])
+
+        self.assertIsInstance(result[1], dict)
+        options = result[1]
+
+        self.assertIn("srid", options)
+        self.assertIn("addressField", options)
+        self.assertIn("zoomField", options)
+        self.assertIn("defaultLocation", options)
+        self.assertIn("zoom", options)
+
+        self.assertEqual(options["srid"], 4326)
+        self.assertEqual(options["addressField"], "address")
+        self.assertEqual(options["zoomField"], "zoom")
+
+    def test_telepath_adapter_streamfield_excludes_stimulus_attributes(self):
+        """Test that HTML by adapter for StreamField widget has no Stimulus attributes."""
+
+        widget = LeafletField(srid=4326, id_prefix="")
+        adapter = LeafletFieldAdapter()
+
+        result = adapter.js_args(widget)
+        html = result[0]
+
+        self.assertNotIn("data-controller=", html)
+        self.assertNotIn("data-leaflet-field-options-value=", html)
+
 
 class GeocoderFieldTestCase(TestCase):
     def setUp(self):
         app_settings.MAPBOX_ACCESS_TOKEN = None
         app_settings.MAPBOX_LANGUAGE = "en"
 
-    def test_geocoder_field_contains_constuct(self):
+    def test_geocoder_field_contains_construct(self):
         widget = GeocoderField()
         html = widget.render(
             "field",

wagtailgeowidget/__init__.py

@@ -7,8 +7,8 @@
 """
 
 __title__ = "wagtailgeowidget"
-__version__ = "9.0.0"
-__build__ = 900
+__version__ = "9.1.0"
+__build__ = 901
 __author__ = "Martin Sandström"
 __license__ = "MIT"
 __copyright__ = "Copyright 2015-Present Fröjd Interactive"

wagtailgeowidget/widgets.py

@@ -66,6 +66,15 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
     def build_attrs(self, *args, **kwargs):
+        attrs = super().build_attrs(*args, **kwargs)
+
+        # Don't add Stimulus controller attributes if this widget is being used
+        # in a StreamField/StructBlock context (id_prefix=""). In that context,
+        # Telepath handles initialization. For FieldPanel (id_prefix="id_"),
+        # Stimulus is still needed even though Telepath is used for serialization.
+        if self.id_prefix == "":
+            return attrs
+
         data = {
             "defaultLocation": GEO_WIDGET_DEFAULT_LOCATION,
             "addressField": self.address_field,
@@ -91,7 +100,6 @@ def build_attrs(self, *args, **kwargs):
                 "lng": self.value_data.x,
             }
 
-        attrs = super().build_attrs(*args, **kwargs)
         attrs["data-controller"] = "google-maps-field"
         attrs["data-google-maps-field-options-value"] = json.dumps(data)
         return attrs
@@ -249,6 +257,15 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
     def build_attrs(self, *args, **kwargs):
+        attrs = super().build_attrs(*args, **kwargs)
+
+        # Don't add Stimulus controller attributes if this widget is being used
+        # in a StreamField/StructBlock context (id_prefix=""). In that context,
+        # Telepath handles initialization. For FieldPanel (id_prefix="id_"),
+        # Stimulus is still needed even though Telepath is used for serialization.
+        if self.id_prefix == "":
+            return attrs
+
         data = {
             "defaultLocation": GEO_WIDGET_DEFAULT_LOCATION,
             "addressField": self.address_field,
@@ -275,7 +292,6 @@ def build_attrs(self, *args, **kwargs):
                 "lng": self.value_data.x,
             }
 
-        attrs = super().build_attrs(*args, **kwargs)
         attrs["data-controller"] = "leaflet-field"
         attrs["data-leaflet-field-options-value"] = json.dumps(data)
         return attrs
@@ -333,19 +349,18 @@ class GoogleMapsFieldAdapter(WidgetAdapter):
     def js_args(self, widget):
         args = super().js_args(widget)
 
-        return [
-            *args,
-            {
-                "addressField": widget.address_field,
-                "zoomField": widget.zoom_field,
-                "defaultLocation": GEO_WIDGET_DEFAULT_LOCATION,
-                "srid": widget.srid,
-                "zoom": widget.zoom,
-                "showEmptyLocation": GEO_WIDGET_EMPTY_LOCATION,
-                "translations": translations,
-                "mapId": widget.map_id,
-            },
-        ]
+        options = {
+            "addressField": widget.address_field,
+            "zoomField": widget.zoom_field,
+            "defaultLocation": GEO_WIDGET_DEFAULT_LOCATION,
+            "srid": widget.srid,
+            "zoom": widget.zoom,
+            "showEmptyLocation": GEO_WIDGET_EMPTY_LOCATION,
+            "translations": translations,
+            "mapId": widget.map_id,
+        }
+
+        return [*args, options]
 
     class Media:
         js = ["wagtailgeowidget/js/google-maps-field-telepath.js"]