snackbar: use ESC to dismiss sidebar

Signed-off-by: Szymon Kłos <[email protected]> Change-Id: I8f198ec3fd1ce459f9f9cce02755548224e5c721
CollaboraOnline · Oct 7, 2023 · dcb69e8 · dcb69e8
1 parent e14897b
commit dcb69e8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/browser/src/control/Control.JSDialog.js b/browser/src/control/Control.JSDialog.js
@@ -35,6 +35,12 @@ L.Control.JSDialog = L.Control.extend({
 			.length > 0;
 	},
 
+	hasSnackbarOpened: function() {
+		return Object.keys(this.dialogs)
+			.filter(function (key) { return key == 'snackbar'; })
+			.length > 0;
+	},
+
 	clearDialog: function(id) {
 		var builder = this.dialogs[id].builder;
 

diff --git a/browser/src/map/handler/Map.Keyboard.js b/browser/src/map/handler/Map.Keyboard.js
@@ -358,7 +358,8 @@ L.Map.Keyboard = L.Handler.extend({
 		if (this._map.uiManager.isUIBlocked())
 			return;
 
-		if (this._map.jsdialog && this._map.jsdialog.hasDialogOpened()
+		if (this._map.jsdialog
+			&& (this._map.jsdialog.hasDialogOpened() || this._map.jsdialog.hasSnackbarOpened())
 			&& this._map.jsdialog.handleKeyEvent(ev)) {
 			ev.preventDefault();
 			return;