Skip to content

Commit 3026edd

Browse files
committed
fix datepicker dropdown and taborder in create time entry
1 parent b6bbcd7 commit 3026edd

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { twMerge } from 'tailwind-merge';
88
99
const props = defineProps<{
1010
class?: string;
11+
tabindex?: string;
1112
}>();
1213
1314
// This has to be a localized timestamp, not UTC
@@ -50,6 +51,7 @@ const emit = defineEmits(['changed']);
5051
<input
5152
id="start"
5253
ref="datePicker"
54+
:tabindex="tabindex"
5355
:class="
5456
twMerge(
5557
'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/TimeEntry/TimeEntryCreateModal.vue

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import type {
1818
Client,
1919
CreateTimeEntryBody,
2020
} from '@/packages/api/src';
21-
import TimePicker from '@/packages/ui/src/Input/TimePicker.vue';
2221
import { getOrganizationCurrencyString } from '@/utils/money';
2322
import { canCreateProjects } from '@/utils/permissions';
2423
import TagDropdown from '@/packages/ui/src/Tag/TagDropdown.vue';
@@ -30,6 +29,7 @@ import DurationHumanInput from '@/packages/ui/src/Input/DurationHumanInput.vue';
3029
3130
import { InformationCircleIcon } from '@heroicons/vue/20/solid';
3231
import type { Tag, Task } from '@/packages/api/src';
32+
import TimePickerSimple from "@/packages/ui/src/Input/TimePickerSimple.vue";
3333
3434
const show = defineModel('show', { default: false });
3535
const saving = ref(false);
@@ -244,30 +244,34 @@ type BillableOption = {
244244
<div class="">
245245
<InputLabel>Start</InputLabel>
246246
<div class="flex flex-col items-center space-y-2 mt-1">
247-
<TimePicker
247+
<TimePickerSimple
248+
248249
v-model="localStart"
249-
size="large"></TimePicker>
250+
size="large"></TimePickerSimple>
250251
<DatePicker
251252
v-model="localStart"
253+
tabindex="1"
252254
class="text-xs text-text-tertiary max-w-28 px-1.5 py-1.5"></DatePicker>
253255
</div>
254256
</div>
255257
<div class="">
256258
<InputLabel>End</InputLabel>
257259
<div class="flex flex-col items-center space-y-2 mt-1">
258-
<TimePicker
260+
<TimePickerSimple
259261
v-model="localEnd"
260-
size="large"></TimePicker>
262+
size="large"></TimePickerSimple>
261263
<DatePicker
262264
v-model="localEnd"
265+
tabindex="1"
263266
class="text-xs text-text-tertiary max-w-28 px-1.5 py-1.5"></DatePicker>
264267
</div>
265268
</div>
266269
</div>
267270
</template>
268271
<template #footer>
269-
<SecondaryButton @click="show = false"> Cancel</SecondaryButton>
272+
<SecondaryButton tabindex="2" @click="show = false"> Cancel</SecondaryButton>
270273
<PrimaryButton
274+
tabindex="2"
271275
class="ms-3"
272276
:class="{ 'opacity-25': saving }"
273277
:disabled="saving"

0 commit comments

Comments
 (0)