136640 cannot open drawioModal when editorKey is null

apps/app/src/components/PageEditor/DrawioModal.tsx

@@ -50,13 +50,17 @@ export const DrawioModal = (): JSX.Element => {
   });
 
   const { data: drawioModalData, close: closeDrawioModal } = useDrawioModal();
-  const { data: drawioModalDataInEditor } = useDrawioModalForEditor();
+  const { data: drawioModalDataInEditor, close: closeDrawioModalInEdior } = useDrawioModalForEditor();
   const isOpened = drawioModalData?.isOpened ?? false;
   const isOpendInEditor = drawioModalDataInEditor?.isOpened ?? false;
   const editorKey = drawioModalDataInEditor?.editorKey ?? null;
   const { data: codeMirrorEditor } = useCodeMirrorEditorIsolated(editorKey);
   const editor = codeMirrorEditor?.view;
 
+  if ((isOpened || isOpendInEditor) && editorKey == null && drawioModalData?.onSave == null) {
+    closeDrawioModalInEdior();
+  }
+
   const drawioUriWithParams = useMemo(() => {
     if (rendererConfig == null) {
       return undefined;

packages/editor/src/components/CodeMirrorEditor/Toolbar/DiagramButton.tsx

@@ -10,9 +10,6 @@ export const DiagramButton = (props: Props): JSX.Element => {
   const { editorKey } = props;
   const { open: openDrawioModal } = useDrawioModalForEditor();
   const onClickDiagramButton = useCallback(() => {
-    if (editorKey == null) {
-      return;
-    }
     openDrawioModal(editorKey);
   }, [editorKey, openDrawioModal]);
   return (