🔀 Merge branch 'master' into i18n-v2

packages/editor-ui/src/components/ModalDrawer.vue

@@ -3,7 +3,7 @@
 		:direction="direction"
 		:visible="visible"
 		:size="width"
-		:before-close="beforeClose"
+		:before-close="close"
 		:modal="modal"
 		:wrapperClosable="wrapperClosable"
 		>
@@ -11,7 +11,9 @@
 			<slot name="header" />
 		</template>
 		<template>
-			<slot name="content"/>
+			<span @keydown.stop>
+				<slot name="content"/>
+			</span>
 		</template>
 	</el-drawer>
 </template>
@@ -79,6 +81,10 @@ export default Vue.extend({
 			}
 		},
 		close() {
+			if (this.beforeClose) {
+				this.beforeClose();
+				return;
+			}
 			this.$store.commit('ui/closeTopModal');
 		},
 	},

packages/editor-ui/src/views/NodeView.vue

@@ -688,7 +688,8 @@ export default mixins(
 
 				if (e.key === 'd') {
 					this.callDebounced('deactivateSelectedNode', 350);
-				} else if (e.key === 'Delete') {
+
+				} else if (e.key === 'Delete' || e.key === 'Backspace') {
 					e.stopPropagation();
 					e.preventDefault();