fixup! ♿️(frontend) fix empty heading before section titles in HTML export

Lists separated by a heading were merged into a single <ul>

CHANGELOG.md

@@ -8,7 +8,32 @@ and this project adheres to
 
 ### Changed
 
+- 💄(frontend) improve comments highlights #1961
+- ♿️(frontend) fix empty heading before section titles in HTML export #2125
+
+## [v4.8.3] - 2026-03-23
+
+### Changed
+
+- ♿️(frontend) improve version history list accessibility #2033
+- ♿(frontend) focus skip link on headings and skip grid dropzone #1983
+- ♿️(frontend) add sr-only format to export download button #2088
+- ♿️(frontend) announce formatting shortcuts for screen readers #2070
+- ✨(frontend) add markdown copy icon for Copy as Markdown option #2096
+- ♻️(backend) skip saving in database a document when payload is empty #2062
+- ♻️(frontend) refacto Version modal to fit with the design system #2091
+- ⚡️(frontend) add debounce WebSocket reconnect #2104
+
+### Fixed
+
+- ♿️(frontend) fix more options menu feedback for screen readers #2071
+- ♿️(frontend) fix more options menu feedback for screen readers #2071
 - 💫(frontend) fix the help button to the bottom in tree #2073
+- ♿️(frontend) fix aria-labels for table of contents #2065
+- 🐛(backend) allow using search endpoint without refresh token enabled #2097
+- 🐛(frontend) fix close panel when click on subdoc #2094
+- 🐛(frontend) fix leftpanel button in doc version #9238
+- 🐛(y-provider) fix loop when no cookies #2101
 
 ## [v4.8.2] - 2026-03-19
 
@@ -1153,7 +1178,8 @@ and this project adheres to
 - ✨(frontend) Coming Soon page (#67)
 - 🚀 Impress, project to manage your documents easily and collaboratively.
 
-[unreleased]: https://github.com/suitenumerique/docs/compare/v4.8.2...main
+[unreleased]: https://github.com/suitenumerique/docs/compare/v4.8.3...main
+[v4.8.3]: https://github.com/suitenumerique/docs/releases/v4.8.3
 [v4.8.2]: https://github.com/suitenumerique/docs/releases/v4.8.2
 [v4.8.1]: https://github.com/suitenumerique/docs/releases/v4.8.1
 [v4.8.0]: https://github.com/suitenumerique/docs/releases/v4.8.0

env.d/development/common

@@ -61,8 +61,8 @@ OIDC_RS_AUDIENCE_CLAIM="client_id"  # The claim used to identify the audience
 OIDC_RS_ALLOWED_AUDIENCES=""
 
 # Store OIDC tokens in the session. Needed by search/ endpoint.
-OIDC_STORE_ACCESS_TOKEN=True
-OIDC_STORE_REFRESH_TOKEN=True # Store the encrypted refresh token in the session.
+# OIDC_STORE_ACCESS_TOKEN=True
+# OIDC_STORE_REFRESH_TOKEN=True # Store the encrypted refresh token in the session.
 
 # Must be a valid Fernet key (32 url-safe base64-encoded bytes)
 # To create one, use the bin/fernetkey command.

renovate.json

@@ -60,10 +60,13 @@
       "groupName": "ignored js dependencies",
       "matchManagers": ["npm"],
       "matchPackageNames": [
+        "@react-pdf/renderer",
         "fetch-mock",
         "node",
         "node-fetch",
         "react-resizable-panels",
+        "stylelint",
+        "stylelint-config-standard",
         "workbox-webpack-plugin"
       ]
     }

src/backend/core/api/serializers.py

@@ -300,6 +300,15 @@ class DocumentSerializer(ListDocumentSerializer):
 
         return file
 
+    def update(self, instance, validated_data):
+        """
+        When no data is sent on the update, skip making the update in the database and return
+        directly the instance unchanged.
+        """
+        if not validated_data:
+            return instance  # No data provided, skip the update
+        return super().update(instance, validated_data)
+
     def save(self, **kwargs):
         """
         Process the content field to extract attachment keys and update the document's

src/backend/core/api/utils.py

@@ -6,8 +6,10 @@ from abc import ABC, abstractmethod
 from django.conf import settings
 from django.core.cache import cache
 from django.core.files.storage import default_storage
+from django.utils.decorators import method_decorator
 
 import botocore
+from lasuite.oidc_login.decorators import refresh_oidc_access_token
 from rest_framework.throttling import BaseThrottle
 
 
@@ -91,6 +93,19 @@ def generate_s3_authorization_headers(key):
     return request
 
 
+def conditional_refresh_oidc_token(func):
+    """
+    Conditionally apply refresh_oidc_access_token decorator.
+
+    The decorator is only applied if OIDC_STORE_REFRESH_TOKEN is True, meaning
+    we can actually refresh something. Broader settings checks are done in settings.py.
+    """
+    if settings.OIDC_STORE_REFRESH_TOKEN:
+        return method_decorator(refresh_oidc_access_token)(func)
+
+    return func
+
+
 class AIBaseRateThrottle(BaseThrottle, ABC):
     """Base throttle class for AI-related rate limiting with backoff."""
 

src/backend/core/api/viewsets.py

@@ -25,7 +25,6 @@ from django.db.models.functions import Greatest, Left, Length
 from django.http import Http404, StreamingHttpResponse
 from django.urls import reverse
 from django.utils import timezone
-from django.utils.decorators import method_decorator
 from django.utils.functional import cached_property
 from django.utils.http import content_disposition_header
 from django.utils.text import capfirst, slugify
@@ -38,7 +37,6 @@ from botocore.exceptions import ClientError
 from csp.constants import NONE
 from csp.decorators import csp_update
 from lasuite.malware_detection import malware_detection
-from lasuite.oidc_login.decorators import refresh_oidc_access_token
 from lasuite.tools.email import get_domain_from_email
 from pydantic import ValidationError as PydanticValidationError
 from rest_framework import filters, status, viewsets
@@ -1415,7 +1413,7 @@ class DocumentViewSet(
         return duplicated_document
 
     @drf.decorators.action(detail=False, methods=["get"], url_path="search")
-    @method_decorator(refresh_oidc_access_token)
+    @utils.conditional_refresh_oidc_token
     def search(self, request, *args, **kwargs):
         """
         Returns an ordered list of documents best matching the search query parameter 'q'.
