fix e2e submit focus test behaviour

TimeTrackerProjectTaskDropdown trigger focus

e2e/time.spec.ts

@@ -1579,6 +1579,57 @@ test('test that project selection works in create modal', async ({ page, ctx })
     expect(createBody.data.project_id).not.toBeNull();
 });
 
+test('test that ctrl+enter submits the create modal after selecting a project via keyboard', async ({
+    page,
+    ctx,
+}) => {
+    // Regression test for https://github.com/solidtime-io/solidtime/issues/1238
+    const projectName = 'Keyboard Submit Project ' + Math.floor(1 + Math.random() * 10000);
+    await createProjectViaApi(ctx, { name: projectName });
+
+    await goToTimeOverview(page);
+
+    await page.getByRole('button', { name: 'Time entry actions' }).click();
+    await page.getByRole('menuitem', { name: 'Manual time entry' }).click();
+    await expect(page.getByRole('dialog')).toBeVisible();
+    // The menu that opened the modal animates out and only then hands focus back to its
+    // own trigger.
+    await expect(page.locator('[role="menu"]')).toHaveCount(0);
+
+    // Fill the description, then move to the project dropdown and select a project purely via keyboard
+    const description = page.getByRole('dialog').getByRole('textbox', { name: 'Description' });
+    await description.fill('Keyboard submit test');
+    await description.press('Tab');
+    await expect(
+        page.getByRole('dialog').getByRole('button', { name: 'No Project' })
+    ).toBeFocused();
+    await page.keyboard.press('Enter');
+    await page.getByTestId('client_dropdown_search').fill(projectName);
+    await expect(page.getByRole('option', { name: projectName })).toBeVisible();
+    await page.keyboard.press('Enter');
+    const projectTrigger = page.getByRole('dialog').getByRole('button', { name: projectName });
+    await expect(projectTrigger).toBeVisible();
+    // The trigger label updates on the next tick, but the dropdown keeps focus until its
+    // exit animation has finished and reka-ui hands focus back to the trigger.
+    await expect(projectTrigger).toBeFocused();
+
+    // Ctrl+Enter must submit even though focus is no longer on the description input
+    const [createResponse] = await Promise.all([
+        page.waitForResponse(
+            (response) => response.url().includes('/time-entries') && response.status() === 201
+        ),
+        page.keyboard.press('Control+Enter'),
+    ]);
+    const createBody = await createResponse.json();
+    expect(createBody.data.description).toBe('Keyboard submit test');
+    expect(createBody.data.project_id).not.toBeNull();
+    await expect(page.getByRole('dialog')).toBeHidden();
+    const newTimeEntry = page.locator('[data-testid="time_entry_row"]').first();
+    await expect(newTimeEntry.getByTestId('time_entry_description').first()).toHaveValue(
+        'Keyboard submit test'
+    );
+});
+
 test('test that tag selection works in create modal', async ({ page }) => {
     await goToTimeOverview(page);
 

resources/js/Components/Common/Client/ClientCreateModal.vue

@@ -28,7 +28,7 @@ useFocus(clientNameInput, { initialValue: true });
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false">
+    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
         <template #title>
             <div class="flex space-x-2">
                 <span> Create Client </span>

resources/js/Components/Common/Client/ClientEditModal.vue

@@ -30,7 +30,7 @@ useFocus(clientNameInput, { initialValue: true });
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false">
+    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
         <template #title>
             <div class="flex space-x-2">
                 <span> Update Client </span>

resources/js/Components/Common/Member/MemberEditModal.vue

@@ -136,7 +136,7 @@ const roleDescription = computed(() => {
         v-model:show="showOwnershipTransferConfirmModal"
         :member-name="member.name"
         @submit="submit"></MemberOwnershipTransferConfirmModal>
-    <DialogModal closeable :show="show" @close="show = false">
+    <DialogModal closeable :show="show" @close="show = false" @submit="saveWithChecks()">
         <template #title>
             <div class="flex space-x-2">
                 <span> Update Member </span>

resources/js/Components/Common/Member/MemberInviteModal.vue

@@ -78,7 +78,7 @@ useFocus(clientNameInput, { initialValue: true });
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false">
+    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
         <template #title>
             <div class="flex space-x-2">
                 <span> Invite Member </span>

resources/js/Components/Common/Project/ProjectEditModal.vue

@@ -79,7 +79,7 @@ async function submitBillableRate() {
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false">
+    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
         <template #title>
             <div class="flex space-x-2">
                 <span> Edit Project {{ props.originalProject.name }} </span>

resources/js/Components/Common/ProjectMember/ProjectMemberCreateModal.vue

@@ -38,7 +38,7 @@ useFocus(projectNameInput, { initialValue: true });
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false">
+    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
         <template #title>
             <div class="flex space-x-2">
                 <span>Add Project Member</span>

resources/js/Components/Common/ProjectMember/ProjectMemberEditModal.vue

@@ -63,7 +63,7 @@ useFocus(projectNameInput, { initialValue: true });
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false">
+    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
         <template #title>
             <div class="flex space-x-2">
                 <span>Edit Project Member</span>

resources/js/Components/Common/Report/ReportCreateModal.vue

@@ -79,7 +79,7 @@ async function submit() {
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false">
+    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
         <template #title>
             <div class="flex space-x-2">
                 <span> Create Report </span>

resources/js/Components/Common/Report/ReportEditModal.vue

@@ -96,7 +96,7 @@ async function submit() {
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false">
+    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
         <template #title>
             <div class="flex space-x-2">
                 <span> Create Report </span>

resources/js/Components/Common/Tag/TagEditModal.vue

@@ -36,7 +36,7 @@ useFocus(tagNameInput, { initialValue: true });
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false">
+    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
         <template #title>
             <div class="flex space-x-2">
                 <span> Update Tag </span>

resources/js/Components/Common/Task/TaskCreateModal.vue

@@ -50,7 +50,7 @@ useFocus(taskNameInput, { initialValue: true });
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false">
+    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
         <template #title>
             <div class="flex space-x-2">
                 <span> Create Task </span>

resources/js/Components/Common/Task/TaskEditModal.vue

@@ -35,7 +35,7 @@ useFocus(taskNameInput, { initialValue: true });
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false">
+    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
         <template #title>
             <div class="flex space-x-2">
                 <span> Update Task </span>

resources/js/Components/Dashboard/ActivityGraphCard.vue

@@ -63,7 +63,7 @@ const max = computed(() => {
 });
 
 const backgroundColor = useCssVariable('--theme-color-card-background');
-const borderColor = useCssVariable('--color-border-secondary');
+const borderColor = useCssVariable('--color-border');
 const labelColor = useCssVariable('--color-text-secondary');
 const chartColorRaw = useCssVariable('--theme-color-chart');
 

resources/js/Components/Timesheet/BreakPlacementModal.vue

@@ -179,7 +179,7 @@ async function submit() {
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="emit('cancel')">
+    <DialogModal closeable :show="show" @close="emit('cancel')" @submit="submit">
         <template #title>
             <div class="flex items-center space-x-2">
                 <Coffee class="w-5 h-5 text-text-secondary" />

resources/js/packages/ui/src/DialogModal.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import Modal from './Modal.vue';
 
-const emit = defineEmits(['close']);
+const emit = defineEmits(['close', 'submit']);
 
 defineProps({
     show: {
@@ -24,7 +24,12 @@ const close = () => {
 </script>
 
 <template>
-    <Modal :show="show" :max-width="maxWidth" :closeable="closeable" @close="close">
+    <Modal
+        :show="show"
+        :max-width="maxWidth"
+        :closeable="closeable"
+        @close="close"
+        @submit="emit('submit')">
         <div class="px-4 lg:px-6 py-4">
             <div class="text-lg font-medium text-text-primary" role="heading">
                 <slot name="title" />

resources/js/packages/ui/src/Modal.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { Dialog, DialogContent, DialogFooter } from './dialog/index';
-import { computed } from 'vue';
+import { computed, nextTick } from 'vue';
 
 const props = defineProps({
     show: {
@@ -17,7 +17,7 @@ const props = defineProps({
     },
 });
 
-const emit = defineEmits(['close']);
+const emit = defineEmits(['close', 'submit']);
 
 const close = () => {
     if (props.closeable) {
@@ -25,6 +25,25 @@ const close = () => {
     }
 };
 
+// Ctrl+Enter (Cmd+Enter on macOS) submits the modal from any focused element inside it.
+// Handled in the capture phase so child elements (buttons, dropdown triggers, inputs with
+// their own Enter handlers) never see the keystroke and cannot open or double-submit.
+async function onKeydownCapture(event: KeyboardEvent) {
+    if (event.key !== 'Enter' || !(event.ctrlKey || event.metaKey) || event.isComposing) {
+        return;
+    }
+    event.preventDefault();
+    event.stopPropagation();
+    // Inputs like the time and duration fields commit their value on blur, so blur first
+    // and let the resulting model updates settle before submitting.
+    const active = document.activeElement;
+    if (active instanceof HTMLElement) {
+        active.blur();
+    }
+    await nextTick();
+    emit('submit');
+}
+
 const maxWidthClass = computed(() => {
     return {
         sm: 'sm:max-w-sm',
@@ -39,7 +58,7 @@ const maxWidthClass = computed(() => {
 <template>
     <Dialog :open="show" @update:open="close">
         <DialogContent :class="maxWidthClass">
-            <div class="min-w-0">
+            <div class="min-w-0" @keydown.capture="onKeydownCapture">
                 <slot />
             </div>
 

resources/js/packages/ui/src/Project/ProjectCreateModal.vue

@@ -72,7 +72,7 @@ const currentClientName = computed(() => {
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false">
+    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
         <template #title>
             <div class="flex space-x-2">
                 <span> Create Project </span>

resources/js/packages/ui/src/Tag/TagCreateModal.vue

@@ -30,7 +30,7 @@ useFocus(tagNameInput, { initialValue: true });
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false">
+    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
         <template #title>
             <div class="flex space-x-2">
                 <span> Create Tags </span>

resources/js/packages/ui/src/TimeEntry/BreakCreateModal.vue

@@ -78,7 +78,7 @@ async function submit() {
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false">
+    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
         <template #title>
             <div class="flex items-center space-x-2 text-amber-600 dark:text-amber-400">
                 <Coffee class="w-5 h-5" />

resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue

@@ -126,7 +126,7 @@ const billableProxy = computed({
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false">
+    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
         <template #title>
             <div class="flex space-x-2">
                 <span> Create manual time entry </span>

resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue

@@ -164,7 +164,7 @@ const typeProxy = computed({
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false">
+    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
         <template #title>
             <div class="flex space-x-2">
                 <span> Edit time entry </span>

resources/js/packages/ui/src/TimeEntry/TimeEntryMassUpdateModal.vue

@@ -16,6 +16,7 @@ import {
 } from '@/packages/api/src';
 import { Checkbox } from '@/packages/ui/src';
 import { TagIcon, ExclamationTriangleIcon } from '@heroicons/vue/20/solid';
+import { XMarkIcon } from '@heroicons/vue/16/solid';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '..';
 import { Button } from '@/packages/ui/src/Buttons';
 import TagDropdown from '@/packages/ui/src/Tag/TagDropdown.vue';
@@ -60,6 +61,13 @@ const projectId = ref<string | null>(null);
 const billable = ref<boolean | undefined>(undefined);
 const selectedTags = ref<string[]>([]);
 
+// Clearing the project puts both fields back to "leave unchanged", the same state the form
+// returns to after a successful submit.
+function resetProject() {
+    projectId.value = null;
+    taskId.value = undefined;
+}
+
 const timeEntryBillable = computed({
     get: () => {
         if (billable.value === undefined) {
@@ -147,7 +155,7 @@ const showBreakWarning = computed(
 </script>
 
 <template>
-    <DialogModal closeable :show="show" @close="show = false">
+    <DialogModal closeable :show="show" @close="show = false" @submit="submit">
         <template #title>
             <div class="flex space-x-2">
                 <span> Update {{ timeEntries.length }} time entries </span>
@@ -182,42 +190,59 @@ const showBreakWarning = computed(
                 </Field>
                 <Field>
                     <FieldLabel for="project">Project</FieldLabel>
-                    <TimeTrackerProjectTaskDropdown
-                        v-model:project="projectId"
-                        v-model:task="taskId"
-                        variant="input"
-                        align="start"
-                        size="default"
-                        :clients
-                        :create-project
-                        :create-client
-                        :currency="currency"
-                        :organization-billable-rate="organizationBillableRate"
-                        :can-create-project
-                        empty-placeholder="Select project..."
-                        allow-reset
-                        :enable-estimated-time
-                        :projects="projects"
-                        :tasks="tasks"></TimeTrackerProjectTaskDropdown>
+                    <div class="flex items-center gap-1 min-w-0">
+                        <!-- the dropdown declares its own `class` prop, which goes to the
+                             trigger button, so the growing has to happen on a wrapper -->
+                        <div class="flex-1 min-w-0">
+                            <TimeTrackerProjectTaskDropdown
+                                v-model:project="projectId"
+                                v-model:task="taskId"
+                                variant="input"
+                                align="start"
+                                size="default"
+                                :clients
+                                :create-project
+                                :create-client
+                                :currency="currency"
+                                :organization-billable-rate="organizationBillableRate"
+                                :can-create-project
+                                empty-placeholder="Select project..."
+                                :enable-estimated-time
+                                :projects="projects"
+                                :tasks="tasks"></TimeTrackerProjectTaskDropdown>
+                        </div>
+                        <button
+                            v-if="projectId !== null"
+                            type="button"
+                            data-testid="project_reset_button"
+                            class="p-1 rounded hover:bg-quaternary text-text-tertiary hover:text-text-primary"
+                            @click="resetProject">
+                            <XMarkIcon class="w-4 h-4" />
+                        </button>
+                    </div>
                 </Field>
                 <Field>
                     <FieldLabel>Tag</FieldLabel>
-                    <div class="flex space-x-5">
-                        <TagDropdown
-                            v-model="selectedTags"
-                            :create-tag
-                            :tags="tags"
-                            :show-no-tag-option="false">
-                            <template #trigger>
-                                <Button variant="input" :disabled="removeAllTags">
-                                    <TagIcon class="h-4 text-icon-default" />
-                                    <span v-if="selectedTags.length > 0">
-                                        Set {{ selectedTags.length }} tags
-                                    </span>
-                                    <span v-else>Select Tags...</span>
-                                </Button>
-                            </template>
-                        </TagDropdown>
+                    <div class="flex items-center space-x-5">
+                        <!-- the dropdown root is `min-w-0`, so as a flex item it would shrink
+                             below its trigger and let the button overflow into the checkbox -->
+                        <div class="shrink-0">
+                            <TagDropdown
+                                v-model="selectedTags"
+                                :create-tag
+                                :tags="tags"
+                                :show-no-tag-option="false">
+                                <template #trigger>
+                                    <Button variant="input" :disabled="removeAllTags">
+                                        <TagIcon class="h-4 text-icon-default" />
+                                        <span v-if="selectedTags.length > 0">
+                                            Set {{ selectedTags.length }} tags
+                                        </span>
+                                        <span v-else>Select Tags...</span>
+                                    </Button>
+                                </template>
+                            </TagDropdown>
+                        </div>
                         <Field orientation="horizontal">
                             <Checkbox id="no_tags" v-model:checked="removeAllTags"></Checkbox>
                             <FieldLabel for="no_tags">Remove all tags</FieldLabel>

resources/js/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue

@@ -12,7 +12,7 @@ import type {
     Client,
 } from '@/packages/api/src';
 
-import { PlusCircleIcon, MinusIcon, XMarkIcon } from '@heroicons/vue/16/solid';
+import { PlusCircleIcon, MinusIcon } from '@heroicons/vue/16/solid';
 import ProjectCreateModal from '@/packages/ui/src/Project/ProjectCreateModal.vue';
 import { twMerge } from 'tailwind-merge';
 import { Button } from '@/packages/ui/src/Buttons';
@@ -58,7 +58,6 @@ const props = withDefaults(
         createClient: (client: CreateClientBody) => Promise<Client | undefined>;
         currency: string;
         emptyPlaceholder?: string;
-        allowReset?: boolean;
         noProjectValue?: string | null;
         enableEstimatedTime: boolean;
         organizationBillableRate: number | null;
@@ -70,7 +69,6 @@ const props = withDefaults(
     }>(),
     {
         emptyPlaceholder: 'No Project',
-        allowReset: false,
         noProjectValue: NO_PROJECT_ID,
         variant: 'ghost',
         align: 'center',
@@ -558,12 +556,6 @@ function selectProject(projectId: string) {
     emit('changed', project.value, task.value);
 }
 
-function resetProject() {
-    project.value = null;
-    task.value = null;
-    emit('changed', project.value, task.value);
-}
-
 const showCreateProject = ref(false);
 </script>
 
@@ -571,40 +563,28 @@ const showCreateProject = ref(false);
     <Dropdown v-model="open" :close-on-content-click="false" :align="props.align">
         <template #trigger>
             <slot name="trigger">
-                <div class="flex items-center gap-1">
-                    <Button
-                        :variant="props.variant"
-                        :size="props.size"
-                        :class="twMerge('w-full justify-start overflow-hidden', props.class)">
-                        <div
-                            class="w-2.5 h-2.5 rounded-full shrink-0"
-                            :style="{ backgroundColor: selectedProjectColor }"></div>
-                        <span class="truncate shrink-[1] text-text-primary">{{
-                            selectedProjectName
-                        }}</span>
-                        <template v-if="currentTask">
-                            <ChevronRightIcon class="!size-3 text-text-primary shrink-0 -mx-1" />
-                            <span class="truncate shrink-[100]">{{ currentTask.name }}</span>
-                        </template>
-                        <template v-if="selectedClientName">
-                            <span class="dark:text-text-tertiary text-text-quaternary shrink-0"
-                                >•</span
-                            >
-                            <span
-                                class="truncate shrink-[200] dark:text-text-tertiary text-text-quaternary"
-                                >{{ selectedClientName }}</span
-                            >
-                        </template>
-                    </Button>
-                    <button
-                        v-if="allowReset && project !== null"
-                        type="button"
-                        data-testid="project_reset_button"
-                        class="p-1 rounded hover:bg-quaternary text-text-tertiary hover:text-text-primary"
-                        @click.stop="resetProject">
-                        <XMarkIcon class="w-4 h-4" />
-                    </button>
-                </div>
+                <Button
+                    :variant="props.variant"
+                    :size="props.size"
+                    :class="twMerge('w-full justify-start overflow-hidden', props.class)">
+                    <div
+                        class="w-2.5 h-2.5 rounded-full shrink-0"
+                        :style="{ backgroundColor: selectedProjectColor }"></div>
+                    <span class="truncate shrink-[1] text-text-primary">{{
+                        selectedProjectName
+                    }}</span>
+                    <template v-if="currentTask">
+                        <ChevronRightIcon class="!size-3 text-text-primary shrink-0 -mx-1" />
+                        <span class="truncate shrink-[100]">{{ currentTask.name }}</span>
+                    </template>
+                    <template v-if="selectedClientName">
+                        <span class="dark:text-text-tertiary text-text-quaternary shrink-0">•</span>
+                        <span
+                            class="truncate shrink-[200] dark:text-text-tertiary text-text-quaternary"
+                            >{{ selectedClientName }}</span
+                        >
+                    </template>
+                </Button>
             </slot>
         </template>
         <template #content>