From ee7ded3ecb576645cf2fb6415ad535561e9a3fd8 Mon Sep 17 00:00:00 2001
From: Alexey Morozov <alexey.morozov@live.ru>
Date: Sat, 25 Oct 2025 01:15:46 +0300
Subject: [PATCH] Fix missing element decorations after re-importing the same
 diagram

---
 CHANGELOG.md                 |  1 +
 src/diagram/elementLayer.tsx | 20 ++++++++++----------
 src/diagram/graph.ts         |  4 +++-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c096054..945785a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 #### 🐛 Fixed
 - Fix `HaloLink` and visual authoring link path highlight being rendered on top on elements by placing it onto `overLinkGeometry` widget layer instead.
 - Fix element template state not being restored when ungrouping entities.
+- Fix missing element decorations after re-importing the same diagram.
 
 ## [0.30.1] - 2025-06-27
 #### 🐛 Fixed
diff --git a/src/diagram/elementLayer.tsx b/src/diagram/elementLayer.tsx
index e58e3488..377b70ae 100644
--- a/src/diagram/elementLayer.tsx
+++ b/src/diagram/elementLayer.tsx
@@ -24,7 +24,7 @@ export interface ElementLayerProps {
 
 interface State {
     readonly version: number;
-    readonly elementStates: ReadonlyMap<string, ElementState>;
+    readonly elementStates: ReadonlyMap<Element, ElementState>;
 }
 
 interface ElementState {
@@ -75,7 +75,7 @@ export class ElementLayer extends React.Component<ElementLayerProps, State> {
                 model,
                 renderingState.shared,
                 this.redrawBatch,
-                new Map<string, ElementState>()
+                new Map<Element, ElementState>()
             )
         };
     }
@@ -86,8 +86,8 @@ export class ElementLayer extends React.Component<ElementLayerProps, State> {
         const {memoizedElements} = this;
 
         const elementsToRender: ElementState[] = [];
-        for (const {id} of model.elements) {
-            const state = elementStates.get(id);
+        for (const element of model.elements) {
+            const state = elementStates.get(element);
             if (state) {
                 elementsToRender.push(state);
             }
@@ -238,15 +238,15 @@ function applyRedrawRequests(
     model: DiagramModel,
     view: SharedCanvasState,
     batch: RedrawBatch,
-    previous: ReadonlyMap<string, ElementState>,
-): ReadonlyMap<string, ElementState> {
+    previous: ReadonlyMap<Element, ElementState>,
+): ReadonlyMap<Element, ElementState> {
     if (batch.forAll === RedrawFlags.None && batch.requests.size === 0) {
         return previous;
     }
-    const computed = new Map<string, ElementState>();
+    const computed = new Map<Element, ElementState>();
     for (const element of model.elements) {
         const elementId = element.id;
-        let state = previous.get(elementId);
+        let state = previous.get(element);
         if (state) {
             const request = (batch.requests.get(elementId) || RedrawFlags.None) | batch.forAll;
             if (request & RedrawFlags.Render) {
@@ -262,10 +262,10 @@ function applyRedrawRequests(
                             ? computeIsBlurred(state.element, view) : state.blurred,
                 };
             }
-            computed.set(elementId, state);
+            computed.set(element, state);
             batch.requests.delete(elementId);
         } else {
-            computed.set(element.id, {
+            computed.set(element, {
                 element,
                 templateProps: computeTemplateProps(element),
                 blurred: computeIsBlurred(element, view),
diff --git a/src/diagram/graph.ts b/src/diagram/graph.ts
index 42c83370..d9807fbc 100644
--- a/src/diagram/graph.ts
+++ b/src/diagram/graph.ts
@@ -38,7 +38,9 @@ export class Graph {
     private readonly source = new EventSource<GraphEvents>();
     readonly events: Events<GraphEvents> = this.source;
 
-    private cellsVersion = 1;
+    // Initialize with random value to avoid accidental version match
+    // when reloading the graph i.e. when importing a diagram
+    private cellsVersion = Math.floor(Math.random() * Number.MAX_SAFE_INTEGER / 2);
     private readonly elements = new OrderedMap<Element>();
     private readonly links = new OrderedMap<Link>();
     private readonly elementLinks = new WeakMap<Element, Link[]>();