From a42c35dda0a2c1f36fef6c3c4caa0106643e1567 Mon Sep 17 00:00:00 2001
From: Cyril <c.gromoff@gmail.com>
Date: Wed, 25 Mar 2026 13:08:58 +0100
Subject: [PATCH] =?UTF-8?q?=E2=99=BF=EF=B8=8F(frontend)=20fix=20list=20mer?=
 =?UTF-8?q?ging=20across=20headings=20in=20HTML=20export?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Lists separated by a heading were merged into a single <ul>
---
 .../src/features/docs/doc-export/utils_html.ts     | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/frontend/apps/impress/src/features/docs/doc-export/utils_html.ts b/src/frontend/apps/impress/src/features/docs/doc-export/utils_html.ts
index f7137bff..8c4ec1ab 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-export/utils_html.ts
+++ b/src/frontend/apps/impress/src/features/docs/doc-export/utils_html.ts
@@ -190,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');
@@ -204,6 +205,7 @@ export const improveHtmlAccessibility = (
           listItem,
           contentType,
           level,
+          blockOuterIndex: index,
         });
       }
     }
@@ -218,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;