fix: basically just undo my previous modal changes

packages/client/src/components/MkMenu.vue

@@ -3,7 +3,6 @@
 		ref="focusTrap"
 		v-model:active="isActive"
 		:return-focus-on-deactivate="!noReturnFocus"
-		:initial-focus="() => itemsEl.children[0]"
 		@deactivate="emit('close')"
 	>
 		<div>

packages/client/src/components/MkModal.vue

@@ -14,16 +14,17 @@
 		:duration="transitionDuration"
 		appear
 		@after-leave="emit('closed')"
+		@keyup.esc="emit('click')"
 		@enter="emit('opening')"
 		@after-enter="onOpened"
 	>
 		<FocusTrap
 			v-model:active="isActive"
-			:return-focus-on-deactivate="false"
+			:return-focus-on-deactivate="!noReturnFocus"
-			@deactivate="close"
 		>
 			<div
 				v-show="manualShowing != null ? manualShowing : showing"
+				v-hotkey.global="keymap"
 				:class="[
 					$style.root,
 					{
@@ -43,6 +44,7 @@
 					'--transformOrigin': transformOrigin,
 				}"
 				tabindex="-1"
+				v-focus
 			>
 				<div
 					class="_modalBg data-cy-bg"
@@ -206,6 +208,10 @@ if (type === "drawer") {
 	maxHeight = window.innerHeight / 1.5;
 }
 
+const keymap = {
+	esc: () => emit("esc"),
+};
+
 const MARGIN = 16;
 
 const align = () => {
@@ -381,8 +387,6 @@ onMounted(() => {
 		{ immediate: true }
 	);
 
-	content.querySelector('button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])')?.focus();
-
 	nextTick(() => {
 		new ResizeObserver((entries, observer) => {
 			align();

packages/client/src/components/MkModalWindow.vue

@@ -6,6 +6,7 @@
 		@keyup.esc="$emit('close')"
 		@closed="$emit('closed')"
 	>
+		<FocusTrap v-model:active="isActive">
 			<div
 				ref="rootEl"
 				class="ebkgoccj"
@@ -56,6 +57,7 @@
 					<slot></slot>
 				</div>
 			</div>
+		</FocusTrap>
 	</MkModal>
 </template>