@@ -1426,7 +1424,6 @@ class DocumentViewSet(
         params = serializers.SearchDocumentSerializer(data=request.query_params)
         params.is_valid(raise_exception=True)
         search_type = self._get_search_type()
-
         if search_type == SearchType.TITLE:
             return self._title_search(request, params.validated_data, *args, **kwargs)
 

src/backend/core/tests/documents/test_api_documents_search.py

@@ -70,17 +70,20 @@ def test_api_documents_search_anonymous(search_query, indexer_settings):
 
 
 @mock.patch("core.api.viewsets.DocumentViewSet.list")
-def test_api_documents_search_fall_back_on_search_list(mock_list, indexer_settings):
+def test_api_documents_search_fall_back_on_search_list(mock_list, settings):
     """
     When indexer is not configured and no path is provided,
     should fall back on list method
     """
-    indexer_settings.SEARCH_URL = None
     assert get_document_indexer() is None
+    assert settings.OIDC_STORE_REFRESH_TOKEN is False
+    assert settings.OIDC_STORE_ACCESS_TOKEN is False
 
     user = factories.UserFactory()
     client = APIClient()
-    client.force_login(user)
+    client.force_login(
+        user, backend="core.authentication.backends.OIDCAuthenticationBackend"
+    )
 
     mocked_response = {
         "count": 0,
@@ -93,6 +96,8 @@ def test_api_documents_search_fall_back_on_search_list(mock_list, indexer_settin
     q = "alpha"
     response = client.get("/api/v1.0/documents/search/", data={"q": q})
 
+    assert response.status_code == 200
+
     assert mock_list.call_count == 1
     assert mock_list.call_args[0][0].GET.get("q") == q
     assert response.json() == mocked_response
@@ -100,18 +105,21 @@ def test_api_documents_search_fall_back_on_search_list(mock_list, indexer_settin
 
 @mock.patch("core.api.viewsets.DocumentViewSet._list_descendants")
 def test_api_documents_search_fallback_on_search_list_sub_docs(
-    mock_list_descendants, indexer_settings
+    mock_list_descendants, settings
 ):
     """
     When indexer is not configured and path parameter is provided,
     should call _list_descendants() method
     """
-    indexer_settings.SEARCH_URL = "http://find/api/v1.0/search"
-    assert get_document_indexer() is not None
+    assert get_document_indexer() is None
+    assert settings.OIDC_STORE_REFRESH_TOKEN is False
+    assert settings.OIDC_STORE_ACCESS_TOKEN is False
 
     user = factories.UserFactory()
     client = APIClient()
-    client.force_login(user)
+    client.force_login(
+        user, backend="core.authentication.backends.OIDCAuthenticationBackend"
+    )
 
     parent = factories.DocumentFactory(title="parent", users=[user])
 
@@ -128,9 +136,9 @@ def test_api_documents_search_fallback_on_search_list_sub_docs(
         "/api/v1.0/documents/search/", data={"q": q, "path": parent.path}
     )
 
-    assert mock_list_descendants.call_count == 1
-    assert mock_list_descendants.call_args[0][0].GET.get("q") == q
-    assert mock_list_descendants.call_args[0][0].GET.get("path") == parent.path
+    mock_list_descendants.assert_called_with(
+        mock.ANY, {"q": "alpha", "path": parent.path}
+    )
     assert response.json() == mocked_response
 
 
@@ -152,7 +160,9 @@ def test_api_documents_search_indexer_crashes(mock_title_search, indexer_setting
 
     user = factories.UserFactory()
     client = APIClient()
-    client.force_login(user)
+    client.force_login(
+        user, backend="core.authentication.backends.OIDCAuthenticationBackend"
+    )
 
     mocked_response = {
         "count": 0,
@@ -185,7 +195,9 @@ def test_api_documents_search_invalid_params(indexer_settings):
 
     user = factories.UserFactory()
     client = APIClient()
-    client.force_login(user)
+    client.force_login(
+        user, backend="core.authentication.backends.OIDCAuthenticationBackend"
+    )
 
     response = client.get("/api/v1.0/documents/search/")
 

src/backend/core/tests/documents/test_api_documents_update.py

@@ -1,8 +1,10 @@
 """
 Tests for Documents API endpoint in impress's core app: update
 """
+# pylint: disable=too-many-lines
 
 import random
+from unittest.mock import patch
 
 from django.contrib.auth.models import AnonymousUser
 from django.core.cache import cache
@@ -17,6 +19,25 @@ from core.tests.conftest import TEAM, USER, VIA
 
 pytestmark = pytest.mark.django_db
 
+# A valid Yjs document derived from YDOC_HELLO_WORLD_BASE64 with "Hello" replaced by "World",
+# used in PATCH tests to guarantee a real content change distinct from what DocumentFactory
+# produces.
+YDOC_UPDATED_CONTENT_BASE64 = (
+    "AR717vLVDgAHAQ5kb2N1bWVudC1zdG9yZQMKYmxvY2tHcm91cAcA9e7y1Q4AAw5ibG9ja0NvbnRh"
+    "aW5lcgcA9e7y1Q4BAwdoZWFkaW5nBwD17vLVDgIGBgD17vLVDgMGaXRhbGljAnt9hPXu8tUOBAVX"
+    "b3JsZIb17vLVDgkGaXRhbGljBG51bGwoAPXu8tUOAg10ZXh0QWxpZ25tZW50AXcEbGVmdCgA9e7y"
+    "1Q4CBWxldmVsAX0BKAD17vLVDgECaWQBdyQwNGQ2MjM0MS04MzI2LTQyMzYtYTA4My00ODdlMjZm"
+    "YWQyMzAoAPXu8tUOAQl0ZXh0Q29sb3IBdwdkZWZhdWx0KAD17vLVDgEPYmFja2dyb3VuZENvbG9y"
+    "AXcHZGVmYXVsdIf17vLVDgEDDmJsb2NrQ29udGFpbmVyBwD17vLVDhADDmJ1bGxldExpc3RJdGVt"
+    "BwD17vLVDhEGBAD17vLVDhIBd4b17vLVDhMEYm9sZAJ7fYT17vLVDhQCb3KG9e7y1Q4WBGJvbGQE"
+    "bnVsbIT17vLVDhcCbGQoAPXu8tUOEQ10ZXh0QWxpZ25tZW50AXcEbGVmdCgA9e7y1Q4QAmlkAXck"
+    "ZDM1MWUwNjgtM2U1NS00MjI2LThlYTUtYWJiMjYzMTk4ZTJhKAD17vLVDhAJdGV4dENvbG9yAXcH"
+    "ZGVmYXVsdCgA9e7y1Q4QD2JhY2tncm91bmRDb2xvcgF3B2RlZmF1bHSH9e7y1Q4QAw5ibG9ja0Nv"
+    "bnRhaW5lcgcA9e7y1Q4eAwlwYXJhZ3JhcGgoAPXu8tUOHw10ZXh0QWxpZ25tZW50AXcEbGVmdCgA"
+    "9e7y1Q4eAmlkAXckODk3MDBjMDctZTBlMS00ZmUwLWFjYTItODQ5MzIwOWE3ZTQyKAD17vLVDh4J"
+    "dGV4dENvbG9yAXcHZGVmYXVsdCgA9e7y1Q4eD2JhY2tncm91bmRDb2xvcgF3B2RlZmF1bHQA"
+)
+
 
 @pytest.mark.parametrize("via_parent", [True, False])
 @pytest.mark.parametrize(
@@ -330,6 +351,7 @@ def test_api_documents_update_authenticated_no_websocket(settings):
     ws_resp = responses.get(endpoint_url, json={"count": 0, "exists": False})
 
     assert cache.get(f"docs:no-websocket:{document.id}") is None
+    old_path = document.path
 
     response = client.put(
         f"/api/v1.0/documents/{document.id!s}/",
@@ -338,6 +360,8 @@ def test_api_documents_update_authenticated_no_websocket(settings):
     )
     assert response.status_code == 200
 
+    document.refresh_from_db()
+    assert document.path == old_path
     assert cache.get(f"docs:no-websocket:{document.id}") == session_key
     assert ws_resp.call_count == 1
 
@@ -446,6 +470,7 @@ def test_api_documents_update_user_connected_to_websocket(settings):
     ws_resp = responses.get(endpoint_url, json={"count": 3, "exists": True})
 
     assert cache.get(f"docs:no-websocket:{document.id}") is None
+    old_path = document.path
 
     response = client.put(
         f"/api/v1.0/documents/{document.id!s}/",
@@ -453,6 +478,9 @@ def test_api_documents_update_user_connected_to_websocket(settings):
         format="json",
     )
     assert response.status_code == 200
+
+    document.refresh_from_db()
+    assert document.path == old_path
     assert cache.get(f"docs:no-websocket:{document.id}") is None
     assert ws_resp.call_count == 1
 
@@ -486,6 +514,7 @@ def test_api_documents_update_websocket_server_unreachable_fallback_to_no_websoc
     ws_resp = responses.get(endpoint_url, status=500)
 
     assert cache.get(f"docs:no-websocket:{document.id}") is None
+    old_path = document.path
 
     response = client.put(
         f"/api/v1.0/documents/{document.id!s}/",
@@ -494,6 +523,8 @@ def test_api_documents_update_websocket_server_unreachable_fallback_to_no_websoc
     )
     assert response.status_code == 200
 
+    document.refresh_from_db()
+    assert document.path == old_path
     assert cache.get(f"docs:no-websocket:{document.id}") == session_key
     assert ws_resp.call_count == 1
 
@@ -605,6 +636,7 @@ def test_api_documents_update_force_websocket_param_to_true(settings):
     ws_resp = responses.get(endpoint_url, status=500)
 
     assert cache.get(f"docs:no-websocket:{document.id}") is None
+    old_path = document.path
 
     response = client.put(
         f"/api/v1.0/documents/{document.id!s}/",
@@ -613,6 +645,8 @@ def test_api_documents_update_force_websocket_param_to_true(settings):
     )
     assert response.status_code == 200
 
+    document.refresh_from_db()
+    assert document.path == old_path
     assert cache.get(f"docs:no-websocket:{document.id}") is None
     assert ws_resp.call_count == 0
 
@@ -643,6 +677,7 @@ def test_api_documents_update_feature_flag_disabled(settings):
     ws_resp = responses.get(endpoint_url, status=500)
 
     assert cache.get(f"docs:no-websocket:{document.id}") is None
+    old_path = document.path
 
     response = client.put(
         f"/api/v1.0/documents/{document.id!s}/",
@@ -651,6 +686,8 @@ def test_api_documents_update_feature_flag_disabled(settings):
     )
     assert response.status_code == 200
 
+    document.refresh_from_db()
+    assert document.path == old_path
     assert cache.get(f"docs:no-websocket:{document.id}") is None
     assert ws_resp.call_count == 0
 
@@ -716,3 +753,724 @@ def test_api_documents_update_invalid_content():
     )
     assert response.status_code == 400
     assert response.json() == {"content": ["Invalid base64 content."]}
+
+
+# =============================================================================
+# PATCH tests
+# =============================================================================
+
+
+@pytest.mark.parametrize("via_parent", [True, False])
+@pytest.mark.parametrize(
+    "reach, role",
+    [
+        ("restricted", "reader"),
+        ("restricted", "editor"),
+        ("authenticated", "reader"),
+        ("authenticated", "editor"),
+        ("public", "reader"),
+    ],
+)
+def test_api_documents_patch_anonymous_forbidden(reach, role, via_parent):
+    """
+    Anonymous users should not be allowed to patch a document when link
+    configuration does not allow it.
+    """
+    if via_parent:
+        grand_parent = factories.DocumentFactory(link_reach=reach, link_role=role)
+        parent = factories.DocumentFactory(parent=grand_parent, link_reach="restricted")
+        document = factories.DocumentFactory(parent=parent, link_reach="restricted")
+    else:
+        document = factories.DocumentFactory(link_reach=reach, link_role=role)
+
+    old_document_values = serializers.DocumentSerializer(instance=document).data
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    response = APIClient().patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+    assert response.status_code == 401
+    assert response.json() == {
+        "detail": "Authentication credentials were not provided."
+    }
+
+    document.refresh_from_db()
+    assert serializers.DocumentSerializer(instance=document).data == old_document_values
+
+
+@pytest.mark.parametrize("via_parent", [True, False])
+@pytest.mark.parametrize(
+    "reach,role",
+    [
+        ("public", "reader"),
+        ("authenticated", "reader"),
+        ("restricted", "reader"),
+        ("restricted", "editor"),
+    ],
+)
+def test_api_documents_patch_authenticated_unrelated_forbidden(reach, role, via_parent):
+    """
+    Authenticated users should not be allowed to patch a document to which
+    they are not related if the link configuration does not allow it.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+
+    client = APIClient()
+    client.force_login(user)
+
+    if via_parent:
+        grand_parent = factories.DocumentFactory(link_reach=reach, link_role=role)
+        parent = factories.DocumentFactory(parent=grand_parent, link_reach="restricted")
+        document = factories.DocumentFactory(parent=parent, link_reach="restricted")
+    else:
+        document = factories.DocumentFactory(link_reach=reach, link_role=role)
+
+    old_document_values = serializers.DocumentSerializer(instance=document).data
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+
+    assert response.status_code == 403
+    assert response.json() == {
+        "detail": "You do not have permission to perform this action."
+    }
+
+    document.refresh_from_db()
+    assert serializers.DocumentSerializer(instance=document).data == old_document_values
+
+
+@pytest.mark.parametrize("via_parent", [True, False])
+@pytest.mark.parametrize(
+    "is_authenticated,reach,role",
+    [
+        (False, "public", "editor"),
+        (True, "public", "editor"),
+        (True, "authenticated", "editor"),
+    ],
+)
+def test_api_documents_patch_anonymous_or_authenticated_unrelated(
+    is_authenticated, reach, role, via_parent
+):
+    """
+    Anonymous and authenticated users should be able to patch a document to which
+    they are not related if the link configuration allows it.
+    """
+    client = APIClient()
+
+    if is_authenticated:
+        user = factories.UserFactory(with_owned_document=True)
+        client.force_login(user)
+
+    if via_parent:
+        grand_parent = factories.DocumentFactory(link_reach=reach, link_role=role)
+        parent = factories.DocumentFactory(parent=grand_parent, link_reach="restricted")
+        document = factories.DocumentFactory(parent=parent, link_reach="restricted")
+    else:
+        document = factories.DocumentFactory(link_reach=reach, link_role=role)
+
+    old_document_values = serializers.DocumentSerializer(instance=document).data
+    old_path = document.path
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content, "websocket": True},
+        format="json",
+    )
+    assert response.status_code == 200
+
+    # Using document.refresh_from_db does not wirk because the content is in cache.
+    # Force reloading it by fetching the document in the database.
+    document = models.Document.objects.get(id=document.id)
+    assert document.path == old_path
+    assert document.content == new_content
+    document_values = serializers.DocumentSerializer(instance=document).data
+    for key in [
+        "id",
+        "title",
+        "link_reach",
+        "link_role",
+        "creator",
+        "depth",
+        "numchild",
+        "path",
+    ]:
+        assert document_values[key] == old_document_values[key]
+
+
+@pytest.mark.parametrize("via_parent", [True, False])
+@pytest.mark.parametrize("via", VIA)
+def test_api_documents_patch_authenticated_reader(via, via_parent, mock_user_teams):
+    """Users who are reader of a document should not be allowed to patch it."""
+    user = factories.UserFactory(with_owned_document=True)
+
+    client = APIClient()
+    client.force_login(user)
+
+    if via_parent:
+        grand_parent = factories.DocumentFactory(link_reach="restricted")
+        parent = factories.DocumentFactory(parent=grand_parent, link_reach="restricted")
+        document = factories.DocumentFactory(parent=parent, link_reach="restricted")
+        access_document = grand_parent
+    else:
+        document = factories.DocumentFactory(link_reach="restricted")
+        access_document = document
+
+    if via == USER:
+        factories.UserDocumentAccessFactory(
+            document=access_document, user=user, role="reader"
+        )
+    elif via == TEAM:
+        mock_user_teams.return_value = ["lasuite", "unknown"]
+        factories.TeamDocumentAccessFactory(
+            document=access_document, team="lasuite", role="reader"
+        )
+
+    old_document_values = serializers.DocumentSerializer(instance=document).data
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+
+    assert response.status_code == 403
+    assert response.json() == {
+        "detail": "You do not have permission to perform this action."
+    }
+
+    document.refresh_from_db()
+    assert serializers.DocumentSerializer(instance=document).data == old_document_values
+
+
+@pytest.mark.parametrize("via_parent", [True, False])
+@pytest.mark.parametrize("role", ["editor", "administrator", "owner"])
+@pytest.mark.parametrize("via", VIA)
+def test_api_documents_patch_authenticated_editor_administrator_or_owner(
+    via, role, via_parent, mock_user_teams
+):
+    """A user who is editor, administrator or owner of a document should be allowed to patch it."""
+    user = factories.UserFactory(with_owned_document=True)
+
+    client = APIClient()
+    client.force_login(user)
+
+    if via_parent:
+        grand_parent = factories.DocumentFactory(link_reach="restricted")
+        parent = factories.DocumentFactory(parent=grand_parent, link_reach="restricted")
+        document = factories.DocumentFactory(parent=parent, link_reach="restricted")
+        access_document = grand_parent
+    else:
+        document = factories.DocumentFactory(link_reach="restricted")
+        access_document = document
+
+    if via == USER:
+        factories.UserDocumentAccessFactory(
+            document=access_document, user=user, role=role
+        )
+    elif via == TEAM:
+        mock_user_teams.return_value = ["lasuite", "unknown"]
+        factories.TeamDocumentAccessFactory(
+            document=access_document, team="lasuite", role=role
+        )
+
+    old_document_values = serializers.DocumentSerializer(instance=document).data
+    old_path = document.path
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content, "websocket": True},
+        format="json",
+    )
+    assert response.status_code == 200
+
+    # Using document.refresh_from_db does not wirk because the content is in cache.
+    # Force reloading it by fetching the document in the database.
+    document = models.Document.objects.get(id=document.id)
+    assert document.path == old_path
+    assert document.content == new_content
+    document_values = serializers.DocumentSerializer(instance=document).data
+    for key in [
+        "id",
+        "title",
+        "link_reach",
+        "link_role",
+        "creator",
+        "depth",
+        "numchild",
+        "path",
+        "nb_accesses_ancestors",
+        "nb_accesses_direct",
+    ]:
+        assert document_values[key] == old_document_values[key]
+
+
+@responses.activate
+def test_api_documents_patch_authenticated_no_websocket(settings):
+    """
+    When a user patches the document, not connected to the websocket and is the first to update,
+    the document should be updated.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+    client = APIClient()
+    client.force_login(user)
+    session_key = client.session.session_key
+
+    document = factories.DocumentFactory(users=[(user, "editor")])
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}get-connections/"
+        f"?room={document.id}&sessionKey={session_key}"
+    )
+    ws_resp = responses.get(endpoint_url, json={"count": 0, "exists": False})
+
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+    old_path = document.path
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+    assert response.status_code == 200
+
+    # Using document.refresh_from_db does not work because the content is cached.
+    # Force reloading it by fetching the document from the database.
+    document = models.Document.objects.get(id=document.id)
+    assert document.path == old_path
+    assert document.content == new_content
+    assert cache.get(f"docs:no-websocket:{document.id}") == session_key
+    assert ws_resp.call_count == 1
+
+
+@responses.activate
+def test_api_documents_patch_authenticated_no_websocket_user_already_editing(settings):
+    """
+    When a user patches the document, not connected to the websocket and is not the first to
+    update, the document should not be updated.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+    client = APIClient()
+    client.force_login(user)
+    session_key = client.session.session_key
+
+    document = factories.DocumentFactory(users=[(user, "editor")])
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}get-connections/"
+        f"?room={document.id}&sessionKey={session_key}"
+    )
+    ws_resp = responses.get(endpoint_url, json={"count": 0, "exists": False})
+
+    cache.set(f"docs:no-websocket:{document.id}", "other_session_key")
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+    assert response.status_code == 403
+    assert response.json() == {"detail": "You are not allowed to edit this document."}
+
+    assert ws_resp.call_count == 1
+
+
+@responses.activate
+def test_api_documents_patch_no_websocket_other_user_connected_to_websocket(settings):
+    """
+    When a user patches the document, not connected to the websocket and another user is connected
+    to the websocket, the document should not be updated.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+    client = APIClient()
+    client.force_login(user)
+    session_key = client.session.session_key
+
+    document = factories.DocumentFactory(users=[(user, "editor")])
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}get-connections/"
+        f"?room={document.id}&sessionKey={session_key}"
+    )
+    ws_resp = responses.get(endpoint_url, json={"count": 3, "exists": False})
+
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+    assert response.status_code == 403
+    assert response.json() == {"detail": "You are not allowed to edit this document."}
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+    assert ws_resp.call_count == 1
+
+
+@responses.activate
+def test_api_documents_patch_user_connected_to_websocket(settings):
+    """
+    When a user patches the document while connected to the websocket, the document should be
+    updated.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+    client = APIClient()
+    client.force_login(user)
+    session_key = client.session.session_key
+
+    document = factories.DocumentFactory(users=[(user, "editor")])
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}get-connections/"
+        f"?room={document.id}&sessionKey={session_key}"
+    )
+    ws_resp = responses.get(endpoint_url, json={"count": 3, "exists": True})
+
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+    old_path = document.path
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+    assert response.status_code == 200
+
+    # Using document.refresh_from_db does not wirk because the content is in cache.
+    # Force reloading it by fetching the document in the database.
+    document = models.Document.objects.get(id=document.id)
+    assert document.path == old_path
+    assert document.content == new_content
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+    assert ws_resp.call_count == 1
+
+
+@responses.activate
+def test_api_documents_patch_websocket_server_unreachable_fallback_to_no_websocket(
+    settings,
+):
+    """
+    When the websocket server is unreachable, the patch should be applied like if the user was
+    not connected to the websocket.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+    client = APIClient()
+    client.force_login(user)
+    session_key = client.session.session_key
+
+    document = factories.DocumentFactory(users=[(user, "editor")])
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}get-connections/"
+        f"?room={document.id}&sessionKey={session_key}"
+    )
+    ws_resp = responses.get(endpoint_url, status=500)
+
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+    old_path = document.path
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+    assert response.status_code == 200
+
+    # Using document.refresh_from_db does not work because the content is cached.
+    # Force reloading it by fetching the document from the database.
+    document = models.Document.objects.get(id=document.id)
+    assert document.path == old_path
+    assert document.content == new_content
+    assert cache.get(f"docs:no-websocket:{document.id}") == session_key
+    assert ws_resp.call_count == 1
+
+
+@responses.activate
+def test_api_documents_patch_websocket_server_unreachable_fallback_to_no_websocket_other_users(
+    settings,
+):
+    """
+    When the websocket server is unreachable, the behavior falls back to no-websocket.
+    If another user is already editing, the patch must be denied.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+    client = APIClient()
+    client.force_login(user)
+    session_key = client.session.session_key
+
+    document = factories.DocumentFactory(users=[(user, "editor")])
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}get-connections/"
+        f"?room={document.id}&sessionKey={session_key}"
+    )
+    ws_resp = responses.get(endpoint_url, status=500)
+
+    cache.set(f"docs:no-websocket:{document.id}", "other_session_key")
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+    assert response.status_code == 403
+
+    assert cache.get(f"docs:no-websocket:{document.id}") == "other_session_key"
+    assert ws_resp.call_count == 1
+
+
+@responses.activate
+def test_api_documents_patch_websocket_server_room_not_found_fallback_to_no_websocket_other_users(
+    settings,
+):
+    """
+    When the WebSocket server does not have the room created, the logic should fallback to
+    no-WebSocket. If another user is already editing, the patch must be denied.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+    client = APIClient()
+    client.force_login(user)
+    session_key = client.session.session_key
+
+    document = factories.DocumentFactory(users=[(user, "editor")])
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}get-connections/"
+        f"?room={document.id}&sessionKey={session_key}"
+    )
+    ws_resp = responses.get(endpoint_url, status=404)
+
+    cache.set(f"docs:no-websocket:{document.id}", "other_session_key")
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+    assert response.status_code == 403
+
+    assert cache.get(f"docs:no-websocket:{document.id}") == "other_session_key"
+    assert ws_resp.call_count == 1
+
+
+@responses.activate
+def test_api_documents_patch_force_websocket_param_to_true(settings):
+    """
+    When the websocket parameter is set to true, the patch should be applied without any check.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+    client = APIClient()
+    client.force_login(user)
+    session_key = client.session.session_key
+
+    document = factories.DocumentFactory(users=[(user, "editor")])
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}get-connections/"
+        f"?room={document.id}&sessionKey={session_key}"
+    )
+    ws_resp = responses.get(endpoint_url, status=500)
+
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+    old_path = document.path
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content, "websocket": True},
+        format="json",
+    )
+    assert response.status_code == 200
+
+    # Using document.refresh_from_db does not work because the content is cached.
+    # Force reloading it by fetching the document from the database.
+    document = models.Document.objects.get(id=document.id)
+    assert document.path == old_path
+    assert document.content == new_content
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+    assert ws_resp.call_count == 0
+
+
+@responses.activate
+def test_api_documents_patch_feature_flag_disabled(settings):
+    """
+    When the feature flag is disabled, the patch should be applied without any check.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+    client = APIClient()
+    client.force_login(user)
+    session_key = client.session.session_key
+
+    document = factories.DocumentFactory(users=[(user, "editor")])
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = False
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}get-connections/"
+        f"?room={document.id}&sessionKey={session_key}"
+    )
+    ws_resp = responses.get(endpoint_url, status=500)
+
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+    old_path = document.path
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+    assert response.status_code == 200
+
+    # Using document.refresh_from_db does not work because the content is cached.
+    # Force reloading it by fetching the document from the database.
+    document = models.Document.objects.get(id=document.id)
+    assert document.path == old_path
+    assert document.content == new_content
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+    assert ws_resp.call_count == 0
+
+
+@pytest.mark.parametrize("via", VIA)
+def test_api_documents_patch_administrator_or_owner_of_another(via, mock_user_teams):
+    """
+    Being administrator or owner of a document should not grant authorization to patch
+    another document.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+
+    client = APIClient()
+    client.force_login(user)
+
+    document = factories.DocumentFactory()
+    if via == USER:
+        factories.UserDocumentAccessFactory(
+            document=document, user=user, role=random.choice(["administrator", "owner"])
+        )
+    elif via == TEAM:
+        mock_user_teams.return_value = ["lasuite", "unknown"]
+        factories.TeamDocumentAccessFactory(
+            document=document,
+            team="lasuite",
+            role=random.choice(["administrator", "owner"]),
+        )
+
+    other_document = factories.DocumentFactory(title="Old title", link_role="reader")
+    old_document_values = serializers.DocumentSerializer(instance=other_document).data
+    new_content = YDOC_UPDATED_CONTENT_BASE64
+
+    response = client.patch(
+        f"/api/v1.0/documents/{other_document.id!s}/",
+        {"content": new_content},
+        format="json",
+    )
+
+    assert response.status_code == 403
+
+    other_document.refresh_from_db()
+    assert (
+        serializers.DocumentSerializer(instance=other_document).data
+        == old_document_values
+    )
+
+
+def test_api_documents_patch_invalid_content():
+    """
+    Patching a document with a non base64 encoded content should raise a validation error.
+    """
+    user = factories.UserFactory(with_owned_document=True)
+    client = APIClient()
+    client.force_login(user)
+
+    document = factories.DocumentFactory(users=[[user, "owner"]])
+
+    response = client.patch(
+        f"/api/v1.0/documents/{document.id!s}/",
+        {"content": "invalid content"},
+        format="json",
+    )
+    assert response.status_code == 400
+    assert response.json() == {"content": ["Invalid base64 content."]}
+
+
+@responses.activate
+def test_api_documents_patch_empty_body(settings):
+    """
+    Test when data is empty the document should not be updated.
+    The `updated_at` property should not change asserting that no update in the database is made.
+    """
+    user = factories.UserFactory()
+
+    client = APIClient()
+    client.force_login(user)
+    session_key = client.session.session_key
+
+    document = factories.DocumentFactory(users=[(user, "owner")], creator=user)
+    document_updated_at = document.updated_at
+
+    settings.COLLABORATION_API_URL = "http://example.com/"
+    settings.COLLABORATION_SERVER_SECRET = "secret-token"
+    settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
+    endpoint_url = (
+        f"{settings.COLLABORATION_API_URL}get-connections/"
+        f"?room={document.id}&sessionKey={session_key}"
+    )
+    ws_resp = responses.get(endpoint_url, json={"count": 3, "exists": True})
+
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+
+    old_document_values = serializers.DocumentSerializer(instance=document).data
+
+    with patch("core.models.Document.save") as mock_document_save:
+        response = client.patch(
+            f"/api/v1.0/documents/{document.id!s}/",
+            content_type="application/json",
+        )
+    mock_document_save.assert_not_called()
+    assert response.status_code == 200
+
+    document = models.Document.objects.get(id=document.id)
+    new_document_values = serializers.DocumentSerializer(instance=document).data
+    assert new_document_values == old_document_values
+    assert document_updated_at == document.updated_at
+    assert cache.get(f"docs:no-websocket:{document.id}") is None
+    assert ws_resp.call_count == 1

src/backend/core/tests/test_api_utils_conditional_refresh_oidc_token.py

@@ -0,0 +1,32 @@
+"""module testing the conditional_refresh_oidc_token utils."""
+
+from unittest import mock
+
+from core.api import utils
+
+
+def test_refresh_oidc_access_token_storing_refresh_token_disabled(settings):
+    """The method_decorator must not be called when OIDC_STORE_REFRESH_TOKEN is False."""
+
+    settings.OIDC_STORE_REFRESH_TOKEN = False
+
+    callback = mock.MagicMock()
+
+    with mock.patch.object(utils, "method_decorator") as mock_method_decorator:
+        result = utils.conditional_refresh_oidc_token(callback)
+
+    mock_method_decorator.assert_not_called()
+    assert result == callback
+
+
+def test_refresh_oidc_access_token_storing_refresh_token_enabled(settings):
+    """The method_decorator must not be called when OIDC_STORE_REFRESH_TOKEN is False."""
+
+    settings.OIDC_STORE_REFRESH_TOKEN = True
+
+    callback = mock.MagicMock()
+
+    with mock.patch.object(utils, "method_decorator") as mock_method_decorator:
+        utils.conditional_refresh_oidc_token(callback)
+
+    mock_method_decorator.assert_called_with(utils.refresh_oidc_access_token)

src/backend/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "impress"
-version = "4.8.2"
+version = "4.8.3"
 authors = [{ "name" = "DINUM", "email" = "dev@mail.numerique.gouv.fr" }]
 classifiers = [
     "Development Status :: 5 - Production/Stable",

src/frontend/apps/e2e/__tests__/app-impress/doc-ai.spec.ts

@@ -47,9 +47,9 @@ test.describe('Doc AI feature', () => {
 
       await page.locator('.bn-block-outer').last().fill('Anything');
       await page.getByText('Anything').selectText();
-      expect(
-        await page.locator('button[data-test="convertMarkdown"]').count(),
-      ).toBe(1);
+      await expect(
+        page.locator('button[data-test="convertMarkdown"]'),
+      ).toHaveCount(1);
       await expect(
         page.getByRole('button', { name: config.selector, exact: true }),
       ).toBeHidden();

src/frontend/apps/e2e/__tests__/app-impress/doc-comments.spec.ts

@@ -131,12 +131,13 @@ test.describe('Doc Comments', () => {
     await thread.getByRole('paragraph').first().fill('This is a comment');
     await thread.locator('[data-test="save"]').click();
     await expect(thread.getByText('This is a comment').first()).toBeHidden();
+    await expect(editor.getByText('Hello')).toHaveClass('bn-thread-mark');
 
-    // Check background color changed
     await expect(editor.getByText('Hello')).toHaveCSS(
       'background-color',
-      'rgba(237, 180, 0, 0.4)',
+      'color(srgb 0.882353 0.831373 0.717647 / 0.4)',
     );
+
     await editor.first().click();
     await editor.getByText('Hello').click();
 
@@ -185,6 +186,7 @@ test.describe('Doc Comments', () => {
     await thread.getByText('This is an edited comment').first().hover();
     await thread.locator('[data-test="resolve"]').click();
     await expect(thread).toBeHidden();
+
     await expect(editor.getByText('Hello')).toHaveCSS(
       'background-color',
       'rgba(0, 0, 0, 0)',
@@ -196,11 +198,13 @@ test.describe('Doc Comments', () => {
 
     await thread.getByRole('paragraph').first().fill('This is a new comment');
     await thread.locator('[data-test="save"]').click();
+    await expect(editor.getByText('Hello')).toHaveClass('bn-thread-mark');
 
     await expect(editor.getByText('Hello')).toHaveCSS(
       'background-color',
-      'rgba(237, 180, 0, 0.4)',
+      'color(srgb 0.882353 0.831373 0.717647 / 0.4)',
     );
+
     await editor.first().click();
     await editor.getByText('Hello').click();
 
@@ -208,6 +212,7 @@ test.describe('Doc Comments', () => {
     await thread.locator('[data-test="moreactions"]').first().click();
     await getMenuItem(thread, 'Delete comment').click();
 
+    await expect(editor.getByText('Hello')).not.toHaveClass('bn-thread-mark');
     await expect(editor.getByText('Hello')).toHaveCSS(
       'background-color',
       'rgba(0, 0, 0, 0)',
@@ -263,7 +268,7 @@ test.describe('Doc Comments', () => {
 
     await expect(otherEditor.getByText('Hello')).toHaveCSS(
       'background-color',
-      'rgba(237, 180, 0, 0.4)',
+      'color(srgb 0.882353 0.831373 0.717647 / 0.4)',
     );
 
     // We change the role of the second user to reader
@@ -298,7 +303,7 @@ test.describe('Doc Comments', () => {
 
     await expect(otherEditor.getByText('Hello')).toHaveCSS(
       'background-color',
-      'rgba(237, 180, 0, 0.4)',
+      'color(srgb 0.882353 0.831373 0.717647 / 0.4)',
     );
     await otherEditor.getByText('Hello').click();
     await expect(
@@ -344,7 +349,7 @@ test.describe('Doc Comments', () => {
 
     await expect(editor1.getByText('Document One')).toHaveCSS(
       'background-color',
-      'rgba(237, 180, 0, 0.4)',
+      'color(srgb 0.882353 0.831373 0.717647 / 0.4)',
     );
 
     await editor1.getByText('Document One').click();

src/frontend/apps/e2e/__tests__/app-impress/doc-editor.spec.ts

@@ -155,13 +155,11 @@ test.describe('Doc Editor', () => {
     expect(wsClose.isClosed()).toBeTruthy();
 
     // Check the ws is connected again
-    webSocketPromise = page.waitForEvent('websocket', (webSocket) => {
+    webSocket = await page.waitForEvent('websocket', (webSocket) => {
       return webSocket
         .url()
         .includes('ws://localhost:4444/collaboration/ws/?room=');
     });
-
-    webSocket = await webSocketPromise;
     framesentPromise = webSocket.waitForEvent('framesent');
     framesent = await framesentPromise;
     expect(framesent.payload).not.toBeNull();
@@ -578,12 +576,10 @@ test.describe('Doc Editor', () => {
 
     await page.reload();
 
-    responseCanEditPromise = page.waitForResponse(
+    responseCanEdit = await page.waitForResponse(
       (response) =>
         response.url().includes(`/can-edit/`) && response.status() === 200,
     );
-
-    responseCanEdit = await responseCanEditPromise;
     expect(responseCanEdit.ok()).toBeTruthy();
 
     jsonCanEdit = (await responseCanEdit.json()) as { can_edit: boolean };

src/frontend/apps/e2e/__tests__/app-impress/doc-header.spec.ts

@@ -236,7 +236,7 @@ test.describe('Doc Header', () => {
         hasText: randomDoc,
       });
 
-    expect(await row.count()).toBe(0);
+    await expect(row).toHaveCount(0);
   });
 
   test('it checks the options available if administrator', async ({ page }) => {
@@ -273,7 +273,7 @@ test.describe('Doc Header', () => {
     await expect(getMenuItem(page, 'Delete document')).toBeDisabled();
 
     // Click somewhere else to close the options
-    await page.click('body', { position: { x: 0, y: 0 } });
+    await page.locator('body').click({ position: { x: 0, y: 0 } });
 
     await page.getByRole('button', { name: 'Share' }).click();
 
@@ -348,7 +348,7 @@ test.describe('Doc Header', () => {
     await expect(getMenuItem(page, 'Delete document')).toBeDisabled();
 
     // Click somewhere else to close the options
-    await page.click('body', { position: { x: 0, y: 0 } });
+    await page.locator('body').click({ position: { x: 0, y: 0 } });
 
     await page.getByRole('button', { name: 'Share' }).click();
 
@@ -418,7 +418,7 @@ test.describe('Doc Header', () => {
     await expect(getMenuItem(page, 'Delete document')).toBeDisabled();
 
     // Click somewhere else to close the options
-    await page.click('body', { position: { x: 0, y: 0 } });
+    await page.locator('body').click({ position: { x: 0, y: 0 } });
 
     await page.getByRole('button', { name: 'Share' }).click();
 
@@ -474,7 +474,9 @@ test.describe('Doc Header', () => {
     // Copy content to clipboard
     await page.getByLabel('Open the document options').click();
     await getMenuItem(page, 'Copy as Markdown').click();
-    await expect(page.getByText('Copied to clipboard')).toBeVisible();
+    await expect(
+      page.getByText('Copied as Markdown to clipboard'),
+    ).toBeVisible();
 
     // Test that clipboard is in Markdown format
     const handle = await page.evaluateHandle(() =>

src/frontend/apps/e2e/__tests__/app-impress/doc-import.spec.ts

@@ -177,5 +177,5 @@ const dragAndDropFiles = async (
     return dt;
   }, filesData);
 
-  await page.dispatchEvent(selector, 'drop', { dataTransfer });
+  await page.locator(selector).dispatchEvent('drop', { dataTransfer });
 };

src/frontend/apps/e2e/__tests__/app-impress/doc-search.spec.ts

@@ -29,7 +29,7 @@ test.describe('Document search', () => {
     await page.getByTestId('search-docs-button').click();
 
     await expect(
-      page.getByRole('img', { name: 'No active search' }),
+      page.getByLabel('Search modal').locator('img[alt=""]'),
     ).toBeVisible();
 
     await expect(
@@ -107,7 +107,7 @@ test.describe('Document search', () => {
 
     await searchButton.click();
     await expect(
-      page.getByRole('combobox', { name: 'Quick search input' }),
+      page.getByRole('combobox', { name: 'Search documents' }),
     ).toBeVisible();
     await expect(filters).toBeHidden();
 
@@ -120,7 +120,7 @@ test.describe('Document search', () => {
 
     await searchButton.click();
     await expect(
-      page.getByRole('combobox', { name: 'Quick search input' }),
+      page.getByRole('combobox', { name: 'Search documents' }),
     ).toBeVisible();
     await expect(filters).toBeHidden();
 
@@ -164,9 +164,9 @@ test.describe('Document search', () => {
     const searchButton = page.getByTestId('search-docs-button');
 
     await searchButton.click();
-    await page.getByRole('combobox', { name: 'Quick search input' }).click();
+    await page.getByRole('combobox', { name: 'Search documents' }).click();
     await page
-      .getByRole('combobox', { name: 'Quick search input' })
+      .getByRole('combobox', { name: 'Search documents' })
       .fill('sub page search');
 
     // Expect to find the first and second docs in the results list
@@ -188,7 +188,7 @@ test.describe('Document search', () => {
     );
     await searchButton.click();
     await page
-      .getByRole('combobox', { name: 'Quick search input' })
+      .getByRole('combobox', { name: 'Search documents' })
       .fill('second');
 
     // Now there is a sub page - expect to have the focus on the current doc

src/frontend/apps/e2e/__tests__/app-impress/doc-table-content.spec.ts

@@ -19,7 +19,9 @@ test.describe('Doc Table Content', () => {
 
     await page.locator('.ProseMirror').click();
 
-    await expect(page.getByRole('button', { name: 'Summary' })).toBeHidden();
+    await expect(
+      page.getByRole('button', { name: 'Show the table of contents' }),
+    ).toBeHidden();
 
     await page.keyboard.type('# Level 1\n## Level 2\n### Level 3');
 

src/frontend/apps/e2e/__tests__/app-impress/doc-tree.spec.ts

@@ -43,15 +43,12 @@ test.describe('Doc Tree', () => {
     await expect(secondSubPageItem).toBeVisible();
 
     // Check the position of the sub pages
-    const allSubPageItems = await docTree
-      .getByTestId(/^doc-sub-page-item/)
-      .all();
-
-    expect(allSubPageItems.length).toBe(2);
+    const allSubPageItems = docTree.getByTestId(/^doc-sub-page-item/);
+    await expect(allSubPageItems).toHaveCount(2);
 
     // Check that elements are in the correct order
-    await expect(allSubPageItems[0].getByText('first move')).toBeVisible();
-    await expect(allSubPageItems[1].getByText('second move')).toBeVisible();
+    await expect(allSubPageItems.nth(0).getByText('first move')).toBeVisible();
+    await expect(allSubPageItems.nth(1).getByText('second move')).toBeVisible();
 
     // Will move the first sub page to the second position
     const firstSubPageBoundingBox = await firstSubPageItem.boundingBox();
@@ -91,17 +88,15 @@ test.describe('Doc Tree', () => {
     await expect(secondSubPageItem).toBeVisible();
 
     // Check that elements are in the correct order
-    const allSubPageItemsAfterReload = await docTree
-      .getByTestId(/^doc-sub-page-item/)
-      .all();
-
-    expect(allSubPageItemsAfterReload.length).toBe(2);
+    const allSubPageItemsAfterReload =
+      docTree.getByTestId(/^doc-sub-page-item/);
+    await expect(allSubPageItemsAfterReload).toHaveCount(2);
 
     await expect(
-      allSubPageItemsAfterReload[0].getByText('second move'),
+      allSubPageItemsAfterReload.nth(0).getByText('second move'),
     ).toBeVisible();
     await expect(
-      allSubPageItemsAfterReload[1].getByText('first move'),
+      allSubPageItemsAfterReload.nth(1).getByText('first move'),
     ).toBeVisible();
   });
 

src/frontend/apps/e2e/__tests__/app-impress/doc-version.spec.ts

@@ -25,7 +25,7 @@ test.describe('Doc Version', () => {
     await expect(page.getByText('History', { exact: true })).toBeVisible();
 
     const modal = page.getByRole('dialog', { name: 'Version history' });
-    const panel = modal.getByLabel('version list');
+    const panel = modal.getByLabel('Version list');
     await expect(panel).toBeVisible();
     await expect(modal.getByText('No versions')).toBeVisible();
 
@@ -80,9 +80,9 @@ test.describe('Doc Version', () => {
     await expect(panel).toBeVisible();
     await expect(page.getByText('History', { exact: true })).toBeVisible();
     await expect(page.getByRole('status')).toBeHidden();
-    const items = await panel.locator('.version-item').all();
-    expect(items.length).toBe(2);
-    await items[1].click();
+    const items = panel.locator('.version-item');
+    await expect(items).toHaveCount(2);
+    await items.nth(1).click();
 
     await expect(modal.getByText('Hello World')).toBeVisible();
     await expect(modal.getByText('It will create a version')).toBeHidden();
@@ -90,7 +90,7 @@ test.describe('Doc Version', () => {
       modal.locator('div[data-content-type="callout"]').first(),
     ).toBeHidden();
 
-    await items[0].click();
+    await items.nth(0).click();
 
     await expect(modal.getByText('Hello World')).toBeVisible();
     await expect(modal.getByText('It will create a version')).toBeVisible();
@@ -101,7 +101,7 @@ test.describe('Doc Version', () => {
       modal.getByText('It will create a second version'),
     ).toBeHidden();
 
-    await items[1].click();
+    await items.nth(1).click();
 
     await expect(modal.getByText('Hello World')).toBeVisible();
     await expect(modal.getByText('It will create a version')).toBeHidden();
@@ -155,20 +155,25 @@ test.describe('Doc Version', () => {
     await getMenuItem(page, 'Version history').click();
 
     const modal = page.getByRole('dialog', { name: 'Version history' });
-    const panel = modal.getByLabel('version list');
+    const panel = modal.getByLabel('Version list');
     await expect(panel).toBeVisible();
 
     await expect(page.getByText('History', { exact: true })).toBeVisible();
-    await panel.getByRole('button', { name: 'version item' }).click();
+    await panel.locator('.version-item').first().click();
 
     await expect(modal.getByText('World')).toBeHidden();
 
-    await page.getByRole('button', { name: 'Restore' }).click();
-    await expect(page.getByText('Your current document will')).toBeVisible();
-    await page.getByText('If a member is editing, his').click();
+    await page.getByRole('button', { name: 'Restore', exact: true }).click();
+    await expect(
+      page.getByText(
+        "The current document will be replaced, but you'll still find it in the version history.",
+      ),
+    ).toBeVisible();
 
     await page.getByLabel('Restore', { exact: true }).click();
 
+    await page.waitForTimeout(500);
+
     await expect(page.getByText('Hello')).toBeVisible();
     await expect(page.getByText('World')).toBeHidden();
   });

src/frontend/apps/e2e/__tests__/app-impress/header.spec.ts

@@ -191,25 +191,27 @@ test.describe('Header: Override configuration', () => {
 });
 
 test.describe('Header: Skip to Content', () => {
-  test('it displays skip link on first TAB and focuses main content on click', async ({
+  test('it displays skip link on first TAB and focuses page heading on click', async ({
     page,
   }) => {
     await page.goto('/');
 
-    // Wait for skip button to be mounted (client-side only component)
-    const skipButton = page.getByRole('button', { name: 'Go to content' });
-    await skipButton.waitFor({ state: 'attached' });
+    // Wait for skip link to be mounted (client-side only component)
+    const skipLink = page.getByRole('link', { name: 'Go to content' });
+    await skipLink.waitFor({ state: 'attached' });
 
-    // First TAB shows the skip button
+    // First TAB shows the skip link
     await page.keyboard.press('Tab');
 
-    // The skip button should be visible and focused
-    await expect(skipButton).toBeFocused();
-    await expect(skipButton).toBeVisible();
-
-    // Clicking moves focus to the main content
-    await skipButton.click();
-    const mainContent = page.locator('main#mainContent');
-    await expect(mainContent).toBeFocused();
+    // The skip link should be visible and focused
+    await expect(skipLink).toBeFocused();
+    await expect(skipLink).toBeVisible();
+    // Clicking moves focus to the page heading
+    await skipLink.click();
+    const pageHeading = page.getByRole('heading', {
+      name: 'All docs',
+      level: 2,
+    });
+    await expect(pageHeading).toBeFocused();
   });
 });

src/frontend/apps/e2e/__tests__/app-impress/left-panel.spec.ts

@@ -1,6 +1,7 @@
 import { expect, test } from '@playwright/test';
 
 import { createDoc, goToGridDoc, verifyDocName } from './utils-common';
+import { createRootSubPage } from './utils-sub-pages';
 
 test.describe('Left panel desktop', () => {
   test.beforeEach(async ({ page }) => {
@@ -18,7 +19,7 @@ test.describe('Left panel desktop', () => {
     await expect(page.getByTestId('home-button')).toBeVisible();
   });
 
-  test('focuses main content after switching the docs filter', async ({
+  test('focuses page heading after switching the docs filter', async ({
     page,
   }) => {
     await page.goto('/');
@@ -28,8 +29,11 @@ test.describe('Left panel desktop', () => {
     await page.keyboard.press('Enter');
     await expect(page).toHaveURL(/target=my_docs/);
 
-    const mainContent = page.locator('main#mainContent');
-    await expect(mainContent).toBeFocused();
+    const pageHeading = page.getByRole('heading', {
+      name: 'My docs',
+      level: 2,
+    });
+    await expect(pageHeading).toBeFocused();
   });
 
   test('checks resize handle is present and functional on document page', async ({
@@ -118,6 +122,47 @@ test.describe('Left panel mobile', () => {
     await expect(logoutButton).toBeInViewport();
   });
 
+  test('checks panel closes when clicking on a subdoc', async ({
+    page,
+    browserName,
+  }) => {
+    const [docTitle] = await createDoc(
+      page,
+      'mobile-doc-test',
+      browserName,
+      1,
+      true,
+    );
+
+    const { name: docChild } = await createRootSubPage(
+      page,
+      browserName,
+      'mobile-doc-test-child',
+      true,
+    );
+
+    const { name: docChild2 } = await createRootSubPage(
+      page,
+      browserName,
+      'mobile-doc-test-child-2',
+      true,
+    );
+
+    const header = page.locator('header').first();
+    await header.getByLabel('Open the header menu').click();
+
+    await expect(page.getByTestId('left-panel-mobile')).toBeInViewport();
+
+    const docTree = page.getByTestId('doc-tree');
+    await expect(docTree.getByText(docTitle)).toBeVisible();
+    await expect(docTree.getByText(docChild)).toBeVisible();
+    await expect(docTree.getByText(docChild2)).toBeVisible();
+
+    await docTree.getByText(docChild).click();
+    await verifyDocName(page, docChild);
+    await expect(page.getByTestId('left-panel-mobile')).not.toBeInViewport();
+  });
+
   test('checks resize handle is not present on mobile', async ({ page }) => {
     await page.goto('/');
 

src/frontend/apps/e2e/__tests__/app-impress/utils-common.ts

@@ -3,6 +3,11 @@ import path from 'path';
 
 import { Locator, Page, TestInfo, expect } from '@playwright/test';
 
+import theme_customization from '../../../../../backend/impress/configuration/theme/default.json';
+
+export type BrowserName = 'chromium' | 'firefox' | 'webkit';
+export const BROWSERS: BrowserName[] = ['chromium', 'webkit', 'firefox'];
+
 /** Returns a locator for a menu item (handles both menuitem and menuitemradio roles) */
 export const getMenuItem = (
   context: Page | Locator,
@@ -13,11 +18,6 @@ export const getMenuItem = (
     .getByRole('menuitem', { name, exact: options?.exact })
     .or(context.getByRole('menuitemradio', { name, exact: options?.exact }));
 
-import theme_customization from '../../../../../backend/impress/configuration/theme/default.json';
-
-export type BrowserName = 'chromium' | 'firefox' | 'webkit';
-export const BROWSERS: BrowserName[] = ['chromium', 'webkit', 'firefox'];
-
 export const CONFIG = {
   AI_BOT: {
     name: 'Docs AI',

src/frontend/apps/e2e/package.json

@@ -1,6 +1,6 @@
 {
   "name": "app-e2e",
-  "version": "4.8.2",
+  "version": "4.8.3",
   "repository": "https://github.com/suitenumerique/docs",
   "author": "DINUM",
   "license": "MIT",

src/frontend/apps/impress/package.json

@@ -1,6 +1,6 @@
 {
   "name": "app-impress",
-  "version": "4.8.2",
+  "version": "4.8.3",
   "repository": "https://github.com/suitenumerique/docs",
   "author": "DINUM",
   "license": "MIT",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@ag-media/react-pdf-table": "2.0.3",
-    "@ai-sdk/openai": "3.0.19",
+    "@ai-sdk/openai": "3.0.45",
     "@blocknote/code-block": "0.47.1",
     "@blocknote/core": "0.47.1",
     "@blocknote/mantine": "0.47.1",
@@ -38,20 +38,20 @@
     "@emoji-mart/data": "1.2.1",
     "@emoji-mart/react": "1.1.1",
     "@fontsource-variable/inter": "5.2.8",
-    "@fontsource-variable/material-symbols-outlined": "5.2.35",
+    "@fontsource-variable/material-symbols-outlined": "5.2.38",
     "@fontsource/material-icons": "5.2.7",
     "@gouvfr-lasuite/cunningham-react": "4.2.0",
     "@gouvfr-lasuite/integration": "1.0.3",
-    "@gouvfr-lasuite/ui-kit": "0.19.6",
+    "@gouvfr-lasuite/ui-kit": "0.19.10",
     "@hocuspocus/provider": "3.4.4",
-    "@mantine/core": "8.3.14",
-    "@mantine/hooks": "8.3.14",
+    "@mantine/core": "8.3.17",
+    "@mantine/hooks": "8.3.17",
     "@react-aria/live-announcer": "3.4.4",
     "@react-pdf/renderer": "4.3.1",
-    "@sentry/nextjs": "10.38.0",
+    "@sentry/nextjs": "10.43.0",
     "@tanstack/react-query": "5.90.21",
     "@tiptap/extensions": "*",
-    "ai": "6.0.49",
+    "ai": "6.0.128",
     "canvg": "4.0.3",
     "clsx": "2.1.1",
     "cmdk": "1.1.1",
@@ -59,28 +59,28 @@
     "emoji-datasource-apple": "16.0.0",
     "emoji-mart": "5.6.0",
     "emoji-regex": "10.6.0",
-    "i18next": "25.8.12",
+    "i18next": "25.8.18",
     "i18next-browser-languagedetector": "8.2.1",
     "idb": "8.0.3",
     "lodash": "4.17.23",
     "luxon": "3.7.2",
-    "next": "16.1.6",
-    "posthog-js": "1.347.2",
+    "next": "16.1.7",
+    "posthog-js": "1.360.2",
     "react": "*",
-    "react-aria-components": "1.15.1",
+    "react-aria-components": "1.16.0",
     "react-dom": "*",
     "react-dropzone": "15.0.0",
-    "react-i18next": "16.5.4",
-    "react-intersection-observer": "10.0.2",
+    "react-i18next": "16.5.8",
+    "react-intersection-observer": "10.0.3",
     "react-resizable-panels": "3.0.6",
     "react-select": "5.10.2",
-    "styled-components": "6.3.9",
+    "styled-components": "6.3.11",
     "use-debounce": "10.1.0",
     "uuid": "13.0.0",
     "y-protocols": "1.0.7",
     "yjs": "*",
-    "zod": "3.25.28",
-    "zustand": "5.0.11"
+    "zod": "4.3.6",
+    "zustand": "5.0.12"
   },
   "devDependencies": {
     "@svgr/webpack": "8.1.0",
@@ -89,26 +89,25 @@
     "@testing-library/jest-dom": "6.9.1",
     "@testing-library/react": "16.3.2",
     "@testing-library/user-event": "14.6.1",
-    "@types/lodash": "4.17.23",
+    "@types/lodash": "4.17.24",
     "@types/luxon": "3.7.1",
     "@types/node": "*",
     "@types/react": "*",
     "@types/react-dom": "*",
-    "@vitejs/plugin-react": "5.1.4",
+    "@vitejs/plugin-react": "6.0.1",
     "cross-env": "10.1.0",
     "dotenv": "17.3.1",
     "eslint-plugin-docs": "*",
     "fetch-mock": "9.11.0",
-    "jsdom": "28.1.0",
+    "jsdom": "29.0.0",
     "node-fetch": "2.7.0",
     "prettier": "3.8.1",
     "stylelint": "16.26.1",
     "stylelint-config-standard": "39.0.1",
     "stylelint-prettier": "5.0.3",
     "typescript": "*",
-    "vite-tsconfig-paths": "6.1.1",
-    "vitest": "4.0.18",
-    "webpack": "5.105.2",
+    "vitest": "4.1.0",
+    "webpack": "5.105.4",
     "workbox-webpack-plugin": "7.1.0"
   },
   "packageManager": "yarn@1.22.22"

src/frontend/apps/impress/src/assets/icons/ui-kit/markdown_copy.svg

@@ -0,0 +1,9 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  viewBox="0 -960 960 960"
+  fill="currentColor"
+>
+  <path
+    d="M360-240q-33 0-56.5-23.5T280-320v-480q0-33 23.5-56.5T360-880h360q33 0 56.5 23.5T800-800v480q0 33-23.5 56.5T720-240H360Zm0-80h360v-480H360v480ZM200-80q-33 0-56.5-23.5T120-160v-560h80v560h440v80H200Zm210-360h60v-180h40v120h60v-120h40v180h60v-200q0-17-11.5-28.5T630-680H450q-17 0-28.5 11.5T410-640v200Zm-50 120v-480 480Z"
+  />
+</svg>

src/frontend/apps/impress/src/components/SkipToContent.tsx

@@ -1,63 +1,33 @@
 import { Button } from '@gouvfr-lasuite/cunningham-react';
-import { useRouter } from 'next/router';
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { css } from 'styled-components';
 
 import { Box } from '@/components';
 import { useCunninghamTheme } from '@/cunningham';
 import { MAIN_LAYOUT_ID } from '@/layouts/conf';
+import { focusMainContentStart } from '@/layouts/utils';
 
 export const SkipToContent = () => {
   const { t } = useTranslation();
-  const router = useRouter();
   const { spacingsTokens } = useCunninghamTheme();
   const [isVisible, setIsVisible] = useState(false);
 
-  // Reset focus after route change so first TAB goes to skip link
-  useEffect(() => {
-    const handleRouteChange = () => {
-      (document.activeElement as HTMLElement)?.blur();
-
-      document.body.setAttribute('tabindex', '-1');
-      document.body.focus({ preventScroll: true });
-
-      setTimeout(() => {
-        document.body.removeAttribute('tabindex');
-      }, 100);
-    };
-
-    router.events.on('routeChangeComplete', handleRouteChange);
-    return () => {
-      router.events.off('routeChangeComplete', handleRouteChange);
-    };
-  }, [router.events]);
-
   const handleClick = (e: React.MouseEvent) => {
     e.preventDefault();
-    const mainContent = document.getElementById(MAIN_LAYOUT_ID);
-    if (mainContent) {
-      mainContent.focus();
-      mainContent.scrollIntoView({ behavior: 'smooth', block: 'start' });
+    const focusTarget = focusMainContentStart();
+
+    if (focusTarget instanceof HTMLElement) {
+      focusTarget.scrollIntoView({ behavior: 'smooth', block: 'start' });
     }
   };
 
   return (
-    <Box
-      $css={css`
-        .c__button--brand--primary.--docs--skip-to-content:focus-visible {
-          box-shadow:
-            0 0 0 1px var(--c--globals--colors--white-000),
-            0 0 0 4px var(--c--contextuals--border--semantic--brand--primary);
-          border-radius: var(--c--globals--spacings--st);
-        }
-      `}
-    >
+    <Box>
       <Button
-        onClick={handleClick}
-        type="button"
+        href={`#${MAIN_LAYOUT_ID}`}
         color="brand"
         className="--docs--skip-to-content"
+        onClick={handleClick}
         onFocus={() => setIsVisible(true)}
         onBlur={() => setIsVisible(false)}
         style={{
@@ -65,7 +35,6 @@ export const SkipToContent = () => {
           pointerEvents: isVisible ? 'auto' : 'none',
           position: 'fixed',
           top: spacingsTokens['2xs'],
-          // padding header + logo(32px) + gap(3xs≈4px) + text "Docs"(≈70px) + 12px
           left: `calc(${spacingsTokens['base']} + 32px + ${spacingsTokens['3xs']} + 70px + 12px)`,
           zIndex: 9999,
           whiteSpace: 'nowrap',

src/frontend/apps/impress/src/components/quick-search/QuickSearch.tsx

@@ -32,6 +32,7 @@ export type QuickSearchProps = {
   label?: string;
   placeholder?: string;
   groupKey?: string;
+  beforeList?: ReactNode;
 };
 
 export const QuickSearch = ({
@@ -41,6 +42,7 @@ export const QuickSearch = ({
   showInput = true,
   label,
   placeholder,
+  beforeList,
   children,
 }: PropsWithChildren<QuickSearchProps>) => {
   const ref = useRef<HTMLDivElement | null>(null);
@@ -76,6 +78,7 @@ export const QuickSearch = ({
               {inputContent}
             </QuickSearchInput>
           )}
+          {beforeList}
           <Command.List id={listId} aria-label={label} role="listbox">
             <Box>{children}</Box>
           </Command.List>

src/frontend/apps/impress/src/components/quick-search/QuickSearchInput.tsx

@@ -1,9 +1,10 @@
 import { Command } from 'cmdk';
-import { PropsWithChildren } from 'react';
+import { PropsWithChildren, useEffect, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { HorizontalSeparator } from '@/components';
 import { useCunninghamTheme } from '@/cunningham';
+import { useFocusStore } from '@/stores';
 
 import { Box } from '../Box';
 import { Icon } from '../Icon';
@@ -14,7 +15,6 @@ type QuickSearchInputProps = {
   placeholder?: string;
   withSeparator?: boolean;
   listId?: string;
-  isExpanded?: boolean;
 };
 export const QuickSearchInput = ({
   inputValue,
@@ -26,6 +26,12 @@ export const QuickSearchInput = ({
 }: PropsWithChildren<QuickSearchInputProps>) => {
   const { t } = useTranslation();
   const { spacingsTokens } = useCunninghamTheme();
+  const inputRef = useRef<HTMLInputElement>(null);
+  const addLastFocus = useFocusStore((state) => state.addLastFocus);
+
+  useEffect(() => {
+    addLastFocus(inputRef.current);
+  }, [addLastFocus]);
 
   if (children) {
     return (
@@ -47,6 +53,7 @@ export const QuickSearchInput = ({
       >
         <Icon iconName="search" $variation="secondary" aria-hidden="true" />
         <Command.Input
+          ref={inputRef}
           autoFocus={true}
           aria-label={t('Quick search input')}
           aria-controls={listId}

src/frontend/apps/impress/src/features/docs/doc-editor/components/DocEditor.tsx

@@ -2,7 +2,7 @@ import clsx from 'clsx';
 import { useEffect, useState } from 'react';
 
 import { Box, Loading } from '@/components';
-import { DocHeader, FloatingBar } from '@/docs/doc-header/';
+import { DocHeader } from '@/docs/doc-header/';
 import {
   Doc,
   LinkReach,
@@ -35,7 +35,6 @@ export const DocEditorContainer = ({
 
   return (
     <>
-      {isDesktop && <FloatingBar />}
       <Box
         $maxWidth="868px"
         $width="100%"

src/frontend/apps/impress/src/features/docs/doc-editor/components/comments/styles.tsx

@@ -8,12 +8,37 @@ export const cssComments = (
   & .--docs--main-editor .ProseMirror {
     // Comments marks in the editor
     .bn-editor {
-      .bn-thread-mark:not([data-orphan='true']),
-      .bn-thread-mark-selected:not([data-orphan='true']) {
-        background: ${canSeeComment ? '#EDB40066' : 'transparent'};
-        color: var(--c--globals--colors--gray-700);
+      // Resets blocknote comments styles
+      .bn-thread-mark,
+      .bn-thread-mark-selected {
+        background-color: transparent;
       }
 
+      ${canSeeComment &&
+      css`
+        .bn-thread-mark:not([data-orphan='true']) {
+          background-color: color-mix(
+            in srgb,
+            var(--c--contextuals--background--palette--yellow--tertiary) 40%,
+            transparent
+          );
+          border-bottom: 2px solid
+            var(--c--contextuals--background--palette--yellow--secondary);
+
+          mix-blend-mode: multiply;
+
+          transition:
+            background-color var(--c--globals--transitions--duration),
+            border-bottom-color var(--c--globals--transitions--duration);
+
+          &:has(.bn-thread-mark-selected) {
+            background-color: var(
+              --c--contextuals--background--palette--yellow--tertiary
+            );
+          }
+        }
+      `}
+
       [data-show-selection] {
         color: HighlightText;
       }

src/frontend/apps/impress/src/features/docs/doc-editor/hook/useSaveDoc.tsx

@@ -3,7 +3,7 @@ import { useCallback, useEffect, useState } from 'react';
 import * as Y from 'yjs';
 
 import { useUpdateDoc } from '@/docs/doc-management/';
-import { KEY_LIST_DOC_VERSIONS } from '@/docs/doc-versioning';
+import { KEY_LIST_DOC_VERSIONS } from '@/docs/doc-versioning/api/useDocVersions';
 import { toBase64 } from '@/utils/string';
 import { isFirefox } from '@/utils/userAgent';
 

src/frontend/apps/impress/src/features/docs/doc-editor/hook/useShortcuts.tsx

@@ -1,11 +1,83 @@
-import { useEffect } from 'react';
+import { announce } from '@react-aria/live-announcer';
+import { useCallback, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { DocsBlockNoteEditor } from '../types';
 
+const getFormattingShortcutLabel = (
+  event: KeyboardEvent,
+  t: (key: string) => string,
+): string | null => {
+  const isMod = event.ctrlKey || event.metaKey;
+  if (!isMod) {
+    return null;
+  }
+
+  if (event.altKey) {
+    switch (event.code) {
+      case 'Digit1':
+        return t('Heading 1 applied');
+      case 'Digit2':
+        return t('Heading 2 applied');
+      case 'Digit3':
+        return t('Heading 3 applied');
+      default:
+        return null;
+    }
+  }
+
+  if (event.shiftKey) {
+    switch (event.code) {
+      case 'Digit0':
+        return t('Paragraph applied');
+      case 'Digit6':
+        return t('Toggle list applied');
+      case 'Digit7':
+        return t('Numbered list applied');
+      case 'Digit8':
+        return t('Bulleted list applied');
+      case 'Digit9':
+        return t('Checklist applied');
+      case 'KeyC':
+        return t('Code block applied');
+      default:
+        return null;
+    }
+  }
+
+  return null;
+};
+
 export const useShortcuts = (
   editor: DocsBlockNoteEditor,
   el: HTMLDivElement | null,
 ) => {
+  const { t } = useTranslation();
+
+  const handleFormattingShortcut = useCallback(
+    (event: KeyboardEvent) => {
+      if (!editor?.isFocused()) {
+        return;
+      }
+
+      const label = getFormattingShortcutLabel(event, t);
+      if (label) {
+        setTimeout(() => {
+          announce(label, 'assertive');
+        }, 150);
+      }
+    },
+    [editor, t],
+  );
+
+  useEffect(() => {
+    el?.addEventListener('keydown', handleFormattingShortcut, true);
+
+    return () => {
+      el?.removeEventListener('keydown', handleFormattingShortcut, true);
+    };
+  }, [el, handleFormattingShortcut]);
+
   useEffect(() => {
     // Check if editor and its view are mounted
     if (!editor || !el) {

src/frontend/apps/impress/src/features/docs/doc-export/__tests__/ExportMIT.test.tsx

@@ -1,4 +1,9 @@
 import { afterAll, afterEach, describe, expect, it, vi } from 'vitest';
+
+vi.mock('@/docs/doc-export/components/ModalExport', () => ({
+  ModalExport: vi.fn(),
+}));
+
 const originalEnv = process.env.NEXT_PUBLIC_PUBLISH_AS_MIT;
 
 describe('useModuleExport', () => {
@@ -16,12 +21,12 @@ describe('useModuleExport', () => {
     const Export = await import('@/features/docs/doc-export/');
 
     expect(Export.default).toBeUndefined();
-  }, 15000);
+  });
 
   it('should load modules when NEXT_PUBLIC_PUBLISH_AS_MIT is false', async () => {
     process.env.NEXT_PUBLIC_PUBLISH_AS_MIT = 'false';
     const Export = await import('@/features/docs/doc-export/');
 
     expect(Export.default).toHaveProperty('ModalExport');
-  }, 15000);
+  });
 });

src/frontend/apps/impress/src/features/docs/doc-export/__tests__/utilsHtmlAccessibility.test.ts

@@ -0,0 +1,267 @@
+import { improveHtmlAccessibility } from '../utils_html';
+
+const parse = (html: string): Document => {
+  const parser = new DOMParser();
+  return parser.parseFromString(html, 'text/html');
+};
+
+const bodyHtml = (doc: Document) =>
+  doc.body.innerHTML.replace(/\s+/g, ' ').trim();
+
+describe('improveHtmlAccessibility', () => {
+  // Headings
+
+  describe('headings', () => {
+    it('converts heading blocks without inner h tag to semantic h1–h6', () => {
+      const doc = parse(`
+        <div data-content-type="heading" data-level="3"><span>Title</span></div>
+      `);
+
+      improveHtmlAccessibility(doc, 'Doc');
+
+      const h3 = doc.querySelector('h3');
+      expect(h3).not.toBeNull();
+      expect(h3!.textContent.trim()).toBe('Title');
+    });
+
+    it('does not nest a second heading when BlockNote already outputs h1–h6', () => {
+      const doc = parse(`
+        <div data-content-type="heading" data-level="2">
+          <h2 class="bn-inline-content">Section</h2>
+        </div>
+      `);
+
+      improveHtmlAccessibility(doc, 'Doc');
+
+      const h2 = doc.querySelectorAll('h2');
+      expect(h2).toHaveLength(1);
+      expect(h2[0].textContent).toBe('Section');
+      expect(h2[0].className).toBe('bn-inline-content');
+    });
+
+    it('uses data-level when inner heading tag has a different level', () => {
+      const doc = parse(`
+        <div data-content-type="heading" data-level="3">
+          <h2 class="bn-inline-content">Mismatch</h2>
+        </div>
+      `);
+
+      improveHtmlAccessibility(doc, 'Doc');
+
+      expect(doc.querySelector('h3')).not.toBeNull();
+      expect(doc.querySelector('h2')).toBeNull();
+    });
+
+    it('inserts an h1 with the document title when none exists', () => {
+      const doc = parse(`<p>Content</p>`);
+
+      improveHtmlAccessibility(doc, 'My Doc');
+
+      const h1 = doc.querySelector('h1');
+      expect(h1).not.toBeNull();
+      expect(h1!.id).toBe('doc-title');
+      expect(h1!.textContent).toBe('My Doc');
+    });
+
+    it('does not insert h1 when the document already has one', () => {
+      const doc = parse(`
+        <div data-content-type="heading" data-level="1"><span>Existing</span></div>
+      `);
+
+      improveHtmlAccessibility(doc, 'Ignored');
+
+      expect(doc.querySelectorAll('h1')).toHaveLength(1);
+    });
+  });
+
+  // Lists
+
+  describe('lists', () => {
+    it('converts bullet list items to ul > li', () => {
+      const doc = parse(`
+        <div class="bn-block-group">
+          <div class="bn-block-outer">
+            <div data-content-type="bulletListItem"><span>A</span></div>
+          </div>
+          <div class="bn-block-outer">
+            <div data-content-type="bulletListItem"><span>B</span></div>
+          </div>
+        </div>
+      `);
+
+      improveHtmlAccessibility(doc, 'Doc');
+
+      const items = doc.querySelectorAll('ul > li');
+      expect(items).toHaveLength(2);
+      expect(items[0].textContent).toBe('A');
+      expect(items[1].textContent).toBe('B');
+    });
+
+    it('converts numbered list items to ol > li', () => {
+      const doc = parse(`
+        <div class="bn-block-group">
+          <div class="bn-block-outer">
+            <div data-content-type="numberedListItem"><span>1st</span></div>
+          </div>
+          <div class="bn-block-outer">
+            <div data-content-type="numberedListItem"><span>2nd</span></div>
+          </div>
+        </div>
+      `);
+
+      improveHtmlAccessibility(doc, 'Doc');
+
+      expect(doc.querySelectorAll('ol > li')).toHaveLength(2);
+    });
+
+    it('splits lists when a heading sits between them', () => {
+      const doc = parse(`
+        <div class="bn-block-group">
+          <div class="bn-block-outer">
+            <div data-content-type="bulletListItem"><span>A</span></div>
+          </div>
+          <div class="bn-block-outer">
+            <div data-content-type="bulletListItem"><span>B</span></div>
+          </div>
+          <div class="bn-block-outer">
+            <div data-content-type="heading" data-level="2"><span>Next</span></div>
+          </div>
+          <div class="bn-block-outer">
+            <div data-content-type="bulletListItem"><span>C</span></div>
+          </div>
+        </div>
+      `);
+
+      improveHtmlAccessibility(doc, 'Doc');
+
+      const uls = doc.querySelectorAll('ul');
+      expect(uls).toHaveLength(2);
+      expect(uls[0].querySelectorAll('li')).toHaveLength(2);
+      expect(uls[1].querySelectorAll('li')).toHaveLength(1);
+
+      const html = bodyHtml(doc);
+      expect(html.indexOf('<ul')).toBeLessThan(html.indexOf('<h2'));
+      expect(html.indexOf('<h2')).toBeLessThan(
+        html.indexOf('<ul', html.indexOf('<ul') + 1),
+      );
+    });
+
+    it('keeps consecutive same-type items in a single list', () => {
+      const doc = parse(`
+        <div class="bn-block-group">
+          <div class="bn-block-outer">
+            <div data-content-type="bulletListItem"><span>A</span></div>
+          </div>
+          <div class="bn-block-outer">
+            <div data-content-type="bulletListItem"><span>B</span></div>
+          </div>
+          <div class="bn-block-outer">
+            <div data-content-type="bulletListItem"><span>C</span></div>
+          </div>
+        </div>
+      `);
+
+      improveHtmlAccessibility(doc, 'Doc');
+
+      expect(doc.querySelectorAll('ul')).toHaveLength(1);
+      expect(doc.querySelectorAll('ul > li')).toHaveLength(3);
+    });
+  });
+
+  // Quotes
+
+  it('converts quote blocks to blockquote', () => {
+    const doc = parse(`
+      <div data-content-type="quote"><span>Wise words</span></div>
+    `);
+
+    improveHtmlAccessibility(doc, 'Doc');
+
+    const bq = doc.querySelector('blockquote');
+    expect(bq).not.toBeNull();
+    expect(bq!.textContent).toBe('Wise words');
+  });
+
+  // Callouts
+
+  it('converts callout blocks to aside with role="note"', () => {
+    const doc = parse(`
+      <div data-content-type="callout"><span>Note</span></div>
+    `);
+
+    improveHtmlAccessibility(doc, 'Doc');
+
+    const aside = doc.querySelector('aside');
+    expect(aside).not.toBeNull();
+    expect(aside!.getAttribute('role')).toBe('note');
+  });
+
+  // Checklists
+
+  it('wraps check list items in a ul with role="list" and adds aria-checked', () => {
+    const doc = parse(`
+      <div>
+        <div data-content-type="checkListItem">
+          <input type="checkbox" />
+          <span>Todo</span>
+        </div>
+      </div>
+    `);
+
+    improveHtmlAccessibility(doc, 'Doc');
+
+    const ul = doc.querySelector('ul.checklist');
+    expect(ul).not.toBeNull();
+    expect(ul!.getAttribute('role')).toBe('list');
+    expect(doc.querySelector('input')!.getAttribute('aria-checked')).toBe(
+      'false',
+    );
+  });
+
+  // Code blocks
+
+  it('converts code blocks to pre > code and preserves data attributes', () => {
+    const doc = parse(`
+      <div data-content-type="codeBlock" class="hl-theme" data-language="js"><span>const x = 1;</span></div>
+    `);
+
+    improveHtmlAccessibility(doc, 'Doc');
+
+    const pre = doc.querySelector('pre');
+    expect(pre).not.toBeNull();
+    expect(pre!.className).toBe('hl-theme');
+    expect(pre!.getAttribute('data-language')).toBe('js');
+    expect(pre!.querySelector('code')!.textContent.trim()).toBe('const x = 1;');
+  });
+
+  // Images
+
+  it('adds empty alt to images without one', () => {
+    const doc = parse(`<img src="photo.png" />`);
+
+    improveHtmlAccessibility(doc, 'Doc');
+
+    expect(doc.querySelector('img')!.getAttribute('alt')).toBe('');
+  });
+
+  it('does not overwrite an existing alt', () => {
+    const doc = parse(`<img src="photo.png" alt="A photo" />`);
+
+    improveHtmlAccessibility(doc, 'Doc');
+
+    expect(doc.querySelector('img')!.getAttribute('alt')).toBe('A photo');
+  });
+
+  // Article wrapper
+
+  it('wraps body in article with role="document"', () => {
+    const doc = parse(`<p>Hello</p>`);
+
+    improveHtmlAccessibility(doc, 'Doc');
+
+    const article = doc.querySelector('article');
+    expect(article).not.toBeNull();
+    expect(article!.getAttribute('role')).toBe('document');
+    expect(article!.getAttribute('aria-labelledby')).toBe('doc-title');
+  });
+});

src/frontend/apps/impress/src/features/docs/doc-export/components/ModalExport.tsx

@@ -60,6 +60,23 @@ export const ModalExport = ({ onClose, doc }: ModalExportProps) => {
   const { untitledDocument } = useTrans();
   const mediaUrl = useMediaUrl();
 
+  const formatOptions = [
+    { label: t('PDF'), value: DocDownloadFormat.PDF },
+    { label: t('Docx'), value: DocDownloadFormat.DOCX },
+    { label: t('ODT'), value: DocDownloadFormat.ODT },
+    { label: t('HTML'), value: DocDownloadFormat.HTML },
+    { label: t('Print'), value: DocDownloadFormat.PRINT },
+  ];
+
+  const formatLabels = Object.fromEntries(
+    formatOptions.map((opt) => [opt.value, opt.label]),
+  );
+
+  const downloadButtonAriaLabel =
+    format === DocDownloadFormat.PRINT
+      ? t('Print')
+      : t('Download {{format}}', { format: formatLabels[format] });
+
   async function onSubmit() {
     if (!editor) {
       toast(t('The export failed'), VariantType.ERROR);
@@ -211,9 +228,7 @@ export const ModalExport = ({ onClose, doc }: ModalExportProps) => {
           </Button>
           <Button
             data-testid="doc-export-download-button"
-            aria-label={
-              format === DocDownloadFormat.PRINT ? t('Print') : t('Download')
-            }
+            aria-label={downloadButtonAriaLabel}
             variant="primary"
             fullWidth
             onClick={() => void onSubmit()}
@@ -260,13 +275,7 @@ export const ModalExport = ({ onClose, doc }: ModalExportProps) => {
           clearable={false}
           fullWidth
           label={t('Format')}
-          options={[
-            { label: t('PDF'), value: DocDownloadFormat.PDF },
-            { label: t('Docx'), value: DocDownloadFormat.DOCX },
-            { label: t('ODT'), value: DocDownloadFormat.ODT },
-            { label: t('HTML'), value: DocDownloadFormat.HTML },
-            { label: t('Print'), value: DocDownloadFormat.PRINT },
-          ]}
+          options={formatOptions}
           value={format}
           onChange={(options) =>
             setFormat(options.target.value as DocDownloadFormat)

src/frontend/apps/impress/src/features/docs/doc-export/utils_html.ts

@@ -145,8 +145,20 @@ export const improveHtmlAccessibility = (
   headingBlocks.forEach((block) => {
     const rawLevel = Number(block.getAttribute('data-level')) || 1;
     const level = Math.min(Math.max(rawLevel, 1), 6);
-    const heading = parsedDocument.createElement(`h${level}`);
-    moveChildNodes(block, heading);
+    const tag = `h${level}`;
+
+    const existingHeading = block.querySelector('h1, h2, h3, h4, h5, h6');
+    const heading = parsedDocument.createElement(tag);
+
+    if (existingHeading) {
+      if (existingHeading.className) {
+        heading.className = existingHeading.className;
+      }
+      moveChildNodes(existingHeading, heading);
+    } else {
+      moveChildNodes(block, heading);
+    }
+
     block.replaceWith(heading);
   });
 
@@ -178,10 +190,11 @@ export const improveHtmlAccessibility = (
     listItem: HTMLElement;
     contentType: string;
     level: number;
+    blockOuterIndex: number;
   }
 
   const listItemsInfo: ListItemInfo[] = [];
-  allBlockOuters.forEach((blockOuter) => {
+  allBlockOuters.forEach((blockOuter, index) => {
     const listItem = blockOuter.querySelector<HTMLElement>(listItemSelector);
     if (listItem) {
       const contentType = listItem.getAttribute('data-content-type');
@@ -192,6 +205,7 @@ export const improveHtmlAccessibility = (
           listItem,
           contentType,
           level,
+          blockOuterIndex: index,
         });
       }
     }
@@ -206,13 +220,19 @@ export const improveHtmlAccessibility = (
     const isBullet = contentType === 'bulletListItem';
     const listTag = isBullet ? 'ul' : 'ol';
 
-    // Check if previous item continues the same list (same type and level)
+    // Check if previous item continues the same list (same type, level, and
+    // no non-list block between them in the DOM : e.g. a heading separates lists).
     const previousInfo = idx > 0 ? listItemsInfo[idx - 1] : null;
+    const isAdjacentBlock = previousInfo && info.blockOuterIndex === previousInfo.blockOuterIndex + 1;
     const continuesPreviousList =
-      previousInfo &&
+      isAdjacentBlock &&
       previousInfo.contentType === contentType &&
       previousInfo.level === level;
 
+    if (previousInfo && !isAdjacentBlock) {
+      listStack.length = 0;
+    }
+
     // Find or create the appropriate list
     let targetList: HTMLElement | null = null;
 

src/frontend/apps/impress/src/features/docs/doc-header/__tests__/DocToolBoxLicence.spec.tsx

@@ -1,6 +1,4 @@
 import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import React from 'react';
 import { afterAll, beforeEach, describe, expect, vi } from 'vitest';
 
 import { AppWrapper } from '@/tests/utils';
@@ -40,17 +38,11 @@ describe('DocToolBox - Licence', () => {
     render(<DocToolBox doc={doc as any} />, {
       wrapper: AppWrapper,
     });
-    const optionsButton = await screen.findByLabelText('Export the document');
-    await userEvent.click(optionsButton);
 
-    // Wait for the export modal to be visible, then assert on its content text.
-    await screen.findByTestId('modal-export-title');
     expect(
-      screen.getByText(
-        'Export your document to print or download in .docx, .odt, .pdf or .html(zip) format.',
-      ),
+      await screen.findByLabelText('Export the document'),
     ).toBeInTheDocument();
-  }, 10000);
+  }, 15000);
 
   test('The export button is not rendered when MIT version is activated', async () => {
     process.env.NEXT_PUBLIC_PUBLISH_AS_MIT = 'true';
@@ -68,5 +60,5 @@ describe('DocToolBox - Licence', () => {
     expect(
       screen.queryByLabelText('Export the document'),
     ).not.toBeInTheDocument();
-  });
+  }, 15000);
 });

src/frontend/apps/impress/src/features/docs/doc-header/components/DocToolBox.tsx

@@ -1,9 +1,8 @@
 import { Button, useModal } from '@gouvfr-lasuite/cunningham-react';
 import { useTreeContext } from '@gouvfr-lasuite/ui-kit';
-import { useQueryClient } from '@tanstack/react-query';
 import dynamic from 'next/dynamic';
 import { useRouter } from 'next/router';
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { css } from 'styled-components';
 
@@ -17,6 +16,7 @@ import GroupSVG from '@/assets/icons/ui-kit/group.svg';
 import HistorySVG from '@/assets/icons/ui-kit/history.svg';
 import KeepSVG from '@/assets/icons/ui-kit/keep.svg';
 import KeepOffSVG from '@/assets/icons/ui-kit/keep_off.svg';
+import MarkdownCopySVG from '@/assets/icons/ui-kit/markdown_copy.svg';
 import {
   Box,
   DropdownMenu,
@@ -38,7 +38,6 @@ import {
   useDocUtils,
   useDuplicateDoc,
 } from '@/docs/doc-management';
-import { KEY_LIST_DOC_VERSIONS } from '@/docs/doc-versioning';
 import { useFocusStore, useResponsiveStore } from '@/stores';
 
 import { useCopyCurrentEditorToClipboard } from '../hooks/useCopyCurrentEditorToClipboard';
@@ -87,7 +86,6 @@ interface DocToolBoxProps {
 export const DocToolBox = ({ doc }: DocToolBoxProps) => {
   const { t } = useTranslation();
   const treeContext = useTreeContext<Doc>();
-  const queryClient = useQueryClient();
   const router = useRouter();
   const { isChild, isTopRoot } = useDocUtils(doc);
 
@@ -113,16 +111,6 @@ export const DocToolBox = ({ doc }: DocToolBoxProps) => {
     listInvalidQueries: [KEY_LIST_DOC, KEY_DOC, KEY_LIST_FAVORITE_DOC],
   });
 
-  useEffect(() => {
-    if (selectHistoryModal.isOpen) {
-      return;
-    }
-
-    void queryClient.resetQueries({
-      queryKey: [KEY_LIST_DOC_VERSIONS],
-    });
-  }, [selectHistoryModal.isOpen, queryClient]);
-
   // Emoji Management
   const { emoji } = getEmojiAndTitle(doc.title ?? '');
   const { updateDocEmoji } = useDocTitleUpdate();
@@ -193,7 +181,7 @@ export const DocToolBox = ({ doc }: DocToolBoxProps) => {
     },
     {
       label: t('Copy as {{format}}', { format: 'Markdown' }),
-      icon: <ContentCopySVG width={24} height={24} />,
+      icon: <MarkdownCopySVG width={24} height={24} />,
       callback: () => {
         void copyCurrentEditorToClipboard('markdown');
       },

src/frontend/apps/impress/src/features/docs/doc-header/hooks/useCopyCurrentEditorToClipboard.tsx

@@ -4,7 +4,7 @@ import {
 } from '@gouvfr-lasuite/cunningham-react';
 import { useTranslation } from 'react-i18next';
 
-import { useEditorStore } from '../../doc-editor';
+import { useEditorStore } from '@/docs/doc-editor/stores/useEditorStore';
 
 export const useCopyCurrentEditorToClipboard = () => {
   const { editor } = useEditorStore();
@@ -13,20 +13,31 @@ export const useCopyCurrentEditorToClipboard = () => {
 
   return async (asFormat: 'html' | 'markdown') => {
     if (!editor) {
-      toast(t('Editor unavailable'), VariantType.ERROR, { duration: 3000 });
+      const message = t('Editor unavailable');
+      toast(message, VariantType.ERROR, { duration: 3000 });
       return;
     }
 
     try {
       const editorContentFormatted =
         asFormat === 'html'
-          ? await editor.blocksToHTMLLossy()
-          : await editor.blocksToMarkdownLossy();
+          ? editor.blocksToHTMLLossy()
+          : editor.blocksToMarkdownLossy();
       await navigator.clipboard.writeText(editorContentFormatted);
-      toast(t('Copied to clipboard'), VariantType.SUCCESS, { duration: 3000 });
+      const successMessage =
+        asFormat === 'markdown'
+          ? t('Copied as Markdown to clipboard')
+          : t('Copied to clipboard');
+
+      toast(successMessage, VariantType.SUCCESS, { duration: 3000 });
     } catch (error) {
       console.error(error);
-      toast(t('Failed to copy to clipboard'), VariantType.ERROR, {
+      const errorMessage =
+        asFormat === 'markdown'
+          ? t('Failed to copy as Markdown to clipboard')
+          : t('Failed to copy to clipboard');
+
+      toast(errorMessage, VariantType.ERROR, {
         duration: 3000,
       });
     }

src/frontend/apps/impress/src/features/docs/doc-management/api/useCreateFavoriteDoc.tsx

@@ -1,4 +1,6 @@
+import { announce } from '@react-aria/live-announcer';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
 
 import { APIError, errorCauses, fetchAPI } from '@/api';
 
@@ -29,6 +31,8 @@ export function useCreateFavoriteDoc({
   listInvalidQueries,
 }: CreateFavoriteDocProps) {
   const queryClient = useQueryClient();
+  const { t } = useTranslation();
+
   return useMutation<void, APIError, CreateFavoriteDocParams>({
     mutationFn: createFavoriteDoc,
     onSuccess: () => {
@@ -37,7 +41,15 @@ export function useCreateFavoriteDoc({
           queryKey: [queryKey],
         });
       });
+
+      const message = t('Document pinned successfully!');
+      announce(message, 'polite');
+
       onSuccess?.();
     },
+    onError: () => {
+      const message = t('Failed to pin the document.');
+      announce(message, 'assertive');
+    },
   });
 }

src/frontend/apps/impress/src/features/docs/doc-management/api/useDeleteFavoriteDoc.tsx

@@ -1,4 +1,6 @@
+import { announce } from '@react-aria/live-announcer';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
 
 import { APIError, errorCauses, fetchAPI } from '@/api';
 
@@ -29,6 +31,8 @@ export function useDeleteFavoriteDoc({
   listInvalidQueries,
 }: DeleteFavoriteDocProps) {
   const queryClient = useQueryClient();
+  const { t } = useTranslation();
+
   return useMutation<void, APIError, DeleteFavoriteDocParams>({
     mutationFn: deleteFavoriteDoc,
     onSuccess: () => {
@@ -37,7 +41,15 @@ export function useDeleteFavoriteDoc({
           queryKey: [queryKey],
         });
       });
+
+      const message = t('Document unpinned successfully!');
+      announce(message, 'polite');
+
       onSuccess?.();
     },
+    onError: () => {
+      const message = t('Failed to unpin the document.');
+      announce(message, 'assertive');
+    },
   });
 }

src/frontend/apps/impress/src/features/docs/doc-management/api/useDuplicateDoc.tsx

@@ -88,14 +88,16 @@ export function useDuplicateDoc(options?: DuplicateDocOptions) {
         queryKey: [KEY_LIST_DOC],
       });
 
-      toast(t('Document duplicated successfully!'), VariantType.SUCCESS, {
+      const message = t('Document duplicated successfully!');
+      toast(message, VariantType.SUCCESS, {
         duration: 3000,
       });
 
       void options?.onSuccess?.(data, variables, onMutateResult, context);
     },
     onError: (error, variables, onMutateResult, context) => {
-      toast(t('Failed to duplicate the document...'), VariantType.ERROR, {
+      const message = t('Failed to duplicate the document...');
+      toast(message, VariantType.ERROR, {
         duration: 3000,
       });
 

src/frontend/apps/impress/src/features/docs/doc-management/api/useUpdateDoc.tsx

@@ -44,7 +44,7 @@ export function useUpdateDoc(queryConfig?: UseUpdateDoc) {
     ...queryConfig,
     onSuccess: (data, variables, onMutateResult, context) => {
       queryConfig?.listInvalidQueries?.forEach((queryKey) => {
-        void queryClient.invalidateQueries({
+        void queryClient.resetQueries({
           queryKey: [queryKey],
         });
       });

src/frontend/apps/impress/src/features/docs/doc-management/hooks/__tests__/useDocTitleUpdate.test.tsx

@@ -14,6 +14,11 @@ vi.mock('@/stores', () => ({
   }),
 }));
 
+vi.mock('@gouvfr-lasuite/ui-kit', async () => ({
+  ...(await vi.importActual('@gouvfr-lasuite/ui-kit')),
+  useTreeContext: () => null,
+}));
+
 describe('useDocTitleUpdate', () => {
   beforeEach(() => {
     vi.clearAllMocks();

src/frontend/apps/impress/src/features/docs/doc-management/stores/useProviderStore.tsx

@@ -30,6 +30,8 @@ const defaultValues = {
 
 type ExtendedCloseEvent = CloseEvent & { wasClean: boolean };
 
+let reconnectTimeout: ReturnType<typeof setTimeout> | undefined;
+
 export const useProviderStore = create<UseCollaborationStore>((set, get) => ({
   ...defaultValues,
   createProvider: (wsUrl, storeId, initialDoc) => {
@@ -48,7 +50,20 @@ export const useProviderStore = create<UseCollaborationStore>((set, get) => ({
       onDisconnect(data) {
         // Attempt to reconnect if the disconnection was clean (initiated by the client or server)
         if ((data.event as ExtendedCloseEvent).wasClean) {
-          void provider.connect();
+          if (data.event.reason === 'No cookies' && data.event.code === 4001) {
+            console.error(
+              'Disconnection due to missing cookies. Not attempting to reconnect.',
+            );
+            void provider.disconnect();
+            set({
+              isReady: true,
+              isConnected: false,
+            });
+            return;
+          }
+
+          clearTimeout(reconnectTimeout);
+          reconnectTimeout = setTimeout(() => void provider.connect(), 1000);
         }
       },
       onAuthenticationFailed() {
@@ -107,6 +122,7 @@ export const useProviderStore = create<UseCollaborationStore>((set, get) => ({
     return provider;
   },
   destroyProvider: () => {
+    clearTimeout(reconnectTimeout);
     const provider = get().provider;
     if (provider) {
       provider.destroy();

src/frontend/apps/impress/src/features/docs/doc-search/components/DocSearchContent.tsx

@@ -1,3 +1,4 @@
+import { announce } from '@react-aria/live-announcer';
 import { t } from 'i18next';
 import { useEffect, useState } from 'react';
 import { InView } from 'react-intersection-observer';
@@ -73,10 +74,12 @@ export const DocSearchContent = ({
       docs = docs.filter(filterResults);
     }
 
+    const elements = search || isSearchNotMandatory ? docs : [];
+
     setDocsData({
       groupName: docs.length > 0 ? groupName : '',
       groupKey: 'docs',
-      elements: search || isSearchNotMandatory ? docs : [],
+      elements,
       emptyString: t('No document found'),
       endActions: hasNextPage
         ? [
@@ -90,6 +93,13 @@ export const DocSearchContent = ({
           ]
         : [],
     });
+
+    if (search) {
+      announce(
+        t('{{count}} result(s) available', { count: elements.length }),
+        'polite',
+      );
+    }
   }, [
     search,
     data?.pages,

src/frontend/apps/impress/src/features/docs/doc-search/components/DocSearchFilters.tsx

@@ -58,7 +58,13 @@ export const DocSearchFilters = ({
         />
       </Box>
       {hasFilters && (
-        <Button color="brand" variant="tertiary" size="small" onClick={onReset}>
+        <Button
+          color="brand"
+          variant="tertiary"
+          size="small"
+          onClick={onReset}
+          aria-label={t('Reset search filters')}
+        >
           {t('Reset')}
         </Button>
       )}

src/frontend/apps/impress/src/features/docs/doc-search/components/DocSearchModal.tsx

@@ -14,7 +14,7 @@ import {
   DocSearchFiltersValues,
   DocSearchTarget,
 } from '@/docs/doc-search';
-import { useResponsiveStore } from '@/stores';
+import { useFocusStore, useResponsiveStore } from '@/stores';
 
 import EmptySearchIcon from '../assets/illustration-docs-empty.png';
 
@@ -36,6 +36,7 @@ const DocSearchModalGlobal = ({
 }: DocSearchModalGlobalProps) => {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
+  const restoreFocus = useFocusStore((state) => state.restoreFocus);
   const router = useRouter();
   const [search, setSearch] = useState('');
   const [filters, setFilters] = useState<DocSearchFiltersValues>(
@@ -51,6 +52,7 @@ const DocSearchModalGlobal = ({
 
   const handleResetFilters = () => {
     setFilters({});
+    restoreFocus();
   };
 
   return (
@@ -62,6 +64,7 @@ const DocSearchModalGlobal = ({
       aria-describedby="doc-search-modal-title"
     >
       <Box
+        aria-label={t('Search modal')}
         $direction="column"
         $justify="space-between"
         className="--docs--doc-search-modal"
@@ -85,21 +88,26 @@ const DocSearchModalGlobal = ({
           />
         </Box>
         <QuickSearch
+          label={t('Search documents')}
           placeholder={t('Type the name of a document')}
           loading={loading}
           onFilter={handleInputSearch}
+          beforeList={
+            showFilters ? (
+              <Box $padding={{ horizontal: '10px' }}>
+                <DocSearchFilters
+                  values={filters}
+                  onValuesChange={setFilters}
+                  onReset={handleResetFilters}
+                />
+              </Box>
+            ) : undefined
+          }
         >
           <Box
             $padding={{ horizontal: '10px', vertical: 'base' }}
             $height={isDesktop ? '500px' : 'calc(100vh - 68px - 1rem)'}
           >
-            {showFilters && (
-              <DocSearchFilters
-                values={filters}
-                onValuesChange={setFilters}
-                onReset={handleResetFilters}
-              />
-            )}
             {search.length === 0 && (
               <Box
                 $direction="column"
@@ -107,11 +115,7 @@ const DocSearchModalGlobal = ({
                 $align="center"
                 $justify="center"
               >
-                <Image
-                  width={320}
-                  src={EmptySearchIcon}
-                  alt={t('No active search')}
-                />
+                <Image width={320} src={EmptySearchIcon} alt="" />
               </Box>
             )}
             {search && (

src/frontend/apps/impress/src/features/docs/doc-table-content/components/Heading.tsx

@@ -51,11 +51,13 @@ export const Heading = ({
 
         editor.setTextCursorPosition(headingId, 'end');
 
-        document.querySelector(`[data-id="${headingId}"]`)?.scrollIntoView({
-          behavior: 'smooth',
-          inline: 'start',
-          block: 'start',
-        });
+        document
+          .querySelector<HTMLElement>(`[data-id="${headingId}"]`)
+          ?.scrollIntoView({
+            behavior: 'smooth',
+            inline: 'start',
+            block: 'start',
+          });
       }}
       $radius="var(--c--globals--spacings--st)"
       $background={

src/frontend/apps/impress/src/features/docs/doc-table-content/components/TableContent.tsx

@@ -91,7 +91,7 @@ export const TableContent = () => {
             $height="100%"
             $justify="center"
             $align="center"
-            aria-label={t('Summary')}
+            aria-label={t('Show the table of contents')}
             aria-expanded={isOpen}
             aria-controls="toc-list"
             $css={css`
@@ -218,8 +218,8 @@ const TableContentOpened = ({
           onClick={onClose}
           $justify="center"
           $align="center"
-          aria-label={t('Summary')}
-          aria-expanded="true"
+          aria-label={t('Hide the table of contents')}
+          aria-expanded={true}
           aria-controls="toc-list"
           $css={css`
             transition: none !important;

src/frontend/apps/impress/src/features/docs/doc-versioning/components/DocVersionEditor.tsx

@@ -4,9 +4,12 @@ import { useEffect, useState } from 'react';
 import * as Y from 'yjs';
 
 import { Box, Text, TextErrors } from '@/components';
-import { BlockNoteReader, DocEditorContainer } from '@/docs/doc-editor/';
+import { BlockNoteReader } from '@/docs/doc-editor/components/BlockNoteEditor';
+import { DocEditorContainer } from '@/docs/doc-editor/components/DocEditor';
 import { Doc, base64ToBlocknoteXmlFragment } from '@/docs/doc-management';
-import { Versions, useDocVersion } from '@/docs/doc-versioning/';
+
+import { useDocVersion } from '../api/useDocVersion';
+import { Versions } from '../types';
 
 import { DocVersionHeader } from './DocVersionHeader';
 

src/frontend/apps/impress/src/features/docs/doc-versioning/components/ModalConfirmationVersion.tsx

@@ -5,8 +5,8 @@ import {
   VariantType,
   useToastProvider,
 } from '@gouvfr-lasuite/cunningham-react';
-import { useRouter } from 'next/router';
 import { useTranslation } from 'react-i18next';
+import { createGlobalStyle } from 'styled-components';
 
 import { Box, Text } from '@/components';
 import {
@@ -21,15 +21,22 @@ import { KEY_LIST_DOC_VERSIONS } from '../api/useDocVersions';
 import { Versions } from '../types';
 import { revertUpdate } from '../utils';
 
-interface ModalConfirmationVersionProps {
-  onClose: () => void;
-  docId: Doc['id'];
+const ModalStyle = createGlobalStyle`
+  .c__modal__title {
+    margin-bottom: var(--c--globals--spacings--sm);
+  }
+`;
 
+interface ModalConfirmationVersionProps {
+  docId: Doc['id'];
+  onClose: () => void;
+  onSuccess: () => void;
   versionId: Versions['version_id'];
 }
 
 export const ModalConfirmationVersion = ({
   onClose,
+  onSuccess,
   docId,
   versionId,
 }: ModalConfirmationVersionProps) => {
@@ -39,14 +46,13 @@ export const ModalConfirmationVersion = ({
   });
   const { t } = useTranslation();
   const { toast } = useToastProvider();
-  const { push } = useRouter();
   const { provider } = useProviderStore();
   const { mutate: updateDoc } = useUpdateDoc({
     listInvalidQueries: [KEY_LIST_DOC_VERSIONS],
     onSuccess: () => {
       const onDisplaySuccess = () => {
         toast(t('Version restored successfully'), VariantType.SUCCESS);
-        void push(`/docs/${docId}`);
+        onSuccess();
       };
 
       if (!provider || !version?.content) {
@@ -64,6 +70,10 @@ export const ModalConfirmationVersion = ({
     },
   });
 
+  if (!version) {
+    return null;
+  }
+
   return (
     <Modal
       isOpen
@@ -102,7 +112,7 @@ export const ModalConfirmationVersion = ({
           </Button>
         </>
       }
-      size={ModalSize.SMALL}
+      size={ModalSize.MEDIUM}
       title={
         <Text
           as="h1"
@@ -111,17 +121,17 @@ export const ModalConfirmationVersion = ({
           $size="h6"
           $align="flex-start"
         >
-          {t('Warning')}
+          {t('Restoring an older version')}
         </Text>
       }
     >
+      <ModalStyle />
       <Box className="--docs--modal-confirmation-version">
         <Box>
-          <Text $variation="secondary" as="p">
-            {t('Your current document will revert to this version.')}
-          </Text>
-          <Text $variation="secondary" as="p">
-            {t('If a member is editing, his works can be lost.')}
+          <Text $variation="secondary" as="p" $margin="none">
+            {t(
+              "The current document will be replaced, but you'll still find it in the version history.",
+            )}
           </Text>
         </Box>
       </Box>

src/frontend/apps/impress/src/features/docs/doc-versioning/components/ModalSelectVersion.tsx

@@ -114,11 +114,12 @@ export const ModalSelectVersion = ({
             $height="calc(100vh - 2em - 12px)"
             $css={css`
               overflow-y: hidden;
-              border-left: 1px solid var(--c--globals--colors--gray-200);
+              border-left: 1px solid
+                var(--c--contextuals--border--surface--primary);
             `}
           >
             <Box
-              aria-label="version list"
+              aria-label={t('Version list')}
               $css={css`
                 overflow-y: auto;
                 flex: 1;
@@ -130,7 +131,8 @@ export const ModalSelectVersion = ({
                 $direction="row"
                 $align="center"
                 $css={css`
-                  border-bottom: 1px solid var(--c--globals--colors--gray-200);
+                  border-bottom: 1px solid
+                    var(--c--contextuals--border--surface--primary);
                 `}
                 $padding="sm"
               >
@@ -155,7 +157,8 @@ export const ModalSelectVersion = ({
               <Box
                 $padding="xs"
                 $css={css`
-                  border-top: 1px solid var(--c--globals--colors--gray-200);
+                  border-top: 1px solid
+                    var(--c--contextuals--border--surface--primary);
                 `}
               >
                 <Button
@@ -174,6 +177,9 @@ export const ModalSelectVersion = ({
         <ModalConfirmationVersion
           onClose={() => {
             restoreModal.close();
+          }}
+          onSuccess={() => {
+            restoreModal.close();
             onClose();
             setSelectedVersionId(undefined);
           }}

src/frontend/apps/impress/src/features/docs/doc-versioning/components/VersionItem.tsx

@@ -1,78 +1,38 @@
-import dynamic from 'next/dynamic';
-import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { Box, Text } from '@/components';
+import { BoxButton, Text } from '@/components';
 import { useCunninghamTheme } from '@/cunningham';
-import { Doc } from '@/docs/doc-management';
-
-import { Versions } from '../types';
-
-const ModalConfirmationVersion = dynamic(
-  () =>
-    import('./ModalConfirmationVersion').then((mod) => ({
-      default: mod.ModalConfirmationVersion,
-    })),
-  { ssr: false },
-);
 
 interface VersionItemProps {
-  docId: Doc['id'];
   text: string;
-
-  versionId?: Versions['version_id'];
   isActive: boolean;
+  onSelect?: () => void;
 }
 
-export const VersionItem = ({
-  docId,
-  versionId,
-  text,
-
-  isActive,
-}: VersionItemProps) => {
-  const { colorsTokens, spacingsTokens } = useCunninghamTheme();
-
-  const [isModalVersionOpen, setIsModalVersionOpen] = useState(false);
+export const VersionItem = ({ text, isActive, onSelect }: VersionItemProps) => {
+  const { t } = useTranslation();
+  const { spacingsTokens } = useCunninghamTheme();
 
   return (
-    <>
-      <Box
-        $width="100%"
-        as="li"
-        $background={isActive ? colorsTokens['gray-100'] : 'transparent'}
-        $radius={spacingsTokens['3xs']}
-        $css={`
-          cursor: pointer;
-
-          &:hover {
-            background: ${colorsTokens['gray-100']};
-          }
-        `}
-        $hasTransition
-        $minWidth="13rem"
-        className="--docs--version-item"
-      >
-        <Box
-          $padding={{ vertical: '0.7rem', horizontal: 'small' }}
-          $align="center"
-          $direction="row"
-          $justify="space-between"
-          $width="100%"
-        >
-          <Box $direction="row" $gap="0.5rem" $align="center">
-            <Text $weight="bold" $size="sm">
-              {text}
-            </Text>
-          </Box>
-        </Box>
-      </Box>
-      {isModalVersionOpen && versionId && (
-        <ModalConfirmationVersion
-          onClose={() => setIsModalVersionOpen(false)}
-          docId={docId}
-          versionId={versionId}
-        />
-      )}
-    </>
+    <BoxButton
+      aria-label={t('Restore version of {{date}}', { date: text })}
+      aria-pressed={isActive}
+      $width="100%"
+      $css={`
+        background: ${isActive ? 'var(--c--contextuals--background--semantic--overlay--primary)' : 'transparent'};
+        &:focus-visible, &:hover {
+          background: var(--c--contextuals--background--semantic--overlay--primary);
+        }
+      `}
+      className="version-item --docs--version-item"
+      onClick={onSelect}
+      $radius={spacingsTokens['3xs']}
+      $padding={{ vertical: 'm', horizontal: 'xs' }}
+      $hasTransition
+    >
+      <Text $weight="bold" $size="sm" $textAlign="left">
+        {text}
+      </Text>
+    </BoxButton>
   );
 };

src/frontend/apps/impress/src/features/docs/doc-versioning/components/VersionList.tsx

@@ -3,14 +3,7 @@ import { DateTime } from 'luxon';
 import { useTranslation } from 'react-i18next';
 
 import { APIError } from '@/api';
-import {
-  Box,
-  BoxButton,
-  Icon,
-  InfiniteScroll,
-  Text,
-  TextErrors,
-} from '@/components';
+import { Box, Icon, InfiniteScroll, Text, TextErrors } from '@/components';
 import { Doc } from '@/docs/doc-management';
 import { useDate } from '@/hooks';
 
@@ -23,7 +16,6 @@ interface VersionListStateProps {
   isLoading: boolean;
   error: APIError<unknown> | null;
   versions?: Versions[];
-  doc: Doc;
   selectedVersionId?: Versions['version_id'];
   onSelectVersion?: (versionId: Versions['version_id']) => void;
 }
@@ -31,13 +23,11 @@ interface VersionListStateProps {
 const VersionListState = ({
   onSelectVersion,
   selectedVersionId,
-
   isLoading,
   error,
   versions,
-  doc,
 }: VersionListStateProps) => {
-  const { formatDate } = useDate();
+  const { formatDateSpecial } = useDate();
 
   if (isLoading) {
     return (
@@ -48,24 +38,23 @@ const VersionListState = ({
   }
 
   return (
-    <Box $gap="10px" $padding="xs">
-      {versions?.map((version) => (
-        <BoxButton
-          aria-label="version item"
-          className="version-item"
-          key={version.version_id}
-          onClick={() => {
-            onSelectVersion?.(version.version_id);
-          }}
-        >
-          <VersionItem
-            versionId={version.version_id}
-            text={formatDate(version.last_modified, DateTime.DATETIME_MED)}
-            docId={doc.id}
-            isActive={version.version_id === selectedVersionId}
-          />
-        </BoxButton>
-      ))}
+    <Box $gap="xxs" $padding="xs">
+      {versions?.map((version) => {
+        const formattedDate = formatDateSpecial(
+          version.last_modified,
+          'dd MMMM · HH:mm',
+        );
+        const isSelected = version.version_id === selectedVersionId;
+        return (
+          <Box as="li" key={version.version_id} $css="list-style: none;">
+            <VersionItem
+              text={formattedDate}
+              isActive={isSelected}
+              onSelect={() => onSelectVersion?.(version.version_id)}
+            />
+          </Box>
+        );
+      })}
       {error && (
         <Box
           $justify="center"
@@ -97,6 +86,7 @@ export const VersionList = ({
   selectedVersionId,
 }: VersionListProps) => {
   const { t } = useTranslation();
+  const { formatDate } = useDate();
 
   const {
     data,
@@ -112,6 +102,12 @@ export const VersionList = ({
   const versions = data?.pages.reduce((acc, page) => {
     return acc.concat(page.versions);
   }, [] as Versions[]);
+  const selectedVersion = versions?.find(
+    (version) => version.version_id === selectedVersionId,
+  );
+  const selectedVersionDate = selectedVersion
+    ? formatDate(selectedVersion.last_modified, DateTime.DATETIME_MED)
+    : null;
 
   return (
     <Box
@@ -127,7 +123,7 @@ export const VersionList = ({
         as="ul"
         $padding="none"
         $margin={{ top: 'none' }}
-        role="listbox"
+        role="list"
       >
         {versions?.length === 0 && (
           <Box $align="center" $margin="large">
@@ -141,10 +137,14 @@ export const VersionList = ({
           isLoading={isLoading}
           error={error}
           versions={versions}
-          doc={doc}
           selectedVersionId={selectedVersionId}
         />
       </InfiniteScroll>
+      <Text className="sr-only" aria-live="polite">
+        {selectedVersionDate
+          ? t('Selected version {{date}}', { date: selectedVersionDate })
+          : ''}
+      </Text>
     </Box>
   );
 };

src/frontend/apps/impress/src/features/docs/doc-versioning/types.ts

@@ -1,4 +1,4 @@
-import { Doc } from '../doc-management';
+import { Doc } from '../doc-management/types';
 
 export interface APIListVersions {
   count: number;

src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGrid.tsx

@@ -116,7 +116,9 @@ export const DocsGrid = ({
         $padding={{
           bottom: 'md',
         }}
-        {...(withUpload ? getRootProps({ className: 'dropzone' }) : {})}
+        {...(withUpload
+          ? getRootProps({ className: 'dropzone', tabIndex: -1 })
+          : {})}
       >
         {withUpload && <input {...getInputProps()} />}
         <DocGridTitleBar

src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGridActions.tsx

@@ -19,7 +19,7 @@ import {
   useDuplicateDoc,
   useTrans,
 } from '@/docs/doc-management';
-import { MAIN_LAYOUT_ID } from '@/layouts/conf';
+import { focusMainContentStart } from '@/layouts/utils';
 import { useFocusStore } from '@/stores';
 
 import { DocMoveModal } from './DocMoveModal';
@@ -55,10 +55,9 @@ export const DocsGridActions = ({ doc }: DocsGridActionsProps) => {
 
   const { mutate: duplicateDoc } = useDuplicateDoc({
     onSuccess: () => {
-      const mainContent = document.getElementById(MAIN_LAYOUT_ID);
-      if (mainContent) {
-        requestAnimationFrame(() => mainContent.focus());
-      }
+      requestAnimationFrame(() => {
+        focusMainContentStart({ preventScroll: true });
+      });
     },
   });
 

src/frontend/apps/impress/src/features/docs/docs-grid/components/__tests__/DocsGridItemDate.test.tsx

@@ -1,4 +1,4 @@
-import { render, screen, waitFor } from '@testing-library/react';
+import { act, render, screen, waitFor } from '@testing-library/react';
 import fetchMock from 'fetch-mock';
 import i18next from 'i18next';
 import { DateTime } from 'luxon';
@@ -73,7 +73,9 @@ describe('DocsGridItemDate', () => {
   });
 
   it(`should render rendered the updated_at field in the correct language`, async () => {
-    await i18next.changeLanguage('fr');
+    await act(async () => {
+      await i18next.changeLanguage('fr');
+    });
 
     render(
       <DocsGridItemDate
@@ -90,7 +92,9 @@ describe('DocsGridItemDate', () => {
 
     expect(screen.getByText('il y a 5 jours')).toBeInTheDocument();
 
-    await i18next.changeLanguage('en');
+    await act(async () => {
+      await i18next.changeLanguage('en');
+    });
   });
 
   [

src/frontend/apps/impress/src/features/left-panel/components/LeftPanel.tsx

@@ -1,3 +1,5 @@
+import { usePathname } from 'next/navigation';
+import { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { createGlobalStyle, css } from 'styled-components';
 
@@ -23,11 +25,15 @@ const MobileLeftPanelStyle = createGlobalStyle`
 
 export const LeftPanel = () => {
   const { isDesktop } = useResponsiveStore();
-  const { t } = useTranslation();
+  if (isDesktop) {
+    return <LeftPanelDesktop />;
+  }
 
-  const { spacingsTokens } = useCunninghamTheme();
-  const { isPanelOpen, isPanelOpenMobile } = useLeftPanelStore();
-  const isPanelOpenState = isDesktop ? isPanelOpen : isPanelOpenMobile;
+  return <LeftPanelMobile />;
+};
+
+export const LeftPanelDesktop = () => {
+  const { t } = useTranslation();
   const { data: config } = useConfig();
   /**
    * The onboarding can be disable, so we need to check if it's enabled before displaying the help menu.
@@ -36,42 +42,51 @@ export const LeftPanel = () => {
    */
   const showHelpMenu = config?.theme_customization?.onboarding?.enabled;
 
-  if (isDesktop) {
-    return (
+  return (
+    <Box
+      data-testid="left-panel-desktop"
+      $css={css`
+        height: calc(100vh - ${HEADER_HEIGHT}px);
+        width: 100%;
+        overflow: hidden;
+        background-color: var(--c--contextuals--background--surface--primary);
+      `}
+      className="--docs--left-panel-desktop"
+      as="nav"
+      aria-label={t('Document sections')}
+    >
       <Box
-        data-testid="left-panel-desktop"
         $css={css`
-          height: calc(100vh - ${HEADER_HEIGHT}px);
-          width: 100%;
-          overflow: hidden;
-          background-color: var(--c--contextuals--background--surface--primary);
+          flex: 0 0 auto;
         `}
-        className="--docs--left-panel-desktop"
-        as="nav"
-        aria-label={t('Document sections')}
       >
-        <Box
-          $css={css`
-            flex: 0 0 auto;
-          `}
-        >
-          <LeftPanelHeader />
-        </Box>
-        <LeftPanelContent />
-        {showHelpMenu && (
-          <SeparatedSection showSeparator={false}>
-            <Box $padding={{ horizontal: 'sm' }} $justify="flex-start">
-              <HelpMenu />
-            </Box>
-          </SeparatedSection>
-        )}
+        <LeftPanelHeader />
       </Box>
-    );
-  }
+      <LeftPanelContent />
+      {showHelpMenu && (
+        <SeparatedSection showSeparator={false}>
+          <Box $padding={{ horizontal: 'sm' }} $justify="flex-start">
+            <HelpMenu />
+          </Box>
+        </SeparatedSection>
+      )}
+    </Box>
+  );
+};
+
+const LeftPanelMobile = () => {
+  const { t } = useTranslation();
+  const { spacingsTokens } = useCunninghamTheme();
+  const { closePanel, isPanelOpenMobile } = useLeftPanelStore();
+  const pathname = usePathname();
+
+  useEffect(() => {
+    closePanel({ type: 'mobile' });
+  }, [pathname, closePanel]);
 
   return (
     <>
-      {isPanelOpenState && <MobileLeftPanelStyle />}
+      {isPanelOpenMobile && <MobileLeftPanelStyle />}
       <Box
         $hasTransition
         $height="100vh"
@@ -81,7 +96,7 @@ export const LeftPanel = () => {
           height: calc(100dvh - 52px);
           border-right: 1px solid var(--c--globals--colors--gray-200);
           position: fixed;
-          transform: translateX(${isPanelOpenState ? '0' : '-100dvw'});
+          transform: translateX(${isPanelOpenMobile ? '0' : '-100dvw'});
           background-color: var(--c--contextuals--background--surface--primary);
           overflow-y: auto;
           overflow-x: hidden;

src/frontend/apps/impress/src/features/left-panel/components/LeftPanelCollapseButton.tsx

@@ -18,8 +18,46 @@ export const LeftPanelCollapseButton = () => {
   const { isPanelOpen, togglePanel } = useLeftPanelStore();
   const { currentDoc } = useDocStore();
   const [isDocTitleVisible, setIsDocTitleVisible] = useState(true);
+  const [isDocTitleInDom, setIsDocTitleInDom] = useState(true);
 
+  /**
+   * CLASS_DOC_TITLE is not every time in the DOM when
+   * this component is rendered, we need to observe the DOM
+   * to know when it is added, then we can observe
+   * its visibility.
+   */
   useEffect(() => {
+    setIsDocTitleInDom(false);
+
+    const docTitleEl = document.querySelector(`.${CLASS_DOC_TITLE}`);
+    if (docTitleEl) {
+      setIsDocTitleInDom(true);
+      return;
+    }
+
+    const mutationObserver = new MutationObserver(() => {
+      if (document.querySelector(`.${CLASS_DOC_TITLE}`)) {
+        mutationObserver.disconnect();
+        setIsDocTitleInDom(true);
+      }
+    });
+
+    mutationObserver.observe(document.body, { childList: true, subtree: true });
+
+    return () => {
+      mutationObserver.disconnect();
+    };
+  }, [currentDoc?.id]);
+
+  /**
+   * When the doc title is in the DOM, we observe its
+   * visibility to show or hide the collapse button accordingly
+   */
+  useEffect(() => {
+    if (!isDocTitleInDom) {
+      return;
+    }
+
     const mainContent = document.getElementById(MAIN_LAYOUT_ID);
     const docTitleEl = document.querySelector(`.${CLASS_DOC_TITLE}`);
 
@@ -43,7 +81,7 @@ export const LeftPanelCollapseButton = () => {
       observer.disconnect();
       setIsDocTitleVisible(true);
     };
-  }, [currentDoc?.id]);
+  }, [isDocTitleInDom]);
 
   const { untitledDocument } = useTrans();
 

src/frontend/apps/impress/src/features/service-worker/__tests__/DocsDB.test.tsx

@@ -1,12 +1,7 @@
-import { afterEach, describe, expect, it, vi } from 'vitest';
-
-vi.mock('@/../package.json', () => ({
-  default: { version: '0.0.0' },
-}));
+import { describe, expect, it, vi } from 'vitest';
 
 describe('DocsDB', () => {
-  afterEach(() => {
-    vi.clearAllMocks();
+  beforeEach(() => {
     vi.resetModules();
   });
 
@@ -20,17 +15,16 @@ describe('DocsDB', () => {
     { version: '3.0.0', expected: 3000000 },
     { version: '10.20.30', expected: 10020030 },
   ].forEach(({ version, expected }) => {
-    it(`correctly computes version for ${version}`, () => {
+    it(`correctly computes version for ${version}`, async () => {
       vi.doMock('@/../package.json', () => ({
         default: { version },
       }));
 
-      return vi.importActual('../DocsDB').then((module: any) => {
-        const result = module.getCurrentVersion();
-        expect(result).toBe(expected);
-        expect(result).toBeGreaterThan(previousExpected);
-        previousExpected = result;
-      });
+      const module = await import('../DocsDB');
+      const result = (module as any).getCurrentVersion();
+      expect(result).toBe(expected);
+      expect(result).toBeGreaterThan(previousExpected);
+      previousExpected = result;
     });
   });
 });

src/frontend/apps/impress/src/hooks/useClipboard.tsx

@@ -2,7 +2,6 @@ import {
   VariantType,
   useToastProvider,
 } from '@gouvfr-lasuite/cunningham-react';
-import { announce } from '@react-aria/live-announcer';
 import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -19,14 +18,12 @@ export const useClipboard = () => {
           toast(message, VariantType.SUCCESS, {
             duration: 3000,
           });
-          announce(message, 'polite');
         })
         .catch(() => {
           const message = errorMessage ?? t('Failed to copy to clipboard');
           toast(message, VariantType.ERROR, {
             duration: 3000,
           });
-          announce(message, 'assertive');
         });
     },
     [t, toast],

src/frontend/apps/impress/src/hooks/useDate.tsx

@@ -21,6 +21,10 @@ export const useDate = () => {
       .toLocaleString(format);
   };
 
+  const formatDateSpecial = (date: string, format: string): string => {
+    return DateTime.fromISO(date).setLocale(i18n.language).toFormat(format);
+  };
+
   const relativeDate = (date: string): string => {
     const dateToCompare = DateTime.fromISO(date);
 
@@ -45,5 +49,5 @@ export const useDate = () => {
       ),
     );
 
-  return { formatDate, relativeDate, calculateDaysLeft };
+  return { formatDate, formatDateSpecial, relativeDate, calculateDaysLeft };
 };

src/frontend/apps/impress/src/hooks/useRouteChangeCompleteFocus.tsx

@@ -1,7 +1,10 @@
 import { useRouter } from 'next/router';
 import { useEffect, useRef } from 'react';
 
-import { MAIN_LAYOUT_ID } from '@/layouts/conf';
+import {
+  focusMainContentStart,
+  getMainContentFocusTarget,
+} from '@/layouts/utils';
 
 export const useRouteChangeCompleteFocus = () => {
   const router = useRouter();
@@ -25,27 +28,24 @@ export const useRouteChangeCompleteFocus = () => {
       lastCompletedPathRef.current = normalizedUrl;
 
       requestAnimationFrame(() => {
-        const mainContent =
-          document.getElementById(MAIN_LAYOUT_ID) ??
-          document.getElementsByTagName('main')[0];
+        const focusTarget = getMainContentFocusTarget();
 
-        if (!mainContent) {
+        if (!focusTarget) {
           return;
         }
 
-        const firstHeading = mainContent.querySelector('h1, h2, h3');
         const prefersReducedMotion = window.matchMedia(
           '(prefers-reduced-motion: reduce)',
         ).matches;
 
         if (isKeyboardNavigationRef.current) {
-          (mainContent as HTMLElement | null)?.focus({ preventScroll: true });
+          focusMainContentStart({ preventScroll: true });
           isKeyboardNavigationRef.current = false;
         }
         if (router.pathname === '/docs/[id]') {
           return;
         }
-        (firstHeading ?? mainContent)?.scrollIntoView({
+        focusTarget.scrollIntoView({
           behavior: prefersReducedMotion ? 'auto' : 'smooth',
           block: 'start',
         });

src/frontend/apps/impress/src/layouts/MainLayout.tsx

@@ -3,7 +3,6 @@ import { useTranslation } from 'react-i18next';
 import { css } from 'styled-components';
 
 import { Box } from '@/components';
-import { useCunninghamTheme } from '@/cunningham';
 import { Header } from '@/features/header';
 import { HEADER_HEIGHT } from '@/features/header/conf';
 import { LeftPanel, ResizableLeftPanel } from '@/features/left-panel';
@@ -94,7 +93,6 @@ const MainContent = ({
   const { isDesktop } = useResponsiveStore();
 
   const { t } = useTranslation();
-  const { colorsTokens } = useCunninghamTheme();
   const currentBackgroundColor = !isDesktop ? 'white' : backgroundColor;
 
   return (
@@ -103,7 +101,6 @@ const MainContent = ({
       role="main"
       aria-label={t('Main content')}
       id={MAIN_LAYOUT_ID}
-      tabIndex={-1}
       $align="center"
       $flex={1}
       $width="100%"
@@ -120,14 +117,6 @@ const MainContent = ({
       $css={css`
         overflow-y: auto;
         overflow-x: clip;
-        &:focus-visible::after {
-          content: '';
-          position: absolute;
-          inset: 0;
-          border: 3px solid ${colorsTokens['brand-400']};
-          pointer-events: none;
-          z-index: 2001;
-        }
       `}
     >
       <Skeleton>

src/frontend/apps/impress/src/layouts/utils.ts

@@ -0,0 +1,37 @@
+import { MAIN_LAYOUT_ID } from './conf';
+
+export const getMainContentElement = (): HTMLElement | null =>
+  document.getElementById(MAIN_LAYOUT_ID) ??
+  document.getElementsByTagName('main')[0] ??
+  null;
+
+export const getMainContentFocusTarget = (): HTMLElement | null => {
+  const mainContent = getMainContentElement();
+
+  if (!mainContent) {
+    return null;
+  }
+
+  const firstHeading =
+    mainContent.querySelector('h1') ?? mainContent.querySelector('h2');
+
+  return firstHeading instanceof HTMLElement ? firstHeading : mainContent;
+};
+
+export const focusMainContentStart = (
+  options?: FocusOptions,
+): HTMLElement | null => {
+  const focusTarget = getMainContentFocusTarget();
+
+  if (!focusTarget) {
+    return null;
+  }
+
+  if (!focusTarget.hasAttribute('tabindex')) {
+    focusTarget.setAttribute('tabindex', '-1');
+  }
+
+  focusTarget.focus(options);
+
+  return focusTarget;
+};

src/frontend/apps/impress/src/pages/docs/[id]/index.tsx

@@ -19,6 +19,7 @@ import {
   useTrans,
 } from '@/docs/doc-management/';
 import { KEY_AUTH, setAuthUrl, useAuth } from '@/features/auth';
+import { FloatingBar } from '@/features/docs/doc-header/components/FloatingBar';
 import { getDocChildren, subPageToTree } from '@/features/docs/doc-tree/';
 import { DocEditorSkeleton, useSkeletonStore } from '@/features/skeletons';
 import { MainLayout } from '@/layouts';
@@ -60,6 +61,7 @@ export function DocLayout() {
         }}
       >
         <MainLayout enableResizablePanel={true}>
+          <FloatingBar />
           <DocPage id={id} />
         </MainLayout>
       </TreeProvider>

src/frontend/apps/impress/vitest.config.ts

@@ -1,16 +1,9 @@
 /// <reference types="vitest" />
 import react from '@vitejs/plugin-react';
-import tsconfigPaths from 'vite-tsconfig-paths';
 import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
-  plugins: [
-    react(),
-    tsconfigPaths({
-      root: '.',
-      projects: ['./tsconfig.json'],
-    }),
-  ],
+  plugins: [react()],
   test: {
     globals: true,
     environment: 'jsdom',
@@ -22,4 +15,7 @@ export default defineConfig({
   define: {
     'process.env.NODE_ENV': 'test',
   },
+  resolve: {
+    tsconfigPaths: true,
+  },
 });

src/frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "impress",
-  "version": "4.8.2",
+  "version": "4.8.3",
   "private": true,
   "repository": "https://github.com/suitenumerique/docs",
   "author": "DINUM",
@@ -32,17 +32,17 @@
   },
   "resolutions": {
     "@tiptap/extensions": "3.19.0",
-    "@types/node": "24.10.13",
+    "@types/node": "24.12.0",
     "@types/react": "19.2.14",
     "@types/react-dom": "19.2.3",
-    "eslint": "10.0.1",
+    "eslint": "10.0.3",
     "glob": "13.0.6",
     "prosemirror-view": "1.41.6",
     "react": "19.2.4",
     "react-dom": "19.2.4",
     "typescript": "5.9.3",
-    "wrap-ansi": "9.0.2",
-    "yjs": "13.6.29"
+    "wrap-ansi": "10.0.0",
+    "yjs": "13.6.30"
   },
   "packageManager": "yarn@1.22.22"
 }

src/frontend/packages/eslint-plugin-docs/base.js

@@ -2,7 +2,7 @@ const js = require('@eslint/js');
 const nextPlugin = require('@next/eslint-plugin-next');
 const tanstackQuery = require('@tanstack/eslint-plugin-query');
 const { defineConfig } = require('eslint/config');
-const importPlugin = require('eslint-plugin-import');
+const importPlugin = require('eslint-plugin-import-x');
 const jsxA11y = require('eslint-plugin-jsx-a11y');
 const prettier = require('eslint-plugin-prettier');
 const react = require('eslint-plugin-react');

src/frontend/packages/eslint-plugin-docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-docs",
-  "version": "4.8.2",
+  "version": "4.8.3",
   "repository": "https://github.com/suitenumerique/docs",
   "author": "DINUM",
   "license": "MIT",
@@ -18,22 +18,22 @@
   },
   "dependencies": {
     "@eslint/js": "10.0.1",
-    "@next/eslint-plugin-next": "16.1.6",
+    "@next/eslint-plugin-next": "16.1.7",
     "@tanstack/eslint-plugin-query": "5.91.4",
-    "@typescript-eslint/eslint-plugin": "8.56.0",
-    "@typescript-eslint/parser": "8.56.0",
-    "@typescript-eslint/utils": "8.56.0",
-    "@vitest/eslint-plugin": "1.6.9",
-    "eslint-config-next": "16.1.6",
+    "@typescript-eslint/eslint-plugin": "8.57.1",
+    "@typescript-eslint/parser": "8.57.1",
+    "@typescript-eslint/utils": "8.57.1",
+    "@vitest/eslint-plugin": "1.6.12",
+    "eslint-config-next": "16.1.7",
     "eslint-config-prettier": "10.1.8",
-    "eslint-plugin-import": "2.32.0",
+    "eslint-plugin-import-x": "4.16.2",
     "eslint-plugin-jest": "29.15.0",
     "eslint-plugin-jsx-a11y": "6.10.2",
-    "eslint-plugin-playwright": "2.5.1",
+    "eslint-plugin-playwright": "2.10.0",
     "eslint-plugin-prettier": "5.5.5",
     "eslint-plugin-react": "7.37.5",
-    "eslint-plugin-react-hooks": "5.2.0",
-    "eslint-plugin-testing-library": "7.15.4",
+    "eslint-plugin-react-hooks": "7.0.1",
+    "eslint-plugin-testing-library": "7.16.0",
     "prettier": "3.8.1"
   },
   "packageManager": "yarn@1.22.22"

src/frontend/packages/i18n/package.json

@@ -1,6 +1,6 @@
 {
   "name": "packages-i18n",
-  "version": "4.8.2",
+  "version": "4.8.3",
   "repository": "https://github.com/suitenumerique/docs",
   "author": "DINUM",
   "license": "MIT",
@@ -19,8 +19,8 @@
     "@types/node": "*",
     "eslint-plugin-docs": "*",
     "eslint-plugin-import": "2.32.0",
-    "i18next-parser": "9.3.0",
-    "jest": "30.2.0",
+    "i18next-parser": "9.4.0",
+    "jest": "30.3.0",
     "ts-jest": "29.4.6",
     "typescript": "*",
     "yargs": "18.0.0"

src/frontend/servers/y-provider/package.json

@@ -18,10 +18,10 @@
   "dependencies": {
     "@blocknote/server-util": "0.47.1",
     "@hocuspocus/server": "3.4.4",
-    "@sentry/node": "10.38.0",
-    "@sentry/profiling-node": "10.38.0",
+    "@sentry/node": "10.43.0",
+    "@sentry/profiling-node": "10.43.0",
     "@tiptap/extensions": "*",
-    "axios": "1.13.5",
+    "axios": "1.13.6",
     "cors": "2.8.6",
     "express": "5.2.1",
     "express-ws": "5.0.2",
@@ -36,16 +36,16 @@
     "@types/express": "5.0.6",
     "@types/express-ws": "3.0.6",
     "@types/node": "*",
-    "@types/supertest": "6.0.3",
+    "@types/supertest": "7.2.0",
     "@types/ws": "8.18.1",
     "cross-env": "10.1.0",
     "eslint-plugin-docs": "*",
-    "nodemon": "3.1.11",
+    "nodemon": "3.1.14",
     "supertest": "7.2.2",
     "ts-node": "10.9.2",
     "tsc-alias": "1.8.16",
     "typescript": "*",
-    "vitest": "4.0.18",
+    "vitest": "4.1.0",
     "vitest-mock-extended": "3.1.0",
     "ws": "8.19.0"
   },

src/helm/helmfile.yaml.gotmpl

@@ -1,10 +1,10 @@
 environments:
   dev:
     values:
-      - version: 4.8.2
+      - version: 4.8.3
   feature:
     values:
-      - version: 4.8.2
+      - version: 4.8.3
         feature: ci
         domain: example.com
         imageTag: demo

src/helm/impress/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
 type: application
 name: docs
-version: 4.8.2
+version: 4.8.3
 appVersion: latest

src/mail/package.json

@@ -1,12 +1,15 @@
 {
   "name": "mail_mjml",
-  "version": "4.8.2",
+  "version": "4.8.3",
   "description": "An util to generate html and text django's templates from mjml templates",
   "type": "module",
   "dependencies": {
     "@html-to/text-cli": "0.5.4",
     "mjml": "4.18.0"
   },
+  "resolutions": {
+    "minimatch": "^9.0.7"
+  },
   "private": true,
   "scripts": {
     "build-mjml-to-html": "bash ./bin/mjml-to-html",

src/mail/yarn.lock

@@ -110,7 +110,7 @@ boolbase@^1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
-brace-expansion@^2.0.1:
+brace-expansion@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7"
   integrity sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==
@@ -562,19 +562,12 @@ mime@^2.4.6:
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
   integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
 
-minimatch@9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.1.tgz#8a555f541cf976c622daf078bb28f29fb927c253"
-  integrity sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==
+minimatch@9.0.1, minimatch@^9.0.3, minimatch@^9.0.4, minimatch@^9.0.7:
+  version "9.0.9"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.9.tgz#9b0cb9fcb78087f6fd7eababe2511c4d3d60574e"
+  integrity sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==
   dependencies:
-    brace-expansion "^2.0.1"
-
-minimatch@^9.0.3, minimatch@^9.0.4:
-  version "9.0.5"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
-  integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
-  dependencies:
-    brace-expansion "^2.0.1"
+    brace-expansion "^2.0.2"
 
 "minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.1.2:
   version "7.1.2"