From 100d2953ed06c46da82b445220dabd08e4ffe286 Mon Sep 17 00:00:00 2001
From: Ovgodd <c.gromoff@gmail.com>
Date: Fri, 4 Sep 2026 09:08:49 +0200
Subject: [PATCH] =?UTF-8?q?=E2=99=BF=EF=B8=8F(frontend)=20announce=20the?=
 =?UTF-8?q?=20doc=20options=20button=20as=20a=20menu=20button?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The dropdown trigger was not exposed as a menu button to assistive tech.
---
 .../docs/doc-management/components/DocToolBox.tsx  |  4 ++++
 .../features/docs/doc-tree/components/DocTree.tsx  | 14 +++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/frontend/apps/impress/src/features/docs/doc-management/components/DocToolBox.tsx b/src/frontend/apps/impress/src/features/docs/doc-management/components/DocToolBox.tsx
index cef8bed47..91cd7e0ff 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-management/components/DocToolBox.tsx
+++ b/src/frontend/apps/impress/src/features/docs/doc-management/components/DocToolBox.tsx
@@ -345,6 +345,10 @@ const DocToolBoxComponent = ({
           aria-label={t('Open the document options: {{title}}', {
             title: doc.title || untitledDocument,
           })}
+          // `DropdownMenu` does not use React Aria's MenuTrigger, so nothing
+          // exposes the button as a menu button. Both attributes are ours.
+          aria-haspopup="menu"
+          aria-expanded={openDropdown}
           size="small"
           icon={<MoreIcon width={24} height={24} aria-hidden="true" />}
           color="neutral"
diff --git a/src/frontend/apps/impress/src/features/docs/doc-tree/components/DocTree.tsx b/src/frontend/apps/impress/src/features/docs/doc-tree/components/DocTree.tsx
index 9fe952662..b7b54b4e1 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-tree/components/DocTree.tsx
+++ b/src/frontend/apps/impress/src/features/docs/doc-tree/components/DocTree.tsx
@@ -14,7 +14,11 @@ import { Doc } from '@/docs/doc-management';
 import { TreeSkeleton } from '@/features/skeletons/components/TreeSkeleton';
 
 import { KEY_DOC_TREE, useDocTree } from '../api/useDocTree';
-import { findIndexInTree, reloadTree } from '../utils';
+import {
+  ID_TREE_KEYBOARD_INSTRUCTIONS,
+  findIndexInTree,
+  reloadTree,
+} from '../utils';
 
 import { DocTreeRoot } from './DocTreeRoot';
 import { DocTreeSubpages } from './DocTreeSubpages';
@@ -174,7 +178,6 @@ export const DocTree = ({ currentDoc }: DocTreeProps) => {
       $height="100%"
       role="tree"
       aria-label={t('Document tree')}
-      aria-describedby="doc-tree-keyboard-instructions"
       $css={css`
         /**
         * TODO: When this pull request is merged (https://github.com/suitenumerique/ui-kit/pull/215), we 
@@ -205,9 +208,9 @@ export const DocTree = ({ currentDoc }: DocTreeProps) => {
       `}
     >
       {/* Keyboard instructions for screen readers */}
-      <Box id="doc-tree-keyboard-instructions" className="sr-only">
+      <Box id={ID_TREE_KEYBOARD_INSTRUCTIONS} className="sr-only">
         {t(
-          'Use the up and down arrow keys to move between documents, and Enter to open one. Press F2 to reach the actions of a document and to move between them, use Escape to go back to the document list.',
+          'Use the up and down arrow keys to move between documents, and Enter to open one. Press F2 to reach the actions of a document, then the left and right arrow keys to move between them, and Escape to go back to the document list.',
         )}
       </Box>
       <Box
@@ -227,7 +230,8 @@ export const DocTree = ({ currentDoc }: DocTreeProps) => {
         treeContext.treeData.nodes.length > 0 &&
         treeRoot && (
           <DocTreeSubpages
-            doc={currentDoc}
+            canMoveInto={currentDoc.abilities.move}
+            isDeleted={currentDoc.deleted_at != null}
             treeRoot={treeRoot}
             initialOpenState={initialOpenState}
             rootNodeId={treeContext.root.id}