add focus trap to tag dropdown to fix focus management

resources/js/packages/ui/src/Input/DatePicker.vue

@@ -8,6 +8,7 @@ import { twMerge } from 'tailwind-merge';
 
 const props = defineProps<{
     class?: string;
+    tabindex?: string;
 }>();
 
 // This has to be a localized timestamp, not UTC
@@ -50,6 +51,7 @@ const emit = defineEmits(['changed']);
         <input
             id="start"
             ref="datePicker"
+            :tabindex="tabindex"
             :class="
                 twMerge(
                     'bg-input-background border text-white border-input-border focus-visible:outline-0 focus-visible:border-input-border-active focus-visible:ring-0 rounded-md',

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

@@ -6,6 +6,7 @@ import TagCreateModal from '@/packages/ui/src/Tag/TagCreateModal.vue';
 import MultiselectDropdownItem from '@/packages/ui/src/Input/MultiselectDropdownItem.vue';
 import type { Tag } from '@/packages/api/src';
 import type { Placement } from '@floating-ui/vue';
+import {UseFocusTrap} from "@vueuse/integrations/useFocusTrap/component";
 
 const props = withDefaults(
     defineProps<{
@@ -177,46 +178,50 @@ const showCreateTagModal = ref(false);
             <slot name="trigger"></slot>
         </template>
         <template #content>
-            <input
-                ref="searchInput"
-                :value="searchValue"
-                data-testid="tag_dropdown_search"
-                class="bg-card-background border-0 placeholder-muted text-sm text-white py-2.5 focus:ring-0 border-b border-card-background-separator focus:border-card-background-separator w-full"
-                placeholder="Search for a Tag..."
-                @input="updateSearchValue"
-                @keydown.enter="addTagIfNoneExists"
-                @keydown.up.prevent="moveHighlightUp"
-                @keydown.down.prevent="moveHighlightDown" />
-            <div ref="dropdownViewport" class="w-60 max-h-60 overflow-y-scroll">
-                <div
-                    v-for="tag in filteredTags"
-                    :key="tag.id"
-                    role="option"
-                    :value="tag.id"
-                    :class="{
+            <UseFocusTrap
+                v-if="open"
+                :options="{ immediate: true, allowOutsideClick: true }">
+                <input
+                    ref="searchInput"
+                    :value="searchValue"
+                    data-testid="tag_dropdown_search"
+                    class="bg-card-background border-0 placeholder-muted text-sm text-white py-2.5 focus:ring-0 border-b border-card-background-separator focus:border-card-background-separator w-full"
+                    placeholder="Search for a Tag..."
+                    @input="updateSearchValue"
+                    @keydown.enter="addTagIfNoneExists"
+                    @keydown.up.prevent="moveHighlightUp"
+                    @keydown.down.prevent="moveHighlightDown" />
+                <div ref="dropdownViewport" class="w-60 max-h-60 overflow-y-scroll">
+                    <div
+                        v-for="tag in filteredTags"
+                        :key="tag.id"
+                        role="option"
+                        :value="tag.id"
+                        :class="{
                         'bg-card-background-active':
                             tag.id === highlightedItemId,
                     }"
-                    data-testid="tag_dropdown_entries"
-                    :data-tag-id="tag.id">
-                    <MultiselectDropdownItem
-                        :selected="isTagSelected(tag.id)"
-                        :name="tag.name"
-                        @click="toggleTag(tag.id)"></MultiselectDropdownItem>
+                        data-testid="tag_dropdown_entries"
+                        :data-tag-id="tag.id">
+                        <MultiselectDropdownItem
+                            :selected="isTagSelected(tag.id)"
+                            :name="tag.name"
+                            @click="toggleTag(tag.id)"></MultiselectDropdownItem>
+                    </div>
                 </div>
-            </div>
-            <div class="hover:bg-card-background-active rounded-b-lg">
-                <button
-                    class="text-white w-full flex space-x-3 items-center px-4 py-3 text-xs font-semibold border-t border-card-background-separator"
-                    @click="
+                <div class="hover:bg-card-background-active rounded-b-lg">
+                    <button
+                        class="text-white w-full flex space-x-3 items-center px-4 py-3 text-xs font-semibold border-t border-card-background-separator"
+                        @click="
                         open = false;
                         showCreateTagModal = true;
                     ">
-                    <PlusCircleIcon
-                        class="w-5 flex-shrink-0 text-icon-default"></PlusCircleIcon>
-                    <span>Create new Tag</span>
-                </button>
-            </div>
+                        <PlusCircleIcon
+                            class="w-5 flex-shrink-0 text-icon-default"></PlusCircleIcon>
+                        <span>Create new Tag</span>
+                    </button>
+                </div>
+            </UseFocusTrap>
         </template>
     </Dropdown>
 </template>

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

@@ -18,7 +18,6 @@ import type {
     Client,
     CreateTimeEntryBody,
 } from '@/packages/api/src';
-import TimePicker from '@/packages/ui/src/Input/TimePicker.vue';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import { canCreateProjects } from '@/utils/permissions';
 import TagDropdown from '@/packages/ui/src/Tag/TagDropdown.vue';
@@ -30,6 +29,7 @@ import DurationHumanInput from '@/packages/ui/src/Input/DurationHumanInput.vue';
 
 import { InformationCircleIcon } from '@heroicons/vue/20/solid';
 import type { Tag, Task } from '@/packages/api/src';
+import TimePickerSimple from "@/packages/ui/src/Input/TimePickerSimple.vue";
 
 const show = defineModel('show', { default: false });
 const saving = ref(false);
@@ -244,30 +244,34 @@ type BillableOption = {
                 <div class="">
                     <InputLabel>Start</InputLabel>
                     <div class="flex flex-col items-center space-y-2 mt-1">
-                        <TimePicker
+                        <TimePickerSimple
+
                             v-model="localStart"
-                            size="large"></TimePicker>
+                            size="large"></TimePickerSimple>
                         <DatePicker
                             v-model="localStart"
+                            tabindex="1"
                             class="text-xs text-text-tertiary max-w-28 px-1.5 py-1.5"></DatePicker>
                     </div>
                 </div>
                 <div class="">
                     <InputLabel>End</InputLabel>
                     <div class="flex flex-col items-center space-y-2 mt-1">
-                        <TimePicker
+                        <TimePickerSimple
                             v-model="localEnd"
-                            size="large"></TimePicker>
+                            size="large"></TimePickerSimple>
                         <DatePicker
                             v-model="localEnd"
+                            tabindex="1"
                             class="text-xs text-text-tertiary max-w-28 px-1.5 py-1.5"></DatePicker>
                     </div>
                 </div>
             </div>
         </template>
         <template #footer>
-            <SecondaryButton @click="show = false"> Cancel</SecondaryButton>
+            <SecondaryButton tabindex="2" @click="show = false"> Cancel</SecondaryButton>
             <PrimaryButton
+                tabindex="2"
                 class="ms-3"
                 :class="{ 'opacity-25': saving }"
                 :disabled="saving"