From 822af44a47b7009a202a3df1f8753966034d8037 Mon Sep 17 00:00:00 2001 From: Fabio Di Stasio Date: Mon, 27 Jun 2022 18:28:04 +0200 Subject: [PATCH] refactor: minor improvements --- src/main/main.ts | 2 +- src/renderer/components/BaseSelect.vue | 1 - src/renderer/components/ModalFakerRows.vue | 10 +++++++++- src/renderer/components/TheTitleBar.vue | 7 ++++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/main.ts b/src/main/main.ts index d59eae33..94c641de 100644 --- a/src/main/main.ts +++ b/src/main/main.ts @@ -94,7 +94,7 @@ else { } }); - ipcMain.on('change-window-title', (event, title: string) => { + ipcMain.on('change-window-title', (_, title: string) => { if (mainWindow) mainWindow.setTitle(title); }); diff --git a/src/renderer/components/BaseSelect.vue b/src/renderer/components/BaseSelect.vue index 43115240..8dc5106b 100644 --- a/src/renderer/components/BaseSelect.vue +++ b/src/renderer/components/BaseSelect.vue @@ -377,7 +377,6 @@ export default defineComponent({ // fix position when the component is created and opened at the same time if (isOpen.value) { setTimeout(() => { - deactivate(); adjustListPosition(); }, 50); } diff --git a/src/renderer/components/ModalFakerRows.vue b/src/renderer/components/ModalFakerRows.vue index bba37cd4..ec6ff84a 100644 --- a/src/renderer/components/ModalFakerRows.vue +++ b/src/renderer/components/ModalFakerRows.vue @@ -125,7 +125,7 @@ const { getSelected: selectedWorkspace } = storeToRefs(workspacesStore); const { getWorkspace } = workspacesStore; -const { trapRef } = useFocusTrap(); +const { trapRef } = useFocusTrap({ disableAutofocus: true }); // eslint-disable-next-line @typescript-eslint/no-explicit-any const localRow: Ref<{[key: string]: any}> = ref({}); @@ -274,6 +274,14 @@ const wrapNumber = (num: number) => { window.addEventListener('keydown', onKey); onMounted(() => { + setTimeout(() => { + const inputs = Array.from(document.querySelectorAll('.modal-container .form-input')); + if (inputs?.length) { + const firstEnabledInput = inputs.find((el) => !el.disabled); + firstEnabledInput?.focus(); + } + }, 50); + const rowObj: {[key: string]: unknown} = {}; for (const field of props.fields) { diff --git a/src/renderer/components/TheTitleBar.vue b/src/renderer/components/TheTitleBar.vue index d40362bc..355e76c1 100644 --- a/src/renderer/components/TheTitleBar.vue +++ b/src/renderer/components/TheTitleBar.vue @@ -36,12 +36,13 @@