From efee4ca25a413c3cb2693a6315b8e589f087fa3b Mon Sep 17 00:00:00 2001
From: Zuzanna Ludzik <zuzanna.maria@protonmail.com>
Date: Mon, 4 May 2026 13:03:10 +0200
Subject: [PATCH] load diagram after metadata update

---
 www/diagram/inner.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/www/diagram/inner.js b/www/diagram/inner.js
index b4f4738d5..d0f5bc71f 100644
--- a/www/diagram/inner.js
+++ b/www/diagram/inner.js
@@ -196,17 +196,30 @@ define([
                 parameters.set('chrome', '1');
                 parameters.set('grid', '1');
             }
+        });
+
+         var loadDiagram = function () {
             checkDefaultTheme(function(theme) {
                 var defaultTheme = theme;
                 parameters.set('ui', defaultTheme);
             });
             drawioFrame.src = ApiConfig.httpSafeOrigin + '/components/drawio/src/main/webapp/index.html?'
             + parameters;
-        });
+        };
 
         // starting the CryptPad framework
         framework.start();
 
+        //wait for metadata to update before checking the theme and loading Drawio UI
+        var metadataMgr = framework._.sfCommon.getMetadataMgr();
+        var onChange = function () {
+            var privateData = metadataMgr.getPrivateData();
+            if (!privateData.settings.toolbar) { return; }
+            loadDiagram();
+            metadataMgr.off('change', onChange);
+        };
+        metadataMgr.onChange(onChange);
+
         window.addEventListener("message", (event) => {
             if (event.source === drawioFrame.contentWindow) {
                 var data = JSON.parse(event.data);