🔀 Merge branch 'master' into i18n-v2

2021-12-19 13:52:04 +01:00
parent 0f1377d68f c2f81d9137
commit 5f6e9767c9
12 changed files with 866 additions and 768 deletions
--- a/packages/editor-ui/src/components/ModalDrawer.vue
+++ b/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');
 		},
 	},