22.0.2 release

ChangeLog

@@ -1,3 +1,8 @@
+03-OCT-2023: 22.0.2
+
+- Fixes new save dialog for SharePoint [drawio-3900]
+- Fixes copy/paste after dialog was shown [drawio-3903]
+
 02-OCT-2023: 22.0.1
 
 - Ignores selection for nested cells with part style

VERSION

@@ -1 +1 @@
-22.0.1
+22.0.2

src/main/webapp/js/diagramly/Dialogs.js

@@ -4782,7 +4782,6 @@ var SaveDialog = function(editorUi, title, saveFn, disabledModes, data, mimeType
 		return option;
 	};
 
-	var pickFolderOption = null;
 	var defaultValue = null;
 
 	function pickFolder(mode)
@@ -4797,7 +4796,8 @@ var SaveDialog = function(editorUi, title, saveFn, disabledModes, data, mimeType
 			}
 			else if (mode == App.MODE_ONEDRIVE && result.value != null && result.value.length > 0)
 			{
-				entry = {mode: mode, path: result.value[0].name, id: result.value[0].id};
+				entry = {mode: mode, path: result.value[0].name,
+					id: OneDriveFile.prototype.getIdOf(result.value[0])};
 			}
 			else if ((mode == App.MODE_GITHUB || mode == App.MODE_GITLAB) &&
 				result != null && result.length > 0)
@@ -4812,10 +4812,19 @@ var SaveDialog = function(editorUi, title, saveFn, disabledModes, data, mimeType
 
 				var option = addStorageEntry(entry.mode, entry.path, entry.id, true);
 				storageSelect.innerHTML = '';
-				pickFolderOption = null;
 				entries = {};
-				storageSelect.value = option.value;
 				addStorageEntries();
+
+				// Selects new entry
+				var prev = storageSelect.selectedIndex;
+				storageSelect.value = option.value;
+
+				// Checks if entry exists
+				// LATER: Pass value to select to addStorageEntries
+				if (storageSelect.selectedIndex < 0)
+				{
+					storageSelect.selectedIndex = prev;
+				}
 			}
 		}, true, true, true, true);
 	};
@@ -4914,15 +4923,15 @@ var SaveDialog = function(editorUi, title, saveFn, disabledModes, data, mimeType
 			storageSelect.value = prev;
 		}
 
-		// Avoids folder picker on initial state
+		// Adds title to avoid entries that execute an action
 		if (storageSelect.value.substring(0, 11) == 'pickFolder-' ||
 			storageSelect.value == 'reset')
 		{
-			pickFolderOption = document.createElement('option');
-			pickFolderOption.setAttribute('value', '');
-			pickFolderOption.setAttribute('selected', 'selected');
-			mxUtils.write(pickFolderOption, mxResources.get('pickFolder') + '...');
-			storageSelect.insertBefore(pickFolderOption, storageSelect.firstChild);
+			var option = document.createElement('option');
+			option.setAttribute('value', '');
+			option.setAttribute('selected', 'selected');
+			mxUtils.write(option, mxResources.get('pickFolder') + '...');
+			storageSelect.insertBefore(option, storageSelect.firstChild);
 		}
 
 		defaultValue = storageSelect.value;

src/main/webapp/js/grapheditor/EditorUi.js

@@ -5555,6 +5555,8 @@ EditorUi.prototype.hideDialog = function(cancel, isEsc, matchContainer)
 			this.dialogs.splice(index, 1);
 		}
 
+		this.dialog = (this.dialogs.length > 0) ? this.dialogs[this.dialogs.length - 1] : null;
+
 		// Restores existing dialogs and adds new dialogs
 		this.editor.fireEvent(new mxEventObject('hideDialog'));