From 45c64e1b4a5f730b96d4ba747ad5f99e03935530 Mon Sep 17 00:00:00 2001
From: Ryan Schultz <ryan@openingdesign.com>
Date: Thu, 19 Mar 2026 06:40:47 -0500
Subject: [PATCH] Fix #7784: Fix drawing names with special chars in sheets

Drawing names containing characters like (, ), and & were
being stripped when displayed in the sheet list and SVG view
titles, because the sanitised filename stem was used instead
of the IFC annotation name.

Generated with the assistance of an AI coding tool.
---
 src/bonsai/bonsai/bim/module/drawing/sheeter.py |  2 +-
 src/bonsai/bonsai/tool/drawing.py               | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/bonsai/bonsai/bim/module/drawing/sheeter.py b/src/bonsai/bonsai/bim/module/drawing/sheeter.py
index df57b6efb5..40429ef659 100644
--- a/src/bonsai/bonsai/bim/module/drawing/sheeter.py
+++ b/src/bonsai/bonsai/bim/module/drawing/sheeter.py
@@ -435,7 +435,7 @@ class SheetBuilder:
                 data = reference.get_info()
                 data.update({"Sheet" + k: v for k, v in sheet.get_info().items()})
                 if not data["Name"]:
-                    data["Name"] = ntpath.basename(foreground_path)[0:-4]
+                    data["Name"] = drawing.Name or ntpath.basename(foreground_path)[0:-4]
 
                 # If a perspective drawing, don't add scale to view title
                 try:
diff --git a/src/bonsai/bonsai/tool/drawing.py b/src/bonsai/bonsai/tool/drawing.py
index a78fd67ed2..43c067604d 100644
--- a/src/bonsai/bonsai/tool/drawing.py
+++ b/src/bonsai/bonsai/tool/drawing.py
@@ -482,8 +482,10 @@ class Drawing(bonsai.core.tool.Drawing):
         for reference in cls.get_document_references(sheet):
             reference_description = cls.get_reference_description(reference)
             if reference_description == "DRAWING":
-                drawing_references[Path(reference.Location).stem] = reference
-                drawing_names.append(Path(reference.Location).stem)
+                info = cls.get_reference_document(reference)
+                drawing_name = info.Name if info else Path(reference.Location).stem
+                drawing_references[drawing_name] = reference
+                drawing_names.append(drawing_name)
         for drawing_annotation in [e for e in tool.Ifc.get().by_type("IfcAnnotation") if e.ObjectType == "DRAWING"]:
             if drawing_annotation.Name in drawing_names:
                 sheet_builder.add_drawing(drawing_references[drawing_annotation.Name], drawing_annotation, sheet)
@@ -1131,6 +1133,12 @@ class Drawing(bonsai.core.tool.Drawing):
             if not new.is_expanded:
                 continue
 
+            drawing_name_by_location = {
+                cls.get_document_uri(cls.get_drawing_document(d)): d.Name
+                for d in tool.Ifc.get().by_type("IfcAnnotation")
+                if d.ObjectType == "DRAWING" and cls.get_drawing_document(d)
+            }
+
             for reference in cls.get_document_references(sheet):
                 reference_description = cls.get_reference_description(reference)
                 if reference_description in ("SHEET", "LAYOUT", "RASTER"):
@@ -1145,7 +1153,8 @@ class Drawing(bonsai.core.tool.Drawing):
                 else:
                     new.identification = reference.Identification or ""
 
-                new.name = os.path.basename(reference.Location)
+                resolved_location = cls.get_document_uri(reference)
+                new.name = drawing_name_by_location.get(resolved_location) or os.path.basename(reference.Location)
                 new.reference_type = reference_description
 
     @classmethod